From 4f5e75dbf73654cbd8b02ec0a7eff69c96898b96 Mon Sep 17 00:00:00 2001 From: edgar Date: Mon, 12 Dec 2016 19:35:41 +0000 Subject: [PATCH] fixes bug #8301 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@63511 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioTabelaPreco.java | 9 +++++++++ .../RelatorioTabelaPrecoArtesp.jasper | Bin 33777 -> 33912 bytes .../RelatorioTabelaPrecoArtesp.jrxml | 7 ++++--- .../RelatorioTabelaPrecoController.java | 3 ++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java index 1bd4c1b17..89f647066 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java @@ -1,10 +1,15 @@ package com.rjconsultores.ventaboletos.relatorios.impl; +import java.io.File; +import java.net.URL; import java.sql.Connection; import java.sql.ResultSet; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.ResourceBundle; + +import javax.faces.context.FacesContext; import com.rjconsultores.ventaboletos.entidad.Tramo; import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; @@ -18,6 +23,10 @@ public class RelatorioTabelaPreco extends Relatorio { super(parametros, conexao); this.isLayoutArtesp = (Boolean) parametros.get("isLayoutArtesp"); + if (isLayoutArtesp) { + URL url = getClass().getResource("/com/rjconsultores/ventaboletos/relatorios/imagens/artesp.png"); + parametros.put("artesp_logo", url.getPath()); + } this.setCustomDataSource(new ArrayDataSource(this) { public void initDados() throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper index 43314876108058a551494891ca7e31226cd8aaef..7730cd8ce596af46ffc7e78d288f942bee8bdfbc 100644 GIT binary patch delta 7164 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 MUsF3!Z`?8HAN?q1%K!iX diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml index 5074d77e6..a2d8365f2 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml @@ -1,8 +1,9 @@ - + + @@ -286,8 +287,8 @@ - - + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java index f51ed3cb5..0a044ae29 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java @@ -1,5 +1,6 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; +import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -80,7 +81,7 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer { private List lsOrcaoConcedente; @Override - public void doAfterCompose(Component comp) throws Exception { + public void doAfterCompose(Component comp) throws Exception { lsVigencia = vigenciaTarifaService.obtenerTodos(); lsEmpresa = empresaService.obtenerTodos(); lsOrcaoConcedente = orgaocConcedenteService.obtenerTodos();