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

trunk/SIPRPSoft/properties/1-development/app.properties

@@ -4,13 +4,14 @@ app.main-class = siprp.Main
 app.main = siprp.Main
 
 db.url.prefix = jdbc:postgresql://
-db.user = siprp
-db.password = rg2h-opksiprp
-db.name = siprp_local_3
+db.user = postgres
+#db.password = rg2h-opksiprp
+db.password = Typein
+db.name = siprp_local_3_20100813
 db.connection.driver = org.postgresql.Driver
 
-jnlp.resources.property.server.address = www.evolute.pt
-jnlp.resources.property.server.port = 5436
+jnlp.resources.property.server.address = evoserver
+jnlp.resources.property.server.port = 5432
 
 app.resources.j2se.max-heap-size=512m
 app.resources.j2se.initial-heap-size=256m

trunk/SIPRPSoft/src/siprp/Main.java

@@ -167,10 +167,10 @@ public class Main implements com.evolute.utils.ui.window.Connector
 			DBManager dbm = new JDBCManager( url, user, passwd , 10, 8, 8, null );
 			Singleton.setInstance( Singleton.DEFAULT_DBMANAGER, dbm );
 			
-			StatementExecuterFactory.initialize( 
-					new DBStatementExecuter( dbm.getSharedExecuter(this) ) );
+			StatementExecuterFactory.initialize( new DBStatementExecuter( dbm.getSharedExecuter(this) ) );
 			
-			Updater.getInstance().executeUpdate(true, true, UpdateList.UPDATE_LIST);
+			Updater.getInstance().executeUpdates( UpdateList.UPDATE_LIST );
+//			Updater.getInstance().executeUpdate(true, true, UpdateList.UPDATE_LIST);
 			
 			new ORMInitializer().initializeORM( url, user, passwd );
 

trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java

@@ -381,8 +381,11 @@ public class GerirMedidasRelatorioPanel extends SIPRPLazyLoadedPanel
 					if( confirm("Tem a certeza que deseja remover o requisito '" + shortenString( rel.toMedida_id().toString() ) + "'?") )
 					{
 						HsRelatorioMedidaData medidaData = rel.toMedida_id();
+//						System.out.println( "\nDELETING MEDIDA : " + medidaData.getId() + " - " + medidaData.getDescription() );
 						medidaData.delete();
 						
+//						System.out.println( "\nDELETING REL : " + rel.getMedida_id() + " : " + rel.getPosto_id() );
+						
 						rel.delete();
 						outcome = true;
 					}

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

@@ -93,27 +93,30 @@ public class RelatorioPrintDataProvider
 	{
 		Virtual2DArray array; 
 		
-		Select select =
-			new Select2( 
-				new String[]{ "hs_relatorio", "marcacoes_estabelecimento", "estabelecimentos", "empresas" },
-				new Integer[]{ Select2.JOIN_INNER, Select2.JOIN_INNER, Select2.JOIN_INNER },
-				new Expression[]{
-					new Field( "hs_relatorio.marcacao_id" ).isEqual( new Field( "marcacoes_estabelecimento.id" ) ),
-					new Field( "marcacoes_estabelecimento.estabelecimento_id" ).isEqual( new Field( "estabelecimentos.id" ) ),
-					new Field( "estabelecimentos.empresa_id" ).isEqual( new Field( "empresas.id" ) )
-				},
-				new String[]{ "empresas.id", "empresas.designacao_social", "empresas.actividade", 
-						"estabelecimentos.id", "estabelecimentos.nome", 
-						"hs_relatorio.data", "marcacoes_estabelecimento.data",
-						"hs_relatorio.acompanhante1", "hs_relatorio.funcao_acompanhante1",
-						"hs_relatorio.acompanhante2", "hs_relatorio.funcao_acompanhante2",
-						"hs_relatorio.funcionarios", "estabelecimentos.morada",
-						"hs_relatorio.avaliacao_inicial"},
-				new Field( "hs_relatorio.id" ).isEqual( id ),
-				null,
-				null,
-				null,
-				null );
+		Select select = new Select2( 
+			new String[]{ "hs_relatorio", "marcacoes_estabelecimento", "estabelecimentos", "empresas" },
+			new Integer[]{ Select2.JOIN_INNER, Select2.JOIN_INNER, Select2.JOIN_INNER },
+			new Expression[]{
+				new Field( "hs_relatorio.marcacao_id" ).isEqual( new Field( "marcacoes_estabelecimento.id" ) ),
+				new Field( "marcacoes_estabelecimento.estabelecimento_id" ).isEqual( new Field( "estabelecimentos.id" ) ),
+				new Field( "estabelecimentos.empresa_id" ).isEqual( new Field( "empresas.id" ) )
+			},
+			new String[]{ 
+				"empresas.id", "empresas.designacao_social", "empresas.actividade", 
+				"estabelecimentos.id", "estabelecimentos.nome", 
+				"hs_relatorio.data", "marcacoes_estabelecimento.data",
+				"hs_relatorio.acompanhante1", "hs_relatorio.funcao_acompanhante1",
+				"hs_relatorio.acompanhante2", "hs_relatorio.funcao_acompanhante2",
+				"hs_relatorio.funcionarios", "estabelecimentos.morada",
+				"hs_relatorio.avaliacao_inicial"},
+			new Field( "hs_relatorio.id" ).isEqual( id ),
+			null,
+			null,
+			null,
+			null 
+		);
+//		System.out.println( "\ngetRelatorioToPrint() : " + select.toString() );
+		
 		array = EXECUTER.executeQuery( select );
 		Integer empresaId = ( Integer ) array.get( 0, 0 );
 		String nomeEmpresa = ( String ) array.get( 0, 1 );
@@ -135,20 +138,20 @@ public class RelatorioPrintDataProvider
 				"http://www.evolute.pt:13080/SIPRPImages/image?id=" + logoId,
 				nomeEstabelecimento, actividadeEmpresa,
 				nomeAcompanhante, funcaoAcompanhante, nomeAcompanhante2, funcaoAcompanhante2, morada );
-		RelatorioToPrint plano = 
-			new RelatorioToPrint( 
-				empresa, 
-				dataRelatorio != null ? new DataToPrint( "data-relatorio", dataRelatorio ) : null, 
-				dataVisita != null ? new DataToPrint( "data-hs", dataVisita ) : null,
-				tipoAvaliacao,
-				dataProximaVisita != null ? new DataToPrint( "data-proxima-hs", dataProximaVisita ) : null,
-				textoFuncionarios,
-				getTecnicoHS( id ),
-				getTecnicoSuperiorHS( id ),
-				getLegislacaoAplicavel( id ),
-				getNormalizacaoAplicavel( id ),
-				getEquipamento( id ),
-				getAreasToPrint( id ) );
+		RelatorioToPrint plano = new RelatorioToPrint( 
+			empresa, 
+			dataRelatorio != null ? new DataToPrint( "data-relatorio", dataRelatorio ) : null, 
+			dataVisita != null ? new DataToPrint( "data-hs", dataVisita ) : null,
+			tipoAvaliacao,
+			dataProximaVisita != null ? new DataToPrint( "data-proxima-hs", dataProximaVisita ) : null,
+			textoFuncionarios,
+			getTecnicoHS( id ),
+			getTecnicoSuperiorHS( id ),
+			getLegislacaoAplicavel( id ),
+			getNormalizacaoAplicavel( id ),
+			getEquipamento( id ),
+			getAreasToPrint( id ) 
+		);
 		return plano; 
 	}
 	
