lxbfYeaa9897955
/
SIPRP
forked from Coded/SIPRP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source 
git-svn-id: https://svn.coded.pt/svn/SIPRP@386 bb69d46d-e84e-40c8-a05a-06db0d633741
Luis Flores 19 years ago
parent d5691057fb
commit 7d049c2c9a
3 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File

2
trunk/siprp/ficha/FichaAptidaoCreator.java
Unescape View File

@ -96,7 +96,7 @@ public class FichaAptidaoCreator implements FichaAptidaoConstants
return out.toByteArray(); return out.toByteArray();
} }
public byte[] createPDF( String fo ) public byte[] createPDF( byte[] fo )
{ {
return null; return null;
} }

30
trunk/siprp/ficha/FichaWindow.java
Unescape View File

@ -194,7 +194,7 @@ public class FichaWindow extends TabbedWindow
} }
}); });
StringBuffer msg = new StringBuffer(); StringBuilder msg = new StringBuilder();
MedicoData medico; MedicoData medico;
try try
{ {
@ -259,8 +259,9 @@ public class FichaWindow extends TabbedWindow
exame.set( ExameData.TRABALHADOR, trabalhador ); exame.set( ExameData.TRABALHADOR, trabalhador );
try try
{ {
byte fo[] = createFO( exame );
exame.set( FichaDataProvider.PDF, createPDF( exame ) ); exame.set( ExameData.FO, fo );
exame.set( FichaDataProvider.PDF, createPDF( fo ) );
// empresa.save(); // empresa.save();
// estabelecimento.save(); // estabelecimento.save();
@ -502,8 +503,23 @@ public class FichaWindow extends TabbedWindow
} }
} }
public byte[] createPDF( ExameData exame ) public byte[] createFO( ExameData exame )
throws Exception
{
HashMap<String, String> ht = createMapFromExame(exame);
// ExamePDF ePDF = new ExamePDF();
// return ePDF.createPDF( ht );
return FichaAptidaoCreator.getCreator().createFO( ht );
}
public byte[] createPDF( byte fo[] )
throws Exception throws Exception
{
return FichaAptidaoCreator.getCreator().createPDF( fo );
}
private HashMap<String, String> createMapFromExame(final ExameData exame)
{ {
MedicoData medico = (MedicoData)exame.get( ExameData.MEDICO ); MedicoData medico = (MedicoData)exame.get( ExameData.MEDICO );
TrabalhadorData trabalhador = (TrabalhadorData) exame.get( ExameData.TRABALHADOR ); TrabalhadorData trabalhador = (TrabalhadorData) exame.get( ExameData.TRABALHADOR );
@ -679,11 +695,7 @@ public class FichaWindow extends TabbedWindow
ht.put( MEDICOS_NOME, aux != null ? aux : "" ); ht.put( MEDICOS_NOME, aux != null ? aux : "" );
aux = (String)medico.get( MedicoData.NUMERO_CEDULA ); aux = (String)medico.get( MedicoData.NUMERO_CEDULA );
ht.put( NUMERO_CEDULA, aux != null ? aux : "" ); ht.put( NUMERO_CEDULA, aux != null ? aux : "" );
// ExamePDF ePDF = new ExamePDF(); return ht;
// return ePDF.createPDF( ht );
return FichaAptidaoCreator.getCreator().createFO( ht );
} }
private void excel() private void excel()

34
trunk/siprp/ficha/ficha_aptidao.xsl
Unescape View File

