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

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

Browse Source
0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Frederico Palma 16 years ago
parent 3256ff50eb
commit 7101dd870d
10 changed files with 432 additions and 173 deletions
Show Stats Download Patch File Download Diff File

4
trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
Unescape View File

@ -89,8 +89,8 @@ public class SIPRPDataLoader implements CompanyDataLoader
// Singleton.setInstance( SingletonConstants.LOCAL_USER, "siprp" ); // Singleton.setInstance( SingletonConstants.LOCAL_USER, "siprp" );
// Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "rg2h-opksiprp" ); // Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "rg2h-opksiprp" );
// Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); // Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
// Singleton.setInstance( SingletonConstants.LOCAL_URL, "www.evolute.pt:5432" ); // Singleton.setInstance( SingletonConstants.LOCAL_URL, "www.evolute.pt:5436" );
// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" ); // Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local_3" );
// Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); // Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" );
Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );

41
trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioPrintDataProvider.java
Unescape View File

@ -142,6 +142,7 @@ public class RelatorioPrintDataProvider
dataProximaVisita != null ? new DataToPrint( "data-proxima-hs", dataProximaVisita ) : null, dataProximaVisita != null ? new DataToPrint( "data-proxima-hs", dataProximaVisita ) : null,
textoFuncionarios, textoFuncionarios,
getTecnicoHS( id ), getTecnicoHS( id ),
getTecnicoSuperiorHS( id ),
getLegislacaoAplicavel( id ), getLegislacaoAplicavel( id ),
getNormalizacaoAplicavel( id ), getNormalizacaoAplicavel( id ),
getEquipamento( id ), getEquipamento( id ),
@ -228,7 +229,45 @@ public class RelatorioPrintDataProvider
String cap = ( String ) array.get( 0, 2 ); String cap = ( String ) array.get( 0, 2 );
String formacao = ( String ) array.get( 0, 3 ); String formacao = ( String ) array.get( 0, 3 );
Integer assinatura = ( Integer ) array.get( 0, 4 ); Integer assinatura = ( Integer ) array.get( 0, 4 );
return new TecnicoHSToPrint( id, nome, cap, formacao, "http://www.evolute.pt:13080/SIPRPImages/image?id=" + assinatura ); return new TecnicoHSToPrint( id, nome, cap, formacao, "http://www.evolute.pt:13080/SIPRPImages/image?id=" + assinatura, false );
}
}
public TecnicoHSToPrint getTecnicoSuperiorHS( Integer relatorioId )
throws Exception
{
Select select =
new Select2(
new String[]{ "hs_relatorio", "marcacoes_estabelecimento", "marcacoes_tecnicos_hst" },
new Integer[]{ Select2.JOIN_INNER, Select2.JOIN_INNER },
new Expression[]{
new Field( "hs_relatorio.marcacao_id" ).isEqual( new Field( "marcacoes_estabelecimento.id" ) ),
new Field( "marcacoes_estabelecimento.tecnico_superior_hst" ).isEqual( new Field( "marcacoes_tecnicos_hst.id" ) ),
},
new String[]{
"marcacoes_tecnicos_hst.id",
"marcacoes_tecnicos_hst.nome",
"marcacoes_tecnicos_hst.cap",
"marcacoes_tecnicos_hst.formacao",
"marcacoes_tecnicos_hst.assinatura",},
new Field( "hs_relatorio.id" ).isEqual( relatorioId ),
null,
null,
null,
null );
Virtual2DArray array = EXECUTER.executeQuery( select );
if( array.columnLength() == 0 )
{
return null;
}
else
{
Integer id = ( Integer ) array.get( 0, 0 );
String nome = ( String ) array.get( 0, 1 );
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, "http://www.evolute.pt:13080/SIPRPImages/image?id=" + assinatura, true );
} }
} }

7
trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioToPrint.java
Unescape View File

