diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioPrintDataProvider.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioPrintDataProvider.java index 69565d0e..e55c4099 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioPrintDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioPrintDataProvider.java @@ -99,7 +99,8 @@ public class RelatorioPrintDataProvider "estabelecimentos.id", "estabelecimentos.nome", "hs_relatorio.data", "marcacoes_estabelecimento.data", "hs_relatorio.acompanhante1", "hs_relatorio.funcao_acompanhante1", - "hs_relatorio.funcionarios", "estabelecimentos.morada" }, + "hs_relatorio.funcionarios", "estabelecimentos.morada", + "hs_relatorio.avaliacao_inicial"}, new Field( "hs_relatorio.id" ).isEqual( id ), null, null, @@ -119,6 +120,7 @@ public class RelatorioPrintDataProvider String funcaoAcompanhante = ( String ) array.get( 0, 8 ); String textoFuncionarios = ( String ) array.get( 0, 9 ); String morada = ( String ) array.get( 0, 10 ); + String tipoAvaliacao = ( ( Boolean ) array.get( 0, 11 ) ).booleanValue() ? "INICIAL" : "PERI\u00d3DICA"; EmpresaToPrint empresa = new EmpresaToPrint( nomeEmpresa, "http://www.evolute.pt:13080/SIPRPImages/image?id=" + logoId, nomeEstabelecimento, actividadeEmpresa, @@ -128,6 +130,7 @@ public class RelatorioPrintDataProvider empresa, dataRelatorio != null ? new DataToPrint( "data-relatorio", dataRelatorio ) : null, dataVisita != null ? new DataToPrint( "data-hs", dataVisita ) : null, + tipoAvaliacao, dataProximaVisita != null ? new DataToPrint( "data-proxima-hs", dataProximaVisita ) : null, textoFuncionarios, getTecnicoHS( id ), @@ -205,7 +208,6 @@ public class RelatorioPrintDataProvider null, null, null ); - System.out.println( select ); Virtual2DArray array = EXECUTER.executeQuery( select ); if( array.columnLength() == 0 ) { diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioToPrint.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioToPrint.java index 603e197f..c3a023fe 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioToPrint.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/RelatorioToPrint.java @@ -12,6 +12,7 @@ public class RelatorioToPrint protected EmpresaToPrint empresa; protected DataToPrint dataRelatorio; protected DataToPrint dataHs; + protected String tipoAvaliacao; protected DataToPrint dataProximaHs; protected String textoFuncionarios; protected TecnicoHSToPrint tecnicoHS; @@ -22,7 +23,8 @@ public class RelatorioToPrint public RelatorioToPrint( EmpresaToPrint empresa, DataToPrint dataRelatorio, - DataToPrint dataHs, + DataToPrint dataHs, + String tipoAvaliacao, DataToPrint dataProximaHs, String textoFuncionarios, TecnicoHSToPrint tecnicoHS, @@ -35,6 +37,7 @@ public class RelatorioToPrint this.empresa = empresa; this.dataRelatorio = dataRelatorio; this.dataHs = dataHs; + this.tipoAvaliacao = tipoAvaliacao; this.dataProximaHs = dataProximaHs; this.textoFuncionarios = textoFuncionarios; this.tecnicoHS = tecnicoHS; @@ -51,6 +54,9 @@ public class RelatorioToPrint relatorioElement.addContent( empresa.toJdomElement() ); relatorioElement.addContent( dataRelatorio.toJdomElement() ); relatorioElement.addContent( dataHs.toJdomElement() ); + Element tipoAvaliacaoElement = new Element( "tipo-avaliacao" ); + tipoAvaliacaoElement.setText( tipoAvaliacao ); + relatorioElement.addContent( tipoAvaliacaoElement ); if( dataProximaHs != null ) { relatorioElement.addContent( dataProximaHs.toJdomElement() ); diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/TestPrint.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/TestPrint.java index bd4d0cca..558318a4 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/TestPrint.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/TestPrint.java @@ -1,15 +1,9 @@ package siprp.higiene.relatorio.print; import java.io.ByteArrayOutputStream; -import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.InputStream; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.output.Format; -import org.jdom.output.XMLOutputter; - import com.evolute.utils.fop.PDFCreator; import com.evolute.utils.xml.XSLTransformer; @@ -56,7 +50,7 @@ public class TestPrint // fos.write( fo ); // fos.close(); - for( int n = 57; n <= 57; n++ ) + for( int n = 59; n <= 59; n++ ) { byte pdf[] = new RelatorioPDFCreator().createPDF( n ); FileOutputStream fos = new FileOutputStream( "/home/fpalma/Desktop/" + n + ".pdf" ); diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/relatorio.xsl b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/relatorio.xsl index b3b24d11..8416f0d1 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/relatorio.xsl +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/print/relatorio.xsl @@ -1509,7 +1509,7 @@ - @@ -3861,10 +3861,9 @@ - EMPRESA + EMPRESA: - : @@ -3897,10 +3896,9 @@ - DATA DA AVALIAÇÃO + DATA DA AVALIAÇÃO: - : de @@ -3920,19 +3918,8 @@ - AVALIAÇÃO: INICIAL - - - - ¨ - - - PERIÓDICA - - - þ + AVALIAÇÃO: -   @@ -3943,10 +3930,9 @@ - DATA DA PRÓXIMA + DATA DA PRÓXIMA: - : de diff --git a/trunk/SIPRPSoft/src/siprp/planoactuacao/print/PlanoActuacaoPrintDataProvider.java b/trunk/SIPRPSoft/src/siprp/planoactuacao/print/PlanoActuacaoPrintDataProvider.java index 5fec993f..1e7a6df8 100644 --- a/trunk/SIPRPSoft/src/siprp/planoactuacao/print/PlanoActuacaoPrintDataProvider.java +++ b/trunk/SIPRPSoft/src/siprp/planoactuacao/print/PlanoActuacaoPrintDataProvider.java @@ -4,7 +4,6 @@ import java.util.Date; import java.util.HashMap; import java.util.Vector; -import siprp.SingletonConstants; import siprp.planoactuacao.db.DBConstants; import siprp.planoactuacao.db.PlanoActuacaoDBInit; @@ -184,6 +183,8 @@ public class PlanoActuacaoPrintDataProvider throws Exception { LegislacaoAplicavelToPrint legislacao = new LegislacaoAplicavelToPrint( new Vector() ); + + return legislacao; }