riscos patrimoniais

git-svn-id: https://svn.coded.pt/svn/SIPRP@1593 bb69d46d-e84e-40c8-a05a-06db0d633741

trunk/PlanosActuacao/nbproject/build-impl.xml

@@ -545,10 +545,11 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.xml-apis-ext-1.3.04.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xml-apis-ext-1.3.04.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.serializer-2.7.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.serializer-2.7.0.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.cursos.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.cursos.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.el-impl-2.2.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.el-impl-2.2.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update">
-            <attribute name="Class-Path" value="${manifest.libs.jsf12.classpath} ${manifest.libs.jstl11.classpath} ${manifest.libs.jsf12-support.classpath} ${manifest.libs.woodstock-components.classpath} ${manifest.libs.woodstock-theme-default.classpath} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.ashwood-2.0.jar} ${manifest.file.reference.avalon-framework-4.2.0.jar} ${manifest.file.reference.activation.jar} ${manifest.file.reference.fop.jar} ${manifest.file.reference.jai_imageio.jar} ${manifest.file.reference.postgresql-8.4-701.jdbc4.jar} ${manifest.file.reference.evologger.jar} ${manifest.file.reference.batik-all-1.7.jar} ${manifest.file.reference.xmlgraphics-commons-1.3.1.jar} ${manifest.file.reference.commons-io-1.4.jar} ${manifest.file.reference.commons-collections-3.1.jar} ${manifest.file.reference.commons-lang-2.1.jar} ${manifest.file.reference.commons-logging-1.1.jar} ${manifest.file.reference.evolute.jar} ${manifest.file.reference.mail.jar-1} ${manifest.file.reference.shst.jar} ${manifest.file.reference.log4j-1.2.15.jar} ${manifest.file.reference.xalan-2.7.0.jar} ${manifest.file.reference.xercesImpl-2.7.1.jar} ${manifest.file.reference.xml-apis-1.3.04.jar} ${manifest.file.reference.xml-apis-ext-1.3.04.jar} ${manifest.file.reference.serializer-2.7.0.jar} ${manifest.file.reference.cursos.jar} "/>
+            <attribute name="Class-Path" value="${manifest.libs.jsf12.classpath} ${manifest.libs.jstl11.classpath} ${manifest.libs.jsf12-support.classpath} ${manifest.libs.woodstock-components.classpath} ${manifest.libs.woodstock-theme-default.classpath} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.ashwood-2.0.jar} ${manifest.file.reference.avalon-framework-4.2.0.jar} ${manifest.file.reference.activation.jar} ${manifest.file.reference.fop.jar} ${manifest.file.reference.jai_imageio.jar} ${manifest.file.reference.postgresql-8.4-701.jdbc4.jar} ${manifest.file.reference.evologger.jar} ${manifest.file.reference.batik-all-1.7.jar} ${manifest.file.reference.xmlgraphics-commons-1.3.1.jar} ${manifest.file.reference.commons-io-1.4.jar} ${manifest.file.reference.commons-collections-3.1.jar} ${manifest.file.reference.commons-lang-2.1.jar} ${manifest.file.reference.commons-logging-1.1.jar} ${manifest.file.reference.evolute.jar} ${manifest.file.reference.mail.jar-1} ${manifest.file.reference.shst.jar} ${manifest.file.reference.log4j-1.2.15.jar} ${manifest.file.reference.xalan-2.7.0.jar} ${manifest.file.reference.xercesImpl-2.7.1.jar} ${manifest.file.reference.xml-apis-1.3.04.jar} ${manifest.file.reference.xml-apis-ext-1.3.04.jar} ${manifest.file.reference.serializer-2.7.0.jar} ${manifest.file.reference.cursos.jar} ${manifest.file.reference.el-impl-2.2.jar} "/>
         </manifest>
     </target>
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
@@ -581,6 +582,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.xml-apis-ext-1.3.04.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.serializer-2.7.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.cursos.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.el-impl-2.2.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
     </target>
     <target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">

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.data.CRC32=602937d9
-nbproject/build-impl.xml.script.CRC32=1fbdeec4
+nbproject/build-impl.xml.script.CRC32=de64e499
 nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.2.1

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

trunk/PlanosActuacao/nbproject/project.xml

