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 433148761..7730cd8ce 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper differ 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();