From 39bbe16eaf579546dd65d9404f0788fc89783708 Mon Sep 17 00:00:00 2001
From: Frederico Palma <deactivated@coded.pt>
Date: Mon, 7 Jan 2008 15:01:20 +0000
Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@649
 bb69d46d-e84e-40c8-a05a-06db0d633741

---
 .../src/siprp/ficha/ficha_aptidao.xsl         | 125 ++++++++++--------
 trunk/SIPRPSoft/src/siprp/ficha/out.txt       |   1 +
 2 files changed, 72 insertions(+), 54 deletions(-)

diff --git a/trunk/SIPRPSoft/src/siprp/ficha/ficha_aptidao.xsl b/trunk/SIPRPSoft/src/siprp/ficha/ficha_aptidao.xsl
index 16372adf..a7deeb3a 100644
--- a/trunk/SIPRPSoft/src/siprp/ficha/ficha_aptidao.xsl
+++ b/trunk/SIPRPSoft/src/siprp/ficha/ficha_aptidao.xsl
@@ -19,7 +19,6 @@
 			<fo:page-sequence master-reference="simpleA4">
 				<fo:flow flow-name="xsl-region-body">
 					<fo:block>
-
 						<fo:block text-align="center" font-size="10pt"
 							font-weight="bold">
 							FICHA DE APTID&#xc3;O
@@ -102,9 +101,9 @@
 													Tipo
 												</fo:block>
 											</fo:table-cell>
-											<fo:table-cell>
-												<fo:block font-size="8pt" margin-left="0.2cm">
-													&#x2610;
+											<fo:table-cell >
+												<fo:block font-size="8pt" margin-left="0.2cm" font-family="ZapfDingbats">
+													&#x2750;
 													<fo:inline
 														font-size="8pt">
 														&#160;&#160;&#160;&#160;
@@ -119,8 +118,8 @@
 												</fo:block>
 											</fo:table-cell>
 											<fo:table-cell>
-												<fo:block font-size="8pt" margin-left="0.2cm">
-													&#x2610;
+												<fo:block font-size="8pt" margin-left="0.2cm" font-family="ZapfDingbats">
+													&#x2750;
 													<fo:inline
 														font-size="8pt">
 														&#160;&#160;&#160;&#160;
@@ -128,8 +127,9 @@
 															select="servico_saude_tipo_interempresas" />
 													</fo:inline>
 												</fo:block>
-												<fo:block font-size="8pt"
-														space-before="-19pt" margin-left="0.22cm">&#x2713;</fo:block>
+												<fo:block font-size="8pt" space-before="-19pt" margin-left="0.22cm" font-family="ZapfDingbats">
+													&#x2713;
+												</fo:block>
 											</fo:table-cell>
 											<fo:table-cell>
 												<fo:block font-size="8pt" margin-left="0.2cm">
@@ -137,8 +137,8 @@
 												</fo:block>
 											</fo:table-cell>
 											<fo:table-cell>
-												<fo:block font-size="8pt" margin-left="0.2cm">
-													&#x2610;
+												<fo:block font-size="8pt" margin-left="0.2cm" font-family="ZapfDingbats">
+													&#x2750;
 													<fo:inline
 														font-size="8pt">
 														&#160;&#160;&#160;&#160;
@@ -153,8 +153,8 @@
 												</fo:block>
 											</fo:table-cell>
 											<fo:table-cell>
-												<fo:block font-size="8pt" margin-left="0.2cm">
-													&#x2610;
+												<fo:block font-size="8pt" margin-left="0.2cm" font-family="ZapfDingbats">
+													&#x2750;
 													<fo:inline
 														font-size="8pt">
 														&#160;&#160;&#160;&#160;
@@ -196,8 +196,8 @@
 												</fo:block>
 											</fo:table-cell>
 											<fo:table-cell>
-												<fo:block font-size="8pt" margin-left="0.2cm">
-													&#x2610;
+												<fo:block font-size="8pt" margin-left="0.2cm" font-family="ZapfDingbats">
+													&#x2750;
 													<fo:inline
 														font-size="8pt">
 														&#160;&#160;&#160;&#160;
@@ -212,8 +212,8 @@
 												</fo:block>
 											</fo:table-cell>
 											<fo:table-cell>
-												<fo:block font-size="8pt" margin-left="0.2cm">
-													&#x2610;
+												<fo:block font-size="8pt" margin-left="0.2cm" font-family="ZapfDingbats">
+													&#x2750;
 													<fo:inline
 														font-size="8pt">
 														&#160;&#160;&#160;&#160;
@@ -221,8 +221,9 @@
 															select="servico_higiene_tipo_interempresas" />
 													</fo:inline>
 												</fo:block>