@@ -384,24 +387,28 @@ public class RelatorioPrintDataProvider
 		Virtual2DArray array;
 		Vector<AreaToPrint> areas = new Vector<AreaToPrint>();
 		
-		Select select = 
-			new Select2( 
-				new String[]{ "hs_relatorio_area" },
-				new Integer[]{},
-				new Expression[]{},
-				new String[]{ "id", "description", "ordem" },
-				new Field( "relatorio_id" ).isEqual( relatorioId ).and(
-					new Field( "deleted_date" ).isEqual( null ) ),
-				new String[]{ "id" },
-				null,
-				null,
-				null );
+		Select select = new Select2( 
+			new String[]{ "hs_relatorio_area" },
+			new Integer[]{},
+			new Expression[]{},
+			new String[]{ "id", "description", "ordem" },
+			new Field( "relatorio_id" ).isEqual( relatorioId ).and(
+				new Field( "deleted_date" ).isEqual( null ) ),
+			new String[]{ "id" },
+			null,
+			null,
+			null 
+		);
+//		System.out.println( "\ngetAreasToPrint( " + relatorioId + " ) : " + select.toString() );
 		array = EXECUTER.executeQuery( select );
 
 		for( int n = 0; n < array.columnLength(); n++ )
 		{
 			Integer areaId = ( Integer ) array.get( n, 0 );
 			String areaDescricao = ( String ) array.get( n, 1 );
+			
+//			System.out.println( "\n\t\tAREA : " + areaDescricao );
+			
 			Integer ordem = ( Integer ) array.get( n, 2 );
 			Vector<PostoToPrint> postos = getPostosToPrintByAreaId( areaId );
 			if( postos.size() > 0 )
@@ -423,22 +430,31 @@ public class RelatorioPrintDataProvider
 	{
 		Vector<PostoToPrint> postos = new Vector<PostoToPrint>();
 		Virtual2DArray array;
-		Select select = 
-			new Select2( 
-				new String[]{ "hs_relatorio_posto" },
-				new Integer[]{},
-				new Expression[]{},
-				new String[]{ "hs_relatorio_posto.id", "hs_relatorio_posto.description", "coalesce(hs_relatorio_posto.is_principal,'FALSE')" },
-				new Field( "hs_relatorio_posto.area_id" ).isEqual( areaId ),
-				new String[]{ "coalesce(hs_relatorio_posto.is_principal,'FALSE') DESC", "hs_relatorio_posto.id" },
-				null,
-				null,
-				null );
+		Select select = new Select2( 
+			new String[]{ "hs_relatorio_posto" },
+			new Integer[]{},
+			new Expression[]{},
+			new String[]{ 
+				"hs_relatorio_posto.id", "hs_relatorio_posto.description", "coalesce(hs_relatorio_posto.is_principal,'FALSE')" 
+			},
+			new Field( "hs_relatorio_posto.area_id" ).isEqual( areaId ).and(
+				new Field( "hs_relatorio_posto.deleted_date" ).isEqual( null )
+			),
+			new String[]{ "coalesce(hs_relatorio_posto.is_principal,'FALSE') DESC", "hs_relatorio_posto.id" },
+			null,
+			null,
+			null 
+		);
+//		System.out.println( "\n\tgetPostosToPrintByAreaId( " + areaId + " ) : " + select.toString() );
+		
 		array = EXECUTER.executeQuery( select );
 		for( int n = 0; n < array.columnLength(); n++ )
 		{
 			Integer id = ( Integer ) array.get( n, 0 );
 			String descricao = ( String ) array.get( n, 1 );
+			
+//			System.out.println( "\n\t\t\tPOSTO : " + descricao );
+			
 			Boolean generico = ( Boolean ) array.get( n, 2 );
 			postos.add( new PostoToPrint( descricao, getRiscosToPrintByPostoId( id ), generico ) );
 		}
@@ -450,28 +466,33 @@ public class RelatorioPrintDataProvider
 	{
 		Virtual2DArray array;
 		Vector<RiscoToPrint> riscos = new Vector<RiscoToPrint>();
-		Select select = 
-			new Select2( 
-				new String[]{ "hs_relatorio_risco", "hs_relatorio_posto_risco", "hs_relatorio_risco_valor_qualitativo" },
-				new Integer[]{ Select2.JOIN_INNER, Select2.JOIN_LEFT_OUTER },
-				new Expression[]{
-					new Field( "hs_relatorio_risco.id" ).isEqual( new Field( "hs_relatorio_posto_risco.risco_id" ) ),
-					new Field( "hs_relatorio_posto_risco.valor_qualitativo_id" ).isEqual( new Field( "hs_relatorio_risco_valor_qualitativo.id" ) )
-				},
-				new String[]{ "hs_relatorio_risco.id", 
-						"hs_relatorio_risco.description", 
-						"hs_relatorio_posto_risco.probabilidade",
-						"hs_relatorio_posto_risco.severidade", 
-						"hs_relatorio_risco_valor_qualitativo.description" },
-				new Field( "hs_relatorio_posto_risco.posto_id" ).isEqual( postoId ).and( 
-					new Field( "hs_relatorio_risco.deleted_date" ).isEqual( null ).and(
-							new Field("hs_relatorio_posto_risco.probabilidade").isDifferent(null).or(
-							new Field("hs_relatorio_posto_risco.severidade").isDifferent(null).or(
-							new Field("hs_relatorio_posto_risco.valor_qualitativo_id").isDifferent(null)))) ),
-				new String[]{ "hs_relatorio_posto_risco.probabilidade*hs_relatorio_posto_risco.severidade DESC" },
-				null,
-				null,
-				null );
+		Select select = new Select2( 
+			new String[]{ "hs_relatorio_risco", "hs_relatorio_posto_risco", "hs_relatorio_risco_valor_qualitativo" },
+			new Integer[]{ Select2.JOIN_INNER, Select2.JOIN_LEFT_OUTER },
+			new Expression[]{
+				new Field( "hs_relatorio_risco.id" ).isEqual( new Field( "hs_relatorio_posto_risco.risco_id" ) ),
+				new Field( "hs_relatorio_posto_risco.valor_qualitativo_id" ).isEqual( new Field( "hs_relatorio_risco_valor_qualitativo.id" ) )
+			},
+			new String[]{ 
+				"hs_relatorio_risco.id", "hs_relatorio_risco.description", "hs_relatorio_posto_risco.probabilidade",
+				"hs_relatorio_posto_risco.severidade", "hs_relatorio_risco_valor_qualitativo.description" 
+			},
+			new Field( "hs_relatorio_posto_risco.posto_id" ).isEqual( postoId ).and( 
+				new Field( "hs_relatorio_risco.deleted_date" ).isEqual( null ).and(
+					new Field( "hs_relatorio_posto_risco.probabilidade" ).isDifferent( null ).or(
+						new Field( "hs_relatorio_posto_risco.severidade" ).isDifferent( null ).or(
+							new Field( "hs_relatorio_posto_risco.valor_qualitativo_id" ).isDifferent( null ) 
+						)
+					)
+				) 
+			),
+			new String[]{ "hs_relatorio_posto_risco.probabilidade*hs_relatorio_posto_risco.severidade DESC" },
+			null,
+			null,
+			null 
+		);
+//		System.out.println( "\n\t\tgetRiscosToPrintByPostoId( " + postoId + " ) : " + select.toString() );
+		
 		array = EXECUTER.executeQuery( select );
 		Vector<String> riscosVector = new Vector<String>();
 		HashMap<String,Vector<Integer>> riscosIdMap = new HashMap<String,Vector<Integer>>();
@@ -479,6 +500,9 @@ public class RelatorioPrintDataProvider
 		{
 			Integer id = ( Integer ) array.get( n, 0 );
 			String descricao = ( String ) array.get( n, 1 );
+			
+//			System.out.println( "\n\t\t\t\tRISCO : " + descricao );
+			
 			Integer probabilidade = ( Integer ) array.get( n, 2 );
 			Integer severidade = ( Integer ) array.get( n, 3 );
 			String valorQualitativo = ( String ) array.get( n, 4 );
@@ -555,18 +579,21 @@ public class RelatorioPrintDataProvider
 		throws Exception
 	{
 		Vector<MedidaToPrint> medidas = new Vector<MedidaToPrint>();
-		Select select = 
-			new Select2(
-				new String[]{ "hs_relatorio_medida" },
-				new Integer[]{},
-				new Expression[]{},
-				new String[]{ "hs_relatorio_medida.id", "hs_relatorio_medida.requesitos_legais", "hs_relatorio_medida.description" },
-				new Field( "hs_relatorio_medida.risco_id" ).isEqual( riscoId ).and( 
-					new Field( "hs_relatorio_medida.deleted_date" ).isEqual( null ) ),
-				new String[]{ "hs_relatorio_medida.id" },
-				null,
-				null,
-				null );
+		Select select = new Select2(
+			new String[]{ "hs_relatorio_medida" },
+			new Integer[]{},
+			new Expression[]{},
+			new String[]{ 
+				"hs_relatorio_medida.id", "hs_relatorio_medida.requesitos_legais", "hs_relatorio_medida.description" 
+			},
+			new Field( "hs_relatorio_medida.risco_id" ).isEqual( riscoId ).and( 
+				new Field( "hs_relatorio_medida.deleted_date" ).isEqual( null ) 
+			),
+			new String[]{ "hs_relatorio_medida.id" },
+			null,
+			null,
+			null 
+		);
 		Virtual2DArray array = EXECUTER.executeQuery( select );
 		for( int n = 0; n < array.columnLength(); n++ )
 		{

trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/relatorio.xsl

@@ -36,9 +36,9 @@
 				<fo:simple-page-master master-name="pm1_2"
 					page-height="8.2701in" page-width="11.6902in" margin-top="0.49in"
 					margin-right="1.3in" margin-left="0.6in">
-					<fo:region-body margin-top="3.05in" margin-bottom="0.9in" />
+ 					<fo:region-body margin-top="3.05in" margin-bottom="0.9in" />
 					<fo:region-before extent="3.05in" margin-bottom="0in" />
-					<fo:region-after extent="0.8in" margin-top="0.4in" />
+					<fo:region-after extent="0.8in" margin-top="0.3in" />
 				</fo:simple-page-master>
 				
 				<fo:page-sequence-master master-name="Standard_2">
@@ -2093,40 +2093,32 @@
 						</fo:table-body>
 					</fo:table>
 					<fo:block text-align-last="justify" line-height="17pt"
-						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm"
-						space-before="12pt"> 
+						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm" space-before="12pt"> 
 					</fo:block>
 					<fo:block text-align-last="justify" line-height="17pt"
-						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm"
-						space-before="12pt"> 
+						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm" space-before="12pt"> 
 					</fo:block>
 					<fo:block font-family="Helvetica" font-size="12pt"
-						margin-right="-0.0146in" text-indent="0in" text-align="justify"
-						line-height="130%" margin-left="0in">
+						margin-right="-0.0146in" text-indent="0in" text-align="justify" line-height="130%" margin-left="0in">
 						A SIPRP acompanha a execução das medidas de prevenção através de assessoramento ao cliente durante o preenchimento do Plano de Actuação.
 						 
 					</fo:block>
 					<fo:block text-align-last="justify" line-height="17pt"
-						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm"
-						space-before="12pt"> 
+						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm" space-before="12pt"> 
 					</fo:block>
 					<fo:block font-family="Helvetica" font-size="12pt"
-						margin-right="-0.0146in" text-indent="0in" text-align="justify"
-						line-height="130%" margin-left="0in">
+						margin-right="-0.0146in" text-indent="0in" text-align="justify" line-height="130%" margin-left="0in">
 						A execução das medidas de prevenção são verificadas através da realização da avaliação dos riscos profissionais periódica.
 						 
 					</fo:block>
 					<fo:block text-align-last="justify" line-height="17pt"
-						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm"
-						space-before="12pt"> 
+						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm" space-before="12pt"> 
 					</fo:block>
 					<fo:block text-align-last="justify" line-height="17pt"
-						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm"
-						space-before="12pt"> 
+						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm" space-before="12pt"> 
 					</fo:block>
 					<fo:block text-align-last="justify" line-height="17pt"
-						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm"
-						space-before="12pt"> 
+						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm" space-before="12pt"> 
 					</fo:block>
 					<fo:table table-layout="fixed" width="6.6953in">
 						<fo:table-column />
@@ -2142,88 +2134,69 @@
 						</fo:table-body>
 					</fo:table>
 					<fo:block text-align-last="justify" line-height="17pt"
-						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm"
-						space-before="12pt"> 
+						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm" space-before="12pt"> 
 					</fo:block>
 					<fo:block text-align-last="justify" line-height="17pt"
-						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm"
-						space-before="12pt"> 
+						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm" space-before="12pt"> 
 					</fo:block>
-					<fo:block font-family="Helvetica" font-size="12pt"
-						text-align="justify" line-height="130%">
+					<fo:block font-family="Helvetica" font-size="12pt" text-align="justify" line-height="130%">
 						A SIPRP agradece a disponibilidade e o apoio de todos os colaboradores da empresa e fica ao dispor para qualquer esclarecimento.
 					</fo:block>
 					<fo:block text-align-last="justify" line-height="17pt"
-						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm"
-						space-before="12pt"> 
+						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm" space-before="12pt"> 
 					</fo:block>
 					<fo:block text-align-last="justify" line-height="17pt"
-						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm"
-						space-before="12pt"> 
+						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm" space-before="12pt"> 
 					</fo:block>
 					<fo:block text-align-last="justify" line-height="17pt"
-						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm"
-						space-before="12pt"> 
+						font-size="14pt" space-after="3pt" text-align="start" text-indent="0cm" space-before="12pt"> 
 					</fo:block>
-					<fo:block font-family="Helvetica" font-size="12pt"
-						line-height="130%">
+					<fo:block font-family="Helvetica" font-size="12pt" line-height="130%">
 						Lisboa,
 						<xsl:value-of select="data-relatorio/dia" />
 						de
-						<xsl:value-of
-							select="data-relatorio/mes-extenso" />
+						<xsl:value-of select="data-relatorio/mes-extenso" />
 						de
 						<xsl:value-of select="data-relatorio/ano" />
 					</fo:block>
-					<fo:block font-family="Helvetica" font-size="12pt"
-						line-height="130%">
+					<fo:block font-family="Helvetica" font-size="12pt" line-height="130%">
 						 
 					</fo:block>
-					<fo:block font-family="Helvetica" font-size="12pt"
-						line-height="130%">
+					<fo:block font-family="Helvetica" font-size="12pt" line-height="130%">
 						 Realizado por:
 					</fo:block>
 					<xsl:if test="tecnico-hs">
-						<fo:table table-layout="fixed" width="4in"
-							space-before="40pt">
+						<fo:table table-layout="fixed" width="4in" space-before="40pt">
 							<fo:table-column column-width="4in" />
 							<fo:table-body>
 								<fo:table-row>
 									<fo:table-cell>
-										<fo:block font-family="Helvetica" font-size="12pt"
-											text-align="center">
+										<fo:block font-family="Helvetica" font-size="12pt" text-align="center">
 											<xsl:if test="tecnico-hs/assinatura">
 												<xsl:variable name="assinatura" select="tecnico-hs/assinatura" />
 												<fo:external-graphic src="url('{$assinatura}')"
-													content-width="4in" content-height="40pt" scaling-method="auto"
-													scaling="uniform" />
+													content-width="4in" content-height="40pt" scaling-method="auto" scaling="uniform" />
 											</xsl:if>
 										</fo:block>
 									</fo:table-cell>
 								</fo:table-row>
 								<fo:table-row>
-									<fo:table-cell padding-bottom="0in" padding-left="0.075in"
-										border-left="none" border-bottom="none" padding-top="0in"
-										border-top="0.0069in solid #000000" display-align="before"
-										writing-mode="lr-tb" padding-right="0.075in" border-right="none">
+									<fo:table-cell padding-bottom="0in" padding-left="0.075in" border-left="none" border-bottom="none" padding-top="0in"
+										border-top="0.0069in solid #000000" display-align="before" writing-mode="lr-tb" padding-right="0.075in" border-right="none">
 										<fo:block font-family="Helvetica" font-size="12pt"
-											font-weight="bold" margin-right="0in" text-indent="0.2134in"
-											text-align="center" margin-left="-0.2134in">
+											font-weight="bold" margin-right="0in" text-indent="0.2134in" text-align="center" margin-left="-0.2134in">
 											 
 										</fo:block>
-										<fo:block font-family="Helvetica" font-size="12pt"
-											font-weight="bold" margin-right="0in" text-indent="0.2134in"
+										<fo:block font-family="Helvetica" font-size="12pt" font-weight="bold" margin-right="0in" text-indent="0.2134in"
 											text-align="center" margin-left="-0.2134in">
 											<xsl:value-of select="tecnico-hs/nome" />
 										</fo:block>
-										<fo:block font-family="Helvetica" font-size="12pt"
-											margin-right="-0.0937in" text-indent="0in" text-align="center"
+										<fo:block font-family="Helvetica" font-size="12pt" margin-right="-0.0937in" text-indent="0in" text-align="center"
 											margin-left="0in">
 											Técnico de Higiene e Segurança
 											 
 										</fo:block>
-										<fo:block font-family="Helvetica" font-size="12pt"
-											margin-right="-0.0937in" text-indent="0in" text-align="center"
+										<fo:block font-family="Helvetica" font-size="12pt" margin-right="-0.0937in" text-indent="0in" text-align="center"
 											margin-left="0in">
 											CAP nº
 											<xsl:value-of select="tecnico-hs/cap" />
@@ -2236,19 +2209,16 @@
 					</xsl:if>
 					<xsl:if test="tecnico-superior-hs">
 						<xsl:if test="tecnico-hs">
-							<fo:block font-family="Helvetica" font-size="12pt"
-								line-height="130%" space-before="20pt" >
+							<fo:block font-family="Helvetica" font-size="12pt" line-height="130%" space-before="20pt" >
 								 Verificado por:
 							</fo:block>
 						</xsl:if>
-						<fo:table table-layout="fixed" width="4in"
-							space-before="40pt">
+						<fo:table table-layout="fixed" width="4in" space-before="40pt">
 							<fo:table-column column-width="4in" />
 							<fo:table-body>
 								<fo:table-row>
 									<fo:table-cell>
-										<fo:block font-family="Helvetica" font-size="12pt"
-											text-align="center">
+										<fo:block font-family="Helvetica" font-size="12pt" text-align="center">
 											<xsl:if test="tecnico-superior-hs/assinatura">
 												<xsl:variable name="assinatura" select="tecnico-superior-hs/assinatura" />
 												<fo:external-graphic src="url('{$assinatura}')"
@@ -2274,14 +2244,12 @@
 											<xsl:value-of select="tecnico-superior-hs/nome" />
 										</fo:block>
 										<fo:block font-family="Helvetica" font-size="12pt"
-											margin-right="-0.0937in" text-indent="0in" text-align="center"
-											margin-left="0in">
+											margin-right="-0.0937in" text-indent="0in" text-align="center" margin-left="0in">
 											Técnico Superior de Higiene e Segurança
 											 
 										</fo:block>
 										<fo:block font-family="Helvetica" font-size="12pt"
-											margin-right="-0.0937in" text-indent="0in" text-align="center"
-											margin-left="0in">
+											margin-right="-0.0937in" text-indent="0in" text-align="center" margin-left="0in">
 											CAP nº
 											<xsl:value-of select="tecnico-superior-hs/cap" />
 	
@@ -2291,8 +2259,7 @@
 							</fo:table-body>
 						</fo:table>
 					</xsl:if>
-					<fo:block font-family="Helvetica"
-						id="evolute_endofdoc" />
+					<fo:block font-family="Helvetica" id="evolute_endofdoc" />
 				</fo:flow>
 			</fo:page-sequence>
 		</fo:root>
@@ -2300,8 +2267,7 @@
 	
 	
 	<xsl:template name="posto">
-		<fo:page-sequence master-reference="Standard_2"
-			force-page-count="no-force" initial-page-number="auto">
+		<fo:page-sequence master-reference="Standard_2" force-page-count="no-force" initial-page-number="auto">
 			<fo:static-content flow-name="xsl-region-before">
 				<fo:table table-layout="fixed" width="100%">
 					<fo:table-column />
@@ -2509,125 +2475,88 @@
 					<fo:table-body>
 						<fo:table-row>
 							<fo:table-cell
-								border="0.0069in solid #000000" display-align="center"
-								background-color="#808080" writing-mode="lr-tb">
-								<fo:block font-family="Helvetica"
-									font-size="11pt" font-weight="bold" margin-right="-0.0146in"
-									text-indent="0in" text-align="center" margin-left="0in"
-									color="white">
+								border="0.0069in solid #000000" display-align="center" background-color="#808080" writing-mode="lr-tb">
+								<fo:block font-family="Helvetica" font-size="11pt" font-weight="bold" margin-right="-0.0146in"
+									text-indent="0in" text-align="center" margin-left="0in" color="white">
 									Grav.  
 								</fo:block>
-								<fo:block font-family="Helvetica"
-									font-size="11pt" font-weight="bold" margin-right="-0.0146in"
-									text-indent="0in" text-align="center" margin-left="0in"
-									color="white">
+								<fo:block font-family="Helvetica" font-size="11pt" font-weight="bold" margin-right="-0.0146in"
+									text-indent="0in" text-align="center" margin-left="0in" color="white">
 									(G)  
 								</fo:block>
 							</fo:table-cell>
-							<fo:table-cell
-								border="0.0069in solid #000000" display-align="center"
-								background-color="#808080" writing-mode="lr-tb">
-								<fo:block font-family="Helvetica"
-									font-size="11pt" font-weight="bold" margin-right="-0.0146in"
-									text-indent="0in" text-align="center" margin-left="0in"
-									color="white">
+							<fo:table-cell border="0.0069in solid #000000" display-align="center" background-color="#808080" writing-mode="lr-tb">
+								<fo:block font-family="Helvetica" font-size="11pt" font-weight="bold" margin-right="-0.0146in"
+									text-indent="0in" text-align="center" margin-left="0in" color="white">
 									Prob.  
 								</fo:block>
-								<fo:block font-family="Helvetica"
-									font-size="11pt" font-weight="bold" margin-right="-0.0146in"
-									text-indent="0in" text-align="center" margin-left="0in"
-									color="white">
+								<fo:block font-family="Helvetica" font-size="11pt" font-weight="bold" margin-right="-0.0146in"
+									text-indent="0in" text-align="center" margin-left="0in" color="white">
 									(P)  
 								</fo:block>
 							</fo:table-cell>
-							<fo:table-cell
-								border="0.0069in solid #000000" display-align="center"
-								background-color="#808080" writing-mode="lr-tb">
-								<fo:block font-family="Helvetica"
-									font-size="11pt" font-weight="bold" margin-right="-0.0146in"
-									text-indent="0in" text-align="center" margin-left="0in"
-									color="white">
+							<fo:table-cell border="0.0069in solid #000000" display-align="center" background-color="#808080" writing-mode="lr-tb">
+								<fo:block font-family="Helvetica" font-size="11pt" font-weight="bold" margin-right="-0.0146in"
+									text-indent="0in" text-align="center" margin-left="0in" color="white">
 									Valor Risco  
 								</fo:block>
-								<fo:block font-family="Helvetica"
-									font-size="11pt" font-weight="bold" margin-right="-0.0146in"
-									text-indent="0in" text-align="center" margin-left="0in"
-									color="white">
+								<fo:block font-family="Helvetica" font-size="11pt" font-weight="bold" margin-right="-0.0146in"
+									text-indent="0in" text-align="center" margin-left="0in" color="white">
 									(G x P)  
 								</fo:block>
 							</fo:table-cell>
-							<fo:table-cell
-								border="0.0069in solid #000000" display-align="center"
-								background-color="#808080" writing-mode="lr-tb">
-								
-								<fo:block font-family="Helvetica"
-									font-size="11pt" font-weight="bold" margin-right="-0.0146in"
-									text-indent="0in" text-align="center" margin-left="0in"
-									color="white">
+							<fo:table-cell border="0.0069in solid #000000" display-align="center" background-color="#808080" writing-mode="lr-tb">
+								<fo:block font-family="Helvetica" font-size="11pt" font-weight="bold" margin-right="-0.0146in"
+									text-indent="0in" text-align="center" margin-left="0in" color="white">
 									risco / requisito legal e medidas de prevenção
 								</fo:block>
 							</fo:table-cell>
 						</fo:table-row>
+						
+						
 						<xsl:for-each select="risco">
-						<xsl:choose>
-							<xsl:when
-								test="position()=1">
-								<fo:table-row>
-									<fo:table-cell
-										border-right="0.0069in solid #000000"
-										border-left="0.0069in solid #000000"
-										border-after-width.conditionality="retain"
-										display-align="center" writing-mode="lr-tb">
-										<fo:block font-family="Helvetica"
-											font-size="8pt" font-weight="bold" margin-right="-0.0146in"
-											text-indent="0in" text-align="left" margin-left="0.1in"
-											keep-with-next="always">
-											&#xa0;
-										</fo:block>
-									</fo:table-cell>
-									<fo:table-cell
-										border-right="0.0069in solid #000000"
-										border-left="0.0069in solid #000000"
-										border-after-width.conditionality="retain"
-										display-align="center" writing-mode="lr-tb">
-										<fo:block font-family="Helvetica"
-											font-size="8pt" font-weight="bold" margin-right="-0.0146in"
-											text-indent="0in" text-align="left" margin-left="0.1in"
-											keep-with-next="always">
-											&#xa0;
-										</fo:block>
-									</fo:table-cell>
-									<fo:table-cell
-										border-right="0.0069in solid #000000"
-										border-left="0.0069in solid #000000"
-										border-after-width.conditionality="retain"
-										display-align="center" writing-mode="lr-tb">
-										<fo:block font-family="Helvetica"
-											font-size="8pt" font-weight="bold" margin-right="-0.0146in"
-											text-indent="0in" text-align="left" margin-left="0.1in"
-											keep-with-next="always">
-											&#xa0;
-										</fo:block>
-									</fo:table-cell>
-									<fo:table-cell
-										border-right="0.0069in solid #000000"
-										border-left="0.0069in solid #000000"
-										border-after-width.conditionality="retain"
-										display-align="center" writing-mode="lr-tb">
-										<fo:block font-family="Helvetica"
-											font-size="8pt" font-weight="bold" margin-right="-0.0146in"
-											text-indent="0in" text-align="left" margin-left="0.1in"
-											keep-with-next="always">
-											&#xa0;
-										</fo:block>
-									</fo:table-cell>
-								</fo:table-row>
-							</xsl:when>
-						</xsl:choose>
+							<xsl:choose>
+								<xsl:when test="position()=1">
+									<fo:table-row>
+										<fo:table-cell border-right="0.0069in solid #000000" border-left="0.0069in solid #000000"
+											border-after-width.conditionality="retain" display-align="center" writing-mode="lr-tb">
+											<fo:block font-family="Helvetica" font-size="8pt" font-weight="bold" margin-right="-0.0146in"
+												text-indent="0in" text-align="left" margin-left="0.1in" keep-with-next="always">
+												&#xa0;
+											</fo:block>
+										</fo:table-cell>
+										<fo:table-cell border-right="0.0069in solid #000000" border-left="0.0069in solid #000000"
+											border-after-width.conditionality="retain" display-align="center" writing-mode="lr-tb">
+											<fo:block font-family="Helvetica" font-size="8pt" font-weight="bold" margin-right="-0.0146in"
+												text-indent="0in" text-align="left" margin-left="0.1in" keep-with-next="always">
+												&#xa0;
+											</fo:block>
+										</fo:table-cell>
+										<fo:table-cell border-right="0.0069in solid #000000" border-left="0.0069in solid #000000"
+											border-after-width.conditionality="retain" display-align="center" writing-mode="lr-tb">
+											<fo:block font-family="Helvetica" font-size="8pt" font-weight="bold" margin-right="-0.0146in"
+												text-indent="0in" text-align="left" margin-left="0.1in" keep-with-next="always">
+												&#xa0;
+											</fo:block>
+										</fo:table-cell>
+										<fo:table-cell border-right="0.0069in solid #000000" border-left="0.0069in solid #000000"
+											border-after-width.conditionality="retain" display-align="center" writing-mode="lr-tb">
+											<fo:block font-family="Helvetica" font-size="8pt" font-weight="bold" margin-right="-0.0146in"
+												text-indent="0in" text-align="left" margin-left="0.1in" keep-with-next="always">
+												&#xa0;
+											</fo:block>
+										</fo:table-cell>
+									</fo:table-row>
+									
+								</xsl:when>
+							</xsl:choose>
 						</xsl:for-each>
+						
+						
 					</fo:table-body>
 				</fo:table>
 			</fo:static-content>
+			
 			<xsl:call-template name="footer" />
 			<fo:flow flow-name="xsl-region-body">
 				<fo:block>
@@ -2643,32 +2572,22 @@
 					<fo:table-body>
 						<xsl:for-each select="risco">
 							<fo:table-row>
-								<fo:table-cell
-									border-right="0.0069in solid #000000"
-									border-left="0.0069in solid #000000"
-									border-bottom="0.0069in solid #000000"
-									border-after-width.conditionality="retain"
+								<fo:table-cell border-right="0.0069in solid #000000" border-left="0.0069in solid #000000"
+									border-bottom="0.0069in solid #000000" border-after-width.conditionality="retain"
 									display-align="center" writing-mode="lr-tb">
-									<fo:block font-family="Helvetica"
-										font-size="12pt" font-weight="bold" margin-right="-0.0146in"
-										text-indent="0in" text-align="left" margin-left="0.1in"
-										keep-with-next="always">
+									<fo:block font-family="Helvetica" font-size="12pt" font-weight="bold" margin-right="-0.0146in"
+										text-indent="0in" text-align="left" margin-left="0.1in" keep-with-next="always">
 										&#xa0;
 									</fo:block>
-									<fo:block font-family="Helvetica"
-										font-size="12pt" font-weight="bold" margin-right="-0.0146in"
-										text-indent="0in" text-align="left" margin-left="0.1in"
-										keep-with-next="always">
+									<fo:block font-family="Helvetica" font-size="12pt" font-weight="bold" margin-right="-0.0146in"
+										text-indent="0in" text-align="left" margin-left="0.1in" keep-with-next="always">
 										&#xa0;
 									</fo:block>
-									<fo:block font-family="Helvetica"
-										font-size="12pt" font-weight="bold" margin-right="-0.0146in"
-										text-indent="0in" text-align="left" margin-left="0.1in"
-										keep-with-next="always">
+									<fo:block font-family="Helvetica" font-size="12pt" font-weight="bold" margin-right="-0.0146in"
+										text-indent="0in" text-align="left" margin-left="0.1in" keep-with-next="always">
 										&#xa0;
 									</fo:block>
-									<fo:block font-family="Helvetica"
-										font-size="12pt" font-weight="bold" margin-right="-0.0146in"
+									<fo:block font-family="Helvetica" font-size="12pt" font-weight="bold" margin-right="-0.0146in"
 										text-indent="0in" text-align="center" margin-left="0in">
 										<xsl:choose>
 											<xsl:when test="severidade">
@@ -2680,32 +2599,21 @@
 										</xsl:choose>
 									</fo:block>
 								</fo:table-cell>
-								<fo:table-cell
-									border-right="0.0069in solid #000000"
-									border-left="0.0069in solid #000000"
-									border-bottom="0.0069in solid #000000"
-									border-after-width.conditionality="retain"
-									display-align="center" writing-mode="lr-tb">
-									<fo:block font-family="Helvetica"
-										font-size="12pt" font-weight="bold" margin-right="-0.0146in"
-										text-indent="0in" text-align="left" margin-left="0.1in"
-										keep-with-next="always">
+								<fo:table-cell border-right="0.0069in solid #000000"	border-left="0.0069in solid #000000" border-bottom="0.0069in solid #000000"
+									border-after-width.conditionality="retain" display-align="center" writing-mode="lr-tb">
+									<fo:block font-family="Helvetica" font-size="12pt" font-weight="bold" margin-right="-0.0146in"
+										text-indent="0in" text-align="left" margin-left="0.1in" keep-with-next="always">
 										&#xa0;
 									</fo:block>
-									<fo:block font-family="Helvetica"
-										font-size="12pt" font-weight="bold" margin-right="-0.0146in"
-										text-indent="0in" text-align="left" margin-left="0.1in"
-										keep-with-next="always">
+									<fo:block font-family="Helvetica" font-size="12pt" font-weight="bold" margin-right="-0.0146in"
+										text-indent="0in" text-align="left" margin-left="0.1in" keep-with-next="always">
 										&#xa0;
 									</fo:block>
-									<fo:block font-family="Helvetica"
-										font-size="12pt" font-weight="bold" margin-right="-0.0146in"
-										text-indent="0in" text-align="left" margin-left="0.1in"
-										keep-with-next="always">
+									<fo:block font-family="Helvetica" font-size="12pt" font-weight="bold" margin-right="-0.0146in"
+										text-indent="0in" text-align="left" margin-left="0.1in" keep-with-next="always">
 										&#xa0;
 									</fo:block>
-									<fo:block font-family="Helvetica"
-										font-size="12pt" font-weight="bold" margin-right="-0.0146in"
+									<fo:block font-family="Helvetica" font-size="12pt" font-weight="bold" margin-right="-0.0146in"
 										text-indent="0in" text-align="center" margin-left="0in">
 										<xsl:choose>
 											<xsl:when test="probabilidade">
@@ -2717,37 +2625,25 @@
 										</xsl:choose>
 									</fo:block>
 								</fo:table-cell>
-								<fo:table-cell
-									border-right="0.0069in solid #000000"
-									border-left="0.0069in solid #000000"
-									border-bottom="0.0069in solid #000000"
-									border-after-width.conditionality="retain"
-									display-align="center" writing-mode="lr-tb">
-									<fo:block font-family="Helvetica"
-										font-size="12pt" font-weight="bold" margin-right="-0.0146in"
-										text-indent="0in" text-align="left" margin-left="0.1in"
-										keep-with-next="always">
+								<fo:table-cell border-right="0.0069in solid #000000" border-left="0.0069in solid #000000" border-bottom="0.0069in solid #000000"
+									border-after-width.conditionality="retain" display-align="center" writing-mode="lr-tb">
+									<fo:block font-family="Helvetica" font-size="12pt" font-weight="bold" margin-right="-0.0146in"
+										text-indent="0in" text-align="left" margin-left="0.1in" keep-with-next="always">
 										&#xa0;
 									</fo:block>
-									<fo:block font-family="Helvetica"
-										font-size="12pt" font-weight="bold" margin-right="-0.0146in"
-										text-indent="0in" text-align="left" margin-left="0.1in"
-										keep-with-next="always">
+									<fo:block font-family="Helvetica" font-size="12pt" font-weight="bold" margin-right="-0.0146in"
+										text-indent="0in" text-align="left" margin-left="0.1in" keep-with-next="always">
 										&#xa0;
 									</fo:block>
-									<fo:block font-family="Helvetica"
-										font-size="12pt" font-weight="bold" margin-right="-0.0146in"
-										text-indent="0in" text-align="left" margin-left="0.1in"
-										keep-with-next="always">
+									<fo:block font-family="Helvetica" font-size="12pt" font-weight="bold" margin-right="-0.0146in"
+										text-indent="0in" text-align="left" margin-left="0.1in" keep-with-next="always">
 										&#xa0;
 									</fo:block>
-									<fo:block font-family="Helvetica"
-										font-size="12pt" font-weight="bold" margin-right="-0.0146in"
+									<fo:block font-family="Helvetica" font-size="12pt" font-weight="bold" margin-right="-0.0146in"
 										text-indent="0in" text-align="center" margin-left="0in" keep-with-next="always">
 										<xsl:value-of select="valor-numerico" />
 									</fo:block>
-									<fo:block font-family="Helvetica"
-										font-size="12pt" font-weight="bold" margin-right="-0.0146in"
+									<fo:block font-family="Helvetica" font-size="12pt" font-weight="bold" margin-right="-0.0146in"
 										text-indent="0in" text-align="center" margin-left="0in">
 										<xsl:choose>
 											<xsl:when test="valor-numerico=1">
@@ -2790,59 +2686,42 @@
 										</xsl:choose>
 									</fo:block>
 								</fo:table-cell>
-								<fo:table-cell
-									border-right="0.0069in solid #000000"
-									border-left="0.0069in solid #000000"
-									border-bottom="0.0069in solid #000000"
-									border-after-width.conditionality="retain"
-									display-align="center" writing-mode="lr-tb" padding="2pt">
+								<fo:table-cell border-right="0.0069in solid #000000" border-left="0.0069in solid #000000" border-bottom="0.0069in solid #000000"
+									border-after-width.conditionality="retain" display-align="center" writing-mode="lr-tb" padding="2pt">
 									<xsl:choose>
-										<xsl:when
-											test="position() &gt; 1">
-											<fo:block font-family="Helvetica"
-												font-size="12pt" font-weight="bold" margin-right="-0.0146in"
-												text-indent="0in" text-align="left" margin-left="0.1in"
-												keep-with-next="always">
+										<xsl:when test="position() &gt; 1">
+											<fo:block font-family="Helvetica" font-size="12pt" font-weight="bold" margin-right="-0.0146in"
+												text-indent="0in" text-align="left" margin-left="0.1in" keep-with-next="always">
 												&#xa0;
 											</fo:block>
 										</xsl:when>
 										<xsl:otherwise>
-											<fo:block font-family="Helvetica"
-												font-size="6pt" font-weight="bold" margin-right="-0.0146in"
-												text-indent="0in" text-align="left" margin-left="0.1in"
-												keep-with-next="always">
+											<fo:block font-family="Helvetica" font-size="6pt" font-weight="bold" margin-right="-0.0146in"
+												text-indent="0in" text-align="left" margin-left="0.1in" keep-with-next="always">
 												&#xa0;
 											</fo:block>
 										</xsl:otherwise>
 									</xsl:choose>
-									<fo:block font-family="Helvetica"
-										font-size="12pt" font-weight="bold" margin-right="-0.0146in"
-										text-indent="0in" text-align="left" margin-left="0.1in"
-										keep-with-next="always">
+									<fo:block font-family="Helvetica" font-size="12pt" font-weight="bold" margin-right="-0.0146in"
+										text-indent="0in" text-align="left" margin-left="0.1in" keep-with-next="always">
 										<xsl:value-of select="descricao" />
 									</fo:block>
-									<fo:block
-											font-family="Helvetica" font-size="5pt" font-weight="bold"
-											margin-right="-0.0146in" text-indent="0in" text-align="left"
-											margin-left="0.1in" keep-with-next="always">
+									<fo:block font-family="Helvetica" font-size="5pt" font-weight="bold"
+										margin-right="-0.0146in" text-indent="0in" text-align="left" margin-left="0.1in" keep-with-next="always">
 											&#xa0;
-										</fo:block>
+									</fo:block>
 									<xsl:for-each select="medida">
 										<fo:list-block>
 										<fo:list-item>
 											<fo:list-item-label>
-												<fo:block
-													font-family="Helvetica" font-size="12pt" margin-right="0.2in"
-													text-indent="0in" text-align="justify"
-													margin-left="0.25in">
+												<fo:block font-family="Helvetica" font-size="12pt" margin-right="0.2in"
+													text-indent="0in" text-align="justify" margin-left="0.25in">
 													-
 												</fo:block>
 											</fo:list-item-label>
 											<fo:list-item-body>
-												<fo:block
-													font-family="Helvetica" font-size="12pt" margin-right="0.2in"
-													text-indent="0in" text-align="justify"
-													margin-left="0.35in" keep-together.within-page="always">
+												<fo:block font-family="Helvetica" font-size="12pt" margin-right="0.2in"
+													text-indent="0in" text-align="justify" margin-left="0.35in" keep-together.within-page="always">
 													<xsl:value-of select="requisitos-legais" />
 													<xsl:choose>
 														<xsl:when test="position()=last()">
@@ -2856,18 +2735,14 @@
 											</fo:list-item-body>
 										</fo:list-item>
 										</fo:list-block>
-										<fo:block
-											font-family="Helvetica" font-size="5pt" font-weight="bold"
-											margin-right="-0.0146in" text-indent="0in" text-align="left"
-											margin-left="0.1in" keep-with-previous="always">
+										<fo:block font-family="Helvetica" font-size="5pt" font-weight="bold"
+											margin-right="-0.0146in" text-indent="0in" text-align="left" margin-left="0.1in" keep-with-previous="always">
 											&#xa0;
 										</fo:block>
 									</xsl:for-each>
 									<xsl:for-each select="medida[string-length(descricao) &gt; 0]">
-										<fo:block
-											font-family="Helvetica" font-size="12pt" margin-right="0.2in"
-											text-indent="0in" text-align="justify"
-											margin-left="0.25in" keep-together.within-page="always">
+										<fo:block font-family="Helvetica" font-size="12pt" margin-right="0.2in"
+											text-indent="0in" text-align="justify" margin-left="0.25in" keep-together.within-page="always">
 												<xsl:value-of select="descricao" />
 												<xsl:choose>
 													<xsl:when test="position()=last()">
@@ -2878,17 +2753,13 @@
 													</xsl:otherwise>
 												</xsl:choose>
 										</fo:block>
-										<fo:block
-											font-family="Helvetica" font-size="5pt" font-weight="bold"
-											margin-right="-0.0146in" text-indent="0in" text-align="left"
-											margin-left="0.1in" keep-with-previous="always">
+										<fo:block font-family="Helvetica" font-size="5pt" font-weight="bold"
+											margin-right="-0.0146in" text-indent="0in" text-align="left" margin-left="0.1in" keep-with-previous="always">
 											&#xa0;
 										</fo:block>
 									</xsl:for-each>
-									<fo:block
-											font-family="Helvetica" font-size="5pt" font-weight="bold"
-											margin-right="-0.0146in" text-indent="0in" text-align="left"
-											margin-left="0.1in" keep-with-previous="always">
+									<fo:block font-family="Helvetica" font-size="5pt" font-weight="bold"
+											margin-right="-0.0146in" text-indent="0in" text-align="left" margin-left="0.1in" keep-with-previous="always">
 											&#xa0;
 									</fo:block>
 								</fo:table-cell>

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

@@ -195,7 +195,7 @@
 								<fo:table-cell display-align="after">
 									<fo:block font-size="12pt" text-align="right">
 										<xsl:variable name="logotipo" select="empresa/logotipo" />
-										<fo:external-graphic src="url('{$logotipo}')" content-width="4cm"  scaling-method="auto" scaling="uniform" />
+										<fo:external-graphic src="url('{$logotipo}')" content-width="2cm"  scaling-method="auto" scaling="uniform" />
 										<!--		content-height="2.5cm"								<fo:external-graphic-->
 										<!--
 											src="url('http://www.evolute.pt/~siprp/planoactuacao/auchan_jumbo_lado.jpg')"
@@ -1090,7 +1090,7 @@
 																<xsl:value-of select="$medida-rows" />
 															</xsl:attribute>
 															<fo:block font-size="9pt" text-align="center" line-height="130%" margin-top="0in" margin-bottom="0in">
-																<xsl:value-of select="../descricao" /> : <xsl:value-of select="$medida-position" /> : <xsl:value-of select="position()" /> 
+																<xsl:value-of select="../descricao" /> 
 															</fo:block>
 														</fo:table-cell>
 													</xsl:if>

trunk/SIPRPSoft/src/siprp/update/UpdateList.java

@@ -46,6 +46,7 @@ import siprp.update.updates.V13_1_To_V13_2;
 import siprp.update.updates.V13_2_To_V13_3;
 import siprp.update.updates.V13_3_To_V13_4;
 import siprp.update.updates.V13_7_To_V13_8;
+import siprp.update.updates.V14_1_To_V14_2;
 import siprp.update.updates.V6_1_To_V7_0;
 import siprp.update.updates.V7_0_To_V7_2;
 import siprp.update.updates.V7_2_To_V7_4;
@@ -128,6 +129,7 @@ public class UpdateList
 							new V13_7_To_V13_8(),
 							new SHSTUpdate8( 13.8, 13.9 ),
 							new SHSTUpdate9( 13.9, 14.1 ),
+							new V14_1_To_V14_2(),
 							};
 //	
 //	protected static Executer EXECUTER;

trunk/SIPRPSoft/src/siprp/update/updates/V14_1_To_V14_2.java

@@ -0,0 +1,52 @@
+package siprp.update.updates;
+
+import com.evolute.module.updater.AbstractUpdate;
+import com.evolute.utils.sql.Delete;
+import com.evolute.utils.sql.Update;
+
+public class V14_1_To_V14_2 extends AbstractUpdate 
+{
+
+	public V14_1_To_V14_2( )
+	{
+		super( 14.1, 14.2, "Corrigir relatórios." );
+	}
+	
+	@Override
+	public void doUpdate() throws Exception 
+	{
+		Delete queryDeleteRiscos = new Delete(
+			"DELETE FROM hs_relatorio_posto_risco " +
+			"WHERE hs_relatorio_posto_risco.risco_id IN ( " +
+				"SELECT hs_relatorio_risco.id FROM hs_relatorio_risco WHERE hs_relatorio_risco.deleted_date IS NOT NULL " +
+			")"
+		);
+		getExecuter().executeQuery( queryDeleteRiscos );
+		
+		Delete queryDeleteMedidas = new Delete(
+			"DELETE FROM hs_relatorio_posto_medida WHERE hs_relatorio_posto_medida.medida_id IN (" +
+				"SELECT hs_relatorio_medida.id FROM hs_relatorio_medida WHERE hs_relatorio_medida.deleted_date IS NOT NULL" +
+			")"
+		);
+		getExecuter().executeQuery( queryDeleteMedidas );
+		
+		Update updateIndex = new Update( "create index hs_relatorio_posto_medida_medida_idx on hs_relatorio_posto_medida( posto_id );" );
+		getExecuter().executeQuery( updateIndex );
+		Update updateIndex2 = new Update( "create index hs_relatorio_posto_medida_posto_idx on hs_relatorio_posto_medida( medida_id );" );
+		getExecuter().executeQuery( updateIndex2 );
+		
+		Update update = new Update(
+			"UPDATE hs_relatorio_medida " +
+			"SET deleted_date = now() " + 
+			"WHERE hs_relatorio_medida.id IN ( " +
+				"SELECT hs_relatorio_medida.id " +
+				"FROM hs_relatorio_medida " +  
+				"LEFT OUTER JOIN hs_relatorio_posto_medida ON ( hs_relatorio_medida.id = hs_relatorio_posto_medida.medida_id ) " + 
+				"WHERE " +
+		         	"hs_relatorio_posto_medida.medida_id IS null " +
+			")"
+		);
+		getExecuter().executeQuery( update );
+	}
+	
+}