From a32fce93edab24be1f88fd439e6bd7a8ab338d58 Mon Sep 17 00:00:00 2001
From: "lucas.calixto" <lucas.calixto@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 3 Mar 2017 19:16:57 +0000
Subject: [PATCH] fixes bug#8716

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@66374 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioDepositosDetalhado.java     |  11 +++++++-
 .../RelatorioDepositosDetalhado_es.properties |   3 ++-
 ...latorioDepositosDetalhado_pt_BR.properties |   3 ++-
 .../RelatorioDepositosDetalhado.jasper        | Bin 36798 -> 37916 bytes
 .../RelatorioDepositosDetalhado.jrxml         |  25 +++++++++++++-----
 ...elatorioDepositosDetalhadosController.java |  13 +++++++++
 web/WEB-INF/i3-label_es_MX.label              |   1 +
 web/WEB-INF/i3-label_pt_BR.label              |   1 +
 .../filtroRelatorioDepositosDetalhados.zul    |   4 +++
 9 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java
index 8b9786019..8a1dd7110 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java
@@ -13,6 +13,7 @@ import java.util.Map;
 
 import org.apache.log4j.Logger;
 
+import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioDepositosDetalhadosBean;
@@ -34,6 +35,7 @@ public class RelatorioDepositosDetalhado extends Relatorio {
 	private Timestamp fecFinal;
 	private Integer marcaId;
 	private Integer instFinanceira;
+	private PuntoVenta puntoVenta;
 
 	public RelatorioDepositosDetalhado(Map<String, Object> parametros, Connection conexao) throws Exception {
 		super(parametros, conexao);
@@ -51,6 +53,10 @@ public class RelatorioDepositosDetalhado extends Relatorio {
 				if (parametros.get("INST_FINANCEIRA") != null) {
 					instFinanceira = Integer.valueOf(parametros.get("INST_FINANCEIRA").toString());
 				}
+				
+				if (parametros.get("puntoVenta") != null) {
+					puntoVenta = (PuntoVenta) parametros.get("puntoVenta");
+				}
 
 				Connection conexao = this.relatorio.getConexao();
 				processarDepositosDetalhados(conexao);
@@ -123,7 +129,7 @@ public class RelatorioDepositosDetalhado extends Relatorio {
 			lsDadosRelatorio.add(relatorioDepositosDetalhadosBean);
 		}
 	}
-
+	
 	protected String getSqlPacotes() {
 		StringBuilder sQuery = new StringBuilder();
  
@@ -172,6 +178,9 @@ public class RelatorioDepositosDetalhado extends Relatorio {
 		if (parametros.get("INST_FINANCEIRA") != null) {
 			sQuery.append(" 	   and if.INSTIFINANCEIRA_ID =:INST_FINANCEIRA                                             ");
 		}
+		if (puntoVenta != null) {
+			sQuery.append("and pv.PUNTOVENTA_ID = " + puntoVenta.getPuntoventaId());
+		}
 		sQuery.append("  and FD.FECCREACION between :fecInicio and  :fecFinal");
 		sQuery.append("  GROUP BY                                                                                          ");
 		sQuery.append("  fd.FECHAMENTODEPOSITO_ID,                                                                         ");
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositosDetalhado_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositosDetalhado_es.properties
index 7dd40d0d9..e8d0adc42 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositosDetalhado_es.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositosDetalhado_es.properties
@@ -20,4 +20,5 @@ label.fechaInclusion=Fec. Inclusion
 label.banco=Banco
 label.numConta=Cuenta
 label.numAgencia=Agencia
-label.valorDeposito=Valor
\ No newline at end of file
+label.valorDeposito=Valor
+label.puntoVenta=Punto Venta
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositosDetalhado_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositosDetalhado_pt_BR.properties
index 54ad61783..964739104 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositosDetalhado_pt_BR.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioDepositosDetalhado_pt_BR.properties
@@ -20,4 +20,5 @@ label.fechaInclusion=Dt. Inclus
 label.banco=Banco
 label.numConta=Conta
 label.numAgencia=Ag\u00EAncia
-label.valorDeposito=Valor
\ No newline at end of file
+label.valorDeposito=Valor
+label.puntoVenta=Agência
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jasper
index cac0f182271f7d90fb199e917a5d34392adb92b2..372d08ae554938edb515b689923f91c5444f46d0 100644
GIT binary patch
literal 37916
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

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

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jrxml
index 50e5a3033..f6e01f2db 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioDepositosDetalhado.jrxml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioVendasComissao" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="84b9dfcf-8ec5-4f51-80cc-7339e3b158b4">
 	<property name="ireport.zoom" value="1.0980750000000008"/>
-	<property name="ireport.x" value="215"/>
+	<property name="ireport.x" value="0"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="fecInicio" class="java.lang.String"/>
 	<parameter name="fecFinal" class="java.lang.String"/>
 	<parameter name="noDataRelatorio" class="java.lang.String"/>
 	<parameter name="empresa" class="java.lang.String"/>
 	<parameter name="banco" class="java.lang.String"/>
+	<parameter name="nombPuntoVenta" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -58,7 +59,7 @@
 		<band splitType="Stretch"/>
 	</background>
 	<title>
-		<band height="82" splitType="Stretch">
+		<band height="110" splitType="Stretch">
 			<textField>
 				<reportElement uuid="43b2c28d-4760-4890-b00d-25e931e79c74" x="0" y="0" width="620" height="20"/>
 				<textElement markup="none">
@@ -81,25 +82,37 @@
 				<textFieldExpression><![CDATA[$R{cabecalho.periodo} + " " + $P{fecInicio} + " " + $R{cabecalho.periodoA} + " " + $P{fecFinal}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="8fa1c53b-1da7-4d4d-a75c-ab1543acae2a" x="53" y="41" width="263" height="20"/>
+				<reportElement uuid="8fa1c53b-1da7-4d4d-a75c-ab1543acae2a" x="60" y="41" width="263" height="20"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$P{empresa}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="a91f6081-4740-4e36-8965-41b6cde4cc20" x="0" y="41" width="53" height="20"/>
+				<reportElement uuid="a91f6081-4740-4e36-8965-41b6cde4cc20" x="0" y="41" width="60" height="20"/>
 				<textElement/>
 				<text><![CDATA[Empresa:]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="a0d7c1c5-7a17-477e-929a-b0d9665b409c" x="53" y="61" width="263" height="20"/>
+				<reportElement uuid="a0d7c1c5-7a17-477e-929a-b0d9665b409c" x="60" y="61" width="263" height="20"/>
 				<textElement/>
 				<textFieldExpression><![CDATA[$P{banco}]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="2a1c0967-7154-4aa5-bc93-577d682a1e5a" x="0" y="61" width="53" height="20"/>
+				<reportElement uuid="2a1c0967-7154-4aa5-bc93-577d682a1e5a" x="0" y="61" width="60" height="20"/>
 				<textElement/>
 				<text><![CDATA[Banco:]]></text>
 			</staticText>
+			<textField>
+				<reportElement uuid="d65cc40d-662b-4159-b0ed-a1b5b3148d30" x="0" y="81" width="60" height="20"/>
+				<textElement/>
+				<textFieldExpression><![CDATA[$R{label.puntoVenta}]]></textFieldExpression>
+			</textField>
+			<textField>
+				<reportElement uuid="d5a28828-ff2f-407c-b0b3-7c9154a27d5d" x="60" y="81" width="181" height="20"/>
+				<textElement>
+					<font isBold="true"/>
+				</textElement>
+				<textFieldExpression><![CDATA[$P{nombPuntoVenta}]]></textFieldExpression>
+			</textField>
 		</band>
 	</title>
 	<pageHeader>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDepositosDetalhadosController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDepositosDetalhadosController.java
index 99c55db5a..6a57ab341 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDepositosDetalhadosController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDepositosDetalhadosController.java
@@ -24,12 +24,14 @@ import org.zkoss.zul.Messagebox;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.InstiFinanceira;
+import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
 import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioDepositosDetalhado;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.service.EmpresaService;
 import com.rjconsultores.ventaboletos.service.InstiFinanceiraService;
 import com.rjconsultores.ventaboletos.utilerias.DateUtil;
 import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
+import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta;
 import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
 
 /**
@@ -53,6 +55,7 @@ private static final long serialVersionUID = 1L;
 	
 	private MyComboboxEstandar cmbEmpresa;
 	private List<Empresa> lsEmpresa;
+	private MyComboboxPuntoVenta cmbPuntoVenta;
 	private MyComboboxEstandar cmbBanco;
 	private List<InstiFinanceira> lsBanco;
 	
@@ -99,6 +102,7 @@ private static final long serialVersionUID = 1L;
 		} else{
 			parametros.put("empresa", "Todas;");
 		}
+		
 		Comboitem itemBanco = cmbBanco.getSelectedItem();
 		if (itemBanco != null) {
 			InstiFinanceira banco = (InstiFinanceira) itemBanco.getValue();
@@ -108,6 +112,15 @@ private static final long serialVersionUID = 1L;
 			parametros.put("banco", "Todos;");
 		}
 		
+		Comboitem cmbItemPuntoVenta = cmbPuntoVenta.getSelectedItem();
+		if (cmbItemPuntoVenta != null) {
+			PuntoVenta puntoVenta = (PuntoVenta) cmbItemPuntoVenta.getValue();
+			parametros.put("puntoVenta", puntoVenta);
+			parametros.put("nombPuntoVenta", puntoVenta.getNombpuntoventa());
+		} else {
+			parametros.put("nombPuntoVenta", "Todos;");
+		}
+		
 		Relatorio relatorio = new RelatorioDepositosDetalhado(parametros, dataSourceRead.getConnection());
 		
 		Map<String, Object> args = new HashMap<String, Object>();
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index d4df75533..2d90c99d9 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -6445,6 +6445,7 @@ relatorioDepositosDetalhadosController.lbEmpresa.value = Empresa
 relatorioDepositosDetalhadosController.lbBanco.value = Banco
 relatorioDepositosDetalhadosController.window.title=Depositos Detallados
 relatorioDepositosDetalhadosController.MSG.busquedaPeriodo = Fecha de inicio retrasado hasta la fecha final.
+relatorioDepositosDetalhadosController.lbPuntoVenta=Punto Venta
 
 # Calculo Comissao
 busquedaCalculoComissaoController.window.title = Cálculo de Comisión 
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 2b62a9d7a..490fd4ef9 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -6636,6 +6636,7 @@ relatorioDepositosDetalhadosController.lbEmpresa.value = Empresa
 relatorioDepositosDetalhadosController.lbBanco.value = Banco
 relatorioDepositosDetalhadosController.window.title=Depósitos Detalhados
 relatorioDepositosDetalhadosController.MSG.busquedaPeriodo = Data de início posterior a data Final.
+relatorioDepositosDetalhadosController.lbPuntoVenta=Agência
 
 # Calculo Comissao
 busquedaCalculoComissaoController.window.title = Cálculo de Comissão
diff --git a/web/gui/relatorios/filtroRelatorioDepositosDetalhados.zul b/web/gui/relatorios/filtroRelatorioDepositosDetalhados.zul
index f841430dd..5b69df016 100644
--- a/web/gui/relatorios/filtroRelatorioDepositosDetalhados.zul
+++ b/web/gui/relatorios/filtroRelatorioDepositosDetalhados.zul
@@ -36,6 +36,10 @@
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
 						model="@{winFiltroRelatorioDepositosDetalhados$composer.lsEmpresa}"
 						width="95%" />
+                   	<label value="${c:l('relatorioDepositosDetalhadosController.lbPuntoVenta')}"/>
+					<combobox id="cmbPuntoVenta"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta"
+						mold="rounded" buttonVisible="true" />
 				</row>
 				<row>
 					<label