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

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

@@ -24,7 +24,7 @@ public class RelatorioPDFCreator
 		Document foDoc = new Document( relatorio.toJdomElement() );
 		XMLOutputter outputter = new XMLOutputter(Format.getPrettyFormat());
 		ByteArrayOutputStream foBaos = new ByteArrayOutputStream();
-//		FileOutputStream fos = new FileOutputStream("/home/jneto/a.fo");
+//		FileOutputStream fos = new FileOutputStream("/home/jneto/a.xml");
 		outputter.output( foDoc, foBaos );
 //		outputter.output( foDoc, fos );
 		

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

@@ -224,7 +224,7 @@ public class RelatorioPrintDataProvider
 			String cap = ( String ) array.get( 0, 2 );
 			String formacao = ( String ) array.get( 0, 3 );
 			Integer assinatura = ( Integer ) array.get( 0, 4 );
-			return new TecnicoHSToPrint( id, nome, cap, formacao, assinatura );
+			return new TecnicoHSToPrint( id, nome, cap, formacao, "http://www.evolute.pt:13080/SIPRPImages/image?id=" + assinatura );
 		}
 	}
 	

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

@@ -9,10 +9,10 @@ public class TecnicoHSToPrint
 	protected String nome;
 	protected String cap;
 	protected String formacao;
-	protected Integer assinatura;
+	protected String assinatura;
 	
 	public TecnicoHSToPrint( Integer id, String nome, String cap,
-			String formacao, Integer assinatura )
+			String formacao, String assinatura )
 	{
 		super();
 		this.id = id;

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

@@ -1480,8 +1480,8 @@
 									</fo:table-cell>
 									<fo:table-cell display-align="after">
 										<fo:block font-size="13pt" text-align="right">
-											<xsl:if test="../../../empresa/logotipo">
-												<xsl:variable name="logotipo" select="../../../empresa/logotipo" />
+											<xsl:if test="../../empresa/logotipo">
+												<xsl:variable name="logotipo" select="../../empresa/logotipo" />
 												<fo:external-graphic src="url('{$logotipo}')" content-width="4cm" />
 											</xsl:if>
 										</fo:block>