From 6f136651e8f59a4b406e0836ac5fcfff64d7dbaf Mon Sep 17 00:00:00 2001
From: edgar <edgar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 2 Jan 2017 18:59:00 +0000
Subject: [PATCH] issue  #8301

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@64411 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../relatorios/impl/RelatorioTabelaPreco.java |   5 +---
 .../render/RenderRelatorioJasper.java         |   1 +
 .../templates/RelatorioTabelaPreco.jasper     | Bin 43267 -> 43267 bytes
 .../RelatorioTabelaPrecoArtesp.jasper         | Bin 34135 -> 34802 bytes
 .../RelatorioTabelaPrecoArtesp.jrxml          |  11 +++++---
 .../relatorios/utilitarios/Relatorio.java     |  25 +++++++++++++-----
 6 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java
index df0f7ff34..0bbf34364 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java
@@ -18,10 +18,7 @@ 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/render/RenderRelatorioJasper.java b/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java
index 19e952106..067f8a9e4 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java
@@ -61,6 +61,7 @@ public class RenderRelatorioJasper {
 
 			ResourceBundle resource = ResourceBundle.getBundle("com.rjconsultores.ventaboletos.relatorios.internacionalizacao." + this.relatorio.getNome(), locale);
 			this.relatorio.getParametros().put(JRParameter.REPORT_RESOURCE_BUNDLE, resource);
+			this.relatorio.getParametros().put("BASE_DIR",this.relatorio.getBaseDir());
 			
 			/* Adicionar o arquivo de internacionalização para o subreporte quando informado */
 			if(this.relatorio.getNomeSubReporte() != null && this.relatorio.getNomeSubReporte().length > 0) {
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jasper
index e05888f695357c23cfa9e05c49b94f93e20a6506..6a58a3370f686da4ac6af378ab3c44af49706f7c 100644
GIT binary patch
delta 75
zcmZp^#MFF=X~W?P2@7LmGh+jD6H_yjcykkDOCuw821Z5(oymo)GLzT0vTy!Zu}@zZ
QQ&q|21155l->wh?0A4H?5C8xG

delta 75
zcmZp^#MFF=X~W?P33CH;6H7x&O9K<*coPdlQ*(2621Z5(oymo)GLzT0vTy!Zu}@zZ
QQ&q|21155l->wh?0AQdOA^-pY

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper
index d366cadae9d05faab79bc0386886e2591a31c317..192795fab7938c8e85f3801a761d9baf2544cbeb 100644
GIT binary patch
delta 7563
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
X8fN^>7lIo3ujgNFy@9X0FZDkFy-sxg

delta 7032
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

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml
index 27ee89b30..73f9d8bd3 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml
@@ -3,7 +3,7 @@
 	<property name="ireport.zoom" value="0.9090909090909127"/>
 	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
-	<parameter name="artesp_logo" class="java.lang.String"/>
+	<parameter name="BASE_DIR" class="java.lang.String"/>
 	<field name="origem" class="java.lang.String"/>
 	<field name="destino" class="java.lang.String"/>
 	<field name="tarifa" class="java.math.BigDecimal"/>
@@ -50,6 +50,11 @@
 				</textElement>
 				<textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression>
 			</textField>
+			<textField>
+				<reportElement uuid="ac518cbb-e6d1-4edb-b544-11e25b5a4c95" x="440" y="0" width="420" height="20"/>
+				<textElement/>
+				<textFieldExpression><![CDATA[$P{BASE_DIR}]]></textFieldExpression>
+			</textField>
 		</band>
 	</title>
 	<pageHeader>
@@ -289,8 +294,8 @@
 				<textFieldExpression><![CDATA[$R{label.msgAviso}]]></textFieldExpression>
 			</textField>
 			<image onErrorType="Blank">
-				<reportElement uuid="c430d4fa-0d54-4292-82b9-b8ea5b1a9aac" x="0" y="15" width="172" height="28"/>
-				<imageExpression><![CDATA[$P{artesp_logo}]]></imageExpression>
+				<reportElement uuid="f0aa2830-eda6-4fbd-aa41-e53b17ae2193" x="0" y="15" width="217" height="29"/>
+				<imageExpression><![CDATA[$P{BASE_DIR}+"/imagens/artesp.png"]]></imageExpression>
 			</image>
 		</band>
 	</pageFooter>
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java
index 1ed8586a8..cc97e90fd 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java
@@ -1,5 +1,6 @@
 package com.rjconsultores.ventaboletos.relatorios.utilitarios;
 
+import java.net.URL;
 import java.sql.Connection;
 import java.util.HashSet;
 import java.util.Map;
@@ -18,6 +19,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 public abstract class Relatorio {
 
 	private static Logger log = Logger.getLogger(Relatorio.class);
+	private static final String DEFAULT_BASE_DIR = "/com/rjconsultores/ventaboletos/relatorios";
 
 	private Connection conexao;
 	protected Map<String, Object> parametros;
@@ -27,13 +29,14 @@ public abstract class Relatorio {
 	private Set<String> infoMsg;
 	private JRBeanCollectionDataSource collectionDataSource;
 	private String[] nomeSubReporte;
+	private String baseDir;
 
 	protected Relatorio(Map<String, Object> parametros, Connection conexao) {
 		this.parametros = parametros;
 		this.conexao = conexao;
 		this.infoMsg = new HashSet<String>();
 	}
-	
+
 	public Connection getConexao() {
 		return conexao;
 	}
@@ -80,15 +83,16 @@ public abstract class Relatorio {
 	 *            the customDataSource to set
 	 */
 	public void setCustomDataSource(IDataSource iDataSource) {
-		setCustomDataSource(true,iDataSource);
+		setCustomDataSource(true, iDataSource);
 	}
+
 	/**
 	 * @param iDataSource
 	 *            the customDataSource to set
 	 */
-	public void setCustomDataSource(boolean closeConnection,IDataSource iDataSource) {
+	public void setCustomDataSource(boolean closeConnection, IDataSource iDataSource) {
 		this.customDataSource = iDataSource;
-		if (closeConnection){
+		if (closeConnection) {
 			closeConnection();
 		}
 	}
@@ -144,10 +148,10 @@ public abstract class Relatorio {
 	public void setNomeSubReporte(String[] nomeSubReporte) {
 		this.nomeSubReporte = nomeSubReporte;
 	}
-	
+
 	public void closeConnection() {
 		try {
-			if(getConexao() != null && !getConexao().isClosed()) {
+			if (getConexao() != null && !getConexao().isClosed()) {
 				getConexao().close();
 				log.info("Conexão relatorio fechada");
 			}
@@ -156,4 +160,13 @@ public abstract class Relatorio {
 		}
 	}
 
+	public String getBaseDir() {
+		//setado como parametro em RenderRelatorioJasper com a chave "BASE_DIR"
+		return getClass().getResource(baseDir == null ? DEFAULT_BASE_DIR : baseDir).getPath();
+	}
+
+	public void setBaseDir(String baseDir) {
+		this.baseDir = baseDir;
+	}
+
 }
\ No newline at end of file