@ -16,6 +16,7 @@ public class RelatorioToPrint
protected DataToPrint dataProximaHs; protected DataToPrint dataProximaHs;
protected String textoFuncionarios; protected String textoFuncionarios;
protected TecnicoHSToPrint tecnicoHS; protected TecnicoHSToPrint tecnicoHS;
protected TecnicoHSToPrint tecnicoSuperiorHS;
protected LegislacaoAplicavelToPrint legislacaoAplicavel; protected LegislacaoAplicavelToPrint legislacaoAplicavel;
protected NormalizacaoToPrint normalizacaoAplicavel; protected NormalizacaoToPrint normalizacaoAplicavel;
protected EquipamentosToPrint equipamentos; protected EquipamentosToPrint equipamentos;
@ -28,6 +29,7 @@ public class RelatorioToPrint
DataToPrint dataProximaHs, DataToPrint dataProximaHs,
String textoFuncionarios, String textoFuncionarios,
TecnicoHSToPrint tecnicoHS, TecnicoHSToPrint tecnicoHS,
TecnicoHSToPrint tecnicoSuperiorHS,
LegislacaoAplicavelToPrint legislacaoAplicavel, LegislacaoAplicavelToPrint legislacaoAplicavel,
NormalizacaoToPrint normalizacaoAplicavel, NormalizacaoToPrint normalizacaoAplicavel,
EquipamentosToPrint equipamentos, EquipamentosToPrint equipamentos,
@ -41,6 +43,7 @@ public class RelatorioToPrint
this.dataProximaHs = dataProximaHs; this.dataProximaHs = dataProximaHs;
this.textoFuncionarios = textoFuncionarios; this.textoFuncionarios = textoFuncionarios;
this.tecnicoHS = tecnicoHS; this.tecnicoHS = tecnicoHS;
this.tecnicoSuperiorHS = tecnicoSuperiorHS;
this.legislacaoAplicavel = legislacaoAplicavel; this.legislacaoAplicavel = legislacaoAplicavel;
this.normalizacaoAplicavel = normalizacaoAplicavel; this.normalizacaoAplicavel = normalizacaoAplicavel;
this.equipamentos = equipamentos; this.equipamentos = equipamentos;
@ -74,6 +77,10 @@ public class RelatorioToPrint
{ {
relatorioElement.addContent( tecnicoHS.toJdomElement() ); relatorioElement.addContent( tecnicoHS.toJdomElement() );
} }
if( tecnicoSuperiorHS != null )
{
relatorioElement.addContent( tecnicoSuperiorHS.toJdomElement() );
}
relatorioElement.addContent( legislacaoAplicavel.toJdomElement() ); relatorioElement.addContent( legislacaoAplicavel.toJdomElement() );
relatorioElement.addContent( normalizacaoAplicavel.toJdomElement() ); relatorioElement.addContent( normalizacaoAplicavel.toJdomElement() );
relatorioElement.addContent( equipamentos.toJdomElement() ); relatorioElement.addContent( equipamentos.toJdomElement() );

6
trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/TecnicoHSToPrint.java
Unescape View File

