From b10408523e2974fb2fe02ad6a5173e47651b77b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Neto?= <deactivated@coded.pt>
Date: Thu, 14 May 2009 19:01:39 +0000
Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1029
 bb69d46d-e84e-40c8-a05a-06db0d633741

---
 .../higiene/relatorio/print/relatorio.xsl     | 48 +++++++++----------
 .../planoactuacao/print/plano_actuacao.xsl    |  4 +-
 .../print/plano_actuacao_alargado.xsl         |  4 +-
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/relatorio.xsl b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/relatorio.xsl
index 50635906..e32f7e8b 100644
--- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/relatorio.xsl
+++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/relatorio.xsl
@@ -116,7 +116,7 @@
 					</fo:block>
 					<fo:block font-size="12pt"> </fo:block>
 					<fo:block font-size="12pt"> </fo:block>
-					<fo:block font-size="16pt" color="#000000" font-family="Arial" margin-right="0in" text-indent="0in" text-align="center" margin-left="0in" margin-top="0.1563in" margin-bottom="0in">
+					<fo:block font-size="16pt" color="#000000" margin-right="0in" text-indent="0in" text-align="center" margin-left="0in" margin-top="0.1563in" margin-bottom="0in">
 						<fo:inline font-weight="bold">
 							<xsl:value-of select="empresa/designacao-social" />
 						</fo:inline>
@@ -1782,8 +1782,8 @@
 							<fo:table-cell number-columns-spanned="3" padding-bottom="0in" padding-left="0.0486in" border="0.0069in solid #000000" padding-top="0in" display-align="before" writing-mode="lr-tb" padding-right="0.0486in">
 								<fo:block font-size="4pt" margin-right="-0.0146in" text-indent="0in" margin-left="0in"> </fo:block>
 								<fo:block font-size="12pt" margin-right="-0.0146in" text-indent="0in" margin-left="0in">
-									<fo:inline font-size="11pt" font-family="Arial">EMPRESA:</fo:inline>
-									<fo:inline font-size="9pt" font-family="Arial">
+									<fo:inline font-size="11pt">EMPRESA:</fo:inline>
+									<fo:inline font-size="9pt">
 										<xsl:value-of select="../../../empresa/designacao-social" />
 									</fo:inline>
 								</fo:block>
@@ -1793,16 +1793,16 @@
 							<fo:table-cell number-columns-spanned="3" padding-bottom="0in" padding-left="0.0486in" border="0.0069in solid #000000" padding-top="0in" display-align="before" writing-mode="lr-tb" padding-right="0.0486in">
 								<fo:block font-size="4pt" margin-right="-0.0146in" text-indent="0in" margin-left="0in"> </fo:block>
 								<fo:block font-size="10pt" margin-right="-0.0146in" text-indent="0in" margin-left="0in">
-									<fo:inline font-size="11pt" font-family="Arial">ESTABELECIMENTO:</fo:inline>
-									<fo:inline font-size="9pt" font-family="Arial"><xsl:value-of select="../../../empresa/estabelecimento" /></fo:inline>
+									<fo:inline font-size="11pt">ESTABELECIMENTO:</fo:inline>
+									<fo:inline font-size="9pt"><xsl:value-of select="../../../empresa/estabelecimento" /></fo:inline>
 								</fo:block>
 							</fo:table-cell>
 						</fo:table-row>
 						<fo:table-row>
 							<fo:table-cell padding-bottom="0in" padding-left="0.0486in" border="0.0069in solid #000000" padding-top="0in" display-align="before" writing-mode="lr-tb" padding-right="0.0486in">
 								<fo:block font-size="12pt" margin-right="-0.0146in" text-indent="0in" margin-left="0in">
-									<fo:inline font-size="11pt" font-family="Arial">DATA DA AVALIAÇÃO:</fo:inline>
-									<fo:inline font-size="9pt" font-family="Arial">
+									<fo:inline font-size="11pt">DATA DA AVALIAÇÃO:</fo:inline>
+									<fo:inline font-size="9pt">
 										<xsl:value-of select="../../../data-hs/dia" />
 										de
 										<xsl:value-of select="../../../data-hs/mes-extenso" />
@@ -1814,10 +1814,10 @@
 							</fo:table-cell>
 							<fo:table-cell padding-bottom="0in" padding-left="0.0486in" border="0.0069in solid #000000" padding-top="0in" display-align="center" writing-mode="lr-tb" padding-right="0.0486in">
 								<fo:block font-size="12pt" margin-right="-0.0146in" text-indent="0in" margin-left="0in">
-									<fo:inline font-size="11pt" font-family="Arial">
+									<fo:inline font-size="11pt">
 										AVALIAÇÃO:
 									</fo:inline>
