From 65b1ea595bdf357daa337e54ca1b255fbb2f7b97 Mon Sep 17 00:00:00 2001
From: Frederico Palma <deactivated@coded.pt>
Date: Mon, 21 Sep 2009 17:37:30 +0000
Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1098
 bb69d46d-e84e-40c8-a05a-06db0d633741

---
 .../higiene/relatorio/print/relatorio.xsl     | 161 +++++++++++++-----
 1 file changed, 122 insertions(+), 39 deletions(-)

diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/relatorio.xsl b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/relatorio.xsl
index 765381aa..a725ab8c 100644
--- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/relatorio.xsl
+++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/relatorio.xsl
@@ -40,9 +40,9 @@
 				<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="2.25in"
+					<fo:region-body margin-top="2.35in"
 						margin-bottom="0.9in" />
-					<fo:region-before extent="2.25in"
+					<fo:region-before extent="2.35in"
 						margin-bottom="0in" />
 					<fo:region-after extent="0.8in" margin-top="0.4in" />
 				</fo:simple-page-master>
@@ -3990,6 +3990,63 @@
 								</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:for-each>
 					</fo:table-body>
 				</fo:table>
 			</fo:static-content>
@@ -4009,7 +4066,9 @@
 						<xsl:for-each select="risco">
 							<fo:table-row>
 								<fo:table-cell
-									border="0.0069in solid #000000"
+									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"
@@ -4046,7 +4105,9 @@
 									</fo:block>
 								</fo:table-cell>
 								<fo:table-cell
-									border="0.0069in solid #000000"
+									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"
@@ -4083,7 +4144,9 @@
 									</fo:block>
 								</fo:table-cell>
 								<fo:table-cell
-									border="0.0069in solid #000000"
+									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"
@@ -4106,7 +4169,7 @@
 									</fo:block>
 									<fo:block font-family="Helvetica"
 										font-size="10pt" font-weight="bold" margin-right="-0.0146in"
-										text-indent="0in" text-align="center" margin-left="0in">
+										text-indent="0in" text-align="center" margin-left="0in" keep-with-next="always">
 										<xsl:value-of
 											select="valor-numerico" />
 									</fo:block>
@@ -4158,15 +4221,22 @@
 									</fo:block>
 								</fo:table-cell>
 								<fo:table-cell
-									border="0.0069in solid #000000"
+									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:block font-family="Helvetica"
-										font-size="10pt" 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:choose>
+										<xsl:when
+											test="position() &gt; 1">
+											<fo:block font-family="Helvetica"
+												font-size="10pt" 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:choose>
 									<fo:block font-family="Helvetica"
 										font-size="10pt" font-weight="bold" margin-right="-0.0146in"
 										text-indent="0in" text-align="left" margin-left="0.1in"
@@ -4177,13 +4247,13 @@
 										<xsl:value-of
 											select="descricao" />
 									</fo:block>
-									<xsl:for-each select="medida">
-										<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">
 											&#xa0;
 										</fo:block>
+									<xsl:for-each select="medida">
 										<fo:list-block>
 										<fo:list-item>
 											<fo:list-item-label>
@@ -4198,7 +4268,7 @@
 												<fo:block
 													font-family="Helvetica" font-size="10pt" margin-right="0.2in"
 													text-indent="0in" text-align="justify"
-													margin-left="0.35in">
+													margin-left="0.35in" keep-together.within-page="always">
 													<xsl:value-of
 														select="requisitos-legais" />
 													<xsl:choose>
@@ -4214,33 +4284,46 @@
 											</fo:list-item-body>
 										</fo:list-item>
 										</fo:list-block>
-<!-- 										<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">
+											&#xa0;
+										</fo:block>
+									</xsl:for-each>
+									<xsl:for-each select="medida">
+										<fo:block
 											font-family="Helvetica" font-size="10pt" margin-right="0.2in"
 											text-indent="0in" text-align="justify"
-											margin-left="0.25in">
-											-
-											<xsl:value-of
-												select="requisitos-legais" />
-											<xsl:choose>
-												<xsl:when
-													test="position()=last()">
-													.
-												</xsl:when>
-												<xsl:otherwise>
-													;
-												</xsl:otherwise>
-											</xsl:choose>
-										</fo:block>-->
+											margin-left="0.25in" keep-together.within-page="always">
+												<xsl:value-of
+													select="descricao" />
+												<xsl:choose>
+													<xsl:when
+														test="position()=last()">
+														.
+													</xsl:when>
+													<xsl:otherwise>
+														;
+													</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">
+											&#xa0;
+										</fo:block>
 									</xsl:for-each>
-<!--									<fo:block font-family="Helvetica"-->
-<!--										font-size="10pt" 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>
-										<fo:leader />
+									<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:block>-->
+<!--										<fo:leader />-->
+<!--									</fo:block>-->
 								</fo:table-cell>
 							</fo:table-row>
 						</xsl:for-each>