From 8b2592855ee967ccdc25d6031f63f8d11b5e742c Mon Sep 17 00:00:00 2001
From: "thiago.clemente" <thiago.clemente@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 16 Aug 2019 13:30:03 +0000
Subject: [PATCH] fixes bug#15327 dev: qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@96696 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../impl/RelatorioVendasRequisicao.java       |  22 +++++++--
 .../RelatorioVendasRequisicao_es.properties   |   3 +-
 ...RelatorioVendasRequisicao_pt_BR.properties |   3 +-
 .../RelatorioVendasRequisicao.jasper          | Bin 36969 -> 37090 bytes
 .../templates/RelatorioVendasRequisicao.jrxml |  29 +++++------
 .../RelatorioVendasRequisicaoController.java  |  46 +++++++++++++++++-
 web/WEB-INF/i3-label_es_MX.label              |   7 ++-
 web/WEB-INF/i3-label_pt_BR.label              |   7 ++-
 .../filtroRelatorioVendasRequisicao.zul       |  18 ++++---
 9 files changed, 101 insertions(+), 34 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java
index 511e746fd..50a097553 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java
@@ -27,10 +27,13 @@ public class RelatorioVendasRequisicao extends Relatorio {
 	private Integer empresaId;
 	private Integer puntoventaId;
 	private Integer secretariaId;
-	
-	public RelatorioVendasRequisicao(Map<String, Object> parametros, Connection conexao) throws Exception {
+	private boolean agruparCliente;
+
+	public RelatorioVendasRequisicao(Map<String, Object> parametros, Connection conexao, boolean agruparCliente) throws Exception {
 		super(parametros, conexao);
 		
+		this.agruparCliente = agruparCliente;
+
 		this.setCustomDataSource(new DataSource(this) {
 
 			@Override
@@ -111,6 +114,12 @@ public class RelatorioVendasRequisicao extends Relatorio {
 			bean.setImporte(rset.getBigDecimal("IMPORTE"));
 			bean.setQtde(rset.getInt("QTDE"));
 			
+			if (agruparCliente) {
+				bean.setDescricaogrupo(bean.getSecretariaId() + "- " + bean.getDescsecretaria());
+			} else {
+				bean.setDescricaogrupo(bean.getNombpuntoventa());
+			}
+
 			lsDadosRelatorio.add(bean);
 		}
 		
@@ -175,8 +184,13 @@ public class RelatorioVendasRequisicao extends Relatorio {
 			sQuery.append("AND SEC.SECRETARIA_ID = :SECRETARIA_ID ");
 		}
 		
-		sQuery.append("GROUP BY CDP.NUMDOCUMENTO, SEC.CVESECRETARIA, SEC.DESCSECRETARIA,PV.NOMBPUNTOVENTA, PV.NOMBPUNTOVENTA, E.NOMBEMPRESA, E.EMPRESA_ID, FP.DESCPAGO, CFP.FORMAPAGO_ID, ORI.DESCPARADA, DES.DESCPARADA, CFP.IMPORTE, ORI.CVEPARADA, DES.CVEPARADA, PV.PUNTOVENTA_ID ")
-			  .append("ORDER BY SEC.DESCSECRETARIA, PV.NOMBPUNTOVENTA, FP.DESCPAGO");
+		sQuery.append("GROUP BY CDP.NUMDOCUMENTO, SEC.CVESECRETARIA, SEC.DESCSECRETARIA,PV.NOMBPUNTOVENTA, PV.NOMBPUNTOVENTA, E.NOMBEMPRESA, E.EMPRESA_ID, FP.DESCPAGO, CFP.FORMAPAGO_ID, ORI.DESCPARADA, DES.DESCPARADA, CFP.IMPORTE, ORI.CVEPARADA, DES.CVEPARADA, PV.PUNTOVENTA_ID ");
+
+		if (agruparCliente) {
+			sQuery.append("ORDER BY SEC.DESCSECRETARIA, PV.NOMBPUNTOVENTA, FP.DESCPAGO");
+		} else {
+			sQuery.append("ORDER BY PV.NOMBPUNTOVENTA, SEC.DESCSECRETARIA, FP.DESCPAGO");
+		}
 		
 		return sQuery.toString();
 		
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasRequisicao_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasRequisicao_es.properties
index 872de7256..02d32d2e2 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasRequisicao_es.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasRequisicao_es.properties
@@ -15,4 +15,5 @@ cabecalho.usuario=Usu
 label.nombPuntoVenta=Agência
 label.total=Total
 label.puntoVenta=Agência:
-label.diferenca=Diferença
\ No newline at end of file
+label.diferenca=Diferença
+label.cliente=Cliente
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasRequisicao_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasRequisicao_pt_BR.properties
index 872de7256..02d32d2e2 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasRequisicao_pt_BR.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioVendasRequisicao_pt_BR.properties
@@ -15,4 +15,5 @@ cabecalho.usuario=Usu
 label.nombPuntoVenta=Agência
 label.total=Total
 label.puntoVenta=Agência:
-label.diferenca=Diferença
\ No newline at end of file
+label.diferenca=Diferença
+label.cliente=Cliente
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasRequisicao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasRequisicao.jasper
index f63f785c07ab9bcda0117d92358fcf2615d28839..88a2beeaf83e8624214a66c617f1fb6ac82a2448 100644
GIT binary patch
delta 11916
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

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

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasRequisicao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasRequisicao.jrxml
index db4b86b80..20b374c80 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasRequisicao.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioVendasRequisicao.jrxml
@@ -1,14 +1,17 @@
 <?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="RelatorioVendasRequisicao" 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.5"/>
-	<property name="ireport.x" value="554"/>
-	<property name="ireport.y" value="78"/>
+	<property name="ireport.x" value="0"/>
+	<property name="ireport.y" value="0"/>
 	<style name="Crosstab Data Text" hAlign="Center"/>
 	<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="puntoventa" class="java.lang.String"/>
+	<parameter name="CABECALHO_AGRUPAMENTO_LABEL" class="java.lang.String"/>
+	<parameter name="CABECALHO_AGRUPAMENTO_DESCRICAO" class="java.lang.String"/>
+	<parameter name="AGRUPAMENTO_LABEL" class="java.lang.String"/>
 	<queryString>
 		<![CDATA[]]>
 	</queryString>
@@ -24,6 +27,7 @@
 	<field name="secretariaId" class="java.lang.Integer"/>
 	<field name="descsecretaria" class="java.lang.String"/>
 	<field name="numdocumento" class="java.lang.String"/>
+	<field name="descricaogrupo" class="java.lang.String"/>
 	<variable name="importe_1" class="java.math.BigDecimal" resetType="Group" resetGroup="secretariagroup" calculation="Sum">
 		<variableExpression><![CDATA[$F{importe}]]></variableExpression>
 	</variable>
@@ -38,7 +42,7 @@
 		<variableExpression><![CDATA[$F{importe}]]></variableExpression>
 	</variable>
 	<group name="secretariagroup">
-		<groupExpression><![CDATA[$F{descsecretaria}]]></groupExpression>
+		<groupExpression><![CDATA[$F{descricaogrupo}]]></groupExpression>
 		<groupHeader>
 			<band height="40">
 				<staticText>
@@ -49,8 +53,8 @@
 					<text><![CDATA[Origem]]></text>
 				</staticText>
 				<textField>
-					<reportElement x="53" y="0" width="748" height="20" uuid="8fc0dadc-9470-4614-9ed8-588df8f619a5"/>
-					<textFieldExpression><![CDATA[$F{secretariaId}+" - "+$F{descsecretaria}]]></textFieldExpression>
+					<reportElement x="0" y="0" width="802" height="20" uuid="8fc0dadc-9470-4614-9ed8-588df8f619a5"/>
+					<textFieldExpression><![CDATA[$P{AGRUPAMENTO_LABEL} + ": " + $F{descricaogrupo}]]></textFieldExpression>
 				</textField>
 				<staticText>
 					<reportElement x="410" y="20" width="210" height="20" uuid="3a02ce7f-5b2e-415f-a9b9-d744f1c2d3aa"/>
@@ -73,13 +77,6 @@
 					</textElement>
 					<text><![CDATA[QTDE]]></text>
 				</staticText>
-				<staticText>
-					<reportElement x="0" y="0" width="53" height="20" uuid="17a00e66-3046-44ae-829b-be9d6a6c7cc7"/>
-					<textElement>
-						<font isBold="true"/>
-					</textElement>
-					<text><![CDATA[CLIENTE:]]></text>
-				</staticText>
 				<staticText>
 					<reportElement x="0" y="20" width="190" height="20" uuid="f7d62619-9506-4382-af1a-aad3081a2ba1"/>
 					<textElement textAlignment="Right">
@@ -149,12 +146,8 @@
 				<text><![CDATA[Empresa:]]></text>
 			</staticText>
 			<textField>
-				<reportElement x="0" y="57" width="53" height="20" uuid="1a29d731-e121-4507-8c0b-e93f437e8d80"/>
-				<textFieldExpression><![CDATA[$R{label.puntoVenta}]]></textFieldExpression>
-			</textField>
-			<textField>
-				<reportElement x="53" y="57" width="748" height="20" uuid="53d53aa5-d8c9-43c6-b17d-1e6b49697237"/>
-				<textFieldExpression><![CDATA[$P{puntoventa}]]></textFieldExpression>
+				<reportElement x="0" y="57" width="790" height="20" uuid="53d53aa5-d8c9-43c6-b17d-1e6b49697237"/>
+				<textFieldExpression><![CDATA[$P{CABECALHO_AGRUPAMENTO_LABEL} + ": " + $P{CABECALHO_AGRUPAMENTO_DESCRICAO}]]></textFieldExpression>
 			</textField>
 			<line>
 				<reportElement x="0" y="76" width="801" height="1" uuid="3a4eed21-70b4-44c0-8d34-8c53d44de3cf"/>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasRequisicaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasRequisicaoController.java
index 613cc579d..acf4abcb1 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasRequisicaoController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasRequisicaoController.java
@@ -17,6 +17,7 @@ import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zul.Comboitem;
 import org.zkoss.zul.Datebox;
+import org.zkoss.zul.Radio;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
@@ -25,6 +26,7 @@ import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioVendasRequisicao;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.utilerias.DateUtil;
 import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
+import com.rjconsultores.ventaboletos.web.utilerias.ConstraintNoEmpty;
 import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
 import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta;
 import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxSecretaria;
@@ -48,16 +50,41 @@ public class RelatorioVendasRequisicaoController extends MyGenericForwardCompose
 	private MyComboboxPuntoVenta cmbPuntoVenta;
 	private MyComboboxSecretaria cmbSecretaria;
 	
+	// Mantis 15327
+	// Radios que vão definir se o relatório será agrupado por cliente ou por ponto de venda
+	private Radio radioTipoRelatorioPorCliente;
+	private Radio radioTipoRelatorioPorPontoVenda;
+
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {
 		super.doAfterCompose(comp);
 		this.lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa();
+		this.radioTipoRelatorioPorCliente.setChecked(true);
+		this.radioTipoRelatorioPorPontoVenda.setChecked(false);
 	}
 
 	public void onClick$btnExecutarRelatorio(Event ev) throws Exception {
 		excutarRelatorios();
 	}
 
+	public void onClick$radioTipoRelatorioPorCliente(Event ev) throws Exception {
+		this.radioTipoRelatorioPorCliente.setChecked(true);
+		this.radioTipoRelatorioPorPontoVenda.setChecked(false);
+		this.cmbPuntoVenta.setConstraint(new ConstraintNoEmpty());
+		this.cmbPuntoVenta.getValue();
+		this.cmbSecretaria.setConstraint("");
+		this.cmbSecretaria.getValue();
+	}
+
+	public void onClick$radioTipoRelatorioPorPontoVenda(Event ev) throws Exception {
+		this.radioTipoRelatorioPorCliente.setChecked(false);
+		this.radioTipoRelatorioPorPontoVenda.setChecked(true);
+		this.cmbPuntoVenta.setConstraint("");
+		this.cmbPuntoVenta.getValue();
+		this.cmbSecretaria.setConstraint(new ConstraintNoEmpty());
+		this.cmbSecretaria.getValue();
+	}
+
 	public void excutarRelatorios() throws SQLException, Exception {
 
 		SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
@@ -81,12 +108,16 @@ public class RelatorioVendasRequisicaoController extends MyGenericForwardCompose
 			parametros.put("empresa", "Todas;");
 		}
 		
+		String nombpuntoventa = "";
+		String descsecretaria = "";
+
 		Comboitem itemPuntoventa = cmbPuntoVenta.getSelectedItem();
 		if(itemPuntoventa != null) {
 			PuntoVenta puntoVenta = (PuntoVenta) itemPuntoventa.getValue();
 			if(puntoVenta.getPuntoventaId() > -1) {
+				nombpuntoventa = puntoVenta.getNombpuntoventa();
 				parametros.put("PUNTOVENTA_ID", puntoVenta.getPuntoventaId());
-				parametros.put("puntoventa", puntoVenta.getNombpuntoventa());
+				parametros.put("puntoventa", nombpuntoventa);
 			} else {
 				parametros.put("puntoventa", "Todas;");
 			}
@@ -99,6 +130,7 @@ public class RelatorioVendasRequisicaoController extends MyGenericForwardCompose
 		if(itemSecretaria != null) {
 			Secretaria secretaria = (Secretaria) itemSecretaria.getValue();
 			if(secretaria.getSecretariaId() > -1) {
+				descsecretaria = secretaria.getDescsecretaria();
 				parametros.put("SECRETARIA_ID", secretaria.getSecretariaId());
 				parametros.put("secretaria", secretaria.getDescsecretaria());
 			} else {
@@ -108,8 +140,18 @@ public class RelatorioVendasRequisicaoController extends MyGenericForwardCompose
 			parametros.put("secretaria", "Todas;");
 		}
 
+		if (radioTipoRelatorioPorCliente.isChecked()) {
+			parametros.put("CABECALHO_AGRUPAMENTO_LABEL", Labels.getLabel("lb.puntoventa"));
+			parametros.put("CABECALHO_AGRUPAMENTO_DESCRICAO", nombpuntoventa);
+			parametros.put("AGRUPAMENTO_LABEL", Labels.getLabel("relatorioVendasRequisicaoController.cliente.label"));
+		} else if (radioTipoRelatorioPorPontoVenda.isChecked()) {
+			parametros.put("CABECALHO_AGRUPAMENTO_LABEL", Labels.getLabel("relatorioVendasRequisicaoController.cliente.label"));
+			parametros.put("CABECALHO_AGRUPAMENTO_DESCRICAO", descsecretaria);
+			parametros.put("AGRUPAMENTO_LABEL", Labels.getLabel("lb.puntoventa"));
+		}
+
 		Map<String, Object> args = new HashMap<String, Object>();
-		Relatorio relatorio = new RelatorioVendasRequisicao(parametros, dataSourceRead.getConnection());
+		Relatorio relatorio = new RelatorioVendasRequisicao(parametros, dataSourceRead.getConnection(), radioTipoRelatorioPorCliente.isChecked());
 		args.put("relatorio", relatorio);
 
 		openWindow("/component/reportView.zul",
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index 46a4aa075..45e6249dc 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -8268,4 +8268,9 @@ viewTestEmailController.lblStatusInfo.erro = Ocorreram alguns erros durante o pr
 viewTestEmailController.emailSubject = Mensagem de Teste do Email da empresa: {0}
 viewTestEmailController.emailText = Este é um email enviado automaticamente pela ADM TotalBus durante o teste das configurações da sua conta.
 viewTestEmailController.semDestinatario = Não foi configurado usuário para envio.
-viewTestEmailController.destinatario = Destinatário
\ No newline at end of file
+viewTestEmailController.destinatario = Destinatário
+
+#relatorioVendasRequisicaoController
+relatorioVendasRequisicaoController.lbAgruparPor.label = Agrupar por
+relatorioVendasRequisicaoController.radioTipoRelatorioPorCliente.label = Ordem de Serviço - Secretaria
+relatorioVendasRequisicaoController.cliente.label = Cliente
\ No newline at end of file
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 3d9ee2ce7..e037f406c 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -8774,4 +8774,9 @@ viewTestEmailController.lblStatusInfo.erro = Ocorreram alguns erros durante o pr
 viewTestEmailController.emailSubject = Mensagem de Teste do Email da empresa: {0}
 viewTestEmailController.emailText = Este é um email enviado automaticamente pela ADM TotalBus durante o teste das configurações da sua conta.
 viewTestEmailController.semDestinatario = Não foi configurado usuário para envio.
-viewTestEmailController.destinatario = Destinatário
\ No newline at end of file
+viewTestEmailController.destinatario = Destinatário
+
+#relatorioVendasRequisicaoController
+relatorioVendasRequisicaoController.lbAgruparPor.label = Agrupar por
+relatorioVendasRequisicaoController.radioTipoRelatorioPorCliente.label = Ordem de Serviço - Secretaria
+relatorioVendasRequisicaoController.cliente.label = Cliente
\ No newline at end of file
diff --git a/web/gui/relatorios/filtroRelatorioVendasRequisicao.zul b/web/gui/relatorios/filtroRelatorioVendasRequisicao.zul
index 9edf4f9b6..a00807d11 100644
--- a/web/gui/relatorios/filtroRelatorioVendasRequisicao.zul
+++ b/web/gui/relatorios/filtroRelatorioVendasRequisicao.zul
@@ -7,13 +7,13 @@
 <zk xmlns="http://www.zkoss.org/2005/zul">
 	<window id="winFiltroRelatorioVendasRequisicao"
 		apply="${relatorioVendasRequisicaoController}"
-		contentStyle="overflow:auto" width="700px" border="normal">
+		contentStyle="overflow:auto" width="900px" border="normal">
 		<grid fixedLayout="true">
 			<columns>
-				<column width="15%" />
-				<column width="35%" />
-				<column width="15%" />
+				<column width="10%" />
 				<column width="35%" />
+				<column width="10%" />
+				<column width="45%" />
 			</columns>
 			<rows>
 				<row>
@@ -48,13 +48,19 @@
 						maxlength="10" />
 				</row>		
 				
-				<row>	
+				<row >	
 					<label
 						value="${c:l('busquedaSecretariaController.window.title')}" />
 					<combobox id="cmbSecretaria"
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxSecretaria"
 						mold="rounded" buttonVisible="true" width="90%"
-						 />			
+						 />
+					
+					<label value="${c:l('relatorioVendasRequisicaoController.lbAgruparPor.label')}" />	 
+					<radiogroup id="radiogroupTipoRelatorio">
+						<radio id="radioTipoRelatorioPorCliente" label="${c:l('relatorioVendasRequisicaoController.radioTipoRelatorioPorCliente.label')}" />
+						<radio id="radioTipoRelatorioPorPontoVenda" label="${c:l('lb.puntoventa')}" />
+					</radiogroup>
 				</row>	
 			</rows>
 		</grid>