diff --git a/trunk/PlanosActuacao/nbproject/build-impl.xml b/trunk/PlanosActuacao/nbproject/build-impl.xml index f14eb1a2..3a4926eb 100644 --- a/trunk/PlanosActuacao/nbproject/build-impl.xml +++ b/trunk/PlanosActuacao/nbproject/build-impl.xml @@ -545,10 +545,11 @@ exists or setup the property manually. For example like this: + - + @@ -581,6 +582,7 @@ exists or setup the property manually. For example like this: + diff --git a/trunk/PlanosActuacao/nbproject/genfiles.properties b/trunk/PlanosActuacao/nbproject/genfiles.properties index cd3486b6..d94b1f12 100644 --- a/trunk/PlanosActuacao/nbproject/genfiles.properties +++ b/trunk/PlanosActuacao/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=62e730b3 +build.xml.data.CRC32=602937d9 build.xml.script.CRC32=50b8b881 build.xml.stylesheet.CRC32=c0ebde35@1.15.2.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=62e730b3 -nbproject/build-impl.xml.script.CRC32=1fbdeec4 +nbproject/build-impl.xml.data.CRC32=602937d9 +nbproject/build-impl.xml.script.CRC32=de64e499 nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.2.1 diff --git a/trunk/PlanosActuacao/nbproject/project.properties b/trunk/PlanosActuacao/nbproject/project.properties index 4316e28f..0518d577 100644 --- a/trunk/PlanosActuacao/nbproject/project.properties +++ b/trunk/PlanosActuacao/nbproject/project.properties @@ -31,6 +31,7 @@ file.reference.commons-io-1.4.jar=lib/commons-io-1.4.jar file.reference.commons-lang-2.1.jar=lib/commons-lang-2.1.jar file.reference.commons-logging-1.1.jar=lib/commons-logging-1.1.jar file.reference.cursos.jar=lib/cursos.jar +file.reference.el-impl-2.2.jar=lib/el-impl-2.2.jar file.reference.evologger.jar=lib/evologger.jar file.reference.evolute.jar=lib/evolute.jar file.reference.fop.jar=lib/fop.jar @@ -80,7 +81,8 @@ javac.classpath=\ ${file.reference.xml-apis-1.3.04.jar}:\ ${file.reference.xml-apis-ext-1.3.04.jar}:\ ${file.reference.serializer-2.7.0.jar}:\ - ${file.reference.cursos.jar} + ${file.reference.cursos.jar}:\ + ${file.reference.el-impl-2.2.jar} # Space-separated list of extra javac options javac.compilerargs= javac.debug=true diff --git a/trunk/PlanosActuacao/nbproject/project.xml b/trunk/PlanosActuacao/nbproject/project.xml index 3a7cff80..e618a4ef 100644 --- a/trunk/PlanosActuacao/nbproject/project.xml +++ b/trunk/PlanosActuacao/nbproject/project.xml @@ -123,6 +123,10 @@ ${file.reference.cursos.jar} WEB-INF/lib + + ${file.reference.el-impl-2.2.jar} + WEB-INF/lib + diff --git a/trunk/PlanosActuacao/src/java/app.properties b/trunk/PlanosActuacao/src/java/app.properties index d4468a92..cfdcea4a 100644 --- a/trunk/PlanosActuacao/src/java/app.properties +++ b/trunk/PlanosActuacao/src/java/app.properties @@ -12,28 +12,17 @@ database.siprp_local = siprp_local_3 username.siprp_local = postgres #password.siprp_local = -# tests evoserver -#server.siprp = evoserver -#port.siprp = 5432 -#database.siprp = siprp_20100813 -#username.siprp = postgres -##password.siprp = -# -#server.siprp_local = evoserver -#port.siprp_local = 5432 -#database.siprp_local = siprp_local_3_20100813 -#username.siprp_local = postgres -##password.siprp_local = -# tests evolute.pt -#server.siprp = www.evolute.pt -#port.siprp = 5436 + +# tests +#server.siprp = localhost +#port.siprp = 5432 #database.siprp = siprp #username.siprp = postgres -#password.siprp = -rg2hpgsql +#password.siprp = Typein # -#server.siprp_local = www.evolute.pt -#port.siprp_local = 5436 +#server.siprp_local = localhost +#port.siprp_local = 5432 #database.siprp_local = siprp_local_3 #username.siprp_local = postgres -#password.siprp_local = -rg2hpgsql +#password.siprp_local = Typein diff --git a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Acidentados.java b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Acidentados.java index 48158509..293c1eb8 100644 --- a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Acidentados.java +++ b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Acidentados.java @@ -204,14 +204,17 @@ public class Acidentados extends com.evolute.entity.evo.EvoDataObjectfromAnalisesAcidentes_acidentado_id() { - java.util.List result = null; - try - { - result = fromReference( db.data.siprp.outer.AnalisesAcidentesData.class , getPrimaryKey().getMap().get("id"), "acidentado_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.AnalisesAcidentesData >(); + if ( getPrimaryKey() != null ) + { + try + { + result = fromReference( db.data.siprp.outer.AnalisesAcidentesData.class , getPrimaryKey().getMap().get("id"), "acidentado_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } diff --git a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/AnalisesAcidentes.java b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/AnalisesAcidentes.java index 4159182e..529fd159 100644 --- a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/AnalisesAcidentes.java +++ b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/AnalisesAcidentes.java @@ -869,28 +869,34 @@ public class AnalisesAcidentes extends com.evolute.entity.evo.EvoDataObjectfromMedidas_analise_id() { - java.util.List result = null; - try - { - result = fromReference( db.data.siprp.outer.MedidasData.class , getPrimaryKey().getMap().get("id"), "analise_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.MedidasData >(); + if ( getPrimaryKey() != null ) + { + try + { + result = fromReference( db.data.siprp.outer.MedidasData.class , getPrimaryKey().getMap().get("id"), "analise_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } public java.util.ListfromRecomendacoes_analise_id() { - java.util.List result = null; - try - { - result = fromReference( db.data.siprp.outer.RecomendacoesData.class , getPrimaryKey().getMap().get("id"), "analise_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.RecomendacoesData >(); + if ( getPrimaryKey() != null ) + { + try + { + result = fromReference( db.data.siprp.outer.RecomendacoesData.class , getPrimaryKey().getMap().get("id"), "analise_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } diff --git a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Departamentos.java b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Departamentos.java index 187c19e2..1408f2ea 100644 --- a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Departamentos.java +++ b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Departamentos.java @@ -102,28 +102,34 @@ public class Departamentos extends com.evolute.entity.evo.EvoDataObjectfromAnalisesAcidentes_departamento_id() { - java.util.List result = null; - try + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.AnalisesAcidentesData >(); + if ( getPrimaryKey() != null ) { - result = fromReference( db.data.siprp.outer.AnalisesAcidentesData.class , getPrimaryKey().getMap().get("id"), "departamento_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + try + { + result = fromReference( db.data.siprp.outer.AnalisesAcidentesData.class , getPrimaryKey().getMap().get("id"), "departamento_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } public java.util.ListfromSeccoes_departamento_id() { - java.util.List result = null; - try + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.SeccoesData >(); + if ( getPrimaryKey() != null ) { - result = fromReference( db.data.siprp.outer.SeccoesData.class , getPrimaryKey().getMap().get("id"), "departamento_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + try + { + result = fromReference( db.data.siprp.outer.SeccoesData.class , getPrimaryKey().getMap().get("id"), "departamento_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } diff --git a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Empresas.java b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Empresas.java index db903c06..1f56ab10 100644 --- a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Empresas.java +++ b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Empresas.java @@ -188,42 +188,51 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObjectfromAvisos_empresa_id() { - java.util.List result = null; - try - { - result = fromReference( db.data.siprp.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.AvisosData >(); + if ( getPrimaryKey() != null ) + { + try + { + result = fromReference( db.data.siprp.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } public java.util.ListfromEstabelecimentos_empresa_id() { - java.util.List result = null; - try - { - result = fromReference( db.data.siprp.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.EstabelecimentosData >(); + if ( getPrimaryKey() != null ) + { + try + { + result = fromReference( db.data.siprp.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } public java.util.ListfromMarcacoesEmpresa_empresa_id() { - java.util.List result = null; - try - { - result = fromReference( db.data.siprp.outer.MarcacoesEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.MarcacoesEmpresaData >(); + if ( getPrimaryKey() != null ) + { + try + { + result = fromReference( db.data.siprp.outer.MarcacoesEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } diff --git a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Estabelecimentos.java b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Estabelecimentos.java index b576d642..f4aab040 100644 --- a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Estabelecimentos.java +++ b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Estabelecimentos.java @@ -158,42 +158,51 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObjectfromAvisos_estabelecimento_id() { - java.util.List result = null; - try - { - result = fromReference( db.data.siprp.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.AvisosData >(); + if ( getPrimaryKey() != null ) + { + try + { + result = fromReference( db.data.siprp.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } public java.util.ListfromHistoricoEstabelecimento_estabelecimento_id() { - java.util.List result = null; - try + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.HistoricoEstabelecimentoData >(); + if ( getPrimaryKey() != null ) { - result = fromReference( db.data.siprp.outer.HistoricoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + try + { + result = fromReference( db.data.siprp.outer.HistoricoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } public java.util.ListfromTrabalhadores_estabelecimento_id() { - java.util.List result = null; - try - { - result = fromReference( db.data.siprp.outer.TrabalhadoresData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.TrabalhadoresData >(); + if ( getPrimaryKey() != null ) + { + try + { + result = fromReference( db.data.siprp.outer.TrabalhadoresData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } diff --git a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/EstadoMedidas.java b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/EstadoMedidas.java index 2408c8e4..ba43213c 100644 --- a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/EstadoMedidas.java +++ b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/EstadoMedidas.java @@ -109,14 +109,17 @@ public class EstadoMedidas extends com.evolute.entity.evo.EvoDataObjectfromPlanoMedidas_estado_medidas_id() { - java.util.List result = null; - try + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.PlanoMedidasData >(); + if ( getPrimaryKey() != null ) { - result = fromReference( db.data.siprp.outer.PlanoMedidasData.class , getPrimaryKey().getMap().get("id"), "estado_medidas_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + try + { + result = fromReference( db.data.siprp.outer.PlanoMedidasData.class , getPrimaryKey().getMap().get("id"), "estado_medidas_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } diff --git a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Medicos.java b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Medicos.java index 944d99da..a2cf678b 100644 --- a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Medicos.java +++ b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Medicos.java @@ -109,14 +109,17 @@ public class Medicos extends com.evolute.entity.evo.EvoDataObjectfromExames_medico_id() { - java.util.List result = null; - try + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.ExamesData >(); + if ( getPrimaryKey() != null ) { - result = fromReference( db.data.siprp.outer.ExamesData.class , getPrimaryKey().getMap().get("id"), "medico_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + try + { + result = fromReference( db.data.siprp.outer.ExamesData.class , getPrimaryKey().getMap().get("id"), "medico_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } diff --git a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanoAreas.java b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanoAreas.java index f00dbb55..320a54a3 100644 --- a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanoAreas.java +++ b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanoAreas.java @@ -202,14 +202,17 @@ public class PlanoAreas extends com.evolute.entity.evo.EvoDataObjectfromPlanoRiscos_area_id() { - java.util.List result = null; - try + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.PlanoRiscosData >(); + if ( getPrimaryKey() != null ) { - result = fromReference( db.data.siprp.outer.PlanoRiscosData.class , getPrimaryKey().getMap().get("id"), "area_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + try + { + result = fromReference( db.data.siprp.outer.PlanoRiscosData.class , getPrimaryKey().getMap().get("id"), "area_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } diff --git a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanoMedidas.java b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanoMedidas.java index edcfc121..e4a23e0c 100644 --- a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanoMedidas.java +++ b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanoMedidas.java @@ -219,14 +219,17 @@ public class PlanoMedidas extends com.evolute.entity.evo.EvoDataObjectfromPlanoPostosTrabalho_medida_id() { - java.util.List result = null; - try - { - result = fromReference( db.data.siprp.outer.PlanoPostosTrabalhoData.class , getPrimaryKey().getMap().get("id"), "medida_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.PlanoPostosTrabalhoData >(); + if ( getPrimaryKey() != null ) + { + try + { + result = fromReference( db.data.siprp.outer.PlanoPostosTrabalhoData.class , getPrimaryKey().getMap().get("id"), "medida_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } diff --git a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanoRiscos.java b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanoRiscos.java index a13ad77b..8cc3b5c5 100644 --- a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanoRiscos.java +++ b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanoRiscos.java @@ -45,6 +45,8 @@ public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >(); @@ -104,20 +106,24 @@ public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObjectfromPlanoMedidas_risco_id() { - java.util.List result = null; - try - { - result = fromReference( db.data.siprp.outer.PlanoMedidasData.class , getPrimaryKey().getMap().get("id"), "risco_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.PlanoMedidasData >(); + if ( getPrimaryKey() != null ) { - throw new RuntimeException( edex ); + try + { + result = fromReference( db.data.siprp.outer.PlanoMedidasData.class , getPrimaryKey().getMap().get("id"), "risco_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } @@ -600,6 +611,35 @@ public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObjectfromPlanoAreas_plano_id() { - java.util.List result = null; - try - { - result = fromReference( db.data.siprp.outer.PlanoAreasData.class , getPrimaryKey().getMap().get("id"), "plano_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.PlanoAreasData >(); + if ( getPrimaryKey() != null ) + { + try + { + result = fromReference( db.data.siprp.outer.PlanoAreasData.class , getPrimaryKey().getMap().get("id"), "plano_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } diff --git a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Seccoes.java b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Seccoes.java index 6e58c53e..0e66639c 100644 --- a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Seccoes.java +++ b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Seccoes.java @@ -118,14 +118,17 @@ public class Seccoes extends com.evolute.entity.evo.EvoDataObjectfromAnalisesAcidentes_seccao_id() { - java.util.List result = null; - try + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.AnalisesAcidentesData >(); + if ( getPrimaryKey() != null ) { - result = fromReference( db.data.siprp.outer.AnalisesAcidentesData.class , getPrimaryKey().getMap().get("id"), "seccao_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + try + { + result = fromReference( db.data.siprp.outer.AnalisesAcidentesData.class , getPrimaryKey().getMap().get("id"), "seccao_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } diff --git a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/TiposExamesComp.java b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/TiposExamesComp.java index 755f8fcf..bbf1916b 100644 --- a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/TiposExamesComp.java +++ b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/TiposExamesComp.java @@ -102,14 +102,17 @@ public class TiposExamesComp extends com.evolute.entity.evo.EvoDataObjectfromExamesPerfis_tipo() { - java.util.List result = null; - try + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.ExamesPerfisData >(); + if ( getPrimaryKey() != null ) { - result = fromReference( db.data.siprp.outer.ExamesPerfisData.class , getPrimaryKey().getMap().get("id"), "tipo" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + try + { + result = fromReference( db.data.siprp.outer.ExamesPerfisData.class , getPrimaryKey().getMap().get("id"), "tipo" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } diff --git a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Trabalhadores.java b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Trabalhadores.java index c6f581f9..fc9a131e 100644 --- a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Trabalhadores.java +++ b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Trabalhadores.java @@ -201,42 +201,51 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObjectfromAvisos_trabalhador_id() { - java.util.List result = null; - try - { - result = fromReference( db.data.siprp.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.AvisosData >(); + if ( getPrimaryKey() != null ) + { + try + { + result = fromReference( db.data.siprp.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } public java.util.ListfromExames_trabalhador_id() { - java.util.List result = null; - try - { - result = fromReference( db.data.siprp.outer.ExamesData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.ExamesData >(); + if ( getPrimaryKey() != null ) + { + try + { + result = fromReference( db.data.siprp.outer.ExamesData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } public java.util.ListfromMarcacoesTrabalhador_trabalhador_id() { - java.util.List result = null; - try - { - result = fromReference( db.data.siprp.outer.MarcacoesTrabalhadorData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.MarcacoesTrabalhadorData >(); + if ( getPrimaryKey() != null ) + { + try + { + result = fromReference( db.data.siprp.outer.MarcacoesTrabalhadorData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } diff --git a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Utilizadores.java b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Utilizadores.java index d067e29c..8323d2ec 100644 --- a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Utilizadores.java +++ b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/Utilizadores.java @@ -215,42 +215,51 @@ public class Utilizadores extends com.evolute.entity.evo.EvoDataObjectfromPlanosActuacao_user_dir_loja() { - java.util.List result = null; - try - { - result = fromReference( db.data.siprp.outer.PlanosActuacaoData.class , getPrimaryKey().getMap().get("id"), "user_dir_loja" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.PlanosActuacaoData >(); + if ( getPrimaryKey() != null ) + { + try + { + result = fromReference( db.data.siprp.outer.PlanosActuacaoData.class , getPrimaryKey().getMap().get("id"), "user_dir_loja" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } public java.util.ListfromPlanosActuacao_user_dns() { - java.util.List result = null; - try - { - result = fromReference( db.data.siprp.outer.PlanosActuacaoData.class , getPrimaryKey().getMap().get("id"), "user_dns" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.PlanosActuacaoData >(); + if ( getPrimaryKey() != null ) + { + try + { + result = fromReference( db.data.siprp.outer.PlanosActuacaoData.class , getPrimaryKey().getMap().get("id"), "user_dns" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } public java.util.ListfromPlanosActuacao_user_hs() { - java.util.List result = null; - try - { - result = fromReference( db.data.siprp.outer.PlanosActuacaoData.class , getPrimaryKey().getMap().get("id"), "user_hs" ); - } - catch( com.evolute.entity.evo.EvoDataException edex ) - { - throw new RuntimeException( edex ); + java.util.List result = new java.util.LinkedList< db.data.siprp.outer.PlanosActuacaoData >(); + if ( getPrimaryKey() != null ) + { + try + { + result = fromReference( db.data.siprp.outer.PlanosActuacaoData.class , getPrimaryKey().getMap().get("id"), "user_hs" ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } } return result; } diff --git a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/package.xml b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/package.xml index dad03529..e25991a5 100644 --- a/trunk/PlanosActuacao/src/java/db/data/siprp/inner/package.xml +++ b/trunk/PlanosActuacao/src/java/db/data/siprp/inner/package.xml @@ -1183,6 +1183,10 @@ + + + + diff --git a/trunk/PlanosActuacao/src/java/db/entidades/Risco.java b/trunk/PlanosActuacao/src/java/db/entidades/Risco.java index 852689d8..06becb0c 100644 --- a/trunk/PlanosActuacao/src/java/db/entidades/Risco.java +++ b/trunk/PlanosActuacao/src/java/db/entidades/Risco.java @@ -30,7 +30,8 @@ public class Risco implements Serializable private Integer risco_id; private String parecer_dns; private String parecer_dl; - private String verificacao_siprp; + private String verificacao_siprp; + private Boolean isPatrimonial; private List valores; private List medidas; @@ -177,4 +178,12 @@ public class Risco implements Serializable this.por = por; } + public Boolean getIsPatrimonial() { + return isPatrimonial; + } + + public void setIsPatrimonial(Boolean isPatrimonial) { + this.isPatrimonial = isPatrimonial; + } + } diff --git a/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java b/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java index cb27d435..9b9604ef 100644 --- a/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java +++ b/trunk/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java @@ -232,10 +232,21 @@ public class CreatePlanosDataProvider extends GenericDataProvider return plano; } + + /** + * create Risco here with isPatrimonial : + * select column in query + * set property + * + * @param a + * @return + * @throws Exception + */ private List getRiscosByArea(Area a) throws Exception { Statement st = createLocalStatement(); - String sql = "select distinct hs_relatorio_risco.id, hs_relatorio_risco.description as descricao from hs_relatorio_posto "; + String sql = "select distinct hs_relatorio_risco.id, hs_relatorio_risco.description as descricao, hs_relatorio_risco.is_patrimonial as is_patrimonial " + + " from hs_relatorio_posto "; sql += "inner join hs_relatorio_posto_medida on hs_relatorio_posto_medida.posto_id = hs_relatorio_posto.id "; sql += "inner join hs_relatorio_medida on hs_relatorio_medida.id = hs_relatorio_posto_medida.medida_id "; sql += "inner join hs_relatorio_risco on hs_relatorio_risco.id = hs_relatorio_medida.risco_id "; @@ -245,30 +256,31 @@ public class CreatePlanosDataProvider extends GenericDataProvider sql += "order by hs_relatorio_risco.id "; System.out.println("RISCOS BY AREA SQL : " + sql); ResultSet rs = st.executeQuery(sql); - List riscos = new ArrayList(); - if(rs.isBeforeFirst()) + + List< Risco > riscos = new ArrayList(); + if ( rs.isBeforeFirst() ) { - rs.first(); do { Risco r = new Risco(); - r.setId(new Integer( rs.getInt("id") )); - if(existemMedidasByRisco(r.getId())) + r.setId( new Integer( rs.getInt( "id" ) ) ); + if ( existemMedidasByRisco( r.getId() ) ) { - r.setDescricao(Utils.unicodeToHTML(rs.getString("descricao"))); - r.setValores(getValoresByRisco(r, a)); + r.setDescricao( Utils.unicodeToHTML( rs.getString( "descricao" ) ) ); + r.setIsPatrimonial( rs.getBoolean( "is_patrimonial" ) ); + + r.setValores( getValoresByRisco( r, a ) ); //Integer valor = getValorByRisco(r, a); //r.setValor(valor); - r.setRisco_id(new Integer( rs.getInt("id") )); - r.setMedidas(getMedidasByRisco( r, a)); - riscos.add(r); + r.setRisco_id( new Integer( rs.getInt( "id" ) ) ); + r.setMedidas( getMedidasByRisco( r, a ) ); + riscos.add( r ); } - - }while(rs.next()); + } + while( rs.next() ); } return riscos; - } private List getValoresByRisco(Risco r, Area a) throws Exception @@ -516,15 +528,17 @@ public class CreatePlanosDataProvider extends GenericDataProvider sql += "where hs_relatorio_posto_risco.risco_id = " + risco_id + " and hs_relatorio_posto_medida.is_plano_actuacao = true) subquery order by medida_id"; System.out.println("EXISTEM MEDIDAS BY RISCO SQL : " + sql); ResultSet rs = st.executeQuery(sql); - if(rs.isBeforeFirst()) - { - return true; - } - else - { - return false; - } + + return rs.isBeforeFirst(); +// if(rs.isBeforeFirst()) +// { +// return true; +// } +// else +// { +// return false; +// } } @@ -698,11 +712,13 @@ public class CreatePlanosDataProvider extends GenericDataProvider Integer newRiscoID = null; PlanoRiscosData riscoData = new PlanoRiscosData(); - riscoData.setArea_id( r.getArea_id() ); riscoData.setDescricao( r.getDescricao() ); + riscoData.setActivo( r.getActivo() == null ? "y" : r.getActivo() ); + riscoData.setArea_id( r.getArea_id() ); riscoData.setValor( r.getValor() ); riscoData.setRisco_id( r.getId() ); - + riscoData.setIs_patrimonial( r.getIsPatrimonial() ); + System.out.println( "\nCREATE RISCO : " ); riscoData.setProvider( EvoBaseProvider.getInstance().getProvider( DB.SIPRP ) ); riscoData.save(); @@ -711,6 +727,7 @@ public class CreatePlanosDataProvider extends GenericDataProvider return newRiscoID; } + // public Integer createRisco(Risco r) throws Exception // { // Statement st = createStatement(); diff --git a/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java b/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java index cf0ef49a..6bf1c466 100644 --- a/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java +++ b/trunk/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java @@ -30,9 +30,13 @@ import global.Global; import java.sql.ResultSet; import java.sql.Statement; import java.util.ArrayList; +import java.util.Collection; import java.util.Date; import java.util.LinkedList; import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; import utils.Utils; @@ -434,7 +438,14 @@ public class PlanosDataProvider extends GenericDataProvider return list; } - + + /** + * FIXME : ORDER BY patrimonial em ultimo ! + * + * @param a + * @return + * @throws Exception + */ private List< Risco > getRiscosByArea( Area a ) throws Exception { List< Risco > list = new LinkedList< Risco >(); @@ -446,7 +457,7 @@ public class PlanosDataProvider extends GenericDataProvider PlanoRiscosData.ID_FULL, PlanoRiscosData.AREA_ID_FULL, PlanoRiscosData.DESCRICAO_FULL, PlanoRiscosData.RESPONSAVEL_EXECUCAO_FULL, PlanoRiscosData.POR_FULL, PlanoRiscosData.RECURSOS_NECESSARIOS_FULL, PlanoRiscosData.DATA_INICIO_FULL, PlanoRiscosData.DATA_FIM_FULL, PlanoRiscosData.PARECER_DL_FULL, PlanoRiscosData.PARECER_DNS_FULL, PlanoRiscosData.VERIFICACAO_SIPRP_FULL, PlanoRiscosData.VALOR_FULL, - "coalesce( valor, -1 ) AS ordem_valor" + PlanoRiscosData.IS_PATRIMONIAL_FULL, "coalesce( valor, -1 ) AS ordem_valor", }, new String[] { "ordem_valor DESC", PlanoRiscosData.AREA_ID_FULL, PlanoRiscosData.RISCO_ID_FULL } ); @@ -469,6 +480,7 @@ public class PlanosDataProvider extends GenericDataProvider String parecerDNS = array.get( i, 9 ); String verificacaoSiprp = array.get( i, 10 ); Integer valor = array.get( i, 11 ); + Boolean isPatrimonial = array.get( i, 12 ); Risco r = new Risco(); r.setId( riscoID ); @@ -484,6 +496,7 @@ public class PlanosDataProvider extends GenericDataProvider r.setVerificacao_siprp( Utils.unicodeToHTML( verificacaoSiprp ) ); r.setValor( valor ); r.setMedidas( getMedidasByRisco( r ) ); + r.setIsPatrimonial( isPatrimonial ); list.add( r ); } diff --git a/trunk/PlanosActuacao/src/java/pagination/Pagina.java b/trunk/PlanosActuacao/src/java/pagination/Pagina.java index c056f92a..888b1c98 100644 --- a/trunk/PlanosActuacao/src/java/pagination/Pagina.java +++ b/trunk/PlanosActuacao/src/java/pagination/Pagina.java @@ -7,6 +7,7 @@ package pagination; import com.sun.webui.jsf.component.Hyperlink; import javax.faces.context.FacesContext; +import planosactuacao.SessionBean1.PAGINATION_ENUM; /** * @@ -14,7 +15,8 @@ import javax.faces.context.FacesContext; */ public class Pagina extends Hyperlink { - + private PAGINATION_ENUM paginationType; + private Integer risco_id; private Integer valor; private Integer page_nr; @@ -36,8 +38,9 @@ public class Pagina extends Hyperlink values[ 3 ] = getPage_nr(); values[ 4 ] = isPrevious(); values[ 5 ] = isNext(); -// values[2] = getId(); - return ( ( Object ) ( values ) ); + values[ 6 ] = getPaginationType(); + return values; +// return ( ( Object ) ( values ) ); } @Override @@ -50,6 +53,7 @@ public class Pagina extends Hyperlink page_nr = ( Integer ) values[ 3 ]; previous = ( Boolean ) values[ 4 ]; next = ( Boolean ) values[ 5 ]; + setPaginationType( ( PAGINATION_ENUM ) values[ 6 ] ); } public Integer getRisco_id() @@ -99,5 +103,15 @@ public class Pagina extends Hyperlink public void setValor(Integer valor) { this.valor = valor; - } + } + + public PAGINATION_ENUM getPaginationType() { + return paginationType; + } + + public void setPaginationType(PAGINATION_ENUM paginationType) { + this.paginationType = paginationType; + } + + } diff --git a/trunk/PlanosActuacao/src/java/pagination/Pagination.java b/trunk/PlanosActuacao/src/java/pagination/Pagination.java index 9aba7889..56f33640 100644 --- a/trunk/PlanosActuacao/src/java/pagination/Pagination.java +++ b/trunk/PlanosActuacao/src/java/pagination/Pagination.java @@ -8,7 +8,6 @@ package pagination; import db.entidades.Area; import db.entidades.PlanoActuacao; import db.entidades.Risco; -import db.entidades.Valor; import java.io.Serializable; import java.util.Iterator; import java.util.Vector; @@ -17,15 +16,18 @@ import java.util.Vector; * * @author lluis */ -public class Pagination implements Serializable +public abstract class Pagination implements Serializable { - private int TOTAL_PAGINAS; - private Vector riscosVector = new Vector(); - private int current_page = 1; + private int TOTAL_PAGINAS = 1; + + private Vector< Risco > riscos = new Vector< Risco >(); + private Vector< Pagina > paginas = new Vector< Pagina >(); + + private int currentPageNumber = 1; - public Pagination(PlanoActuacao p) + public Pagination( PlanoActuacao p ) { - initialize(p); + initialize( p ); } private void initialize( PlanoActuacao p ) @@ -34,50 +36,56 @@ public class Pagination implements Serializable { for ( Risco r : a.getRiscos() ) { - riscosVector.add( r ); + if ( canBePaginated( r ) ) + { + riscos.add( r ); + } } } - TOTAL_PAGINAS = riscosVector.size(); + TOTAL_PAGINAS = riscos.size(); } + protected abstract boolean canBePaginated( Risco risco ); + public Vector< Pagina > getPaginas() { - Vector< Pagina > paginas = new Vector< Pagina >(); - Pagina pagina = null; - - if ( current_page > 1 ) - { - pagina = new Pagina(); - pagina.setId( "prev" ); - pagina.setPrevious( new Boolean( true ) ); - pagina.setText( "<<" ); - paginas.add( pagina ); - } - - Iterator< Risco > iter = riscosVector.iterator(); + paginas = new Vector< Pagina >(); + Pagina pagina = null; + + if ( currentPageNumber > 1 ) + { + pagina = new Pagina(); + pagina.setId( "prev" ); + pagina.setPrevious( new Boolean( true ) ); + pagina.setText( "<<" ); + paginas.add( pagina ); + } + + Iterator< Risco > iter = riscos.iterator(); for ( int i = 1; iter.hasNext(); i++ ) { - Risco r = iter.next(); - pagina = new Pagina(); - pagina.setId( "valor" + r.getId().toString() ); - pagina.setPage_nr( i ); - if ( i == current_page ) - { - pagina.setDisabled( true ); - } - pagina.setText( i ); - paginas.add( pagina ); - } - - if ( current_page < TOTAL_PAGINAS ) - { - pagina = new Pagina(); - pagina.setId("next"); - pagina.setNext( new Boolean( true ) ); - pagina.setText( ">>" ); - paginas.add( pagina ); - } - + Risco r = iter.next(); + pagina = new Pagina(); + pagina.setId( "valor" + r.getId().toString() ); + pagina.setPage_nr( i ); +// if ( i == currentPageNumber ) +// { +//// pagina.setDisabled( true ); +// pagina.setStyle( "color:#000000;" ); +// } + pagina.setText( i ); + paginas.add( pagina ); + } + + if ( currentPageNumber < TOTAL_PAGINAS ) + { + pagina = new Pagina(); + pagina.setId("next"); + pagina.setNext( new Boolean( true ) ); + pagina.setText( ">>" ); + paginas.add( pagina ); + } + return paginas; } @@ -85,28 +93,28 @@ public class Pagination implements Serializable { if ( p.isNext() ) { - current_page++; + currentPageNumber++; } else if ( p.isPrevious() ) { - current_page--; + currentPageNumber--; } else { - current_page = p.getPage_nr().intValue(); + currentPageNumber = p.getPage_nr().intValue(); } - return riscosVector.get( current_page - 1 ); + return riscos.get( currentPageNumber - 1 ); } public Risco nextValor() { Risco r = null; - if ( current_page < TOTAL_PAGINAS ) + if ( currentPageNumber < TOTAL_PAGINAS ) { - current_page++; - r = riscosVector.get( current_page - 1 ); + currentPageNumber++; + r = riscos.get( currentPageNumber - 1 ); } return r; @@ -116,5 +124,5 @@ public class Pagination implements Serializable { return TOTAL_PAGINAS; } - + } diff --git a/trunk/PlanosActuacao/src/java/pagination/PaginationNormais.java b/trunk/PlanosActuacao/src/java/pagination/PaginationNormais.java new file mode 100644 index 00000000..890bdc0e --- /dev/null +++ b/trunk/PlanosActuacao/src/java/pagination/PaginationNormais.java @@ -0,0 +1,29 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package pagination; + +import db.entidades.PlanoActuacao; +import db.entidades.Risco; + +/** + * + * @author dneves + */ +public class PaginationNormais extends Pagination +{ + public PaginationNormais( PlanoActuacao plano ) + { + super( plano ); + } + + @Override + protected boolean canBePaginated( Risco risco ) + { + return risco != null && ! risco.getIsPatrimonial(); + } + +} + diff --git a/trunk/PlanosActuacao/src/java/pagination/PaginationPatrimoniais.java b/trunk/PlanosActuacao/src/java/pagination/PaginationPatrimoniais.java new file mode 100644 index 00000000..8c9e8fc0 --- /dev/null +++ b/trunk/PlanosActuacao/src/java/pagination/PaginationPatrimoniais.java @@ -0,0 +1,28 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ + +package pagination; + +import db.entidades.PlanoActuacao; +import db.entidades.Risco; + +/** + * + * @author dneves + */ +public class PaginationPatrimoniais extends Pagination +{ + public PaginationPatrimoniais( PlanoActuacao plano ) + { + super( plano ); + } + + @Override + protected boolean canBePaginated( Risco risco ) + { + return risco != null && risco.getIsPatrimonial(); + } + +} diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java b/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java index dd89af66..3527fd33 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/EditarPlano.java @@ -49,6 +49,9 @@ import javax.faces.event.ValueChangeEvent; import mail.Mail; import pagination.Pagina; import pagination.Pagination; +import pagination.PaginationNormais; +import pagination.PaginationPatrimoniais; +import planosactuacao.SessionBean1.PAGINATION_ENUM; import utils.JSFUtils; import utils.Utils; @@ -404,14 +407,21 @@ public class EditarPlano extends AbstractPageBean } } - //setPagination(p); - setPagination(); - if(p.getCorrecao().matches("y")) + + if ( gridPagination.getChildCount() > 0 ) + { + gridPagination.getChildren().clear(); + } + + setPagination( PAGINATION_ENUM.NORMAL ); + setPagination( PAGINATION_ENUM.PATRIMONIAIS ); + + if( p.getCorrecao().matches( "y" ) ) { - lblObs.setText(p.getObs_correcao()); + lblObs.setText( p.getObs_correcao() ); } - lblMsg.setText(getSessionBean1().getMsg()); - getSessionBean1().setMsg(""); + lblMsg.setText( getSessionBean1().getMsg() ); + getSessionBean1().setMsg( "" ); } /** @@ -461,8 +471,14 @@ public class EditarPlano extends AbstractPageBean private void initialize( PlanoActuacao p ) { - Pagination pagination = new Pagination( p ); - getSessionBean1().setPagination( pagination ); + Pagination paginationNormal = new PaginationNormais( p ); + Pagination paginationPatrimoniais = new PaginationPatrimoniais( p ); + getSessionBean1().addPagination( PAGINATION_ENUM.NORMAL, paginationNormal ); + getSessionBean1().addPagination( PAGINATION_ENUM.PATRIMONIAIS, paginationPatrimoniais ); + +// Pagination pagination = new Pagination( p ); +// getSessionBean1().setPagination( pagination ); + Utilizador u = getSessionBean1().getCurrentUser(); if(u.getTipo().intValue() == Global.DIRECTOR_NACIONAL_SEGURANCA) { @@ -802,9 +818,8 @@ public class EditarPlano extends AbstractPageBean } } - showPreviousValidacoes(p); + showPreviousValidacoes( p ); - //TODO: do this IFF userType is Rogerio or 'tecnico ?' Utilizador currentUser = getSessionBean1().getCurrentUser(); if ( currentUser.getTipo().intValue() == Global.TECNICO_HS || currentUser.getTipo().intValue() == Global.DIRECTOR_SIPRP ) @@ -817,52 +832,51 @@ public class EditarPlano extends AbstractPageBean } } - private void showArea(Area a) + private void showArea( Area a ) { pg = new PanelGroup(); st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Área: "); - pg.getChildren().add(st); + st.setEscape( false ); + st.setStyleClass( "label" ); + st.setText( "Área: " ); + pg.getChildren().add( st ); st = new StaticText(); - st.setEscape(false); - st.setText(Utils.unicodeToHTML(a.getDescricao())); - pg.getChildren().add(st); - gridArea.getChildren().add(pg); - - + st.setEscape( false ); + st.setText( Utils.unicodeToHTML( a.getDescricao() ) ); + pg.getChildren().add( st ); + gridArea.getChildren().add( pg ); } - private void showRisco(Risco r) + private void showRisco( Risco r ) { - getSessionBean1().setCurrentRisco(r); + System.out.println( "\nEditarPlano . showRisco() : " + r.getId() + " - " + r.getDescricao() ); + + getSessionBean1().setCurrentRisco( r ); HtmlPanelGrid grd = new HtmlPanelGrid(); - grd.setColumns(1); - grd.setWidth("100%"); + grd.setColumns( 1 ); + grd.setWidth( "100%" ); //grd.setStyleClass("centerBlock"); // gridArea.getChildren().add(grd); gridRisco = new HtmlPanelGrid(); - //gridRisco.setStyleClass("centerBlock"); - gridRisco.setWidth("98%"); - gridRisco.setColumns(1); - gridRisco.setColumnClasses("gridColLeft"); + //gridRisco.setStyleClass("centerBlock"); + gridRisco.setWidth( "98%" ); + gridRisco.setColumns( 1 ); + gridRisco.setColumnClasses( "gridColLeft" ); //grd.getChildren().add(gridRisco); - gridArea.getChildren().add(gridRisco); + gridArea.getChildren().add( gridRisco ); pg = new PanelGroup(); st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Risco: "); - pg.getChildren().add(st); + st.setEscape( false ); + st.setStyleClass( "label" ); + st.setText( "Risco: " ); + pg.getChildren().add( st ); st = new StaticText(); - st.setEscape(false); - st.setText(r.getDescricao()); - pg.getChildren().add(st); - gridRisco.getChildren().add(pg); - + st.setEscape( false ); + st.setText( r.getDescricao() ); + pg.getChildren().add( st ); + gridRisco.getChildren().add( pg ); } private void showValores(Risco r) @@ -1426,22 +1440,22 @@ public class EditarPlano extends AbstractPageBean } private static final int MAX_PAGES_PER_LINE = 20; - - private void setPagination() + + private void setPagination( PAGINATION_ENUM type ) { Class[] argtypes = new Class[ 1 ]; argtypes[ 0 ] = ActionEvent.class; MethodExpression me = ( MethodExpression ) this.getApplication().getExpressionFactory().createMethodExpression( getFacesContext().getELContext(), "#{EditarPlano.paginacao_actionListener}", null, argtypes ); - if ( gridPagination.getChildCount() > 0 ) - { - gridPagination.getChildren().clear(); - } + StaticText typeLabel = new StaticText(); + typeLabel.setText( type.getType() + ":" ); + gridPagination.getChildren().add( typeLabel ); PanelGroup group = new PanelGroup(); - Pagination pagination = getSessionBean1().getPagination(); +// Pagination pagination = getSessionBean1().getPagination(); + Pagination pagination = getSessionBean1().getPagination( type ); Vector< Pagina > paginas = pagination.getPaginas(); for ( int p = 0; p < paginas.size(); p++ ) @@ -1457,6 +1471,7 @@ public class EditarPlano extends AbstractPageBean if ( pagina.isPrevious() ) { pagina.addActionListener( new MethodExpressionActionListener( me ) ); + pagina.setPaginationType( type ); group.getChildren().add( pagina ); st = new StaticText(); st.setEscape( false ); @@ -1470,11 +1485,13 @@ public class EditarPlano extends AbstractPageBean st.setText( " " ); group.getChildren().add( st ); pagina.addActionListener( new MethodExpressionActionListener( me ) ); + pagina.setPaginationType( type ); group.getChildren().add( pagina ); } else { pagina.addActionListener( new MethodExpressionActionListener( me ) ); + pagina.setPaginationType( type ); group.getChildren().add( pagina ); if ( pagina.getPage_nr().intValue() < pagination.totalPaginas() ) { @@ -1774,8 +1791,9 @@ public class EditarPlano extends AbstractPageBean getSessionBean1().getRiscosHash().remove( r.getId() ); getSessionBean1().getRiscosHash().put( r.getId(), r ); - Pagination pagination = getSessionBean1().getPagination(); - +// Pagination pagination = getSessionBean1().getPagination(); + Pagination pagination = getSessionBean1().getPagination( r.getIsPatrimonial() ? PAGINATION_ENUM.PATRIMONIAIS : PAGINATION_ENUM.NORMAL ); + r = pagination.nextValor(); Area a = getSessionBean1().getAreasHash().get( r.getArea_id() ); if ( r != null ) @@ -2529,31 +2547,33 @@ public class EditarPlano extends AbstractPageBean gridArea = ( HtmlPanelGrid ) gridPlano.findComponent( "form1:gridArea" ); if ( gridArea.getChildren() != null ) { - gridArea.getChildren().clear(); + gridArea.getChildren().clear(); } Pagina pagina = ( Pagina ) e.getSource(); - Pagination pagination = getSessionBean1().getPagination(); + PAGINATION_ENUM type = pagina.getPaginationType(); - Risco r = pagination.getValor( pagina ); - r = getSessionBean1().getRiscosHash().get( r.getId() ); - - Area a = getSessionBean1().getAreasHash().get( r.getArea_id() ); - showArea( a ); - showRisco( r ); - showValor( r ); - showResponsavel( r ); +// Pagination pagination = getSessionBean1().getPagination(); + Pagination pagination = getSessionBean1().getPagination( type ); + if ( pagination != null ) + { + Risco r = pagination.getValor( pagina ); + r = getSessionBean1().getRiscosHash().get( r.getId() ); + + Area a = getSessionBean1().getAreasHash().get( r.getArea_id() ); + showArea( a ); + showRisco( r ); + showValor( r ); + showResponsavel( r ); + } } - public String butCancelar_action() { - // TODO: Process the action. Return value is a navigation - // case name where null will return to the same page. + public String butCancelar_action() + { return "lista_planos"; - } - public String butLimparDados_action() { - // TODO: Process the action. Return value is a navigation - // case name where null will return to the same page. + public String butLimparDados_action() + { gridArea = (HtmlPanelGrid) gridPlano.findComponent("form1:gridArea"); gridResponsavel = (HtmlPanelGrid) gridArea.findComponent("form1:gridResponsavel"); PlanoActuacao p = getSessionBean1().getPlanoActuacao(); @@ -2602,14 +2622,11 @@ public class EditarPlano extends AbstractPageBean return null; } - public String butEnviarCorrecao_action() { - // TODO: Process the action. Return value is a navigation - // case name where null will return to the same page. - System.out.println("BUT ENVIAR CORRECAO"); + public String butEnviarCorrecao_action() + { + System.out.println( "BUT ENVIAR CORRECAO" ); return "enviar_correcao"; } - - - + } diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java b/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java index 5e87b5cc..58f8ef90 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java @@ -554,36 +554,18 @@ public class ListaPlanos extends AbstractPageBean PlanoActuacao p = getTableConcluidosRowData(); getSessionBean1().setPlanoActuacao(p); return "ver_plano"; - } - - private void createPdf( Integer pID ) - { - PlanoActuacaoPDFCreator pdfCreator = new PlanoActuacaoPDFCreator(); - try - { - System.out.println( "CREATING PDF ..." ); - byte[] pdf = pdfCreator.createPDF( pID, true ); - System.out.println( "\t.. DONE !" ); - showPdf( pdf ); - } - catch ( Exception ex ) - { - ErrorLogger.logException( ex ); - System.out.println( "\n\tError creating PDF : " + ex.getMessage() ); - } - } + } + //**** IMPRIMIR PLANO SEM RISCOS PATRIMONIAIS ****// public String goImprimirPlano_action() { PlanoActuacao p = getTableActivosRowData(); createPdf( p.getId() ); return null; - } + } public String goImprimirPlanoFromSeguimento_action() { - System.out.println( "\ngoImprimirPlanoFromSeguimento_action() : " ); - PlanoActuacao p = getTableSeguimentoRowData(); createPdf( p.getId() ); return null; @@ -601,7 +583,61 @@ public class ListaPlanos extends AbstractPageBean } return null; } - + + + //*** IMPRIMIR PLANO COM RISCOS PATRIMONIAIS ***// + public String goImprimirPlanoPatrimoniais_action() + { + PlanoActuacao p = getTableActivosRowData(); + createPdf( p.getId(), true ); + return null; + } + + public String goImprimirPlanoSeguimentoPatrimoniais_action() + { + PlanoActuacao p = getTableSeguimentoRowData(); + createPdf( p.getId(), true ); + return null; + } + + public String goImprimirPlanoConcluidoPatrimoniais_action() + { + Utilizador currentUser = getSessionBean1().getCurrentUser(); + int userType = currentUser == null ? -1 : currentUser.getTipo(); + + PlanoActuacao p = getTableConcluidosRowData(); + if ( ! p.getConcluidoPorDesactivacao() || ( userType == Global.DIRECTOR_SIPRP ) ) + { + createPdf( p.getId(), true ); + } + return null; + } + + + + private void createPdf( Integer pID ) + { + createPdf( pID, false ); + } + + private void createPdf( Integer pID, boolean withPatrimoniais ) + { + PlanoActuacaoPDFCreator pdfCreator = new PlanoActuacaoPDFCreator(); + try + { + System.out.println( "CREATING PDF ..." ); + byte[] pdf = pdfCreator.createPDF( pID, true ); +// byte[] pdf = pdfCreator.createPDF( pID, true, withPatrimoniais ); + System.out.println( "\t.. DONE !" ); + showPdf( pdf ); + } + catch ( Exception ex ) + { + ErrorLogger.logException( ex ); + System.out.println( "\n\tError creating PDF : " + ex.getMessage() ); + } + } + private void showPdf( byte[] pdf ) throws Exception { // FacesContext fc = getFacesContext(); diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java b/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java index cda62d4a..a7541bf9 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java @@ -282,29 +282,35 @@ public class PlanosActuacao } } - - private void createRiscos(Integer area_id, List riscos) throws Exception + + /** + * FIXME : importacao -> r.setPatrimonial( ... ) + * + * @param area_id + * @param riscos + * @throws Exception + */ + private void createRiscos( Integer area_id, List< Risco > riscos ) throws Exception { CreatePlanosDataProvider cpdp = CreatePlanosDataProvider.getInstance(); - for(Risco r : riscos) + for ( Risco r : riscos ) { r.setArea_id( area_id ); //r.setId(pdp.createRisco(r)); - System.out.println("CREATE RISCO:"); - if(r.getValores() != null) + System.out.println( "CREATE RISCO: " ); + if ( r.getValores() != null ) { - for(Valor v : r.getValores()) + for ( Valor v : r.getValores() ) { //System.out.println("RISCO -> " + r.getRisco_id().toString() + "VALOR -> " + v.getValor().toString()); - r.setValor(v.getValor()); + r.setValor( v.getValor() ); r.setId( cpdp.createRisco( r ) ); - } } - if(r.getMedidas() != null) + if ( r.getMedidas() != null ) { - createMedidas(r.getId(), r.getMedidas()); + createMedidas( r.getId(), r.getMedidas() ); } // if(r.getValores() != null) // { diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/SessionBean1.java b/trunk/PlanosActuacao/src/java/planosactuacao/SessionBean1.java index b66ddbfa..224c5171 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/SessionBean1.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/SessionBean1.java @@ -14,6 +14,7 @@ import db.entidades.Risco; import db.entidades.Utilizador; import db.entidades.Valor; import java.util.HashMap; +import java.util.Map; import javax.faces.FacesException; import pagination.Pagination; @@ -71,8 +72,36 @@ public class SessionBean1 extends AbstractSessionBean { private HashMap valoresHash; private HashMap areasHash; - private HashMap riscosHash; - private Pagination pagination = null; + private HashMap riscosHash; + + + public static enum PAGINATION_ENUM + { + NORMAL( 0, "Normal" ), + PATRIMONIAIS( 1, "Patrimoniais" ) + ; + + private Integer code = null; + private String type = null; + + PAGINATION_ENUM( Integer code, String type ) + { + this.code = code; + this.type = type; + } + + public Integer getCode() { + return code; + } + + public String getType() { + return type; + } + + } + + private Map< PAGINATION_ENUM, Pagination > paginationMap = null; +// private Pagination pagination = null; private String logoEmpresaUrl = ""; @@ -329,13 +358,33 @@ public class SessionBean1 extends AbstractSessionBean { this.riscosHash = riscosHash; } - public Pagination getPagination() { - return pagination; - } - public void setPagination(Pagination pagination) { - this.pagination = pagination; - } + public void addPagination( PAGINATION_ENUM type, Pagination pagination ) + { + if ( paginationMap == null ) + { + paginationMap = new HashMap< PAGINATION_ENUM, Pagination >(); + } + + paginationMap.put( type, pagination ); + } + + public Pagination getPagination( PAGINATION_ENUM type ) + { + Pagination pagination = null; + if ( paginationMap != null ) + { + pagination = paginationMap.get( type ); + } + return pagination; + } +// public Pagination getPagination() { +// return pagination; +// } +// +// public void setPagination(Pagination pagination) { +// this.pagination = pagination; +// } public Risco getCurrentRisco() { return currentRisco; diff --git a/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java b/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java index a6590e07..c02a4cc0 100644 --- a/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java +++ b/trunk/PlanosActuacao/src/java/planosactuacao/ViewPlano.java @@ -17,12 +17,14 @@ import db.entidades.Medida; import db.entidades.PlanoActuacao; import db.entidades.PostoTrabalho; import db.entidades.Risco; -import db.entidades.Valor; import db.providers.UtilizadoresLogic; import java.text.SimpleDateFormat; +import java.util.Collections; +import java.util.Comparator; import java.util.List; import javax.faces.FacesException; import javax.faces.component.html.HtmlPanelGrid; +import javax.sound.midi.SysexMessage; /** *