@ -10,9 +10,10 @@ public class TecnicoHSToPrint
protected String cap; protected String cap;
protected String formacao; protected String formacao;
protected String assinatura; protected String assinatura;
protected boolean superior;
public TecnicoHSToPrint( Integer id, String nome, String cap, public TecnicoHSToPrint( Integer id, String nome, String cap,
String formacao, String assinatura ) String formacao, String assinatura, boolean superior )
{ {
super(); super();
this.id = id; this.id = id;
@ -20,12 +21,13 @@ public class TecnicoHSToPrint
this.cap = cap; this.cap = cap;
this.formacao = formacao; this.formacao = formacao;
this.assinatura = assinatura; this.assinatura = assinatura;
this.superior = superior;
} }
@Override @Override
public Element toJdomElement() throws Exception public Element toJdomElement() throws Exception
{ {
Element tecnicoHSElement = new Element( "tecnico-hs" ); Element tecnicoHSElement = new Element( "tecnico" + ( superior ? "-superior" : "" ) + "-hs" );
Element nomeElement = new Element( "nome" ); Element nomeElement = new Element( "nome" );
nomeElement.setText( nome ); nomeElement.setText( nome );
tecnicoHSElement.addContent( nomeElement ); tecnicoHSElement.addContent( nomeElement );

174
trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/relatorio.xsl
Unescape View File

@ -2200,78 +2200,114 @@
line-height="130%"> line-height="130%">
   
</fo:block> </fo:block>
<fo:table table-layout="fixed" width="2.825in"
space-before="40pt">
<fo:table-column column-width="2.825in" />
<fo:table-body>
<fo:table-row>
<fo:table-cell>
<fo:block font-family="Helvetica"
font-size="12pt" text-align="center">
<xsl:if
test="tecnico-hs/assinatura">
<xsl:variable
name="assinatura" select="tecnico-hs/assinatura" />
<fo:external-graphic
src="url('{$assinatura}')" />
</xsl:if>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell padding-bottom="0in"
padding-left="0.075in" border-left="none" border-bottom="none"
padding-top="0in" border-top="0.0069in solid #000000"
display-align="before" writing-mode="lr-tb"
padding-right="0.075in" border-right="none">
<fo:block font-family="Helvetica"
font-size="12pt" font-weight="bold" margin-right="0in"
text-indent="0.2134in" text-align="center"
margin-left="-0.2134in">
 
</fo:block>
<fo:block font-family="Helvetica"
font-size="12pt" font-weight="bold" margin-right="0in"
text-indent="0.2134in" text-align="center"
margin-left="-0.2134in">
<xsl:value-of
select="tecnico-hs/nome" />
</fo:block>
<fo:block font-family="Helvetica"
font-size="12pt" margin-right="-0.0937in" text-indent="0in"
text-align="center" margin-left="0in">
Técnico de Higiene e Segurança
 
</fo:block>
<fo:block font-family="Helvetica"
font-size="12pt" margin-right="-0.0937in" text-indent="0in"
text-align="center" margin-left="0in">
CAP nº
<xsl:value-of
select="tecnico-hs/cap" />
</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
<fo:block font-family="Helvetica" font-size="12pt"
text-align="justify">
 
</fo:block>
<fo:block font-family="Helvetica" font-size="12pt" <fo:block font-family="Helvetica" font-size="12pt"
line-height="130%"> line-height="130%">
   Realizado por:
</fo:block>
<fo:block font-family="Helvetica" font-size="12pt"
font-weight="bold" margin-right="0in" text-indent="0.2134in"
margin-left="-0.2134in">
 
</fo:block>
<fo:block font-family="Helvetica"
font-size="12pt">
 
</fo:block> </fo:block>
<xsl:if test="tecnico-hs">
<fo:table table-layout="fixed" width="4in"
space-before="40pt">
<fo:table-column column-width="4in" />
<fo:table-body>
<fo:table-row>
<fo:table-cell>
<fo:block font-family="Helvetica" font-size="12pt"
text-align="center">
<xsl:if test="tecnico-hs/assinatura">
<xsl:variable name="assinatura" select="tecnico-hs/assinatura" />
<fo:external-graphic src="url('{$assinatura}')" />
</xsl:if>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell padding-bottom="0in" padding-left="0.075in"
border-left="none" border-bottom="none" padding-top="0in"
border-top="0.0069in solid #000000" display-align="before"
writing-mode="lr-tb" padding-right="0.075in" border-right="none">
<fo:block font-family="Helvetica" font-size="12pt"
font-weight="bold" margin-right="0in" text-indent="0.2134in"
text-align="center" margin-left="-0.2134in">
 
</fo:block>
<fo:block font-family="Helvetica" font-size="12pt"
font-weight="bold" margin-right="0in" text-indent="0.2134in"
text-align="center" margin-left="-0.2134in">
<xsl:value-of select="tecnico-hs/nome" />
</fo:block>
<fo:block font-family="Helvetica" font-size="12pt"
margin-right="-0.0937in" text-indent="0in" text-align="center"
margin-left="0in">
Técnico de Higiene e Segurança
 
</fo:block>
<fo:block font-family="Helvetica" font-size="12pt"
margin-right="-0.0937in" text-indent="0in" text-align="center"
margin-left="0in">
CAP nº
<xsl:value-of select="tecnico-hs/cap" />
</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
</xsl:if>
<xsl:if test="tecnico-superior-hs">
<xsl:if test="tecnico-hs">
<fo:block font-family="Helvetica" font-size="12pt"
line-height="130%" space-before="20pt" >
 Verificado por:
</fo:block>
</xsl:if>
<fo:table table-layout="fixed" width="4in"
space-before="40pt">
<fo:table-column column-width="4in" />
<fo:table-body>
<fo:table-row>
<fo:table-cell>
<fo:block font-family="Helvetica" font-size="12pt"
text-align="center">
<xsl:if test="tecnico-superior-hs/assinatura">
<xsl:variable name="assinatura" select="tecnico-superior-hs/assinatura" />
<fo:external-graphic src="url('{$assinatura}')" />
</xsl:if>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell padding-bottom="0in" padding-left="0.075in"
border-left="none" border-bottom="none" padding-top="0in"
border-top="0.0069in solid #000000" display-align="before"
writing-mode="lr-tb" padding-right="0.075in" border-right="none">
<fo:block font-family="Helvetica" font-size="12pt"
font-weight="bold" margin-right="0in" text-indent="0.2134in"
text-align="center" margin-left="-0.2134in">
 
</fo:block>
<fo:block font-family="Helvetica" font-size="12pt"
font-weight="bold" margin-right="0in" text-indent="0.2134in"
text-align="center" margin-left="-0.2134in">
<xsl:value-of select="tecnico-superior-hs/nome" />
</fo:block>
<fo:block font-family="Helvetica" font-size="12pt"
margin-right="-0.0937in" text-indent="0in" text-align="center"
margin-left="0in">
Técnico Superior de Higiene e Segurança
 
</fo:block>
<fo:block font-family="Helvetica" font-size="12pt"
margin-right="-0.0937in" text-indent="0in" text-align="center"
margin-left="0in">
CAP nº
<xsl:value-of select="tecnico-superior-hs/cap" />
</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
</xsl:if>
<fo:block font-family="Helvetica" <fo:block font-family="Helvetica"
id="evolute_endofdoc" /> id="evolute_endofdoc" />
</fo:flow> </fo:flow>

49
trunk/SIPRPSoft/src/siprp/planoactuacao/print/PlanoActuacaoPrintDataProvider.java
Unescape View File

@ -163,7 +163,8 @@ public class PlanoActuacaoPrintDataProvider
getAreasToPrintByPlanoId( id, validacaoDl, validacaoDns ), getAreasToPrintByPlanoId( id, validacaoDl, validacaoDns ),
observacoesDl, observacoesDl,
observacoesDns, observacoesDns,
getTecnicoHS( id ) ); getTecnicoHS( id ),
getTecnicoSuperiorHS( id ) );
return plano; return plano;
} }
@ -748,6 +749,50 @@ public class PlanoActuacaoPrintDataProvider
null, null,
null ); null );
Virtual2DArray array = LOCAL_EXECUTER.executeQuery( select ); Virtual2DArray array = LOCAL_EXECUTER.executeQuery( select );
if( array.columnLength() == 0 )
{
return null;
}
else
{
Integer id = ( Integer ) array.get( 0, 0 );
String nome = ( String ) array.get( 0, 1 );
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, "http://www.evolute.pt:13080/SIPRPImages/image?id=" + assinatura, false );
}
}
public TecnicoHSToPrint getTecnicoSuperiorHS( Integer relatorioId )
throws Exception
{
if( web )
{
relatorioId = getRelatorioIdForPlanoId( relatorioId );
}
Select select =
new Select2(
new String[]{ "hs_relatorio", "marcacoes_estabelecimento", "marcacoes_tecnicos_hst" },
new Integer[]{ Select2.JOIN_INNER, Select2.JOIN_INNER },
new Expression[]{
new Field( "hs_relatorio.marcacao_id" ).isEqual( new Field( "marcacoes_estabelecimento.id" ) ),
new Field( "marcacoes_estabelecimento.tecnico_superior_hst" ).isEqual( new Field( "marcacoes_tecnicos_hst.id" ) ),
},
new String[]{
"marcacoes_tecnicos_hst.id",
"marcacoes_tecnicos_hst.nome",
"marcacoes_tecnicos_hst.cap",
"marcacoes_tecnicos_hst.formacao",
"marcacoes_tecnicos_hst.assinatura",},
new Field( "hs_relatorio.id" ).isEqual( relatorioId ),
null,
null,
null,
null );
Virtual2DArray array = LOCAL_EXECUTER.executeQuery( select );
if( array.columnLength() == 0 ) if( array.columnLength() == 0 )
{ {
return null; return null;
@ -759,7 +804,7 @@ public class PlanoActuacaoPrintDataProvider
String cap = ( String ) array.get( 0, 2 ); String cap = ( String ) array.get( 0, 2 );
String formacao = ( String ) array.get( 0, 3 ); String formacao = ( String ) array.get( 0, 3 );
Integer assinatura = ( Integer ) array.get( 0, 4 ); Integer assinatura = ( Integer ) array.get( 0, 4 );
return new TecnicoHSToPrint( id, nome, cap, formacao, "http://www.evolute.pt:13080/SIPRPImages/image?id=" + assinatura ); return new TecnicoHSToPrint( id, nome, cap, formacao, "http://www.evolute.pt:13080/SIPRPImages/image?id=" + assinatura, true );
} }
} }
} }