-									<fo:inline font-size="9pt" font-family="Arial">
+									<fo:inline font-size="9pt">
 										<xsl:value-of select="../../../tipo-avaliacao" />
 									</fo:inline>
 									 
@@ -1825,8 +1825,8 @@
 							</fo:table-cell>
 							<fo:table-cell padding-bottom="0in" padding-left="0.0486in" border="0.0069in solid #000000" padding-top="0in" display-align="before" writing-mode="lr-tb" padding-right="0.0486in">
 								<fo:block font-size="12pt" margin-right="-0.0146in" text-indent="0in" margin-left="0in">
-									<fo:inline font-size="11pt" font-family="Arial">DATA DA PRÓXIMA:</fo:inline>
-									<fo:inline font-size="9pt" font-family="Arial">
+									<fo:inline font-size="11pt">DATA DA PRÓXIMA:</fo:inline>
+									<fo:inline font-size="9pt">
 										<xsl:value-of select="../../../data-proxima-hs/dia" />
 										de
 										<xsl:value-of select="../../../data-proxima-hs/mes-extenso" />
@@ -1840,8 +1840,8 @@
 						<fo:table-row>
 							<fo:table-cell number-columns-spanned="3" padding-bottom="0in" padding-left="0.0486in" border="0.0069in solid #000000" padding-top="0in" display-align="before" writing-mode="lr-tb" padding-right="0.0486in">
 								<fo:block font-size="12pt" margin-right="-0.0146in" text-indent="0in" text-align="justify" margin-left="0in">
-									<fo:inline font-size="11pt" font-family="Arial">REALIZADA POR:</fo:inline>
-									<fo:inline font-size="9pt" font-family="Arial"> 
+									<fo:inline font-size="11pt">REALIZADA POR:</fo:inline>
+									<fo:inline font-size="9pt"> 
 									Sónia Campos  /
 										SIPRP – Sociedade Ibérica de
 										Prevenção de Riscos
@@ -1850,18 +1850,18 @@
 							</fo:table-cell>
 						</fo:table-row>
 						<fo:table-row>
-							<fo:table-cell number-columns-spanned="2" padding-bottom="0in" padding-left="0.0486in" border="0.0069in solid #000000" padding-top="0in" display-align="center" writing-mode="lr-tb" padding-right="0.0486in">
+							<fo:table-cell number-columns-spanned="3" padding-bottom="0in" padding-left="0.0486in" border="0.0069in solid #000000" padding-top="0in" display-align="center" writing-mode="lr-tb" padding-right="0.0486in">
 								<fo:block font-size="12pt" margin-right="-0.0146in" text-indent="0in" margin-left="0in">
-									<fo:inline font-size="11pt" font-family="Arial">POSTO DE TRABALHO:</fo:inline>
-									<fo:inline font-size="9pt" font-family="Arial">
+									<fo:inline font-size="11pt">POSTO DE TRABALHO:</fo:inline>
+									<fo:inline font-size="9pt">
 										<xsl:value-of select="designacao" />
 									</fo:inline>
 								</fo:block>
 							</fo:table-cell>
-							<fo:table-cell padding-bottom="0in" padding-left="0.0486in" border="0.0069in solid #000000" padding-top="0in" display-align="center" writing-mode="lr-tb" padding-right="0.0486in">
+							<!-- fo:table-cell padding-bottom="0in" padding-left="0.0486in" border="0.0069in solid #000000" padding-top="0in" display-align="center" writing-mode="lr-tb" padding-right="0.0486in">
 								<fo:block font-size="12pt" margin-right="-0.0146in" text-indent="0in" margin-left="0in">
 								</fo:block>
-							</fo:table-cell>
+							</fo:table-cell-->
 						</fo:table-row>
 					</fo:table-body>
 				</fo:table>
@@ -1909,20 +1909,20 @@
 						<xsl:for-each select="risco" >
 							<fo:table-row >
 								<fo:table-cell border="0.0069in solid #000000" border-after-width.conditionality="retain" display-align="center" writing-mode="lr-tb">
-									<fo:block font-size="11pt" font-family="Arial" font-weight="bold" margin-right="-0.0146in" text-indent="0in" text-align="center" margin-left="0in">
+									<fo:block font-size="11pt" font-weight="bold" margin-right="-0.0146in" text-indent="0in" text-align="center" margin-left="0in">
 										<xsl:value-of select="severidade" />
 									</fo:block>
 								</fo:table-cell>
 								<fo:table-cell border="0.0069in solid #000000" border-after-width.conditionality="retain" display-align="center" writing-mode="lr-tb">