@@ -123,6 +123,10 @@
                     <file>${file.reference.cursos.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library>
+                    <file>${file.reference.el-impl-2.2.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
             </web-module-libraries>
             <web-module-additional-libraries>
                 <library>

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
+# tests
-#port.siprp = 5436
+#server.siprp = localhost
+#port.siprp = 5432
 #database.siprp = siprp
 #username.siprp = postgres
-#password.siprp = -rg2hpgsql
+#password.siprp = Typein
 #
-#server.siprp_local = www.evolute.pt
+#server.siprp_local = localhost
-#port.siprp_local = 5436
+#port.siprp_local = 5432
 #database.siprp_local = siprp_local_3
 #username.siprp_local = postgres
-#password.siprp_local = -rg2hpgsql
+#password.siprp_local = Typein

trunk/PlanosActuacao/src/java/db/data/siprp/inner/Acidentados.java

@@ -204,7 +204,9 @@ public class Acidentados extends com.evolute.entity.evo.EvoDataObject<com.evolut
 
 	public java.util.List<db.data.siprp.outer.AnalisesAcidentesData>fromAnalisesAcidentes_acidentado_id()
 	{
-		java.util.List<db.data.siprp.outer.AnalisesAcidentesData> result = null;
+		java.util.List<db.data.siprp.outer.AnalisesAcidentesData> 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" );
@@ -213,6 +215,7 @@ public class Acidentados extends com.evolute.entity.evo.EvoDataObject<com.evolut
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 

trunk/PlanosActuacao/src/java/db/data/siprp/inner/AnalisesAcidentes.java

@@ -869,7 +869,9 @@ public class AnalisesAcidentes extends com.evolute.entity.evo.EvoDataObject<com.
 
 	public java.util.List<db.data.siprp.outer.MedidasData>fromMedidas_analise_id()
 	{
-		java.util.List<db.data.siprp.outer.MedidasData> result = null;
+		java.util.List<db.data.siprp.outer.MedidasData> 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" );
@@ -878,12 +880,15 @@ public class AnalisesAcidentes extends com.evolute.entity.evo.EvoDataObject<com.
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp.outer.RecomendacoesData>fromRecomendacoes_analise_id()
 	{
-		java.util.List<db.data.siprp.outer.RecomendacoesData> result = null;
+		java.util.List<db.data.siprp.outer.RecomendacoesData> 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" );
@@ -892,6 +897,7 @@ public class AnalisesAcidentes extends com.evolute.entity.evo.EvoDataObject<com.
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 

trunk/PlanosActuacao/src/java/db/data/siprp/inner/Departamentos.java

@@ -102,7 +102,9 @@ public class Departamentos extends com.evolute.entity.evo.EvoDataObject<com.evol
 
 	public java.util.List<db.data.siprp.outer.AnalisesAcidentesData>fromAnalisesAcidentes_departamento_id()
 	{
-		java.util.List<db.data.siprp.outer.AnalisesAcidentesData> result = null;
+		java.util.List<db.data.siprp.outer.AnalisesAcidentesData> 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"), "departamento_id" );
@@ -111,12 +113,15 @@ public class Departamentos extends com.evolute.entity.evo.EvoDataObject<com.evol
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp.outer.SeccoesData>fromSeccoes_departamento_id()
 	{
-		java.util.List<db.data.siprp.outer.SeccoesData> result = null;
+		java.util.List<db.data.siprp.outer.SeccoesData> result = new java.util.LinkedList< db.data.siprp.outer.SeccoesData >();
+		if ( getPrimaryKey() != null ) 
+		{
 			try
 			{
 				result = fromReference( db.data.siprp.outer.SeccoesData.class , getPrimaryKey().getMap().get("id"), "departamento_id" );
@@ -125,6 +130,7 @@ public class Departamentos extends com.evolute.entity.evo.EvoDataObject<com.evol
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 

trunk/PlanosActuacao/src/java/db/data/siprp/inner/Empresas.java

@@ -188,7 +188,9 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObject<com.evolute.e
 
 	public java.util.List<db.data.siprp.outer.AvisosData>fromAvisos_empresa_id()
 	{
-		java.util.List<db.data.siprp.outer.AvisosData> result = null;
+		java.util.List<db.data.siprp.outer.AvisosData> 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" );
@@ -197,12 +199,15 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObject<com.evolute.e
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp.outer.EstabelecimentosData>fromEstabelecimentos_empresa_id()
 	{
-		java.util.List<db.data.siprp.outer.EstabelecimentosData> result = null;
+		java.util.List<db.data.siprp.outer.EstabelecimentosData> 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" );
@@ -211,12 +216,15 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObject<com.evolute.e
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp.outer.MarcacoesEmpresaData>fromMarcacoesEmpresa_empresa_id()
 	{
-		java.util.List<db.data.siprp.outer.MarcacoesEmpresaData> result = null;
+		java.util.List<db.data.siprp.outer.MarcacoesEmpresaData> 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" );
@@ -225,6 +233,7 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObject<com.evolute.e
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 

trunk/PlanosActuacao/src/java/db/data/siprp/inner/Estabelecimentos.java

@@ -158,7 +158,9 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObject<com.e
 
 	public java.util.List<db.data.siprp.outer.AvisosData>fromAvisos_estabelecimento_id()
 	{
-		java.util.List<db.data.siprp.outer.AvisosData> result = null;
+		java.util.List<db.data.siprp.outer.AvisosData> 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" );
@@ -167,12 +169,15 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObject<com.e
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp.outer.HistoricoEstabelecimentoData>fromHistoricoEstabelecimento_estabelecimento_id()
 	{
-		java.util.List<db.data.siprp.outer.HistoricoEstabelecimentoData> result = null;
+		java.util.List<db.data.siprp.outer.HistoricoEstabelecimentoData> result = new java.util.LinkedList< db.data.siprp.outer.HistoricoEstabelecimentoData >();
+		if ( getPrimaryKey() != null ) 
+		{
 			try
 			{
 				result = fromReference( db.data.siprp.outer.HistoricoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
@@ -181,12 +186,15 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObject<com.e
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp.outer.TrabalhadoresData>fromTrabalhadores_estabelecimento_id()
 	{
-		java.util.List<db.data.siprp.outer.TrabalhadoresData> result = null;
+		java.util.List<db.data.siprp.outer.TrabalhadoresData> 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" );
@@ -195,6 +203,7 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObject<com.e
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 

trunk/PlanosActuacao/src/java/db/data/siprp/inner/EstadoMedidas.java

@@ -109,7 +109,9 @@ public class EstadoMedidas extends com.evolute.entity.evo.EvoDataObject<com.evol
 
 	public java.util.List<db.data.siprp.outer.PlanoMedidasData>fromPlanoMedidas_estado_medidas_id()
 	{
-		java.util.List<db.data.siprp.outer.PlanoMedidasData> result = null;
+		java.util.List<db.data.siprp.outer.PlanoMedidasData> result = new java.util.LinkedList< db.data.siprp.outer.PlanoMedidasData >();
+		if ( getPrimaryKey() != null ) 
+		{
 			try
 			{
 				result = fromReference( db.data.siprp.outer.PlanoMedidasData.class , getPrimaryKey().getMap().get("id"), "estado_medidas_id" );
@@ -118,6 +120,7 @@ public class EstadoMedidas extends com.evolute.entity.evo.EvoDataObject<com.evol
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 

trunk/PlanosActuacao/src/java/db/data/siprp/inner/Medicos.java

@@ -109,7 +109,9 @@ public class Medicos extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 
 	public java.util.List<db.data.siprp.outer.ExamesData>fromExames_medico_id()
 	{
-		java.util.List<db.data.siprp.outer.ExamesData> result = null;
+		java.util.List<db.data.siprp.outer.ExamesData> 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"), "medico_id" );
@@ -118,6 +120,7 @@ public class Medicos extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 

trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanoAreas.java

@@ -202,7 +202,9 @@ public class PlanoAreas extends com.evolute.entity.evo.EvoDataObject<com.evolute
 
 	public java.util.List<db.data.siprp.outer.PlanoRiscosData>fromPlanoRiscos_area_id()
 	{
-		java.util.List<db.data.siprp.outer.PlanoRiscosData> result = null;
+		java.util.List<db.data.siprp.outer.PlanoRiscosData> result = new java.util.LinkedList< db.data.siprp.outer.PlanoRiscosData >();
+		if ( getPrimaryKey() != null ) 
+		{
 			try
 			{
 				result = fromReference( db.data.siprp.outer.PlanoRiscosData.class , getPrimaryKey().getMap().get("id"), "area_id" );
@@ -211,6 +213,7 @@ public class PlanoAreas extends com.evolute.entity.evo.EvoDataObject<com.evolute
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 

trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanoMedidas.java

@@ -219,7 +219,9 @@ public class PlanoMedidas extends com.evolute.entity.evo.EvoDataObject<com.evolu
 
 	public java.util.List<db.data.siprp.outer.PlanoPostosTrabalhoData>fromPlanoPostosTrabalho_medida_id()
 	{
-		java.util.List<db.data.siprp.outer.PlanoPostosTrabalhoData> result = null;
+		java.util.List<db.data.siprp.outer.PlanoPostosTrabalhoData> 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" );
@@ -228,6 +230,7 @@ public class PlanoMedidas extends com.evolute.entity.evo.EvoDataObject<com.evolu
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 

trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanoRiscos.java

@@ -45,6 +45,8 @@ public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObject<com.evolut
 		FIELD_INDEXES.put( PlanoRiscos.RISCO_ID_FULL, PlanoRiscos.RISCO_ID_INDEX );
 		FIELD_INDEXES.put( PlanoRiscos.POR, PlanoRiscos.POR_INDEX );
 		FIELD_INDEXES.put( PlanoRiscos.POR_FULL, PlanoRiscos.POR_INDEX );
+		FIELD_INDEXES.put( PlanoRiscos.IS_PATRIMONIAL, PlanoRiscos.IS_PATRIMONIAL_INDEX );
+		FIELD_INDEXES.put( PlanoRiscos.IS_PATRIMONIAL_FULL, PlanoRiscos.IS_PATRIMONIAL_INDEX );
 	}
 
 	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
@@ -104,20 +106,24 @@ public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObject<com.evolut
 	public static final String POR = "por";
 	public static final String POR_FULL = "plano_riscos.por";
 	public static final int POR_INDEX = 14;
+	public static final String IS_PATRIMONIAL = "is_patrimonial";
+	public static final String IS_PATRIMONIAL_FULL = "plano_riscos.is_patrimonial";
+	public static final int IS_PATRIMONIAL_INDEX = 15;
 
 	public static final String FIELD_NAMES[] = new String[]{
 		DESCRICAO, ACTIVO, AREA_ID, TO_AREA_ID, VALOR, RESPONSAVEL_EXECUCAO, 
 		RECURSOS_NECESSARIOS, DATA_INICIO, DATA_FIM, PARECER_DL, PARECER_DNS, 
-		VERIFICACAO_SIPRP, RISCO_ID, POR, };
+		VERIFICACAO_SIPRP, RISCO_ID, POR, IS_PATRIMONIAL, };
 
 	public static final String FIELD_NAMES_FULL[] = new String[]{
 		TABLENAME + "." + DESCRICAO, TABLENAME + "." + ACTIVO, TABLENAME + "." + AREA_ID, TABLENAME + "." + TO_AREA_ID, TABLENAME + "." + VALOR, TABLENAME + "." + RESPONSAVEL_EXECUCAO, 
 		TABLENAME + "." + RECURSOS_NECESSARIOS, TABLENAME + "." + DATA_INICIO, TABLENAME + "." + DATA_FIM, TABLENAME + "." + PARECER_DL, TABLENAME + "." + PARECER_DNS, 
-		TABLENAME + "." + VERIFICACAO_SIPRP, TABLENAME + "." + RISCO_ID, TABLENAME + "." + POR, };
+		TABLENAME + "." + VERIFICACAO_SIPRP, TABLENAME + "." + RISCO_ID, TABLENAME + "." + POR, TABLENAME + "." + IS_PATRIMONIAL, };
 
 	protected static final String DB_FIELD_NAMES[] = new String[]{
 		DESCRICAO, ACTIVO, AREA_ID, ID, VALOR, RESPONSAVEL_EXECUCAO, RECURSOS_NECESSARIOS, 
-		DATA_INICIO, DATA_FIM, PARECER_DL, PARECER_DNS, VERIFICACAO_SIPRP, RISCO_ID, POR, };
+		DATA_INICIO, DATA_FIM, PARECER_DL, PARECER_DNS, VERIFICACAO_SIPRP, RISCO_ID, POR, 
+		IS_PATRIMONIAL, };
 
 
 	protected static final String PK_FIELD_NAMES[] = new String[]{
@@ -126,7 +132,8 @@ public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObject<com.evolut
 
 	public static final String DEFAULT_LOAD_SET[] = new String[] {
 		DESCRICAO, ACTIVO, AREA_ID, ID, VALOR, RESPONSAVEL_EXECUCAO, RECURSOS_NECESSARIOS, 
-		DATA_INICIO, DATA_FIM, PARECER_DL, PARECER_DNS, VERIFICACAO_SIPRP, RISCO_ID, POR, };
+		DATA_INICIO, DATA_FIM, PARECER_DL, PARECER_DNS, VERIFICACAO_SIPRP, RISCO_ID, POR, 
+		IS_PATRIMONIAL, };
 
 	private String descricao;
 	private String activo;
@@ -143,6 +150,7 @@ public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObject<com.evolut
 	private String verificacao_siprp;
 	private Integer risco_id;
 	private String por;
+	private Boolean is_patrimonial;
 
 	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
 
@@ -151,7 +159,7 @@ public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObject<com.evolut
 		super();
 		dirtyProperties = new boolean[]{ false, false, false
 			, false, false, false, false, false, false, false, false, 
-			false, false, false, false };
+			false, false, false, false, false };
 	}
 
 	public String getDescricao()
@@ -298,7 +306,9 @@ public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObject<com.evolut
 
 	public java.util.List<db.data.siprp.outer.PlanoMedidasData>fromPlanoMedidas_risco_id()
 	{
-		java.util.List<db.data.siprp.outer.PlanoMedidasData> result = null;
+		java.util.List<db.data.siprp.outer.PlanoMedidasData> result = new java.util.LinkedList< db.data.siprp.outer.PlanoMedidasData >();
+		if ( getPrimaryKey() != null ) 
+		{
 			try
 			{
 				result = fromReference( db.data.siprp.outer.PlanoMedidasData.class , getPrimaryKey().getMap().get("id"), "risco_id" );
@@ -307,6 +317,7 @@ public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObject<com.evolut
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 
@@ -600,6 +611,35 @@ public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObject<com.evolut
 		LAZY_LOADED_OBJECTS.put( POR, Boolean.TRUE );
 	}
 
+	public Boolean getIs_patrimonial()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( IS_PATRIMONIAL );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.is_patrimonial;
+	}
+
+	public void setIs_patrimonial( Boolean is_patrimonial )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( IS_PATRIMONIAL, is_patrimonial );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.is_patrimonial = is_patrimonial;
+		LAZY_LOADED_OBJECTS.put( IS_PATRIMONIAL, Boolean.TRUE );
+	}
+
 	public Object get( String fieldName )
 	{
 		Object value = null;
@@ -651,6 +691,9 @@ public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObject<com.evolut
 			case PlanoRiscos.POR_INDEX:
 				value = getPor();
 				break;
+			case PlanoRiscos.IS_PATRIMONIAL_INDEX:
+				value = getIs_patrimonial();
+				break;
 		}
 		return value;
 	}
@@ -706,6 +749,9 @@ public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObject<com.evolut
 			case PlanoRiscos.POR_INDEX:
 				value = this.por;
 				break;
+			case PlanoRiscos.IS_PATRIMONIAL_INDEX:
+				value = this.is_patrimonial;
+				break;
 		}
 		return value;
 	}
@@ -760,6 +806,9 @@ public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObject<com.evolut
 			case PlanoRiscos.POR_INDEX:
 				setPor( ( String ) value );
 				break;
+			case PlanoRiscos.IS_PATRIMONIAL_INDEX:
+				setIs_patrimonial( ( Boolean ) value );
+				break;
 		}
 	}
 
@@ -813,6 +862,9 @@ public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObject<com.evolut
 			case PlanoRiscos.POR_INDEX:
 				this.por = ( String ) value;
 				break;
+			case PlanoRiscos.IS_PATRIMONIAL_INDEX:
+				this.is_patrimonial = ( Boolean ) value;
+				break;
 		}
 	}
 
@@ -897,6 +949,9 @@ public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObject<com.evolut
 			case PlanoRiscos.POR_INDEX:
 				theClass = String.class;
 				break;
+			case PlanoRiscos.IS_PATRIMONIAL_INDEX:
+				theClass = Boolean.class;
+				break;
 		}
 		return theClass;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp/inner/PlanosActuacao.java

@@ -1204,7 +1204,9 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject<com.evo
 
 	public java.util.List<db.data.siprp.outer.PlanoAreasData>fromPlanoAreas_plano_id()
 	{
-		java.util.List<db.data.siprp.outer.PlanoAreasData> result = null;
+		java.util.List<db.data.siprp.outer.PlanoAreasData> 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" );
@@ -1213,6 +1215,7 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject<com.evo
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 

trunk/PlanosActuacao/src/java/db/data/siprp/inner/Seccoes.java

@@ -118,7 +118,9 @@ public class Seccoes extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 
 	public java.util.List<db.data.siprp.outer.AnalisesAcidentesData>fromAnalisesAcidentes_seccao_id()
 	{
-		java.util.List<db.data.siprp.outer.AnalisesAcidentesData> result = null;
+		java.util.List<db.data.siprp.outer.AnalisesAcidentesData> 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"), "seccao_id" );
@@ -127,6 +129,7 @@ public class Seccoes extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 

trunk/PlanosActuacao/src/java/db/data/siprp/inner/TiposExamesComp.java

@@ -102,7 +102,9 @@ public class TiposExamesComp extends com.evolute.entity.evo.EvoDataObject<com.ev
 
 	public java.util.List<db.data.siprp.outer.ExamesPerfisData>fromExamesPerfis_tipo()
 	{
-		java.util.List<db.data.siprp.outer.ExamesPerfisData> result = null;
+		java.util.List<db.data.siprp.outer.ExamesPerfisData> result = new java.util.LinkedList< db.data.siprp.outer.ExamesPerfisData >();
+		if ( getPrimaryKey() != null ) 
+		{
 			try
 			{
 				result = fromReference( db.data.siprp.outer.ExamesPerfisData.class , getPrimaryKey().getMap().get("id"), "tipo" );
@@ -111,6 +113,7 @@ public class TiposExamesComp extends com.evolute.entity.evo.EvoDataObject<com.ev
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 

trunk/PlanosActuacao/src/java/db/data/siprp/inner/Trabalhadores.java

@@ -201,7 +201,9 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObject<com.evol
 
 	public java.util.List<db.data.siprp.outer.AvisosData>fromAvisos_trabalhador_id()
 	{
-		java.util.List<db.data.siprp.outer.AvisosData> result = null;
+		java.util.List<db.data.siprp.outer.AvisosData> 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" );
@@ -210,12 +212,15 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObject<com.evol
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp.outer.ExamesData>fromExames_trabalhador_id()
 	{
-		java.util.List<db.data.siprp.outer.ExamesData> result = null;
+		java.util.List<db.data.siprp.outer.ExamesData> 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" );
@@ -224,12 +229,15 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObject<com.evol
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp.outer.MarcacoesTrabalhadorData>fromMarcacoesTrabalhador_trabalhador_id()
 	{
-		java.util.List<db.data.siprp.outer.MarcacoesTrabalhadorData> result = null;
+		java.util.List<db.data.siprp.outer.MarcacoesTrabalhadorData> 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" );
@@ -238,6 +246,7 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObject<com.evol
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 

trunk/PlanosActuacao/src/java/db/data/siprp/inner/Utilizadores.java

@@ -215,7 +215,9 @@ public class Utilizadores extends com.evolute.entity.evo.EvoDataObject<com.evolu
 
 	public java.util.List<db.data.siprp.outer.PlanosActuacaoData>fromPlanosActuacao_user_dir_loja()
 	{
-		java.util.List<db.data.siprp.outer.PlanosActuacaoData> result = null;
+		java.util.List<db.data.siprp.outer.PlanosActuacaoData> 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" );
@@ -224,12 +226,15 @@ public class Utilizadores extends com.evolute.entity.evo.EvoDataObject<com.evolu
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp.outer.PlanosActuacaoData>fromPlanosActuacao_user_dns()
 	{
-		java.util.List<db.data.siprp.outer.PlanosActuacaoData> result = null;
+		java.util.List<db.data.siprp.outer.PlanosActuacaoData> 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" );
@@ -238,12 +243,15 @@ public class Utilizadores extends com.evolute.entity.evo.EvoDataObject<com.evolu
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp.outer.PlanosActuacaoData>fromPlanosActuacao_user_hs()
 	{
-		java.util.List<db.data.siprp.outer.PlanosActuacaoData> result = null;
+		java.util.List<db.data.siprp.outer.PlanosActuacaoData> 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" );
@@ -252,6 +260,7 @@ public class Utilizadores extends com.evolute.entity.evo.EvoDataObject<com.evolu
 			{
 				throw new RuntimeException( edex );
 			}
+		}
 		return result;
 	}
 

trunk/PlanosActuacao/src/java/db/data/siprp/inner/package.xml

@@ -1183,6 +1183,10 @@
 			<column name="por" length="8192"/>
 			<extension vendor-name="evolute" key="java-type" value="String"/>
 		</field>
+		<field name="is_patrimonial" null-value="default">
+			<column name="is_patrimonial"/>
+			<extension vendor-name="evolute" key="java-type" value="Boolean"/>
+		</field>
 	</class>
 	<class name="PlanosActuacao" identity-type="application" table="planos_actuacao" >
 		<field name="estabelecimento_id">

trunk/PlanosActuacao/src/java/db/entidades/Risco.java

@@ -31,6 +31,7 @@ public class Risco implements Serializable
     private String parecer_dns;
     private String parecer_dl;
     private String verificacao_siprp;
+	private Boolean isPatrimonial;
     
     private List<Valor> valores;
     private List<Medida> 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;
+	}
+	
 }

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<Risco> 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,10 +256,10 @@ 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< Risco > riscos = new ArrayList();
         if ( rs.isBeforeFirst() )
         {
-
             rs.first();
             do
             {
@@ -257,6 +268,8 @@ public class CreatePlanosDataProvider extends GenericDataProvider
                 if ( existemMedidasByRisco( r.getId() ) )
                 {
                     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);
@@ -264,11 +277,10 @@ public class CreatePlanosDataProvider extends GenericDataProvider
                     r.setMedidas( getMedidasByRisco( r, a ) );
                     riscos.add( r );
                 }
-
+            }
-            }while(rs.next());
+			while( rs.next() );
         }
         return riscos;
-
     }
 
     private List<Valor> 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,10 +712,12 @@ 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 ) );
@@ -711,6 +727,7 @@ public class CreatePlanosDataProvider extends GenericDataProvider
 		
 		return newRiscoID;
 	}
+	
 //    public Integer createRisco(Risco r) throws Exception
 //    {
 //        Statement st = createStatement();

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;
 
 
@@ -435,6 +439,13 @@ 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 );
 			}

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,6 +15,7 @@ import javax.faces.context.FacesContext;
  */
 public class Pagina extends Hyperlink
 {
+	private PAGINATION_ENUM paginationType;
 
     private Integer risco_id;
     private Integer valor;
@@ -36,8 +38,9 @@ public class Pagina extends Hyperlink
         values[ 3 ] = getPage_nr();
         values[ 4 ] = isPrevious();
         values[ 5 ] = isNext();
-//        values[2] = getId();
+		values[ 6 ] = getPaginationType();
-        return ( ( Object ) ( values ) );
+		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()
@@ -100,4 +104,14 @@ public class Pagina extends Hyperlink
 	{
         this.valor = valor;
 	}
+
+	public PAGINATION_ENUM getPaginationType() {
+		return paginationType;
+	}
+
+	public void setPaginationType(PAGINATION_ENUM paginationType) {
+		this.paginationType = paginationType;
+	}
+	
+
 }

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,11 +16,14 @@ import java.util.Vector;
  *
  * @author lluis
  */
-public class Pagination implements Serializable
+public abstract class Pagination implements Serializable
 {
-    private int TOTAL_PAGINAS;
+    private int TOTAL_PAGINAS = 1;
-    private Vector<Risco> riscosVector = new Vector();
+
-    private int current_page = 1;
+    private Vector< Risco > riscos = new Vector< Risco >();
+	private Vector< Pagina > paginas = new Vector< Pagina >();
+
+    private int currentPageNumber = 1;
     
     public Pagination( PlanoActuacao p )
     {
@@ -34,18 +36,23 @@ 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 >();
+		paginas = new Vector< Pagina >();
 		Pagina pagina = null;
 
-        if ( current_page > 1 )
+		if ( currentPageNumber > 1 )
 		{
 			pagina = new Pagina();
 			pagina.setId( "prev" );
@@ -54,22 +61,23 @@ public class Pagination implements Serializable
 			paginas.add( pagina );
 		}
 
-        Iterator< Risco > iter = riscosVector.iterator();
+		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 )
+//			if ( i == currentPageNumber )
-            {
+//			{
-                pagina.setDisabled( true );
+////				pagina.setDisabled( true );
-            }
+//				pagina.setStyle( "color:#000000;" );
+//			}
 			pagina.setText( i );
 			paginas.add( pagina );
 		}
 
-        if ( current_page < TOTAL_PAGINAS )
+		if ( currentPageNumber < TOTAL_PAGINAS )
 		{
 			pagina = new Pagina();
 			pagina.setId("next");
@@ -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++; 
+           currentPageNumber++;
-           r = riscosVector.get( current_page - 1 );
+           r = riscos.get( currentPageNumber - 1 );
         }
         
         return r;

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();
+	}
+
+}
+

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();
+	}
+	
+}

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,8 +407,15 @@ public class EditarPlano extends AbstractPageBean
             }
             
         }
-        //setPagination(p);        
+
-        setPagination();   
+		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() );
@@ -461,8 +471,14 @@ public class EditarPlano extends AbstractPageBean
     
     private void initialize( PlanoActuacao p )
     {
-        Pagination pagination = new Pagination( p );
+		Pagination paginationNormal = new PaginationNormais( p );
-        getSessionBean1().setPagination( pagination );
+		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)
         {
@@ -804,7 +820,6 @@ public class EditarPlano extends AbstractPageBean
         }
         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 )
@@ -830,12 +845,12 @@ public class EditarPlano extends AbstractPageBean
         st.setText( Utils.unicodeToHTML( a.getDescricao() ) );
         pg.getChildren().add( st );
         gridArea.getChildren().add( pg );
-        
-
     }
     
     private void showRisco( Risco r )
     {
+		System.out.println( "\nEditarPlano . showRisco() : " + r.getId() + " - " + r.getDescricao() );
+
         getSessionBean1().setCurrentRisco( r );
         HtmlPanelGrid grd = new HtmlPanelGrid();
         grd.setColumns( 1 );
@@ -862,7 +877,6 @@ public class EditarPlano extends AbstractPageBean
         st.setText( r.getDescricao() );
         pg.getChildren().add( st );
         gridRisco.getChildren().add( pg );
-        
     }
     
     private void showValores(Risco r)
@@ -1427,21 +1441,21 @@ 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 )
+		StaticText typeLabel = new StaticText();
-		{
+		typeLabel.setText( type.getType() + ":" );
-			gridPagination.getChildren().clear();
+		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( "&nbsp;" );
                 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,7 +1791,8 @@ 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() );
@@ -2532,8 +2550,12 @@ public class EditarPlano extends AbstractPageBean
             gridArea.getChildren().clear();
         }        
         Pagina pagina = ( Pagina ) e.getSource();
