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

trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java

@@ -93,12 +93,12 @@ public class SIPRPDataLoader implements CompanyDataLoader
 //		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local_3" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
 //		
-		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
+//		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
-		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
+//		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
-		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
+//		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
-		Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" );
+//		Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" );
-		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
+//		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
-		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
+//		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
 		
 //		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
@@ -136,12 +136,12 @@ public class SIPRPDataLoader implements CompanyDataLoader
 //		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local3" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
 		
-//		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
+		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
-//		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
+		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
-//		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
+		Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
-//		Singleton.setInstance( SingletonConstants.LOCAL_URL, "localhost:5432" );
+		Singleton.setInstance( SingletonConstants.LOCAL_URL, "localhost:5432" );
-//		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
+		Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
-//		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
+		Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
 		
 //		Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );
 //		Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );

trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/AreaToPrint.java

@@ -48,11 +48,11 @@ public class AreaToPrint
 			{
 				return 1;
 			} 
-		}
 			if( ordem != null )
 			{
 				return ordem.compareTo( ( ( AreaToPrint ) o ).ordem );
 			}
+		}
 		return 0;
 	}
 

trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioPrintDataProvider.java

@@ -237,9 +237,10 @@ public class RelatorioPrintDataProvider
 				new String[]{ "hs_relatorio_legislacao" },
 				new Integer[]{},
 				new Expression[]{},
-				new String[]{ "hs_relatorio_legislacao.categoria", "hs_relatorio_legislacao.descricao" },
+				new String[]{ "hs_relatorio_legislacao.categoria", "hs_relatorio_legislacao.descricao",
+							"COALESCE(hs_relatorio_legislacao.categoria,'A')"},
 				new Field( "hs_relatorio_legislacao.hs_relatorio_id" ).isEqual( relatorioId ),
-				new String[]{ "hs_relatorio_legislacao.categoria DESC" },
+				new String[]{ "COALESCE(hs_relatorio_legislacao.categoria,'A')", "ordem" },
 				null,
 				null,
 				null );

trunk/SIPRPSoft/src/siprp/planoactuacao/print/AreaToPrint.java

@@ -5,16 +5,20 @@ import java.util.Vector;
 import org.jdom.Element;
 
 public class AreaToPrint
-	implements PrintableInterface
+	implements PrintableInterface, Comparable
 {
 	protected String designacao;
 	protected Vector<RiscoToPrint> riscos;
+	protected Integer ordem;
+	protected boolean generico;
 	
-	public AreaToPrint( String designacao, Vector<RiscoToPrint> riscos )
+	public AreaToPrint( String designacao, Vector<RiscoToPrint> riscos, Integer ordem, boolean generico )
 	{
 		super();
 		this.designacao = designacao;
 		this.riscos = riscos;
+		this.ordem = ordem;
+		this.generico = generico;
 	}
 
 	public String getDesignacao()
@@ -42,6 +46,11 @@ public class AreaToPrint
 		riscos.add( risco );
 	}
 	
+	protected boolean isGenerico()
+	{
+		return generico;
+	}
+
 	@Override
 	public Element toJdomElement() throws Exception
 	{
@@ -56,4 +65,25 @@ public class AreaToPrint
 		return areaElement;
 	}
 
+	@Override
+	public int compareTo(Object o)
+	{
+		if( o instanceof AreaToPrint )
+		{
+			if( generico && !( ( AreaToPrint ) o ).generico )
+			{
+				return -1;
+			}
+			else if( !generico && ( ( AreaToPrint ) o ).generico )
+			{
+				return 1;
+			} 
+			if( ordem != null )
+			{
+				return ordem.compareTo( ( ( AreaToPrint ) o ).ordem );
+			}
+		}
+		return 0;
+	}
+
 }

trunk/SIPRPSoft/src/siprp/planoactuacao/print/LegislacaoAplicavelToPrint.java