-									<fo:block font-size="11pt" font-weight="bold" font-family="Arial" margin-right="-0.0146in" text-indent="0in" text-align="center" margin-left="0in">
+									<fo:block font-size="11pt" font-weight="bold" margin-right="-0.0146in" text-indent="0in" text-align="center" margin-left="0in">
 										<xsl:value-of select="probabilidade" />
 									</fo:block>
 								</fo:table-cell>
 								<fo:table-cell border="0.0069in solid #000000" border-after-width.conditionality="retain" display-align="center" writing-mode="lr-tb">
-									<fo:block font-size="11pt" font-weight="bold" font-family="Arial" margin-right="-0.0146in" text-indent="0in" text-align="center" margin-left="0in">
+									<fo:block font-size="11pt" font-weight="bold" margin-right="-0.0146in" text-indent="0in" text-align="center" margin-left="0in">
 										<xsl:value-of select="valor-numerico" />
 									</fo:block>
-									<fo:block font-size="11pt" font-weight="bold" font-family="Arial" margin-right="-0.0146in" text-indent="0in" text-align="center" margin-left="0in">
+									<fo:block font-size="11pt" font-weight="bold" margin-right="-0.0146in" text-indent="0in" text-align="center" margin-left="0in">
 										<xsl:choose>
 											<xsl:when test="valor-numerico=1">IRRELEVANTE</xsl:when>
 											<xsl:when test="valor-numerico=2">MUITO BAIXO</xsl:when>
@@ -1940,14 +1940,14 @@
 									</fo:block>
 								</fo:table-cell>
 								<fo:table-cell border="0.0069in solid #000000" border-after-width.conditionality="retain" display-align="center" writing-mode="lr-tb" padding="2pt">
-									<fo:block font-size="11pt" font-weight="bold" font-family="Arial" margin-right="-0.0146in" text-indent="0in" text-align="left" margin-left="0.1in">
+									<fo:block font-size="11pt" font-weight="bold" margin-right="-0.0146in" text-indent="0in" text-align="left" margin-left="0.1in">
 										<fo:block>
 											<fo:leader />
 										</fo:block>
 										<xsl:value-of select="descricao" />
 									</fo:block>
 									<xsl:for-each select="medida">
-										<fo:block font-size="12pt" font-family="Arial" margin-right="0.2in" text-indent="0in" text-align="justify" margin-left="0.25in" space-before="4pt">
+										<fo:block font-size="12pt" margin-right="0.2in" text-indent="0in" text-align="justify" margin-left="0.25in" space-before="4pt">
 											-
 											<xsl:value-of select="requisitos-legais" />
 											<xsl:choose>
diff --git a/trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao.xsl b/trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao.xsl
index 28de94bd..b09d117e 100644
--- a/trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao.xsl
+++ b/trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao.xsl
@@ -102,10 +102,10 @@
 					</fo:block>
 					<fo:block font-size="12pt"> </fo:block>
 					<fo:block font-size="12pt"> </fo:block>
-					<fo:block font-size="16pt" color="#000000" font-family="Arial" font-weight="bold" margin-right="0in" text-indent="0in" text-align="center" margin-left="0in" margin-top="0.1563in" margin-bottom="0in">
+					<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>
-					<fo:block font-size="16pt" color="#000000" font-family="Arial" margin-right="0in" text-indent="0in" text-align="center" margin-left="0in" margin-top="0.1563in" margin-bottom="0in">
+					<fo:block font-size="16pt" color="#000000" margin-right="0in" text-indent="0in" text-align="center" margin-left="0in" margin-top="0.1563in" margin-bottom="0in">
 						<xsl:value-of select="empresa/estabelecimento" />						 
 					</fo:block>
 					<fo:block font-size="12pt"> </fo:block>
diff --git a/trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao_alargado.xsl b/trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao_alargado.xsl
index d133e141..b0401b61 100644
--- a/trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao_alargado.xsl
+++ b/trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao_alargado.xsl
@@ -102,10 +102,10 @@
 					</fo:block>
 					<fo:block font-size="12pt"> </fo:block>
 					<fo:block font-size="12pt"> </fo:block>
-					<fo:block font-size="16pt" color="#000000" font-family="Arial" font-weight="bold" margin-right="0in" text-indent="0in" text-align="center" margin-left="0in" margin-top="0.1563in" margin-bottom="0in">
+					<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>
-					<fo:block font-size="16pt" color="#000000" font-family="Arial" margin-right="0in" text-indent="0in" text-align="center" margin-left="0in" margin-top="0.1563in" margin-bottom="0in">
+					<fo:block font-size="16pt" color="#000000" margin-right="0in" text-indent="0in" text-align="center" margin-left="0in" margin-top="0.1563in" margin-bottom="0in">
 						<xsl:value-of select="empresa/estabelecimento" />						 
 					</fo:block>
 					<fo:block font-size="12pt"> </fo:block>