-        Pagination pagination = getSessionBean1().getPagination();
+		PAGINATION_ENUM type = pagina.getPaginationType();
 
+//        Pagination pagination = getSessionBean1().getPagination();
+		Pagination pagination = getSessionBean1().getPagination( type );
+		if ( pagination != null )
+		{
 			Risco r = pagination.getValor( pagina );
 			r = getSessionBean1().getRiscosHash().get( r.getId() );
 
@@ -2543,17 +2565,15 @@ public class EditarPlano extends AbstractPageBean
 			showValor( r );
 			showResponsavel( r );
 		}
+    }
 
-    public String butCancelar_action() {
+    public String butCancelar_action()
-        // TODO: Process the action. Return value is a navigation
+	{
-        // case name where null will return to the same page.
         return "lista_planos";
-
     }
 
-    public String butLimparDados_action() {
+    public String butLimparDados_action()
-        // TODO: Process the action. Return value is a navigation
+	{
-        // case name where null will return to the same page.
         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() {
+    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" );
         return "enviar_correcao";
     }
 
- 
-    
 }
 

trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java

@@ -556,40 +556,51 @@ public class ListaPlanos extends AbstractPageBean
         return "ver_plano";        
     }
 
-	private void createPdf( Integer pID )
+	//**** IMPRIMIR PLANO SEM RISCOS PATRIMONIAIS ****//
+    public String goImprimirPlano_action()
 	{
-		PlanoActuacaoPDFCreator pdfCreator = new PlanoActuacaoPDFCreator();
+        PlanoActuacao p = getTableActivosRowData();
-        try
+        createPdf( p.getId() );
+        return null;
+	}
+    
+    public String goImprimirPlanoFromSeguimento_action()
 	{
-			System.out.println( "CREATING PDF ..." );
+        PlanoActuacao p = getTableSeguimentoRowData();
-            byte[] pdf = pdfCreator.createPDF( pID, true );
+        createPdf( p.getId() );
-			System.out.println( "\t.. DONE !" );
+        return null;
-            showPdf( pdf );
     }    
-        catch ( Exception ex )
+    
+    public String goImprimirPlanoFromConcluidos_action()
 	{
-            ErrorLogger.logException( ex );
+		Utilizador currentUser = getSessionBean1().getCurrentUser();
-			System.out.println( "\n\tError creating PDF : " + ex.getMessage() );
+		int userType = currentUser == null ? -1 : currentUser.getTipo();
+
+		PlanoActuacao p = getTableConcluidosRowData();
+		if ( ! p.getConcluidoPorDesactivacao() || ( userType == Global.DIRECTOR_SIPRP ) )
+		{
+			createPdf( p.getId() );
 		}
+        return null;
     } 
 
-    public String goImprimirPlano_action()
+
+	//*** IMPRIMIR PLANO COM RISCOS PATRIMONIAIS ***//
+	public String goImprimirPlanoPatrimoniais_action()
 	{
 		PlanoActuacao p = getTableActivosRowData();
-        createPdf( p.getId() );
+		createPdf( p.getId(), true );
 		return null;
 	}
 
-    public String goImprimirPlanoFromSeguimento_action()
+	public String goImprimirPlanoSeguimentoPatrimoniais_action()
 	{
-		System.out.println( "\ngoImprimirPlanoFromSeguimento_action() : " );
-
 		PlanoActuacao p = getTableSeguimentoRowData();
-        createPdf( p.getId() );
+		createPdf( p.getId(), true );
 		return null;
 	}
 
-    public String goImprimirPlanoFromConcluidos_action()
+	public String goImprimirPlanoConcluidoPatrimoniais_action()
 	{
 		Utilizador currentUser = getSessionBean1().getCurrentUser();
 		int userType = currentUser == null ? -1 : currentUser.getTipo();
@@ -597,11 +608,36 @@ public class ListaPlanos extends AbstractPageBean
 		PlanoActuacao p = getTableConcluidosRowData();
 		if ( ! p.getConcluidoPorDesactivacao() || ( userType == Global.DIRECTOR_SIPRP ) )
 		{
-			createPdf( p.getId() );
+			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();

trunk/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java

@@ -283,6 +283,13 @@ public class PlanosActuacao
         }
     }
 
+	/**
+	 * 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();
@@ -299,7 +306,6 @@ public class PlanosActuacao
                     //System.out.println("RISCO -> " + r.getRisco_id().toString() + "VALOR -> " + v.getValor().toString());                    
                     r.setValor( v.getValor() );
                     r.setId( cpdp.createRisco( r ) );
-
                 }
             }
             if ( r.getMedidas() != null )

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;
 
@@ -72,7 +73,35 @@ public class SessionBean1 extends AbstractSessionBean {
     private HashMap<Integer, Valor> valoresHash;
     private HashMap<Integer, Area> areasHash;
     private HashMap<Integer, Risco> riscosHash;
-    private Pagination pagination = null;
+
+
+	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 addPagination( PAGINATION_ENUM type, Pagination pagination )
+	{
+		if ( paginationMap == null )
+		{
+			paginationMap = new HashMap< PAGINATION_ENUM, Pagination >();
 		}
 
-    public void setPagination(Pagination pagination) {
+		paginationMap.put( type, pagination );
-        this.pagination = 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;

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;
 
 /**
  * <p>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
         //lblTop.setText("Plano de actua&ccedil;&atilde;o da auditoria " + p.getData_visita_str());
 
 		if ( p.getConcluidoPorDesactivacao() )
@@ -259,11 +259,6 @@ public class ViewPlano extends AbstractPageBean
             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() );
         }
@@ -272,6 +267,15 @@ public class ViewPlano extends AbstractPageBean
     private void showRiscos( List< Risco > riscos )
     {
         int rCount = 0;
+		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();
@@ -383,7 +387,6 @@ public class ViewPlano extends AbstractPageBean
 				st.setText( r.getResponsavel_execucao().toString() );
 				pg.getChildren().add( st );
 
-
 				if ( r.getPor() != null )
 				{
 					if ( r.getPor().trim().length() > 0 )
@@ -478,7 +481,6 @@ public class ViewPlano extends AbstractPageBean
 				st.setText( r.getParecer_dl().toString() );
 				pg.getChildren().add( st );
 				gridParecer.getChildren().add( pg );
-                    
 			}
 		}
 
@@ -516,192 +518,191 @@ public class ViewPlano extends AbstractPageBean
 				st.setText( r.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:&nbsp;");
-            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());
+//    private void showValores( List< Valor > valores )
-            
+//    {
-            grd = new HtmlPanelGrid();
+//        for ( Valor valor : valores )
-            grd.setColumns(1);
+//        {
-            grd.setWidth("100%");
+//            HtmlPanelGrid grd = new HtmlPanelGrid();
+//            grd.setColumns( 1 );
+//            grd.setWidth( "100%" );
 //            //grd.setStyleClass("centerBlock");
-            gridValor.getChildren().add(grd);                
+//            //gridRisco.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&aacute;vel de execu&ccedil;&atilde;o:&nbsp;");
-                    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&aacute;rios:&nbsp;");
-                    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&iacute;cio:&nbsp;");
-                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:&nbsp;");
-                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:&nbsp;");
-                    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:&nbsp;");
-                    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&ccedil;&atilde;o SIPRP:&nbsp;");
-                    pg.getChildren().add(st); 
-                    st = new StaticText();
-                    st.setEscape(false);
-                    st.setText(valor.getVerificacao_siprp().toString());
-                    pg.getChildren().add(st);
-                    gridParecer.getChildren().add(pg);                        
-                    
-                }
-            }    
 //
-        }
+//            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:&nbsp;");
+//            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&aacute;vel de execu&ccedil;&atilde;o:&nbsp;");
+//                    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&aacute;rios:&nbsp;");
+//                    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&iacute;cio:&nbsp;");
+//                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:&nbsp;");
+//                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:&nbsp;");
+//                    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:&nbsp;");
+//                    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&ccedil;&atilde;o SIPRP:&nbsp;");
+//                    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< Medida > medidas )
     {
@@ -721,6 +722,7 @@ public class ViewPlano extends AbstractPageBean
             gridMedida.setColumns(1);
             gridMedida.setColumnClasses("gridColLeft");
             grd.getChildren().add( gridMedida );
+
             pg = new PanelGroup();
             st = new StaticText();
             st.setEscape(false);

trunk/PlanosActuacao/web/EditarPlano.jsp

@@ -4,7 +4,12 @@
     Created on : Aug 26, 2008, 3:10:59 PM
     Author     : lluis
 -->
-<jsp:root version="2.1" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:webuijsf="http://www.sun.com/webui/webuijsf">
+<jsp:root version="2.1" 
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:jsp="http://java.sun.com/JSP/Page"
+	xmlns:webuijsf="http://www.sun.com/webui/webuijsf"
+	>
     <jsp:directive.page contentType="text/html;charset=ISO-8859-1" pageEncoding="ISO-8859-1"/>
     <f:view>
         <webuijsf:page id="page1">
@@ -170,6 +175,7 @@
                         <div style="left: 0px; top: 0px; width: 100%">
                             <jsp:directive.include file="Header.jspf"/>
                         </div>
+
 					<webuijsf:form id="form1">
                         <h:inputHidden binding="#{EditarPlano.hidValidacao}" id="hidValidacao"/>
                         <h:panelGrid columns="1" id="gridBaseLayout" style="left: 0px; top: 76px; position: absolute; width: 100%" styleClass="centerBlock">
@@ -246,6 +252,7 @@
                             </h:panelGrid>
                         </h:panelGrid>
 						</webuijsf:form>
+
                     <script type="text/javascript">
                     var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
                     document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

trunk/PlanosActuacao/web/ListaPlanos.jsp

@@ -90,6 +90,9 @@
                                                 <webuijsf:tableColumn headerText="Plano" id="tableColumn10">
                                                     <webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlano_action}" id="lnkPlanoActivo"
                                                         style="color: #008000;" text="imprimir"/>
+													<webuijsf:staticText id="staticTextActivosSeparator" text=" | " />
+													<webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoPatrimoniais_action}" id="lnkPlanoImprimirPatrimoniais"
+                                                        style="color: #008000;" text="imprimir (Patrimoniais)"/>
                                                 </webuijsf:tableColumn>
                                                 <webuijsf:tableColumn headerText="Loja" id="tableColumn13" sort="loja_nome">
                                                     <webuijsf:hyperlink actionExpression="#{ListaPlanos.goEditarPlano_action}" id="lnkLojaActivo" text="#{currentRow.value['nome_estabelecimento']}"/>
@@ -145,6 +148,9 @@
                                                 <webuijsf:tableColumn headerText="Plano" id="tableColumn11">
                                                     <webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoFromSeguimento_action}" id="hyperlink4"
                                                         style="color: #008000;" text="imprimir" />
+													<webuijsf:staticText id="staticTextSeguimentoSeparator" text=" | " />
+													<webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoSeguimentoPatrimoniais_action}" id="lnkPlanoImprimirSeguimentoPatrimoniais"
+                                                        style="color: #008000;" text="imprimir (Patrimoniais)"/>
                                                 </webuijsf:tableColumn>
                                                 <webuijsf:tableColumn headerText="Loja" id="tableColumn14" sort="nome_estabelecimento">
                                                     <webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromSeguimento_action}" id="hyperlink5" text="#{currentRow.value['nome_estabelecimento']}"/>
@@ -198,6 +204,9 @@
                                                 <webuijsf:tableColumn headerText="Plano" id="tableColumn12">
                                                     <webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoFromConcluidos_action}" id="hyperlink9"
                                                         style="color: #008000;" text="imprimir"/>
+													<webuijsf:staticText id="staticTextConcluidoSeparator" text=" | " />
+													<webuijsf:hyperlink actionExpression="#{ListaPlanos.goImprimirPlanoConcluidoPatrimoniais_action}" id="lnkPlanoImprimirConcluidoPatrimoniais"
+                                                        style="color: #008000;" text="imprimir (Patrimoniais)"/>
                                                 </webuijsf:tableColumn>
                                                 <webuijsf:tableColumn headerText="Loja" id="tableColumn15" sort="nome_estabelecimento">
                                                     <webuijsf:hyperlink actionExpression="#{ListaPlanos.goVerPlanoFromConcluidos_action}" id="hyperlink10" text="#{currentRow.value['nome_estabelecimento']}"/>