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

trunk/SIPRPSoft/src/siprp/Main.java

@@ -61,7 +61,7 @@ import com.evolute.utils.ui.window.LoginWindow;
 
 public class Main implements com.evolute.utils.ui.window.Connector
 {
-	public final static String SHST_VERSION = "11.5.2";
+	public final static String SHST_VERSION = "11.5.4";
 	
 	private final static ClassLoader classLoader = new EVUtilsImageLib().getClass().getClassLoader();
 	

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

@@ -57,6 +57,9 @@ public class RelatorioToPrint
 		Element tipoAvaliacaoElement = new Element( "tipo-avaliacao" );
 		tipoAvaliacaoElement.setText( tipoAvaliacao );
 		relatorioElement.addContent( tipoAvaliacaoElement );
+		Element tipoAvaliacaoCamelElement = new Element( "tipo-avaliacao-camel" );
+		tipoAvaliacaoCamelElement.setText( tipoAvaliacao.charAt(0) + tipoAvaliacao.toLowerCase().substring(1) );
+		relatorioElement.addContent( tipoAvaliacaoCamelElement );
 		if( dataProximaHs != null )
 		{
 			relatorioElement.addContent( dataProximaHs.toJdomElement() );

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.35in"
+					<fo:region-body margin-top="2.9in"
 						margin-bottom="0.9in" />
-					<fo:region-before extent="2.35in"
+					<fo:region-before extent="2.9in"
 						margin-bottom="0in" />
 					<fo:region-after extent="0.8in" margin-top="0.4in" />
 				</fo:simple-page-master>
@@ -3714,7 +3714,7 @@
 					<fo:table-column />
 					<fo:table-column />
 					<fo:table-body>
-						<fo:table-row>
+						<fo:table-row height="2.5cm">
 							<fo:table-cell display-align="after">
 								<fo:block font-family="Helvetica"
 									font-size="13pt" text-align="left">
@@ -3885,7 +3885,8 @@
 										REALIZADA POR:
 									</fo:inline>
 									<fo:inline font-size="10pt">
-										Sónia Campos  / SIPRP –
+										<xsl:value-of
+											select="../../../tecnico-hs/nome" />  / SIPRP –
 										Sociedade Ibérica de Prevenção
 										de Riscos Profissionais  
 									</fo:inline>
@@ -4355,7 +4356,8 @@
 							border-top="0.0069in solid #000000">
 							<fo:block font-family="Helvetica"
 								font-size="10pt" text-align="left">
-								Avaliação Periódica de Riscos Laborais
+								Avaliação <xsl:value-of
+											select="../../../tipo-avaliacao-camel" /> de Riscos Laborais
 							</fo:block>
 						</fo:table-cell>
 						<fo:table-cell