diff --git a/trunk/PlanosActuacao/lib/evolute.jar b/trunk/PlanosActuacao/lib/evolute.jar index 18f3067d..4ae1de1b 100644 Binary files a/trunk/PlanosActuacao/lib/evolute.jar and b/trunk/PlanosActuacao/lib/evolute.jar differ diff --git a/trunk/PlanosActuacao/lib/shst.jar b/trunk/PlanosActuacao/lib/shst.jar index 9cf6a6cc..da44ffec 100644 Binary files a/trunk/PlanosActuacao/lib/shst.jar and b/trunk/PlanosActuacao/lib/shst.jar differ diff --git a/trunk/PlanosActuacao/nbproject/private/private.properties b/trunk/PlanosActuacao/nbproject/private/private.properties index 5858bc8d..69a1b979 100644 --- a/trunk/PlanosActuacao/nbproject/private/private.properties +++ b/trunk/PlanosActuacao/nbproject/private/private.properties @@ -4,7 +4,7 @@ auxiliary.org-netbeans-modules-web-client-tools-api.FIREFOX=true auxiliary.org-netbeans-modules-web-client-tools-api.INTERNET_5f_EXPLORER=false auxiliary.org-netbeans-modules-web-client-tools-api.serverdebug=true deploy.ant.properties.file=/home/dneves/.netbeans/6.7/tomcat60.properties -j2ee.platform.classpath=/usr/local/apache-tomcat-6.0.18/lib/jasper.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ant.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-ja.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-fr.jar:/usr/local/apache-tomcat-6.0.18/lib/annotations-api.jar:/usr/local/apache-tomcat-6.0.18/lib/servlet-api.jar:/usr/local/apache-tomcat-6.0.18/lib/jasper-el.jar:/usr/local/apache-tomcat-6.0.18/lib/el-api.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-es.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-tribes.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ha.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-coyote.jar:/usr/local/apache-tomcat-6.0.18/lib/jsp-api.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-dbcp.jar:/usr/local/apache-tomcat-6.0.18/bin/tomcat-juli.jar +j2ee.platform.classpath=/usr/local/apache-tomcat-6.0.18/lib/catalina.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-tribes.jar:/usr/local/apache-tomcat-6.0.18/lib/jasper.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-coyote.jar:/usr/local/apache-tomcat-6.0.18/lib/annotations-api.jar:/usr/local/apache-tomcat-6.0.18/lib/servlet-api.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-es.jar:/usr/local/apache-tomcat-6.0.18/lib/jasper-el.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-dbcp.jar:/usr/local/apache-tomcat-6.0.18/lib/el-api.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ha.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-ja.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-fr.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ant.jar:/usr/local/apache-tomcat-6.0.18/lib/jsp-api.jar:/usr/local/apache-tomcat-6.0.18/bin/tomcat-juli.jar j2ee.server.instance=tomcat60:home=/usr/local/apache-tomcat-6.0.18:base=apache-tomcat-6.0.18_base javac.debug=true javadoc.preview=true diff --git a/trunk/PlanosActuacao/src/java/app.properties b/trunk/PlanosActuacao/src/java/app.properties index 3d576c07..d4468a92 100644 --- a/trunk/PlanosActuacao/src/java/app.properties +++ b/trunk/PlanosActuacao/src/java/app.properties @@ -12,7 +12,7 @@ database.siprp_local = siprp_local_3 username.siprp_local = postgres #password.siprp_local = -# tests +# tests evoserver #server.siprp = evoserver #port.siprp = 5432 #database.siprp = siprp_20100813 @@ -23,4 +23,17 @@ username.siprp_local = postgres #port.siprp_local = 5432 #database.siprp_local = siprp_local_3_20100813 #username.siprp_local = postgres -##password.siprp_local = \ No newline at end of file +##password.siprp_local = + +# tests evolute.pt +#server.siprp = www.evolute.pt +#port.siprp = 5436 +#database.siprp = siprp +#username.siprp = postgres +#password.siprp = -rg2hpgsql +# +#server.siprp_local = www.evolute.pt +#port.siprp_local = 5436 +#database.siprp_local = siprp_local_3 +#username.siprp_local = postgres +#password.siprp_local = -rg2hpgsql diff --git a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanosActuacao.java b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanosActuacao.java index ab4d1551..cb02ae70 100644 --- a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanosActuacao.java +++ b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanosActuacao.java @@ -93,6 +93,8 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >(); @@ -230,6 +232,9 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject + + + + diff --git a/trunk/PlanosActuacao/src/java/db/entidades/PlanoActuacao.java b/trunk/PlanosActuacao/src/java/db/entidades/PlanoActuacao.java index d81eb372..285d80ba 100644 --- a/trunk/PlanosActuacao/src/java/db/entidades/PlanoActuacao.java +++ b/trunk/PlanosActuacao/src/java/db/entidades/PlanoActuacao.java @@ -79,6 +79,9 @@ public class PlanoActuacao implements Serializable private String tecnicos_nomes; + private Integer hs_relatorio_id; + + public PlanoActuacao() { @@ -514,4 +517,12 @@ public class PlanoActuacao implements Serializable this.user_seg = user_seg; } + public Integer getHs_relatorio_id() { + return hs_relatorio_id; + } + + public void setHs_relatorio_id(Integer hs_relatorio_id) { + this.hs_relatorio_id = hs_relatorio_id; + } + } diff --git a/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java b/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java index e074b4f5..cb27d435 100644 --- a/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java +++ b/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java @@ -587,9 +587,11 @@ public class CreatePlanosDataProvider extends GenericDataProvider planoData.setData_validacao_seg( null ); planoData.setUser_seg( null ); + planoData.setHs_relatorio_id( p.getHs_relatorio_id() ); + System.out.println( "\nCREATE PLANO : " ); planoData.setProvider( EvoBaseProvider.getInstance().getProvider() ); - planoData.save();; + planoData.save(); newPlanoID = planoData.getId(); System.out.println( "\n\tplanoID : " + newPlanoID ); diff --git a/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java b/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java index 2ed2012f..cf0ef49a 100644 --- a/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java +++ b/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java @@ -396,6 +396,7 @@ public class PlanosDataProvider extends GenericDataProvider pa.setData_disponibilizacao( rs.getDate( "data_disponibilizacao" ) ); pa.setData_validacao_seg( rs.getDate( "data_validacao_seg" ) ); pa.setUser_seg( rs.getInt( "user_seg" ) ); + pa.setHs_relatorio_id( rs.getInt( "hs_relatorio_id" ) ); list.add( pa ); } diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java b/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java index 53e46406..b2994a96 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java @@ -234,6 +234,7 @@ public class PlanosActuacao p.setNome_estabelecimento( relatorio.toMarcacao_id().toEstabelecimento_id().getNome() ); p.setData_relatorio(relatorio.getData()); p.setData_disponibilizacao( relatorio.getIs_submetido() ); + p.setHs_relatorio_id( relatorio.getId() ); //p = rdp.getFullPlano(p, relatorio.getId()); p = cpdp.getFullPlano( p, relatorio.getId() ); diff --git a/trunk/PlanosActuacao/src/java/utils/PlanosUpdater.java b/trunk/PlanosActuacao/src/java/utils/PlanosUpdater.java new file mode 100644 index 00000000..9e4f7cae --- /dev/null +++ b/trunk/PlanosActuacao/src/java/utils/PlanosUpdater.java @@ -0,0 +1,101 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package utils; + +import com.evolute.utils.arrays.Virtual2DArray; +import com.evolute.utils.db.Executer; +import com.evolute.utils.sql.Assignment; +import com.evolute.utils.sql.Expression; +import com.evolute.utils.sql.Field; +import com.evolute.utils.sql.Select2; +import com.evolute.utils.sql.Update; +import db.providers.EvoBaseProvider; +import java.util.Date; +import shst.companydataloaders.SIPRPPropertiesLoader; + +/** + * + * @author dneves + */ +public class PlanosUpdater +{ + + public static void main( String[] args ) + { + try + { + SIPRPPropertiesLoader props = SIPRPPropertiesLoader.getInstance(); + props.load(); + + EvoBaseProvider provider = EvoBaseProvider.getInstance(); + Executer executer = provider.getExecuter(); + Executer localExecuter = provider.getLocalExecuter(); + + // Expression whereExpression = new Field( "planos_actuacao.deleted_date" ).isEqual( null ); + Expression whereExpression = null; + Select2 query = new Select2( + new String[] { "planos_actuacao" }, + new Integer[] {}, + new Expression[] {}, + new String[] { "planos_actuacao.id", "planos_actuacao.estabelecimento_id", "planos_actuacao.data_visita" }, + whereExpression, + new String[] { "planos_actuacao.estabelecimento_id", "planos_actuacao.data_visita" }, + null, null, null + ); + Virtual2DArray array = executer.executeQuery( query ); + if ( array != null ) + { + System.out.println( array.columnLength() + " : " ); + + for ( int i = 0; i < array.columnLength(); i++ ) + { + Integer planoID = array.get( i, 0 ); + Integer estabelecimentoID = array.get( i, 1 ); + Date dataVisita = array.get( i, 2 ); + + System.out.println( planoID + " : " + estabelecimentoID + " : " + dataVisita ); + + Integer relatorioID = null; + Date dataDisponibilizacao = null; + + Expression whereExpression2 = new Field( "marcacoes_estabelecimento.data" ).isEqual( dataVisita ).and( + new Field( "marcacoes_estabelecimento.estabelecimento_id" ).isEqual( estabelecimentoID ) + ); + Select2 query2 = new Select2( + new String[] { "hs_relatorio", "marcacoes_estabelecimento" }, + new Integer[] { Select2.JOIN_INNER }, + new Expression[] { + new Field( "marcacoes_estabelecimento.id" ).isEqual( new Field( "hs_relatorio.marcacao_id" ) ) + }, + new String[] { "hs_relatorio.id", "hs_relatorio.is_submetido" }, + whereExpression2, + null, + null, null, null + ); + Virtual2DArray array2 = localExecuter.executeQuery( query2 ); + if ( array2 != null && array2.columnLength() > 0 ) + { + relatorioID = array2.get( 0, 0 ); + dataDisponibilizacao = array2.get( 0, 1 ); + } + + System.out.println( "\tRelatorioID : " + relatorioID ); + + Update upd = new Update( "planos_actuacao", new Assignment[] { + new Assignment( new Field( "hs_relatorio_id" ), relatorioID ), + new Assignment( new Field( "data_disponibilizacao" ), dataDisponibilizacao ) + }, new Field( "id" ).isEqual( planoID ) ); + executer.executeQuery( upd ); + } + } + } + catch ( Exception e ) + { + System.out.println( e.getMessage() ); + } + } + +}