@ -21,8 +21,8 @@
<fo:block text-align="center" font-size="7pt" font-weight="bold"> <fo:block text-align="center" font-size="7pt" font-weight="bold">
(<xsl:value-of select="portaria"/>) (<xsl:value-of select="portaria"/>)
</fo:block> </fo:block>
<fo:table table-layout="fixed" width="100%" border-color="black" border-style="solid" border-width="medium"> <fo:table table-layout="fixed" width="proportional-column-width(100)" border-color="black" border-style="solid" border-width="medium">
<fo:table-column column-width="100%" /> <fo:table-column column-width="proportional-column-width(100)" />
<fo:table-body> <fo:table-body>
<fo:table-row border-bottom-color="black" border-bottom-style="solid" border-bottom-width="thick"> <fo:table-row border-bottom-color="black" border-bottom-style="solid" border-bottom-width="thick">
@ -63,9 +63,9 @@ DESIGNA&#xc7;&#xc3;O: <xsl:value-of select="servico_higiene_designacao"/>
</fo:table-row> </fo:table-row>
</fo:table-body> </fo:table-body>
</fo:table> </fo:table>
<fo:table table-layout="fixed" width="100%" space-before="5mm"> <fo:table table-layout="fixed" width="proportional-column-width(100)" space-before="5mm">
<fo:table-column column-width="50%" /> <fo:table-column column-width="proportional-column-width(50)" />
<fo:table-column column-width="50%" /> <fo:table-column column-width="proportional-column-width(50)" />
<fo:table-body> <fo:table-body>
<fo:table-row> <fo:table-row>
<fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="2"> <fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="2">
@ -111,9 +111,9 @@ FUNCAO PROPOSTA: <xsl:value-of select="funcao_proposta"/>
</fo:table-row> </fo:table-row>
</fo:table-body> </fo:table-body>
</fo:table> </fo:table>
<fo:table table-layout="fixed" width="100%" space-before="5mm"> <fo:table table-layout="fixed" width="proportional-column-width(100)" space-before="5mm">
<fo:table-column column-width="50%" /> <fo:table-column column-width="proportional-column-width(50)" />
<fo:table-column column-width="50%" /> <fo:table-column column-width="proportional-column-width(50)" />
<fo:table-body> <fo:table-body>
<fo:table-row> <fo:table-row>
<fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="2"> <fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="2">
@ -131,9 +131,9 @@ FUNCAO PROPOSTA: <xsl:value-of select="funcao_proposta"/>
</fo:table-body> </fo:table-body>
</fo:table> </fo:table>
<fo:table table-layout="fixed" width="100%" space-before="5mm"> <fo:table table-layout="fixed" width="proportional-column-width(100)" space-before="5mm">
<fo:table-column column-width="50%" /> <fo:table-column column-width="proportional-column-width(50)" />
<fo:table-column column-width="50%" /> <fo:table-column column-width="proportional-column-width(50)" />
<fo:table-body> <fo:table-body>
<fo:table-row> <fo:table-row>
<fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="2"> <fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="2">
@ -225,9 +225,9 @@ OUTRAS FUN&#xc7;&#xd5;ES QUE PODE DESEMPENHAR
</fo:table-row> </fo:table-row>
</fo:table-body> </fo:table-body>
</fo:table> </fo:table>
<fo:table table-layout="fixed" width="100%" space-before="5mm"> <fo:table table-layout="fixed" width="proportional-column-width(100)" space-before="5mm">
<fo:table-column column-width="50%" /> <fo:table-column column-width="proportional-column-width(50)" />
<fo:table-column column-width="50%" /> <fo:table-column column-width="proportional-column-width(50)" />
<fo:table-body> <fo:table-body>
<fo:table-row> <fo:table-row>
<fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="2"> <fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="2">
@ -248,9 +248,9 @@ PR&#xd3;XIMO EXAME: <xsl:value-of select="proximo_exame"/>
</fo:table-row> </fo:table-row>
</fo:table-body> </fo:table-body>
</fo:table> </fo:table>
<fo:table table-layout="fixed" width="100%" space-before="5mm"> <fo:table table-layout="fixed" width="proportional-column-width(100)" space-before="5mm">
<fo:table-column column-width="50%" /> <fo:table-column column-width="proportional-column-width(50)" />
<fo:table-column column-width="50%" /> <fo:table-column column-width="proportional-column-width(50)" />
<fo:table-body> <fo:table-body>
<fo:table-row> <fo:table-row>
<fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="2"> <fo:table-cell border-color="black" border-style="solid" border-width="medium" number-columns-spanned="2">

Write Preview
Loading…
Cancel
Save