16
trunk/SIPRPSoft/src/siprp/planoactuacao/print/PlanoActuacaoToPrint.java
Unescape View File

@ -15,11 +15,12 @@ public class PlanoActuacaoToPrint
protected String observacoesDl; protected String observacoesDl;
protected String observacoesDns; protected String observacoesDns;
protected TecnicoHSToPrint tecnico; protected TecnicoHSToPrint tecnico;
protected TecnicoHSToPrint tecnicoSuperior;
public PlanoActuacaoToPrint( EmpresaToPrint empresa, DataToPrint dataRelatorio, public PlanoActuacaoToPrint( EmpresaToPrint empresa, DataToPrint dataRelatorio,
DataToPrint dataHs, LegislacaoAplicavelToPrint legislacaoAplicavel, DataToPrint dataHs, LegislacaoAplicavelToPrint legislacaoAplicavel,
Vector<AreaToPrint> areas, String observacoesDl, String observacoesDns, Vector<AreaToPrint> areas, String observacoesDl, String observacoesDns,
TecnicoHSToPrint tecnico ) TecnicoHSToPrint tecnico, TecnicoHSToPrint tecnicoSuperior )
{ {
super(); super();
this.empresa = empresa; this.empresa = empresa;
@ -30,6 +31,7 @@ public class PlanoActuacaoToPrint
this.observacoesDl = observacoesDl; this.observacoesDl = observacoesDl;
this.observacoesDns = observacoesDns; this.observacoesDns = observacoesDns;
this.tecnico = tecnico; this.tecnico = tecnico;
this.tecnicoSuperior = tecnicoSuperior;
} }
public EmpresaToPrint getEmpresa() public EmpresaToPrint getEmpresa()
@ -115,6 +117,10 @@ public class PlanoActuacaoToPrint
{ {
planoElement.addContent( tecnico.toJdomElement() ); planoElement.addContent( tecnico.toJdomElement() );
} }
if( tecnicoSuperior != null )
{
planoElement.addContent( tecnicoSuperior.toJdomElement() );
}
return planoElement; return planoElement;
} }
@ -148,4 +154,12 @@ public class PlanoActuacaoToPrint
this.tecnico = tecnico; this.tecnico = tecnico;
} }
public TecnicoHSToPrint getTecnicoSuperior() {
return tecnicoSuperior;
}
public void setTecnicoSuperior(TecnicoHSToPrint tecnicoSuperior) {
this.tecnicoSuperior = tecnicoSuperior;
}
} }