Page bean that corresponds to a similarly named JSP page. This @@ -197,14 +199,12 @@ public class ViewPlano extends AbstractPageBean { System.out.println( "\nViewPlano . showPlano( " + p.getId() + " ) : \n" ); - gridPlano = new HtmlPanelGrid(); - gridPlano.setId("gridPlano"); - gridPlano.setWidth("100%"); - gridPlano.setColumns(1); - gridPlano.setStyle("background-color: #f6f4e8; border: solid 1px #000000"); - gridPlano.setColumnClasses("gridColCenter"); - //plano + gridPlano.setId( "gridPlano" ); + gridPlano.setWidth( "100%" ); + gridPlano.setColumns( 1 ); + gridPlano.setStyle( "background-color: #f6f4e8; border: solid 1px #000000" ); + gridPlano.setColumnClasses( "gridColCenter" ); //lblTop.setText("Plano de actuação da auditoria " + p.getData_visita_str()); if ( p.getConcluidoPorDesactivacao() ) @@ -214,97 +214,101 @@ public class ViewPlano extends AbstractPageBean st.setStyle( "color: #FF0000; font-weight: bold; font-size: 13px;" ); gridPlano.getChildren().add( st ); } - gridLayout.getChildren().add(gridPlano); - showAreas(p.getAreas()); - showValidacoes(gridPlano, p); + gridLayout.getChildren().add( gridPlano ); + showAreas( p.getAreas() ); + showValidacoes( gridPlano, p ); } - private void showAreas(List areas) + private void showAreas( List< Area > areas ) { int i = 0; - for(Area area : areas) + for( Area area : areas ) { i++; gridArea = new HtmlPanelGrid(); - gridArea.setColumns(1); - gridArea.setColumnClasses("gridColCenter"); - gridArea.setWidth("100%"); + gridArea.setColumns( 1 ); + gridArea.setColumnClasses( "gridColCenter" ); + gridArea.setWidth( "100%" ); - gridPlano.getChildren().add(gridArea); + gridPlano.getChildren().add( gridArea ); pg = new PanelGroup(); st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Área: "); - pg.getChildren().add(st); + st.setEscape( false ); + st.setStyleClass( "label" ); + st.setText( "Área: " ); + pg.getChildren().add( st ); st = new StaticText(); - st.setId("fakeLink" + i); - st.setStyleClass("fakeLink"); - st.setOnMouseOver("this.style.textDecoration = 'underline'"); - st.setOnMouseOut("this.style.textDecoration = 'none'"); - st.setOnClick("expand(this)"); - st.setEscape(false); - st.setText(area.getDescricao()); - pg.getChildren().add(st); + st.setId( "fakeLink" + i ); + st.setStyleClass( "fakeLink" ); + st.setOnMouseOver( "this.style.textDecoration = 'underline'" ); + st.setOnMouseOut( "this.style.textDecoration = 'none'" ); + st.setOnClick( "expand(this)" ); + st.setEscape( false ); + st.setText( area.getDescricao() ); + pg.getChildren().add( st ); - gridArea.getChildren().add(pg); + gridArea.getChildren().add( pg ); gridAreaContainer = new HtmlPanelGrid(); - gridAreaContainer.setId("area_container" + i); + gridAreaContainer.setId( "area_container" + i ); ////gridAreaContainer.setStyle("border: solid 1px #000000; width: 100%;"); - gridAreaContainer.setStyleClass("hidden"); + gridAreaContainer.setStyleClass( "hidden" ); //gridAreaContainer.setStyleClass("visible"); - gridAreaContainer.setColumns(1); - gridAreaContainer.setColumnClasses("gridColLeft"); - gridAreaContainer.setWidth("100%"); - -// st = new StaticText(); -// st.setEscape(false); -// st.setText("AAAAAAAAA"); -// gridAreaContainer.getChildren().add(st); - - gridArea.getChildren().add(gridAreaContainer); - showRiscos(area.getRiscos()); + gridAreaContainer.setColumns( 1 ); + gridAreaContainer.setColumnClasses( "gridColLeft" ); + gridAreaContainer.setWidth( "100%" ); + + gridArea.getChildren().add( gridAreaContainer ); + showRiscos( area.getRiscos() ); } } - private void showRiscos(List riscos) + private void showRiscos( List< Risco > riscos ) { int rCount = 0; - for(Risco risco : riscos) + Collections.sort( riscos, new Comparator< Risco >() + { + public int compare( Risco o1, Risco o2 ) + { + // false first, true after + return o1.getIsPatrimonial().compareTo( o2.getIsPatrimonial() ); + } + } ); + + for ( Risco risco : riscos ) { HtmlPanelGrid grd = new HtmlPanelGrid(); - grd.setColumns(1); - grd.setColumnClasses("gridColLeft"); + grd.setColumns( 1 ); + grd.setColumnClasses( "gridColLeft" ); //grd.setStyle("border: solid 1px #0000FF; display: inline; width: 100%"); - grd.setStyle("display: block; width: 100%"); - grd.setWidth("100%"); + grd.setStyle( "display: block; width: 100%" ); + grd.setWidth( "100%" ); //grd.setStyleClass("centerBlock"); //gridArea.getChildren().add(grd); - gridAreaContainer.getChildren().add(grd); + gridAreaContainer.getChildren().add( grd ); gridRisco = new HtmlPanelGrid(); //gridRisco.setStyleClass("centerBlock"); - gridRisco.setStyle("display: block; width: 98%"); - gridRisco.setWidth("98%"); - gridRisco.setColumns(1); - gridRisco.setColumnClasses("gridColLeft"); - grd.getChildren().add(gridRisco); + gridRisco.setStyle( "display: block; width: 98%" ); + gridRisco.setWidth( "98%" ); + gridRisco.setColumns( 1 ); + gridRisco.setColumnClasses( "gridColLeft" ); + grd.getChildren().add( gridRisco ); pg = new PanelGroup(); st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Risco: "); - pg.getChildren().add(st); + st.setEscape( false ); + st.setStyleClass( "label" ); + st.setText( "Risco: " ); + pg.getChildren().add( st ); st = new StaticText(); - st.setEscape(false); - st.setText(risco.getDescricao()); - pg.getChildren().add(st); - gridRisco.getChildren().add(pg); + st.setEscape( false ); + st.setText( risco.getDescricao() ); + pg.getChildren().add( st ); + gridRisco.getChildren().add( pg ); //showValores(risco.getValores()); - showValor(risco); + showValor( risco ); //showMedidas(risco.getMedidas()); if ( rCount < riscos.size() - 1 ) @@ -316,403 +320,400 @@ public class ViewPlano extends AbstractPageBean } } - private void showValor(Risco r) + private void showValor( Risco r ) { - HtmlPanelGrid grd = new HtmlPanelGrid(); - grd.setColumns(1); - grd.setWidth("100%"); - grd.setStyleClass("centerBlock"); - grd.setStyle("display: block"); - //gridRisco.getChildren().add(grd); - - gridValor = new HtmlPanelGrid(); - gridRisco.getChildren().add(gridValor); - //gridValor.setStyleClass("centerBlock"); - gridValor.setStyle("display: block"); - gridValor.setWidth("100%"); - gridValor.setColumns(1); - gridValor.setColumnClasses("gridColLeft"); - //grd.getChildren().add(gridValor); - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Valor: "); - pg.getChildren().add(st); - st = new StaticText(); - st.setEscape(false); - if(r.getValor() == null) - { - st.setText("IND"); - } - else - { - st.setText(r.getValor().toString()); - } - pg.getChildren().add(st); - gridValor.getChildren().add(pg); - - showMedidas(r.getMedidas()); - - grd = new HtmlPanelGrid(); - grd.setColumns(1); - grd.setWidth("100%"); - //grd.setStyleClass("centerBlock"); - gridValor.getChildren().add(grd); - HtmlPanelGrid gridParecer = new HtmlPanelGrid(); - gridParecer.setStyleClass("centerBlock"); - gridParecer.setStyle("display: block"); - gridParecer.setWidth("98%"); - gridParecer.setColumns(1); - gridParecer.setColumnClasses("gridColLeft"); - grd.getChildren().add(gridParecer); - - if(r.getResponsavel_execucao() != null) - { - if(r.getResponsavel_execucao().trim().length() > 0) - { - pg = new PanelGroup(); - - st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Responsável de execução: "); - pg.getChildren().add(st); - st = new StaticText(); - st.setEscape(false); - st.setText(r.getResponsavel_execucao().toString()); - pg.getChildren().add(st); - - - if(r.getPor() != null) - { - if(r.getPor().trim().length() > 0) - { - st = new StaticText(); - st.setEscape(false); - st.setText(" "); - pg.getChildren().add(st); - - st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("POR:  "); - pg.getChildren().add(st); - st = new StaticText(); - st.setEscape(false); - st.setText(r.getPor().toString()); - pg.getChildren().add(st); - } - } - - gridParecer.getChildren().add(pg); - } - } - - if(r.getRecursos_necessarios() != null) - { - if(r.getRecursos_necessarios().trim().length() > 0) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Recursos necessários: "); - pg.getChildren().add(st); - st = new StaticText(); - st.setEscape(false); - st.setText(r.getRecursos_necessarios().toString()); - pg.getChildren().add(st); - gridParecer.getChildren().add(pg); - } - } - - if(r.getData_inicio() != null) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Data início: "); - pg.getChildren().add(st); - st = new StaticText(); - st.setEscape(false); - String data_str = ""; - SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); - data_str = formatter.format(r.getData_inicio()); - st.setText(data_str); - pg.getChildren().add(st); - gridParecer.getChildren().add(pg); - } - - if(r.getData_fim() != null) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Data fim: "); - pg.getChildren().add(st); - st = new StaticText(); - st.setEscape(false); - String data_str = ""; - SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); - data_str = formatter.format(r.getData_fim()); - st.setText(data_str); - pg.getChildren().add(st); - gridParecer.getChildren().add(pg); - } - - if(r.getParecer_dl() != null) - { - if(r.getParecer_dl().trim().length() > 0) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Parecer DL: "); - pg.getChildren().add(st); - st = new StaticText(); - st.setEscape(false); - st.setText(r.getParecer_dl().toString()); - pg.getChildren().add(st); - gridParecer.getChildren().add(pg); - - } - } - - if(r.getParecer_dns() != null) - { - if(r.getParecer_dns().trim().length() > 0) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Parecer DNS: "); - pg.getChildren().add(st); - st = new StaticText(); - st.setEscape(false); - st.setText(r.getParecer_dns().toString()); - pg.getChildren().add(st); - gridParecer.getChildren().add(pg); - - } - } - - if(r.getVerificacao_siprp() != null) - { - if(r.getVerificacao_siprp().trim().length() > 0) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Verificação SIPRP: "); - pg.getChildren().add(st); - st = new StaticText(); - st.setEscape(false); - st.setText(r.getVerificacao_siprp().toString()); - pg.getChildren().add(st); - gridParecer.getChildren().add(pg); - - } - } + HtmlPanelGrid grd = new HtmlPanelGrid(); + grd.setColumns( 1 ); + grd.setWidth( "100%" ); + grd.setStyleClass( "centerBlock" ); + grd.setStyle( "display: block" ); + //gridRisco.getChildren().add(grd); + + gridValor = new HtmlPanelGrid(); + gridRisco.getChildren().add( gridValor ); + //gridValor.setStyleClass("centerBlock"); + gridValor.setStyle( "display: block" ); + gridValor.setWidth( "100%" ); + gridValor.setColumns( 1 ); + gridValor.setColumnClasses( "gridColLeft" ); + //grd.getChildren().add(gridValor); + pg = new PanelGroup(); + st = new StaticText(); + st.setEscape( false ); + st.setStyleClass( "label" ); + st.setText( "Valor: " ); + pg.getChildren().add( st ); + st = new StaticText(); + st.setEscape( false ); + if ( r.getValor() == null ) + { + st.setText( "IND" ); + } + else + { + st.setText( r.getValor().toString() ); + } + pg.getChildren().add( st ); + gridValor.getChildren().add( pg ); + + showMedidas( r.getMedidas() ); + + grd = new HtmlPanelGrid(); + grd.setColumns( 1 ); + grd.setWidth( "100%" ); + //grd.setStyleClass("centerBlock"); + gridValor.getChildren().add( grd ); + HtmlPanelGrid gridParecer = new HtmlPanelGrid(); + gridParecer.setStyleClass( "centerBlock" ); + gridParecer.setStyle( "display: block" ); + gridParecer.setWidth( "98%" ); + gridParecer.setColumns( 1 ); + gridParecer.setColumnClasses( "gridColLeft" ); + grd.getChildren().add( gridParecer ); + + if ( r.getResponsavel_execucao() != null ) + { + if ( r.getResponsavel_execucao().trim().length() > 0 ) + { + pg = new PanelGroup(); + + st = new StaticText(); + st.setEscape( false ); + st.setStyleClass( "label" ); + st.setText( "Responsável de execução: " ); + pg.getChildren().add( st ); + st = new StaticText(); + st.setEscape( false ); + st.setText( r.getResponsavel_execucao().toString() ); + pg.getChildren().add( st ); + + if ( r.getPor() != null ) + { + if ( r.getPor().trim().length() > 0 ) + { + st = new StaticText(); + st.setEscape( false ); + st.setText( " " ); + pg.getChildren().add( st ); + + st = new StaticText(); + st.setEscape( false ); + st.setStyleClass( "label" ); + st.setText( "POR:  " ); + pg.getChildren().add( st ); + st = new StaticText(); + st.setEscape( false ); + st.setText( r.getPor().toString() ); + pg.getChildren().add( st ); + } + } + + gridParecer.getChildren().add( pg ); + } + } + + if ( r.getRecursos_necessarios() != null ) + { + if ( r.getRecursos_necessarios().trim().length() > 0 ) + { + pg = new PanelGroup(); + st = new StaticText(); + st.setEscape( false ); + st.setStyleClass( "label" ); + st.setText( "Recursos necessários: " ); + pg.getChildren().add( st ); + st = new StaticText(); + st.setEscape( false ); + st.setText( r.getRecursos_necessarios().toString() ); + pg.getChildren().add( st ); + gridParecer.getChildren().add( pg ); + } + } + + if ( r.getData_inicio() != null ) + { + pg = new PanelGroup(); + st = new StaticText(); + st.setEscape( false ); + st.setStyleClass( "label" ); + st.setText( "Data início: " ); + pg.getChildren().add( st ); + st = new StaticText(); + st.setEscape( false ); + String data_str = ""; + SimpleDateFormat formatter = new SimpleDateFormat( "dd/MM/yyyy" ); + data_str = formatter.format( r.getData_inicio() ); + st.setText( data_str ); + pg.getChildren().add( st ); + gridParecer.getChildren().add( pg ); + } + + if ( r.getData_fim() != null ) + { + pg = new PanelGroup(); + st = new StaticText(); + st.setEscape( false ); + st.setStyleClass( "label" ); + st.setText( "Data fim: " ); + pg.getChildren().add( st ); + st = new StaticText(); + st.setEscape( false ); + String data_str = ""; + SimpleDateFormat formatter = new SimpleDateFormat( "dd/MM/yyyy" ); + data_str = formatter.format( r.getData_fim() ); + st.setText( data_str ); + pg.getChildren().add( st ); + gridParecer.getChildren().add( pg ); + } + + if ( r.getParecer_dl() != null ) + { + if ( r.getParecer_dl().trim().length() > 0 ) + { + pg = new PanelGroup(); + st = new StaticText(); + st.setEscape( false ); + st.setStyleClass( "label" ); + st.setText( "Parecer DL: " ); + pg.getChildren().add( st ); + st = new StaticText(); + st.setEscape( false ); + st.setText( r.getParecer_dl().toString() ); + pg.getChildren().add( st ); + gridParecer.getChildren().add( pg ); + } + } + + if ( r.getParecer_dns() != null ) + { + if ( r.getParecer_dns().trim().length() > 0 ) + { + pg = new PanelGroup(); + st = new StaticText(); + st.setEscape( false ); + st.setStyleClass( "label" ); + st.setText( "Parecer DNS: " ); + pg.getChildren().add( st ); + st = new StaticText(); + st.setEscape( false ); + st.setText( r.getParecer_dns().toString() ); + pg.getChildren().add( st ); + gridParecer.getChildren().add( pg ); + + } + } + + if ( r.getVerificacao_siprp() != null ) + { + if ( r.getVerificacao_siprp().trim().length() > 0 ) + { + pg = new PanelGroup(); + st = new StaticText(); + st.setEscape( false ); + st.setStyleClass( "label" ); + st.setText( "Verificação SIPRP: " ); + pg.getChildren().add( st ); + st = new StaticText(); + st.setEscape( false ); + st.setText( r.getVerificacao_siprp().toString() ); + pg.getChildren().add( st ); + gridParecer.getChildren().add( pg ); + } + } } - private void showValores(List valores) - { - for(Valor valor : valores) - { - HtmlPanelGrid grd = new HtmlPanelGrid(); - grd.setColumns(1); - grd.setWidth("100%"); - //grd.setStyleClass("centerBlock"); - //gridRisco.getChildren().add(grd); - - gridValor = new HtmlPanelGrid(); - gridRisco.getChildren().add(gridValor); - ////gridValor.setStyleClass("centerBlock"); - gridValor.setWidth("100%"); - gridValor.setColumns(1); - gridValor.setColumnClasses("gridColLeft"); - //grd.getChildren().add(gridValor); - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Valor: "); - pg.getChildren().add(st); - st = new StaticText(); - st.setEscape(false); - if(valor.getValor() == null) - { - st.setText(" - "); - } - else - { - st.setText(valor.getValor().toString()); - } - pg.getChildren().add(st); - gridValor.getChildren().add(pg); - - showMedidas(valor.getMedidas()); - - grd = new HtmlPanelGrid(); - grd.setColumns(1); - grd.setWidth("100%"); - ////grd.setStyleClass("centerBlock"); - gridValor.getChildren().add(grd); - HtmlPanelGrid gridParecer = new HtmlPanelGrid(); - gridParecer.setStyleClass("centerBlock"); - gridParecer.setWidth("98%"); - gridParecer.setColumns(1); - gridParecer.setColumnClasses("gridColLeft"); - grd.getChildren().add(gridParecer); - - if(valor.getResponsavel_execucao() != null) - { - if(valor.getResponsavel_execucao().trim().length() > 0) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Responsável de execução: "); - pg.getChildren().add(st); - st = new StaticText(); - st.setEscape(false); - st.setText(valor.getResponsavel_execucao().toString()); - pg.getChildren().add(st); - gridParecer.getChildren().add(pg); - } - } - - if(valor.getRecursos_necessarios() != null) - { - if(valor.getRecursos_necessarios().trim().length() > 0) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Recursos necessários: "); - pg.getChildren().add(st); - st = new StaticText(); - st.setEscape(false); - st.setText(valor.getRecursos_necessarios().toString()); - pg.getChildren().add(st); - gridParecer.getChildren().add(pg); - } - } - - if(valor.getData_inicio() != null) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Data início: "); - pg.getChildren().add(st); - st = new StaticText(); - st.setEscape(false); - String data_str = ""; - SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); - data_str = formatter.format(valor.getData_inicio()); - st.setText(data_str); - pg.getChildren().add(st); - gridParecer.getChildren().add(pg); - } - - if(valor.getData_fim() != null) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Data fim: "); - pg.getChildren().add(st); - st = new StaticText(); - st.setEscape(false); - String data_str = ""; - SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); - data_str = formatter.format(valor.getData_fim()); - st.setText(data_str); - pg.getChildren().add(st); - gridParecer.getChildren().add(pg); - } - - if(valor.getParecer_dl() != null) - { - if(valor.getParecer_dl().trim().length() > 0) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Parecer DL: "); - pg.getChildren().add(st); - st = new StaticText(); - st.setEscape(false); - st.setText(valor.getParecer_dl().toString()); - pg.getChildren().add(st); - gridParecer.getChildren().add(pg); - - } - } - - if(valor.getParecer_dns() != null) - { - if(valor.getParecer_dns().trim().length() > 0) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Parecer DNS: "); - pg.getChildren().add(st); - st = new StaticText(); - st.setEscape(false); - st.setText(valor.getParecer_dns().toString()); - pg.getChildren().add(st); - gridParecer.getChildren().add(pg); - - } - } - - if(valor.getVerificacao_siprp() != null) - { - if(valor.getVerificacao_siprp().trim().length() > 0) - { - pg = new PanelGroup(); - st = new StaticText(); - st.setEscape(false); - st.setStyleClass("label"); - st.setText("Verificação SIPRP: "); - pg.getChildren().add(st); - st = new StaticText(); - st.setEscape(false); - st.setText(valor.getVerificacao_siprp().toString()); - pg.getChildren().add(st); - gridParecer.getChildren().add(pg); - - } - } - // - } - } +// private void showValores( List< Valor > valores ) +// { +// for ( Valor valor : valores ) +// { +// HtmlPanelGrid grd = new HtmlPanelGrid(); +// grd.setColumns( 1 ); +// grd.setWidth( "100%" ); +// //grd.setStyleClass("centerBlock"); +// //gridRisco.getChildren().add(grd); +// +// gridValor = new HtmlPanelGrid(); +// gridRisco.getChildren().add( gridValor ); +// ////gridValor.setStyleClass("centerBlock"); +// gridValor.setWidth( "100%" ); +// gridValor.setColumns( 1 ); +// gridValor.setColumnClasses( "gridColLeft" ); +// //grd.getChildren().add(gridValor); +// pg = new PanelGroup(); +// st = new StaticText(); +// st.setEscape(false); +// st.setStyleClass("label"); +// st.setText("Valor: "); +// pg.getChildren().add(st); +// st = new StaticText(); +// st.setEscape(false); +// if(valor.getValor() == null) +// { +// st.setText(" - "); +// } +// else +// { +// st.setText(valor.getValor().toString()); +// } +// pg.getChildren().add(st); +// gridValor.getChildren().add(pg); +// +// showMedidas(valor.getMedidas()); +// +// grd = new HtmlPanelGrid(); +// grd.setColumns(1); +// grd.setWidth("100%"); +// ////grd.setStyleClass("centerBlock"); +// gridValor.getChildren().add(grd); +// HtmlPanelGrid gridParecer = new HtmlPanelGrid(); +// gridParecer.setStyleClass("centerBlock"); +// gridParecer.setWidth("98%"); +// gridParecer.setColumns(1); +// gridParecer.setColumnClasses("gridColLeft"); +// grd.getChildren().add(gridParecer); +// +// if(valor.getResponsavel_execucao() != null) +// { +// if(valor.getResponsavel_execucao().trim().length() > 0) +// { +// pg = new PanelGroup(); +// st = new StaticText(); +// st.setEscape(false); +// st.setStyleClass("label"); +// st.setText("Responsável de execução: "); +// pg.getChildren().add(st); +// st = new StaticText(); +// st.setEscape(false); +// st.setText(valor.getResponsavel_execucao().toString()); +// pg.getChildren().add(st); +// gridParecer.getChildren().add(pg); +// } +// } +// +// if(valor.getRecursos_necessarios() != null) +// { +// if(valor.getRecursos_necessarios().trim().length() > 0) +// { +// pg = new PanelGroup(); +// st = new StaticText(); +// st.setEscape(false); +// st.setStyleClass("label"); +// st.setText("Recursos necessários: "); +// pg.getChildren().add(st); +// st = new StaticText(); +// st.setEscape(false); +// st.setText(valor.getRecursos_necessarios().toString()); +// pg.getChildren().add(st); +// gridParecer.getChildren().add(pg); +// } +// } +// +// if(valor.getData_inicio() != null) +// { +// pg = new PanelGroup(); +// st = new StaticText(); +// st.setEscape(false); +// st.setStyleClass("label"); +// st.setText("Data início: "); +// pg.getChildren().add(st); +// st = new StaticText(); +// st.setEscape(false); +// String data_str = ""; +// SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); +// data_str = formatter.format(valor.getData_inicio()); +// st.setText(data_str); +// pg.getChildren().add(st); +// gridParecer.getChildren().add(pg); +// } +// +// if(valor.getData_fim() != null) +// { +// pg = new PanelGroup(); +// st = new StaticText(); +// st.setEscape(false); +// st.setStyleClass("label"); +// st.setText("Data fim: "); +// pg.getChildren().add(st); +// st = new StaticText(); +// st.setEscape(false); +// String data_str = ""; +// SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy"); +// data_str = formatter.format(valor.getData_fim()); +// st.setText(data_str); +// pg.getChildren().add(st); +// gridParecer.getChildren().add(pg); +// } +// +// if(valor.getParecer_dl() != null) +// { +// if(valor.getParecer_dl().trim().length() > 0) +// { +// pg = new PanelGroup(); +// st = new StaticText(); +// st.setEscape(false); +// st.setStyleClass("label"); +// st.setText("Parecer DL: "); +// pg.getChildren().add(st); +// st = new StaticText(); +// st.setEscape(false); +// st.setText(valor.getParecer_dl().toString()); +// pg.getChildren().add(st); +// gridParecer.getChildren().add(pg); +// +// } +// } +// +// if(valor.getParecer_dns() != null) +// { +// if(valor.getParecer_dns().trim().length() > 0) +// { +// pg = new PanelGroup(); +// st = new StaticText(); +// st.setEscape(false); +// st.setStyleClass("label"); +// st.setText("Parecer DNS: "); +// pg.getChildren().add(st); +// st = new StaticText(); +// st.setEscape(false); +// st.setText(valor.getParecer_dns().toString()); +// pg.getChildren().add(st); +// gridParecer.getChildren().add(pg); +// +// } +// } +// +// if(valor.getVerificacao_siprp() != null) +// { +// if(valor.getVerificacao_siprp().trim().length() > 0) +// { +// pg = new PanelGroup(); +// st = new StaticText(); +// st.setEscape(false); +// st.setStyleClass("label"); +// st.setText("Verificação SIPRP: "); +// pg.getChildren().add(st); +// st = new StaticText(); +// st.setEscape(false); +// st.setText(valor.getVerificacao_siprp().toString()); +// pg.getChildren().add(st); +// gridParecer.getChildren().add(pg); +// +// } +// } +// // +// } +// } - private void showMedidas(List medidas) + private void showMedidas( List< Medida > medidas ) { - for(Medida medida : medidas) + for( Medida medida : medidas ) { HtmlPanelGrid grd = new HtmlPanelGrid(); - grd.setColumns(1); + grd.setColumns( 1 ); grd.setWidth("100%"); ////grd.setStyleClass("centerBlock"); grd.setStyle("display: block"); - gridValor.getChildren().add(grd); + gridValor.getChildren().add( grd ); gridMedida = new HtmlPanelGrid(); ////gridMedida.setStyleClass("centerBlock"); @@ -720,20 +721,21 @@ public class ViewPlano extends AbstractPageBean gridMedida.setWidth("98%"); gridMedida.setColumns(1); gridMedida.setColumnClasses("gridColLeft"); - grd.getChildren().add(gridMedida); + grd.getChildren().add( gridMedida ); + pg = new PanelGroup(); st = new StaticText(); st.setEscape(false); - st.setStyleClass("label"); - st.setText("Medida: "); - pg.getChildren().add(st); + st.setStyleClass("label"); + st.setText("Medida: "); + pg.getChildren().add( st ); st = new StaticText(); - st.setEscape(false); - st.setText(medida.getDescricao()); - pg.getChildren().add(st); - gridMedida.getChildren().add(pg); + st.setEscape( false ); + st.setText( medida.getDescricao() ); + pg.getChildren().add( st ); + gridMedida.getChildren().add( pg ); - showPostos(medida.getPostos()); + showPostos( medida.getPostos() ); } } diff --git a/trunk/PlanosActuacao/web/EditarPlano.jsp b/trunk/PlanosActuacao/web/EditarPlano.jsp index 2372a0c9..37b9015b 100644 --- a/trunk/PlanosActuacao/web/EditarPlano.jsp +++ b/trunk/PlanosActuacao/web/EditarPlano.jsp @@ -4,7 +4,12 @@ Created on : Aug 26, 2008, 3:10:59 PM Author : lluis --> - + @@ -170,7 +175,8 @@

- + + @@ -246,6 +252,7 @@ +