@@ -7,38 +7,45 @@ import org.jdom.Element;
 public class LegislacaoAplicavelToPrint
 	implements PrintableInterface
 {
-	protected Vector<String> diplomas;
+	protected Vector<String> diplomasGerais;
+	protected String[] nomesGruposEspecificos;
+	protected Vector<String>[] diplomasEspecificos;
 	
-	public LegislacaoAplicavelToPrint( Vector<String> diplomas )
+	public LegislacaoAplicavelToPrint( Vector<String> diplomasGerais,
+			String[] nomesGruposEspecificos, Vector<String>[] diplomasEspecificos )
 	{
 		super();
-		this.diplomas = diplomas;
+		this.diplomasGerais = diplomasGerais;
+		this.nomesGruposEspecificos = nomesGruposEspecificos;
+		this.diplomasEspecificos = diplomasEspecificos;
 	}
 	
-	public Vector<String> getDiplomas()
+	@Override
-	{
+	public Element toJdomElement() throws Exception
-		return diplomas;
-	}
-
-	public void setDiplomas( Vector<String> diplomas )
 	{
-		this.diplomas = diplomas;
+		Element legislacaoAplicavelElement = new Element( "legislacao-aplicavel" );
-	}
+		Element legislacaoGeralElement = new Element( "legislacao-geral" ); 
-	
+		for( String diploma : diplomasGerais )
-	protected void addDiploma( String diploma )
 		{
-		diplomas.add( diploma );
+			Element diplomaElement = new Element( "diploma" );
+			diplomaElement.setText( diploma );
+			legislacaoGeralElement.addContent( diplomaElement );
 		}
+		legislacaoAplicavelElement.addContent( legislacaoGeralElement );
 		
-	@Override
+		for( int e = 0; e < nomesGruposEspecificos.length; e++ )
-	public Element toJdomElement() throws Exception
 		{
-		Element legislacaoAplicavelElement = new Element( "legislacao-aplicavel" );
+			Element legislacaoEspecificaElement = new Element( "legislacao-especifica" );
-		for( String diploma : diplomas )
+			Element designacaoElement = new Element( "designacao" );
+			designacaoElement.setText( nomesGruposEspecificos[ e ] );
+			legislacaoEspecificaElement.addContent( designacaoElement );
+			for( String diploma : diplomasEspecificos[ e ] )
 			{
 				Element diplomaElement = new Element( "diploma" );
 				diplomaElement.setText( diploma );
-			legislacaoAplicavelElement.addContent( diplomaElement );
+				legislacaoEspecificaElement.addContent( diplomaElement );
+			}
+			legislacaoAplicavelElement.addContent( legislacaoEspecificaElement );
 		}
 		return legislacaoAplicavelElement;
 	}

trunk/SIPRPSoft/src/siprp/planoactuacao/print/PlanoActuacaoPrintDataProvider.java

@@ -1,5 +1,7 @@
 package siprp.planoactuacao.print;
 
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Vector;
@@ -24,6 +26,9 @@ public class PlanoActuacaoPrintDataProvider
 {
 	private static final Object LOCK = new Object();
 	private static PlanoActuacaoPrintDataProvider instance = null;
+	protected static final Object UNCONTROLLED = "Incontrolado";
+	protected static final Object CONTROLLED = "Controlado";
+	protected static final Object INDETERMINATE = "Indeterminado";
 	
 	protected final Executer WEB_EXECUTER;
 	protected final Executer LOCAL_EXECUTER;
@@ -79,7 +84,7 @@ public class PlanoActuacaoPrintDataProvider
 					null );
 			Virtual2DArray array = LOCAL_EXECUTER.executeQuery( select );
 			
-			return ( ( Boolean ) array.get( 0, 0 ) ).booleanValue();
+			return  array.get( 0, 0 ) != null ? ( ( Boolean ) array.get( 0, 0 ) ).booleanValue() : false;
 		}
 		catch( Exception ex )
 		{
@@ -207,17 +212,18 @@ public class PlanoActuacaoPrintDataProvider
 //		return legislacao;
 //	}
 	
-	public LegislacaoAplicavelToPrint getLegislacaoAplicavel( Integer planoId )
+	public LegislacaoAplicavelToPrint getLegislacaoAplicavel( Integer relatorioId )
 		throws Exception
-{
+	{
 		Select select =
 			new Select2( 
 				new String[]{ "hs_relatorio_legislacao" },
 				new Integer[]{},
 				new Expression[]{},
-			new String[]{ "hs_relatorio_legislacao.categoria", "hs_relatorio_legislacao.descricao" },
+				new String[]{ "hs_relatorio_legislacao.categoria", "hs_relatorio_legislacao.descricao",
-			new Field( "hs_relatorio_legislacao.hs_relatorio_id" ).isEqual( planoId ),
+							"COALESCE(hs_relatorio_legislacao.categoria,'A')"},
-			new String[]{ "hs_relatorio_legislacao.categoria DESC" },
+				new Field( "hs_relatorio_legislacao.hs_relatorio_id" ).isEqual( relatorioId ),
+				new String[]{ "COALESCE(hs_relatorio_legislacao.categoria,'A')", "ordem" },
 				null,
 				null,
 				null );
@@ -241,13 +247,15 @@ public class PlanoActuacaoPrintDataProvider
 					nomes.add( categoria );
 					diplomas.add( new Vector<String>() );
 				}
+				last = categoria;
 				diplomas.lastElement().add( descricao );
 			}
 		}
 		LegislacaoAplicavelToPrint legislacao = 