-												<fo:block font-size="8pt"
-														space-before="-19pt" margin-left="0.22cm">&#x2713;</fo:block>
+												<fo:block font-size="8pt" space-before="-19pt" margin-left="0.22cm" font-family="ZapfDingbats">
+													&#x2713;
+												</fo:block>
 											</fo:table-cell>
 											<fo:table-cell>
 												<fo:block font-size="8pt" margin-left="0.2cm">
@@ -230,8 +231,8 @@
 												</fo:block>
 											</fo:table-cell>
 											<fo:table-cell>
-												<fo:block font-size="8pt" margin-left="0.2cm">
-													&#x2610;
+												<fo:block font-size="8pt" margin-left="0.2cm" font-family="ZapfDingbats">
+													&#x2750;
 													<fo:inline
 														font-size="8pt">
 														&#160;&#160;&#160;&#160;
@@ -246,8 +247,8 @@
 												</fo:block>
 											</fo:table-cell>
 											<fo:table-cell>
-												<fo:block font-size="8pt" margin-left="0.2cm">
-													&#x2610;
+												<fo:block font-size="8pt" margin-left="0.2cm" font-family="ZapfDingbats">
+													&#x2750;
 													<fo:inline
 														font-size="8pt">
 														&#160;&#160;&#160;&#160;
@@ -450,69 +451,80 @@
 											TIPO
 										</fo:block>
 										<fo:block font-size="8pt"
-											space-before="0.1cm" margin-left="0.2cm">
+											space-before="0.1cm" margin-left="0.2cm">
+											<fo:inline font-family="ZapfDingbats">&#x2750;</fo:inline>
 											<xsl:value-of
 												select="tipo_admissao" />
-											&#x2610; ADMISS&#xc3;O
+											 ADMISS&#xc3;O
 										</fo:block>
 										<fo:block font-size="8pt"
-											space-before="0.1cm" margin-left="0.2cm">
+											space-before="0.1cm" margin-left="0.2cm">
+											<fo:inline font-family="ZapfDingbats">&#x2750;</fo:inline>
 											<xsl:value-of
 												select="tipo_periodico" />
-											&#x2610; PERI&#xd3;DICO
+											 PERI&#xd3;DICO
+										</fo:block>
+										<fo:block font-size="8pt" space-before="-10pt" margin-left="0.22cm" font-family="ZapfDingbats">
+											&#x2713;
 										</fo:block>
 										<fo:block font-size="8pt"
-														space-before="-10pt" margin-left="0.22cm">&#x2713;</fo:block>
-										<fo:block font-size="8pt"
-											space-before="0.1cm" margin-left="0.2cm">
+											space-before="0.1cm" margin-left="0.2cm">
+											<fo:inline font-family="ZapfDingbats">&#x2750;</fo:inline>
 											<xsl:value-of
 												select="tipo_ocasional" />
-											&#x2610; OCASIONAL
+											 OCASIONAL
 										</fo:block>
 										<fo:block font-size="8pt"
-											space-before="0.1cm" margin-left="1.2cm">
+											space-before="0.1cm" margin-left="1.2cm">
+											<fo:inline font-family="ZapfDingbats">&#x2750;</fo:inline>
 											<xsl:value-of
 												select="tipo_apos_doenca" />
-											&#x2610; AP&#xd3;S DOENCA
+											 AP&#xd3;S DOENCA
 										</fo:block>
 										<fo:block font-size="8pt"
-											space-before="0.1cm" margin-left="1.2cm">
+											space-before="0.1cm" margin-left="1.2cm">
+											<fo:inline font-family="ZapfDingbats">&#x2750;</fo:inline>
 											<xsl:value-of
 												select="tipo_apos_acidente" />
-											&#x2610; AP&#xd3;S ACIDENTE
+											 AP&#xd3;S ACIDENTE
 										</fo:block>
 										<fo:block font-size="8pt"
-											space-before="0.1cm" margin-left="1.2cm">
+											space-before="0.1cm" margin-left="1.2cm">
+											<fo:inline font-family="ZapfDingbats">&#x2750;</fo:inline>
 											<xsl:value-of
 												select="tipo_pedido_trabalhador" />
-											&#x2610; A PEDIDO DO TRABALHADOR
+											 A PEDIDO DO TRABALHADOR
 										</fo:block>
 										<fo:block font-size="8pt"
-											space-before="0.1cm" margin-left="1.2cm">
+											space-before="0.1cm" margin-left="1.2cm">
+											<fo:inline font-family="ZapfDingbats">&#x2750;</fo:inline>
 											<xsl:value-of
 												select="tipo_pedido_empresa" />