6
trunk/SIPRPSoft/src/siprp/planoactuacao/print/TecnicoHSToPrint.java
Unescape View File

@ -10,9 +10,10 @@ public class TecnicoHSToPrint
protected String cap; protected String cap;
protected String formacao; protected String formacao;
protected String assinatura; protected String assinatura;
protected boolean superior;
public TecnicoHSToPrint( Integer id, String nome, String cap, public TecnicoHSToPrint( Integer id, String nome, String cap,
String formacao, String assinatura ) String formacao, String assinatura, boolean superior )
{ {
super(); super();
this.id = id; this.id = id;
@ -20,12 +21,13 @@ public class TecnicoHSToPrint
this.cap = cap; this.cap = cap;
this.formacao = formacao; this.formacao = formacao;
this.assinatura = assinatura; this.assinatura = assinatura;
this.superior = superior;
} }
@Override @Override
public Element toJdomElement() throws Exception public Element toJdomElement() throws Exception
{ {
Element tecnicoHSElement = new Element( "tecnico-hs" ); Element tecnicoHSElement = new Element( "tecnico" + ( superior ? "-superior" : "" ) + "-hs" );
Element nomeElement = new Element( "nome" ); Element nomeElement = new Element( "nome" );
nomeElement.setText( nome ); nomeElement.setText( nome );
tecnicoHSElement.addContent( nomeElement ); tecnicoHSElement.addContent( nomeElement );

151
trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao.xsl
Unescape View File

@ -1384,53 +1384,110 @@
line-height="130%"> line-height="130%">
 Realizado por:  Realizado por:
</fo:block> </fo:block>
<fo:table table-layout="fixed" width="2.825in" <xsl:if test="tecnico-hs">
space-before="40pt"> <fo:table table-layout="fixed" width="4in"
<fo:table-column column-width="2.825in" /> space-before="40pt">
<fo:table-body> <fo:table-column column-width="4in" />
<fo:table-row> <fo:table-body>
<fo:table-cell> <fo:table-row>
<fo:block font-family="Helvetica" font-size="12pt" <fo:table-cell>
text-align="center"> <fo:block font-family="Helvetica" font-size="12pt"
<xsl:if test="tecnico-hs/assinatura"> text-align="center">
<xsl:variable name="assinatura" select="tecnico-hs/assinatura" /> <xsl:if test="tecnico-hs/assinatura">
<fo:external-graphic src="url('{$assinatura}')" /> <xsl:variable name="assinatura" select="tecnico-hs/assinatura" />
</xsl:if> <fo:external-graphic src="url('{$assinatura}')" />
</fo:block> </xsl:if>
</fo:table-cell> </fo:block>
</fo:table-row> </fo:table-cell>
<fo:table-row> </fo:table-row>
<fo:table-cell padding-bottom="0in" padding-left="0.075in" <fo:table-row>
border-left="none" border-bottom="none" padding-top="0in" <fo:table-cell padding-bottom="0in" padding-left="0.075in"
border-top="0.0069in solid #000000" display-align="before" border-left="none" border-bottom="none" padding-top="0in"
writing-mode="lr-tb" padding-right="0.075in" border-right="none"> border-top="0.0069in solid #000000" display-align="before"
<fo:block font-family="Helvetica" font-size="12pt" writing-mode="lr-tb" padding-right="0.075in" border-right="none">
font-weight="bold" margin-right="0in" text-indent="0.2134in" <fo:block font-family="Helvetica" font-size="12pt"
text-align="center" margin-left="-0.2134in"> font-weight="bold" margin-right="0in" text-indent="0.2134in"
  text-align="center" margin-left="-0.2134in">
</fo:block>  
<fo:block font-family="Helvetica" font-size="12pt" </fo:block>
font-weight="bold" margin-right="0in" text-indent="0.2134in" <fo:block font-family="Helvetica" font-size="12pt"
text-align="center" margin-left="-0.2134in"> font-weight="bold" margin-right="0in" text-indent="0.2134in"
<xsl:value-of select="tecnico-hs/nome" /> text-align="center" margin-left="-0.2134in">
</fo:block> <xsl:value-of select="tecnico-hs/nome" />
<fo:block font-family="Helvetica" font-size="12pt" </fo:block>
margin-right="-0.0937in" text-indent="0in" text-align="center" <fo:block font-family="Helvetica" font-size="12pt"
margin-left="0in"> margin-right="-0.0937in" text-indent="0in" text-align="center"
Técnico de Higiene e Segurança margin-left="0in">
  Técnico de Higiene e Segurança
</fo:block>  
<fo:block font-family="Helvetica" font-size="12pt" </fo:block>
margin-right="-0.0937in" text-indent="0in" text-align="center" <fo:block font-family="Helvetica" font-size="12pt"
margin-left="0in"> margin-right="-0.0937in" text-indent="0in" text-align="center"
CAP nº margin-left="0in">
<xsl:value-of select="tecnico-hs/cap" /> CAP nº
<xsl:value-of select="tecnico-hs/cap" />
</fo:block>
</fo:table-cell> </fo:block>
</fo:table-row> </fo:table-cell>
</fo:table-body> </fo:table-row>
</fo:table> </fo:table-body>
</fo:table>
</xsl:if>
<xsl:if test="tecnico-superior-hs">
<xsl:if test="tecnico-hs">
<fo:block font-family="Helvetica" font-size="12pt"
line-height="130%" space-before="20pt" >
 Verificado por:
</fo:block>
</xsl:if>
<fo:table table-layout="fixed" width="4in"
space-before="40pt">
<fo:table-column column-width="4in" />
<fo:table-body>
<fo:table-row>
<fo:table-cell>
<fo:block font-family="Helvetica" font-size="12pt"
text-align="center">
<xsl:if test="tecnico-superior-hs/assinatura">
<xsl:variable name="assinatura" select="tecnico-superior-hs/assinatura" />
<fo:external-graphic src="url('{$assinatura}')" />
</xsl:if>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell padding-bottom="0in" padding-left="0.075in"
border-left="none" border-bottom="none" padding-top="0in"
border-top="0.0069in solid #000000" display-align="before"
writing-mode="lr-tb" padding-right="0.075in" border-right="none">
<fo:block font-family="Helvetica" font-size="12pt"
font-weight="bold" margin-right="0in" text-indent="0.2134in"
text-align="center" margin-left="-0.2134in">
 
</fo:block>
<fo:block font-family="Helvetica" font-size="12pt"
font-weight="bold" margin-right="0in" text-indent="0.2134in"
text-align="center" margin-left="-0.2134in">
<xsl:value-of select="tecnico-superior-hs/nome" />
</fo:block>
<fo:block font-family="Helvetica" font-size="12pt"
margin-right="-0.0937in" text-indent="0in" text-align="center"
margin-left="0in">
Técnico Superior de Higiene e Segurança
 
</fo:block>
<fo:block font-family="Helvetica" font-size="12pt"
margin-right="-0.0937in" text-indent="0in" text-align="center"
margin-left="0in">
CAP nº
<xsl:value-of select="tecnico-superior-hs/cap" />
</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
</xsl:if>
<fo:block font-family="Helvetica" id="evolute_endofdoc" /> <fo:block font-family="Helvetica" id="evolute_endofdoc" />
</fo:flow> </fo:flow>
</fo:page-sequence> </fo:page-sequence>

151
trunk/SIPRPSoft/src/siprp/planoactuacao/print/plano_actuacao_alargado.xsl
Unescape View File

@ -1237,53 +1237,110 @@
line-height="130%"> line-height="130%">
 Realizado por:  Realizado por:
</fo:block> </fo:block>
<fo:table table-layout="fixed" width="2.825in" <xsl:if test="tecnico-hs">
space-before="40pt"> <fo:table table-layout="fixed" width="4in"
<fo:table-column column-width="2.825in" /> space-before="40pt">
<fo:table-body> <fo:table-column column-width="4in" />
<fo:table-row> <fo:table-body>
<fo:table-cell> <fo:table-row>
<fo:block font-family="Helvetica" font-size="12pt" <fo:table-cell>
text-align="center"> <fo:block font-family="Helvetica" font-size="12pt"
<xsl:if test="tecnico-hs/assinatura"> text-align="center">
<xsl:variable name="assinatura" select="tecnico-hs/assinatura" /> <xsl:if test="tecnico-hs/assinatura">
<fo:external-graphic src="url('{$assinatura}')" /> <xsl:variable name="assinatura" select="tecnico-hs/assinatura" />
</xsl:if> <fo:external-graphic src="url('{$assinatura}')" />
</fo:block> </xsl:if>
</fo:table-cell> </fo:block>
</fo:table-row> </fo:table-cell>
<fo:table-row> </fo:table-row>
<fo:table-cell padding-bottom="0in" padding-left="0.075in" <fo:table-row>
border-left="none" border-bottom="none" padding-top="0in" <fo:table-cell padding-bottom="0in" padding-left="0.075in"
border-top="0.0069in solid #000000" display-align="before" border-left="none" border-bottom="none" padding-top="0in"
writing-mode="lr-tb" padding-right="0.075in" border-right="none"> border-top="0.0069in solid #000000" display-align="before"
<fo:block font-family="Helvetica" font-size="12pt" writing-mode="lr-tb" padding-right="0.075in" border-right="none">
font-weight="bold" margin-right="0in" text-indent="0.2134in" <fo:block font-family="Helvetica" font-size="12pt"
text-align="center" margin-left="-0.2134in"> font-weight="bold" margin-right="0in" text-indent="0.2134in"
  text-align="center" margin-left="-0.2134in">
</fo:block>  
<fo:block font-family="Helvetica" font-size="12pt" </fo:block>
font-weight="bold" margin-right="0in" text-indent="0.2134in" <fo:block font-family="Helvetica" font-size="12pt"
text-align="center" margin-left="-0.2134in"> font-weight="bold" margin-right="0in" text-indent="0.2134in"
<xsl:value-of select="tecnico-hs/nome" /> text-align="center" margin-left="-0.2134in">
</fo:block> <xsl:value-of select="tecnico-hs/nome" />
<fo:block font-family="Helvetica" font-size="12pt" </fo:block>
margin-right="-0.0937in" text-indent="0in" text-align="center" <fo:block font-family="Helvetica" font-size="12pt"
margin-left="0in"> margin-right="-0.0937in" text-indent="0in" text-align="center"
Técnico de Higiene e Segurança margin-left="0in">
  Técnico de Higiene e Segurança
</fo:block>  
<fo:block font-family="Helvetica" font-size="12pt" </fo:block>
margin-right="-0.0937in" text-indent="0in" text-align="center" <fo:block font-family="Helvetica" font-size="12pt"
margin-left="0in"> margin-right="-0.0937in" text-indent="0in" text-align="center"
CAP nº margin-left="0in">
<xsl:value-of select="tecnico-hs/cap" /> CAP nº
<xsl:value-of select="tecnico-hs/cap" />
</fo:block>
</fo:table-cell> </fo:block>
</fo:table-row> </fo:table-cell>
</fo:table-body> </fo:table-row>
</fo:table> </fo:table-body>
</fo:table>
</xsl:if>
<xsl:if test="tecnico-superior-hs">
<xsl:if test="tecnico-hs">
<fo:block font-family="Helvetica" font-size="12pt"
line-height="130%" space-before="20pt" >
 Verificado por:
</fo:block>
</xsl:if>
<fo:table table-layout="fixed" width="4in"
space-before="40pt">
<fo:table-column column-width="4in" />
<fo:table-body>
<fo:table-row>
<fo:table-cell>
<fo:block font-family="Helvetica" font-size="12pt"
text-align="center">
<xsl:if test="tecnico-superior-hs/assinatura">
<xsl:variable name="assinatura" select="tecnico-superior-hs/assinatura" />
<fo:external-graphic src="url('{$assinatura}')" />
</xsl:if>
</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell padding-bottom="0in" padding-left="0.075in"
border-left="none" border-bottom="none" padding-top="0in"
border-top="0.0069in solid #000000" display-align="before"
writing-mode="lr-tb" padding-right="0.075in" border-right="none">
<fo:block font-family="Helvetica" font-size="12pt"
font-weight="bold" margin-right="0in" text-indent="0.2134in"
text-align="center" margin-left="-0.2134in">
 
</fo:block>
<fo:block font-family="Helvetica" font-size="12pt"
font-weight="bold" margin-right="0in" text-indent="0.2134in"
text-align="center" margin-left="-0.2134in">
<xsl:value-of select="tecnico-superior-hs/nome" />
</fo:block>
<fo:block font-family="Helvetica" font-size="12pt"
margin-right="-0.0937in" text-indent="0in" text-align="center"
margin-left="0in">
Técnico Superior de Higiene e Segurança
 
</fo:block>
<fo:block font-family="Helvetica" font-size="12pt"
margin-right="-0.0937in" text-indent="0in" text-align="center"
margin-left="0in">
CAP nº
<xsl:value-of select="tecnico-superior-hs/cap" />
</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-body>
</fo:table>
</xsl:if>
<fo:block font-family="Helvetica" id="evolute_endofdoc" /> <fo:block font-family="Helvetica" id="evolute_endofdoc" />
</fo:flow> </fo:flow>
</fo:page-sequence> </fo:page-sequence>

Write Preview
Loading…
Cancel
Save