-		new LegislacaoAplicavelToPrint( diplomasGerais);
+			new LegislacaoAplicavelToPrint( diplomasGerais, nomes.toArray( new String[ nomes.size() ] ),
+					diplomas.toArray( new Vector[ diplomas.size() ] ));
 		return legislacao;
-}
+	}
 	
 	public Vector<AreaToPrint> getAreasToPrintByPlanoId( Integer planoId, boolean validacaoDl, boolean validacaoDns )
 		throws Exception
@@ -261,7 +269,7 @@ public class PlanoActuacaoPrintDataProvider
 					new String[]{ "plano_areas" },
 					new Integer[]{},
 					new Expression[]{},
-					new String[]{ "id", "descricao" },
+					new String[]{ "id", "descricao", "1" },
 					new Field( "plano_id" ).isEqual( planoId ),
 					new String[]{ "id" },
 					null,
@@ -276,7 +284,7 @@ public class PlanoActuacaoPrintDataProvider
 					new String[]{ "hs_relatorio_area" },
 					new Integer[]{},
 					new Expression[]{},
-					new String[]{ "id", "description" },
+					new String[]{ "id", "description", "ordem" },
 					new Field( "relatorio_id" ).isEqual( planoId ).and(
 						new Field( "deleted_date" ).isEqual( null ) ),
 					new String[]{ "id" },
@@ -289,12 +297,35 @@ public class PlanoActuacaoPrintDataProvider
 		{
 			Integer areaId = ( Integer ) array.get( n, 0 );
 			String areaDescricao = ( String ) array.get( n, 1 );
+			Integer ordem = ( Integer ) array.get( n, 2 );
+			boolean generico = false;
+			if( !web )
+			{
+				Select selectGen =
+					new Select2( 
+						new String[]{ "hs_relatorio_posto" },
+						new Integer[]{},
+						new Expression[]{},
+						new String[]{ "COUNT( hs_relatorio_posto.id )" },
+						new Field( "hs_relatorio_posto.area_id" ).isEqual( areaId ).and( 
+							new Field( "hs_relatorio_posto.is_principal" ).isEqual( true ) ),
+						null,
+						null,
+						null,
+						null );
+				Virtual2DArray genArray = LOCAL_EXECUTER.executeQuery( selectGen );
+				if( genArray.columnLength() > 0 && genArray.get( 0, 0 ) != null )
+				{
+					generico = ( ( Number ) genArray.get( 0, 0 ) ).intValue() > 0;
+				}
+			}
 			Vector<RiscoToPrint> riscos = getRiscosToPrintByAreaId( areaId, validacaoDl, validacaoDns );
 			if( riscos.size() > 0 )
 			{
-				areas.add( new AreaToPrint( areaDescricao, riscos ) );
+				areas.add( new AreaToPrint( areaDescricao, riscos, ordem, generico ) );
 			}
 		}
+		Collections.sort( areas );
 		return areas;
 	}
 	
@@ -353,7 +384,7 @@ public class PlanoActuacaoPrintDataProvider
 						dataFim != null ? new DataToPrint( "data-prevista-conclusao", dataFim ) : null,
 						parecerDl, 
 						parecerDns, 
-						verificacaoSiprp ) );
+						verificacaoSiprp, null, null ) );
 			}
 		}
 		else
@@ -388,6 +419,8 @@ public class PlanoActuacaoPrintDataProvider
 			Vector<String> riscosVector = new Vector<String>();
 			HashMap<String,Vector<Integer>> riscosIdMap = new HashMap<String,Vector<Integer>>();
 			HashMap<Integer,Integer> riscoPostoMap = new HashMap<Integer, Integer>();