-											&#x2610; A PEDIDO DO SERVI&#xc7;O
+											 A PEDIDO DO SERVI&#xc7;O
 										</fo:block>
 										<fo:block font-size="8pt"
-											space-before="0.1cm" margin-left="1.2cm">
+											space-before="0.1cm" margin-left="1.2cm">
+											<fo:inline font-family="ZapfDingbats">&#x2750;</fo:inline>
 											<xsl:value-of
 												select="tipo_mudanca_funcao" />
-											&#x2610; POR MUDANCA DE
+											 POR MUDANCA DE
 											FUN&#xc7;&#xc3;O
 										</fo:block>
 										<fo:block font-size="8pt"
-											space-before="0.1cm" margin-left="1.2cm">
+											space-before="0.1cm" margin-left="1.2cm">
+											<fo:inline font-family="ZapfDingbats">&#x2750;</fo:inline>
 											<xsl:value-of
 												select="tipo_trabalho" />
-											&#x2610; POR ALTERA&#xc7;&#xc3;O DAS
+											 POR ALTERA&#xc7;&#xc3;O DAS
 											CONDI&#xc7;&#xd5;ES DE
 											TRABALHO
 										</fo:block>
 										<fo:block font-size="8pt"
-											space-before="0.1cm" margin-left="1.2cm">
+											space-before="0.1cm" margin-left="1.2cm">
+											<fo:inline font-family="ZapfDingbats">&#x2750;</fo:inline>
 											<xsl:value-of
 												select="tipo_outro" />
-											&#x2610; OUTRO
+											 OUTRO
 										</fo:block>
 										<fo:block font-size="8pt"
 											space-before="0.1cm" margin-left="0.2cm">
@@ -528,30 +540,35 @@
 											RESULTADO
 										</fo:block>
 										<fo:block font-size="8pt"
-											space-before="0.1cm" margin-left="0.2cm">
+											space-before="0.1cm" margin-left="0.2cm">
+											<fo:inline font-family="ZapfDingbats">&#x2750;</fo:inline>
 											<xsl:value-of
 												select="resultado_apto" />
-											&#x2610; APTO
+											 APTO
 										</fo:block>
 										<fo:block font-size="8pt"
-											space-before="0.1cm" margin-left="0.2cm">
+											space-before="0.1cm" margin-left="0.2cm">
+											<fo:inline font-family="ZapfDingbats">&#x2750;</fo:inline>
 											<xsl:value-of
 												select="resultado_apto_condicionalmente" />
-											&#x2610; APTO CONDICIONALMENTE
+											 APTO CONDICIONALMENTE
+										</fo:block>
+										<fo:block font-size="8pt" margin-left="0.22cm" space-before="-9pt" font-family="ZapfDingbats">
+											&#x2713;
 										</fo:block>
 										<fo:block font-size="8pt"
-														space-before="-9pt" margin-left="0.22cm">&#x2713;</fo:block>
-										<fo:block font-size="8pt"
-											space-before="0.1cm" margin-left="0.2cm">
+											space-before="0.1cm" margin-left="0.2cm">
+											<fo:inline font-family="ZapfDingbats">&#x2750;</fo:inline>
 											<xsl:value-of
 												select="resultado_inapto_temp" />
-											&#x2610; INAPTO TEMPORARIAMENTE
+											 INAPTO TEMPORARIAMENTE
 										</fo:block>
 										<fo:block font-size="8pt"
-											space-before="0.1cm" margin-left="0.2cm">
+											space-before="0.1cm" margin-left="0.2cm">
+											<fo:inline font-family="ZapfDingbats">&#x2750;</fo:inline>
 											<xsl:value-of
 												select="resultado_inapto_def" />
-											&#x2610; INAPTO DEFINITIVAMENTE
+											 INAPTO DEFINITIVAMENTE
 										</fo:block>
 										<fo:block font-size="8pt"
 											space-before="0.1cm" margin-left="0.2cm">
diff --git a/trunk/SIPRPSoft/src/siprp/ficha/out.txt b/trunk/SIPRPSoft/src/siprp/ficha/out.txt
index b44fa85f..f853af5a 100644
--- a/trunk/SIPRPSoft/src/siprp/ficha/out.txt
+++ b/trunk/SIPRPSoft/src/siprp/ficha/out.txt
@@ -1,4 +1,5 @@
 C:\Documents and Settings\Frederico\workspace\SIPRP\SIPRPSoft\src\siprp\ficha\ficha_aptidao_teste.xml
+/home/fpalma/projectos2/SIPRP/SIPRPSoft/src/siprp/ficha/ficha_aptidao_teste.xml
 
 &#x2610;
 &#x2713;