From b6ab7ee1a6e29a2f3861f06626ac5b5e0a855fcf Mon Sep 17 00:00:00 2001
From: Frederico Palma <deactivated@coded.pt>
Date: Tue, 5 May 2009 17:50:57 +0000
Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1012
 bb69d46d-e84e-40c8-a05a-06db0d633741

---
 .../higiene/relatorio/print/relatorio.xsl     | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/relatorio.xsl b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/relatorio.xsl
index cc61d3aa..a13da2e3 100644
--- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/relatorio.xsl
+++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/relatorio.xsl
@@ -1733,9 +1733,10 @@
 			</fo:page-sequence>
 		</fo:root>
 	</xsl:template>
-	<xsl:template name="posto">
+	<xsl:template name="posto">
+		<xsl:variable name="starting-page" ><fo:page-number /></xsl:variable>
 		<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:static-content flow-name="xsl-region-before">
 				<fo:table table-layout="fixed" width="100%">
 					<fo:table-column />
 					<fo:table-column />
@@ -1835,7 +1836,7 @@
 							</fo:table-cell>
 						</fo:table-row>
 						<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="center" writing-mode="lr-tb" padding-right="0.0486in">
+							<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:block font-size="12pt" margin-right="-0.0146in" text-indent="0in" margin-left="0in">
 									<fo:inline font-size="11pt" font-weight="bold">POSTO DE TRABALHO</fo:inline>
 									<fo:inline>:</fo:inline>
@@ -1843,6 +1844,11 @@
 										<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:block font-size="12pt" margin-right="-0.0146in" text-indent="0in" margin-left="0in">
+
+								</fo:block>
 							</fo:table-cell>
 						</fo:table-row>
 					</fo:table-body>
@@ -1876,7 +1882,7 @@
 				</fo:table>
 			</fo:static-content>
 			<xsl:call-template name="footer" />
-			<fo:flow flow-name="xsl-region-body">
+			<fo:flow flow-name="xsl-region-body">
 				<fo:block>
 					<xsl:attribute name="id">
 						<xsl:value-of select="generate-id()" />
@@ -1888,19 +1894,19 @@
 					<fo:table-column column-width="1.2611in" />
 					<fo:table-column column-width="7.3709in" />
 					<fo:table-body>
-						<xsl:for-each select="risco">
-							<fo:table-row >
-								<fo:table-cell border="0.0069in solid #000000" display-align="center" writing-mode="lr-tb">
+						<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-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" display-align="center" writing-mode="lr-tb">
+								<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" 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" display-align="center" writing-mode="lr-tb">
+								<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" margin-right="-0.0146in" text-indent="0in" text-align="center" margin-left="0in">
 										<xsl:value-of select="valor-numerico" />
 									</fo:block>
@@ -1908,7 +1914,7 @@
 										<xsl:value-of select="valor-qualitativo" />
 									</fo:block>
 								</fo:table-cell>
-								<fo:table-cell border="0.0069in solid #000000" display-align="center" writing-mode="lr-tb" padding="2pt">
+								<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" margin-right="-0.0146in" text-indent="0in" text-align="left" margin-left="0.1in">
 										<fo:block>
 											<fo:leader />