+			HashMap<String,Integer> valoresQuantitativos = new HashMap<String,Integer>();
+			HashMap<String,String> valoresQualitativos = new HashMap<String,String>();
 			for( int n = 0; n < array.columnLength(); n++ )
 			{
 				Integer id = ( Integer ) array.get( n, 0 );
@@ -417,6 +450,8 @@ public class PlanoActuacaoPrintDataProvider
 				}
 				riscosIdMap.get( key ).add( id );
 				riscoPostoMap.put(id, posto);
+				valoresQuantitativos.put( key, risco );
+				valoresQualitativos.put( key, ((String) array.get( n, 3)) );
 			}
 			for( String risco : riscosVector )
 			{
@@ -442,11 +477,53 @@ public class PlanoActuacaoPrintDataProvider
 								null,
 								null, 
 								null, 
-								null ) );
+								null,
+								valoresQuantitativos.get( risco ),
+								valoresQualitativos.get( risco ) ) );
 				}
 			}
 		}
+		Collections.sort(riscos, new Comparator<RiscoToPrint>(){
 
+			@Override
+			public int compare(RiscoToPrint o1, RiscoToPrint o2) {
+				Integer o1Value = 1000;
+				Integer o2Value = 1000;
+				if( o1.valorQuantitativo != null )
+				{
+					o1Value = -o1.valorQuantitativo;
+				}
+				else if(o1.valorQualitativo.equals(UNCONTROLLED))
+				{
+					o1Value = 100;
+				}
+				else if(o1.valorQualitativo.equals(CONTROLLED))
+				{
+					o1Value = 200;
+				}
+				else if(o1.valorQualitativo.equals(INDETERMINATE))
+				{
+					o1Value = 300;
+				}
+				if( o2.valorQuantitativo != null )
+				{
+					o2Value = -o2.valorQuantitativo;
+				}
+				else if(o2.valorQualitativo.equals(UNCONTROLLED))
+				{
+					o2Value = 100;
+				}
+				else if(o2.valorQualitativo.equals(CONTROLLED))
+				{
+					o2Value = 200;
+				}
+				else if(o2.valorQualitativo.equals(INDETERMINATE))
+				{
+					o2Value = 300;
+				}
+				return o1Value.compareTo(o2Value);
+			}
+		});
 		return riscos;
 	}
 	

trunk/SIPRPSoft/src/siprp/planoactuacao/print/RiscoToPrint.java

@@ -17,11 +17,13 @@ public class RiscoToPrint
 	protected String parecerDl;
 	protected String parecerDns;
 	protected String verificacaoSiprp;
+	protected Integer valorQuantitativo;
+	protected String valorQualitativo;
 	
 	public RiscoToPrint( String descricao, String valor,
 			Vector<MedidaToPrint> medidas, String responsavel, String recursos,
 			DataToPrint dataPrevistaInicio, DataToPrint dataPrevistaConclusao,
-			String parecerDl, String parecerDns, String verificacaoSiprp )
+			String parecerDl, String parecerDns, String verificacaoSiprp, Integer valorQuantitativo, String valorQualitativo )
 	{
 		super();
 		this.descricao = descricao;
@@ -34,6 +36,8 @@ public class RiscoToPrint
 		this.parecerDl = parecerDl;
 		this.parecerDns = parecerDns;
 		this.verificacaoSiprp = verificacaoSiprp;
+		this.valorQuantitativo = valorQuantitativo;
+		this.valorQualitativo = valorQualitativo;
 	}
 
 	@Override

trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao.xsl

@@ -25,8 +25,8 @@
 					</fo:repeatable-page-master-alternatives>
 				</fo:page-sequence-master>
 				<fo:simple-page-master master-name="pm1_2" page-height="8.2701in" page-width="11.6902in" margin-top="0.4917in" margin-right="1.3in" margin-left="0.6in">
-					<fo:region-body margin-top="1.96in" margin-bottom="0.6201in" />
+					<fo:region-body margin-top="2.10in" margin-bottom="0.6201in" />
-					<fo:region-before extent="1.96in" margin-bottom="0in" />
+					<fo:region-before extent="2.10in" margin-bottom="0in" />
 					<fo:region-after extent="0.6201in" margin-top="0.4201in" />
 				</fo:simple-page-master>
 				<fo:page-sequence-master master-name="Standard_2">
