From 72975d941a11a6da4302bdd56d1ecde31db86983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20Sim=C3=A3o?= Date: Tue, 16 Jun 2009 15:21:17 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1056 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../nbproject/private/private.properties | 13 +++++++++---- trunk/PlanosActuacao/src/java/db/Db.java | 1 + trunk/PlanosActuacao/src/java/db/Dblocal.java | 1 + .../java/db/providers/CreatePlanosDataProvider.java | 6 +++--- .../src/java/db/providers/PlanosDataProvider.java | 8 ++++---- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/trunk/PlanosActuacao/nbproject/private/private.properties b/trunk/PlanosActuacao/nbproject/private/private.properties index 702a7e1c..36b9f129 100644 --- a/trunk/PlanosActuacao/nbproject/private/private.properties +++ b/trunk/PlanosActuacao/nbproject/private/private.properties @@ -1,7 +1,12 @@ -deploy.ant.properties.file=/home/ntaborda/.netbeans/6.5/tomcat60.properties -j2ee.platform.classpath=/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-es.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-coyote.jar:/usr/local/apache-tomcat-6.0.18/lib/jasper.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina-ha.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-dbcp.jar:/usr/local/apache-tomcat-6.0.18/lib/tomcat-i18n-fr.jar:/usr/local/apache-tomcat-6.0.18/lib/catalina.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/catalina-tribes.jar:/usr/local/apache-tomcat-6.0.18/lib/jsp-api.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/bin/tomcat-juli.jar -j2ee.server.instance=tomcat60:home=/usr/local/apache-tomcat-6.0.18:base=apache-tomcat-6.0.18_base +auxiliary.org-netbeans-modules-web-client-tools-api.clientdebug=false +auxiliary.org-netbeans-modules-web-client-tools-api.dialogShowDebugPanel=false +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/tsimao/.netbeans/6.5/tomcat60.properties +j2ee.platform.classpath=/usr/local/netbeans-6.5.1/apache-tomcat-6.0.18/lib/tomcat-dbcp.jar:/usr/local/netbeans-6.5.1/apache-tomcat-6.0.18/lib/servlet-api.jar:/usr/local/netbeans-6.5.1/apache-tomcat-6.0.18/lib/annotations-api.jar:/usr/local/netbeans-6.5.1/apache-tomcat-6.0.18/lib/tomcat-i18n-fr.jar:/usr/local/netbeans-6.5.1/apache-tomcat-6.0.18/lib/jasper.jar:/usr/local/netbeans-6.5.1/apache-tomcat-6.0.18/lib/tomcat-i18n-es.jar:/usr/local/netbeans-6.5.1/apache-tomcat-6.0.18/lib/catalina.jar:/usr/local/netbeans-6.5.1/apache-tomcat-6.0.18/lib/jasper-el.jar:/usr/local/netbeans-6.5.1/apache-tomcat-6.0.18/lib/catalina-ha.jar:/usr/local/netbeans-6.5.1/apache-tomcat-6.0.18/lib/tomcat-i18n-ja.jar:/usr/local/netbeans-6.5.1/apache-tomcat-6.0.18/lib/el-api.jar:/usr/local/netbeans-6.5.1/apache-tomcat-6.0.18/lib/catalina-ant.jar:/usr/local/netbeans-6.5.1/apache-tomcat-6.0.18/lib/jsp-api.jar:/usr/local/netbeans-6.5.1/apache-tomcat-6.0.18/lib/tomcat-coyote.jar:/usr/local/netbeans-6.5.1/apache-tomcat-6.0.18/lib/catalina-tribes.jar:/usr/local/netbeans-6.5.1/apache-tomcat-6.0.18/bin/tomcat-juli.jar +j2ee.server.instance=tomcat60:home=/usr/local/netbeans-6.5.1/apache-tomcat-6.0.18:base=apache-tomcat-6.0.18_base javac.debug=true javadoc.preview=true jaxws.endorsed.dir=/usr/local/netbeans-6.5.1/java2/modules/ext/jaxws21/api:/usr/local/netbeans-6.5.1/ide10/modules/ext/jaxb/api -user.properties.file=/home/ntaborda/.netbeans/6.5/build.properties +user.properties.file=/home/tsimao/.netbeans/6.5/build.properties diff --git a/trunk/PlanosActuacao/src/java/db/Db.java b/trunk/PlanosActuacao/src/java/db/Db.java index 28b48762..28d44dad 100644 --- a/trunk/PlanosActuacao/src/java/db/Db.java +++ b/trunk/PlanosActuacao/src/java/db/Db.java @@ -20,6 +20,7 @@ import utils.JSFUtils; */ public class Db { //String connectionURL = "jdbc:postgresql://storage:5432/siprp"; //testes +// String connectionURL = "jdbc:postgresql://www.evolute.pt:5436/siprp"; //real String connectionURL = "jdbc:postgresql://localhost:5436/siprp"; //real diff --git a/trunk/PlanosActuacao/src/java/db/Dblocal.java b/trunk/PlanosActuacao/src/java/db/Dblocal.java index a6f4c713..3dfdbe73 100644 --- a/trunk/PlanosActuacao/src/java/db/Dblocal.java +++ b/trunk/PlanosActuacao/src/java/db/Dblocal.java @@ -26,6 +26,7 @@ public class Dblocal { //String connectionURL = "jdbc:postgresql://storage/siprp_local"; //testes //String connectionURL = "jdbc:postgresql://storage/siprp_local_3"; //testes local_3 +// String connectionURL = "jdbc:postgresql://www.evolute.pt:5436/siprp_local_3"; //testes local_3 String connectionURL = "jdbc:postgresql://localhost:5436/siprp_local_3"; diff --git a/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java b/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java index 1acd3414..c8834889 100644 --- a/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java +++ b/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java @@ -71,10 +71,10 @@ public class CreatePlanosDataProvider { { ArrayList list = new ArrayList(); Statement st = createStatement(); - String sql = "select data_visita from planos_actuacao "; + String sql = "select data_visita from planos_actuacao where deleted_date is null"; if( estabelecimentoID != null ) { - sql += "where estabelecimento_id = " + estabelecimentoID; + sql += "and estabelecimento_id = " + estabelecimentoID; } ResultSet rs = st.executeQuery(sql); @@ -98,7 +98,7 @@ public class CreatePlanosDataProvider { try { Statement st = createStatement(); - String sql = "select distinct estabelecimento_id from planos_actuacao where deleted_date is not null"; + String sql = "select distinct estabelecimento_id from planos_actuacao where deleted_date is null"; ResultSet rs = st.executeQuery(sql); if(rs.isBeforeFirst()) { diff --git a/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java b/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java index fc52b70f..1190e82d 100644 --- a/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java +++ b/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java @@ -415,7 +415,7 @@ public class PlanosDataProvider extends GenericDataProvider{ { sql += " and estabelecimento_id = " + u.getEstabelecimento_id(); } - + sql += " and deleted_date is null"; ResultSet rs = st.executeQuery(sql); ArrayList list = getFullPlanos(rs); @@ -477,7 +477,7 @@ public class PlanosDataProvider extends GenericDataProvider{ sql += " and estabelecimento_id = " + u.getEstabelecimento_gestor(); } } - + sql += " and deleted_date is null"; System.out.println("PLANOS SEGUIMENTO SQL : " + sql); ResultSet rs = st.executeQuery(sql); ArrayList list = getFullPlanos(rs); @@ -493,7 +493,7 @@ public class PlanosDataProvider extends GenericDataProvider{ { sql += " and estabelecimento_id = " + u.getEstabelecimento_id(); } - + sql += " and deleted_date is null"; System.out.println("PLANOS CONCLUIDOS SQL : " + sql); ResultSet rs = st.executeQuery(sql); ArrayList list = getFullPlanos(rs); @@ -726,7 +726,7 @@ public class PlanosDataProvider extends GenericDataProvider{ sql += "inner join plano_areas on plano_riscos.area_id = plano_areas.id "; sql += "inner join planos_actuacao on plano_areas.plano_id = planos_actuacao.id "; sql += "where planos_actuacao.id = " + plano_id; - + sql += " and planos_actuacao.deleted_date is null"; int total_riscos = 0; try