@@ -98,7 +98,6 @@
 						<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" content-height="2.5cm" scaling-method="auto" scaling="uniform" />
 					</fo:block>
 					<fo:block font-size="12pt"> </fo:block>
-					<fo:block font-size="12pt"> </fo:block>
 					<fo:block font-size="16pt" color="#000000" font-weight="bold" margin-right="0in" text-indent="0in" text-align="center" margin-left="0in" margin-top="0.1563in" margin-bottom="0in">
 						<xsl:value-of select="empresa/designacao-social" />						 
 					</fo:block>
@@ -820,16 +819,112 @@
 					<fo:block font-size="12pt" text-align="justify"> </fo:block>
 					<fo:block id="N68890" font-size="13pt" font-weight="bold" padding-left="0.0555in" padding-top="0.0138in" text-shadow="#000000 0.0626in 0.0626in" padding-bottom="0.0138in" text-align="justify" border="0.0071in solid #000000" background-color="#f3f3f3" padding-right="0.0555in">5. LEGISLAÇÃO APLICÁVEL  </fo:block>
 					<fo:block font-size="12pt" margin-right="0in" text-indent="-0.1972in" text-align="justify" margin-left="0.1972in"> </fo:block>
-					<xsl:for-each select="legislacao-aplicavel/diploma">
+					<fo:block font-family="Helvetica" id="N68463"
-						<fo:block font-size="12pt" text-indent="-0.3cm" text-align="justify" margin-left="1.5cm">
+						font-size="10pt" font-weight="bold" margin-right="-0.0146in"
-							-
+						text-indent="0in" text-align="justify" line-height="130%"
+						margin-left="0in" margin-top="0.0835in" margin-bottom="0.0835in"
+						space-after="6pt" keep-with-next="always">
+						5.1 Legislação de aplicação geral  
+					</fo:block>
+					<fo:list-block>
+						<fo:list-item keep-with-next="always">
+							<fo:list-item-label />
+							<fo:list-item-body />
+						</fo:list-item>
+						<xsl:for-each
+							select="legislacao-aplicavel/legislacao-geral/diploma">
+							<fo:list-item>
+								<fo:list-item-label>
+									<fo:block font-family="Helvetica"
+										font-size="16pt" margin-left="0.2in" line-height="130%"
+										margin-top="0.0835in" margin-bottom="0.0835in">
+										•
+									</fo:block>
+								</fo:list-item-label>
+								<fo:list-item-body>
+									<fo:block font-family="Helvetica"
+										font-size="10pt" margin-right="-0.0146in" text-align="justify"
+										line-height="130%" margin-left="0.5in" margin-top="0.0835in"
+										margin-bottom="0.0835in" space-after="6pt">
+										<xsl:value-of select="." />
+										<xsl:choose>
+											<xsl:when
+												test="position()=last()">
+												.
+											</xsl:when>
+											<xsl:otherwise>
+												;
+											</xsl:otherwise>
+										</xsl:choose>
+									</fo:block>
+								</fo:list-item-body>
+							</fo:list-item>
+						</xsl:for-each>
+					</fo:list-block>
+					<fo:block font-family="Helvetica" font-size="10pt"
+						font-weight="bold" margin-right="-0.0146in" text-indent="0in"
+						text-align="justify" line-height="130%" margin-left="0in"
+						margin-top="0.0835in" margin-bottom="0.0835in">
+						 
+					</fo:block>
+					<fo:block font-family="Helvetica" id="N68508"
+						font-size="10pt" font-weight="bold" margin-right="-0.0146in"
+						text-indent="0in" text-align="justify" line-height="130%"
+						margin-left="0in" margin-top="0.0835in" margin-bottom="0.0835in"
+						space-after="6pt" keep-with-next="always">
+						5.2 Legislação específica  
+					</fo:block>
+					<xsl:for-each
+						select="legislacao-aplicavel/legislacao-especifica">
+						<fo:block 
+							font-size="10pt" text-indent="-0.3cm" text-align="justify"
+							margin-left="1.5cm" text-decoration="underline"
+							font-weight="bold" space-before="16pt" keep-with-next="always">
+							<xsl:value-of select="designacao" />
+						</fo:block>
+						<fo:list-block>
+							<fo:list-item keep-with-next="always">
+								<fo:list-item-label />
+								<fo:list-item-body />
+							</fo:list-item>
+							<xsl:for-each select="diploma">
+								<fo:list-item>
+									<fo:list-item-label>
+										<fo:block
+											font-size="16pt" margin-left="0.2in"
+											line-height="130%" margin-top="0.0835in"
+											margin-bottom="0.0835in">
+											•
+										</fo:block>
+									</fo:list-item-label>
+									<fo:list-item-body>
+										<fo:block
+											font-family="Helvetica" font-size="10pt"
+											margin-right="-0.0146in" text-align="justify"
+											line-height="130%" margin-left="0.5in" margin-top="0.0835in"
+											margin-bottom="0.0835in" space-after="6pt">
 											<xsl:value-of select="." />
 											<xsl:choose>
-								<xsl:when test="position()=last()">.</xsl:when>
+												<xsl:when
-								<xsl:otherwise>;</xsl:otherwise>
+													test="position()=last()">
+													.
+												</xsl:when>
+												<xsl:otherwise>
+													;
+												</xsl:otherwise>
 											</xsl:choose>
 										</fo:block>
+									</fo:list-item-body>
+								</fo:list-item>
+							</xsl:for-each>
+						</fo:list-block>
 					</xsl:for-each>
+					<fo:block font-size="2pt"
+						margin-right="-0.0146in" text-indent="0in" text-align="justify"
+						line-height="130%" margin-left="0in" margin-top="0.0835in"
+						margin-bottom="0.0835in" space-after="6pt">
+						 
+					</fo:block>
 					<fo:block font-size="12pt" text-align="justify"> </fo:block>
 					<fo:block font-size="13pt" margin-right="-0.0146in" text-indent="-0.5in" text-align="justify" margin-left="0.5in"> </fo:block>
 					<fo:block font-size="13pt" margin-right="-0.0146in" text-indent="-0.5in" text-align="justify" margin-left="0.5in"> </fo:block>
@@ -936,7 +1031,7 @@
 											<!--												src="url('http://www.evolute.pt/~siprp/planoactuacao/auchan_jumbo_lado.jpg')"-->
 											<!--												height="2cm" />-->
 											<xsl:variable name="logotipo" select="empresa/logotipo" />
-											<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" content-height="2.5cm" scaling-method="auto" scaling="uniform" />
+											<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" content-height="1.5cm" scaling-method="auto" scaling="uniform" />
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
@@ -1033,7 +1128,7 @@
 										<fo:block font-size="8pt" text-align="center" line-height="115%" margin-top="0in" margin-bottom="0in" font-weight="bold">Data prevista de conclusão</fo:block>
 									</fo:table-cell>
 									<fo:table-cell padding-bottom="0in" padding-left="0.0493in" border-left="0.0139in solid #000000" border-bottom="0.0139in solid #000000" padding-top="0in" border-top="0.0139in solid #000000" display-align="center" background-color="#ccffff" writing-mode="lr-tb" padding-right="0.0493in" border-right="0.0139in solid #000000">
-										<fo:block font-size="9pt" text-align="justify" line-height="115%" margin-top="0in" margin-bottom="0.139in" font-weight="bold">Verificação SIPRP</fo:block>
+										<fo:block font-size="9pt" text-align="center" line-height="115%" margin-top="0in" margin-bottom="0.139in" font-weight="bold">Verificação SIPRP</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
 							</fo:table-body>

trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao_alargado.xsl

@@ -88,8 +88,6 @@
 					<fo:block font-size="16pt" color="#606060" font-weight="bold" margin-right="0in" text-indent="0in" text-align="center" margin-left="0in" margin-top="0in" margin-bottom="0in">Plano de Actuação  </fo:block>
 					<fo:block font-size="12pt"> </fo:block>
 					<fo:block font-size="12pt"> </fo:block>
-					<!-- fo:block font-size="12pt"> </fo:block>
-					<fo:block font-size="12pt"> </fo:block-->
 					<fo:block font-size="12pt" text-align="center">
 						<!--						<fo:external-graphic-->
 						<!--							src="url('http://www.evolute.pt/~siprp/planoactuacao/auchan_jumbo_lado.jpg')"-->
@@ -98,7 +96,6 @@
 						<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" content-height="2.5cm" scaling-method="auto" scaling="uniform" />
 					</fo:block>
 					<fo:block font-size="12pt"> </fo:block>
-					<fo:block font-size="12pt"> </fo:block>
 					<fo:block font-size="16pt" color="#000000" font-weight="bold" margin-right="0in" text-indent="0in" text-align="center" margin-left="0in" margin-top="0.1563in" margin-bottom="0in">
 						<xsl:value-of select="empresa/designacao-social" />						 
 					</fo:block>
@@ -821,16 +818,112 @@
 					<fo:block font-size="12pt" text-align="justify"> </fo:block>
 					<fo:block id="N68890" font-size="13pt" font-weight="bold" padding-left="0.0555in" padding-top="0.0138in" text-shadow="#000000 0.0626in 0.0626in" padding-bottom="0.0138in" text-align="justify" border="0.0071in solid #000000" background-color="#f3f3f3" padding-right="0.0555in">5. LEGISLAÇÃO APLICÁVEL  </fo:block>
 					<fo:block font-size="12pt" margin-right="0in" text-indent="-0.1972in" text-align="justify" margin-left="0.1972in"> </fo:block>
-					<xsl:for-each select="legislacao-aplicavel/diploma">
+					<fo:block font-family="Helvetica" id="N68463"
-						<fo:block font-size="12pt" text-indent="-0.3cm" text-align="justify" margin-left="1.5cm">
+						font-size="10pt" font-weight="bold" margin-right="-0.0146in"
-							-
+						text-indent="0in" text-align="justify" line-height="130%"
+						margin-left="0in" margin-top="0.0835in" margin-bottom="0.0835in"
+						space-after="6pt" keep-with-next="always">
+						5.1 Legislação de aplicação geral  
+					</fo:block>
+					<fo:list-block>
+						<fo:list-item keep-with-next="always">
+							<fo:list-item-label />
+							<fo:list-item-body />
+						</fo:list-item>
+						<xsl:for-each
+							select="legislacao-aplicavel/legislacao-geral/diploma">
+							<fo:list-item>
+								<fo:list-item-label>
+									<fo:block font-family="Helvetica"
+										font-size="16pt" margin-left="0.2in" line-height="130%"
+										margin-top="0.0835in" margin-bottom="0.0835in">
+										•
+									</fo:block>
+								</fo:list-item-label>
+								<fo:list-item-body>
+									<fo:block font-family="Helvetica"
+										font-size="10pt" margin-right="-0.0146in" text-align="justify"
+										line-height="130%" margin-left="0.5in" margin-top="0.0835in"
+										margin-bottom="0.0835in" space-after="6pt">
 										<xsl:value-of select="." />
 										<xsl:choose>
-								<xsl:when test="position()=last()">.</xsl:when>
+											<xsl:when
-								<xsl:otherwise>;</xsl:otherwise>
+												test="position()=last()">
+												.
+											</xsl:when>
+											<xsl:otherwise>
+												;
+											</xsl:otherwise>
 										</xsl:choose>
 									</fo:block>
+								</fo:list-item-body>
+							</fo:list-item>
 						</xsl:for-each>
+					</fo:list-block>
+					<fo:block font-family="Helvetica" font-size="10pt"
+						font-weight="bold" margin-right="-0.0146in" text-indent="0in"
+						text-align="justify" line-height="130%" margin-left="0in"
+						margin-top="0.0835in" margin-bottom="0.0835in">
+						 
+					</fo:block>
+					<fo:block font-family="Helvetica" id="N68508"
+						font-size="10pt" font-weight="bold" margin-right="-0.0146in"
+						text-indent="0in" text-align="justify" line-height="130%"
+						margin-left="0in" margin-top="0.0835in" margin-bottom="0.0835in"
+						space-after="6pt" keep-with-next="always">
+						5.2 Legislação específica  
+					</fo:block>
+					<xsl:for-each
+						select="legislacao-aplicavel/legislacao-especifica">
+						<fo:block 
+							font-size="10pt" text-indent="-0.3cm" text-align="justify"
+							margin-left="1.5cm" text-decoration="underline"
+							font-weight="bold" space-before="16pt" keep-with-next="always">
+							<xsl:value-of select="designacao" />
+						</fo:block>
+						<fo:list-block>
+							<fo:list-item keep-with-next="always">
+								<fo:list-item-label />
+								<fo:list-item-body />
+							</fo:list-item>
+							<xsl:for-each select="diploma">
+								<fo:list-item>
+									<fo:list-item-label>
+										<fo:block
+											font-size="16pt" margin-left="0.2in"
+											line-height="130%" margin-top="0.0835in"
+											margin-bottom="0.0835in">
+											•
+										</fo:block>
+									</fo:list-item-label>
+									<fo:list-item-body>
+										<fo:block
+											font-family="Helvetica" font-size="10pt"
+											margin-right="-0.0146in" text-align="justify"
+											line-height="130%" margin-left="0.5in" margin-top="0.0835in"
+											margin-bottom="0.0835in" space-after="6pt">
+											<xsl:value-of select="." />
+											<xsl:choose>
+												<xsl:when
+													test="position()=last()">
+													.
+												</xsl:when>
+												<xsl:otherwise>
+													;
+												</xsl:otherwise>
+											</xsl:choose>
+										</fo:block>
+									</fo:list-item-body>
+								</fo:list-item>
+							</xsl:for-each>
+						</fo:list-block>
+					</xsl:for-each>
+					<fo:block font-size="2pt"
+						margin-right="-0.0146in" text-indent="0in" text-align="justify"
+						line-height="130%" margin-left="0in" margin-top="0.0835in"
+						margin-bottom="0.0835in" space-after="6pt">
+						 
+					</fo:block>
 					<fo:block font-size="12pt" text-align="justify"> </fo:block>
 					<fo:block font-size="13pt" margin-right="-0.0146in" text-indent="-0.5in" text-align="justify" margin-left="0.5in"> </fo:block>
 					<fo:block font-size="13pt" margin-right="-0.0146in" text-indent="-0.5in" text-align="justify" margin-left="0.5in"> </fo:block>
@@ -1036,13 +1129,13 @@
 										<fo:block font-size="8pt" text-align="center" line-height="115%" margin-top="0in" margin-bottom="0in" font-weight="bold">Data prevista de conclusão</fo:block>
 									</fo:table-cell>
 									<fo:table-cell padding-bottom="0in" padding-left="0.0493in" border-left="0.0139in solid #000000" border-bottom="0.0139in solid #000000" padding-top="0in" border-top="0.0139in solid #000000" display-align="center" background-color="#ccffff" writing-mode="lr-tb" padding-right="0.0493in" border-right="none">
-										<fo:block font-size="9pt" text-align="start" line-height="115%" margin-top="0in" margin-bottom="0.139in" color="#000000" font-weight="bold">Parecer DL</fo:block>
+										<fo:block font-size="9pt" text-align="center" line-height="115%" margin-top="0in" margin-bottom="0.139in" color="#000000" font-weight="bold">Parecer DL</fo:block>
 									</fo:table-cell>
 									<fo:table-cell padding-bottom="0in" padding-left="0.0493in" border-left="0.0139in solid #000000" border-bottom="0.0139in solid #000000" padding-top="0in" border-top="0.0139in solid #000000" display-align="center" background-color="#ccffff" writing-mode="lr-tb" padding-right="0.0493in" border-right="0.0139in solid #000000">
-										<fo:block font-size="9pt" text-align="justify" line-height="115%" margin-top="0in" margin-bottom="0.139in" font-weight="bold">Parecer DNS</fo:block>
+										<fo:block font-size="9pt" text-align="center" line-height="115%" margin-top="0in" margin-bottom="0.139in" font-weight="bold">Parecer DNS</fo:block>
 									</fo:table-cell>
 									<fo:table-cell padding-bottom="0in" padding-left="0.0493in" border-left="0.0139in solid #000000" border-bottom="0.0139in solid #000000" padding-top="0in" border-top="0.0139in solid #000000" display-align="center" background-color="#ccffff" writing-mode="lr-tb" padding-right="0.0493in" border-right="0.0139in solid #000000">
-										<fo:block font-size="9pt" text-align="justify" line-height="115%" margin-top="0in" margin-bottom="0.139in" font-weight="bold">Verificação SIPRP</fo:block>
+										<fo:block font-size="9pt" text-align="center" line-height="115%" margin-top="0in" margin-bottom="0.139in" font-weight="bold">Verificação SIPRP</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
 							</fo:table-body>