From 25a47a930dca92c91c59245f700b730835dac1ec Mon Sep 17 00:00:00 2001 From: frederico Date: Fri, 16 Mar 2018 19:10:21 +0000 Subject: [PATCH] bug#10699 dev:veloso qua:jose git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@79974 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioHistoricoClientes.java | 18 +- ...toricoClientesSemAgrupamento_es.properties | 33 ++ ...icoClientesSemAgrupamento_pt_BR.properties | 33 ++ .../RelatorioHistoricoClientes_es.properties | 27 +- .../RelatorioHistoricoClientes.jasper | Bin 47419 -> 47795 bytes .../RelatorioHistoricoClientes.jrxml | 3 + ...orioHistoricoClientesSemAgrupamento.jasper | Bin 0 -> 43935 bytes ...torioHistoricoClientesSemAgrupamento.jrxml | 378 ++++++++++++++++++ .../RelatorioHistoricoClientesController.java | 3 + web/WEB-INF/i3-label_es_MX.label | 1 + web/WEB-INF/i3-label_pt_BR.label | 1 + .../filtroRelatorioHistoricoClientes.zul | 11 +- 12 files changed, 497 insertions(+), 11 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_es.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jrxml diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoClientes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoClientes.java index be793b49d..92e6baca9 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoClientes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoClientes.java @@ -12,19 +12,24 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; public class RelatorioHistoricoClientes extends Relatorio { + + private boolean agrupar; public RelatorioHistoricoClientes(Map parametros, Connection conexao) throws Exception { + super(parametros, conexao); + this.setCustomDataSource(new ArrayDataSource(this) { public void initDados() throws Exception { Connection conexao = this.relatorio.getConexao(); Map parametros = this.relatorio.getParametros(); + String sql = getSql(parametros); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); - + agrupar = parametros.get("AGRUPAR").toString().equals("true"); ResultSet rset = stmt.executeQuery(); while (rset.next()) { @@ -57,7 +62,16 @@ public class RelatorioHistoricoClientes extends Relatorio { } }); } - + + @Override + public String getNome() { + if (agrupar) { + return super.getNome(); + } else { + return super.getNome() + "SemAgrupamento"; + } + } + @Override protected void processaParametros() throws Exception { } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_es.properties new file mode 100644 index 000000000..e7b873e63 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_es.properties @@ -0,0 +1,33 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. + +#Labels cabeçalho +cabecalho.relatorio=Relatório: +cabecalho.periodo=Período: +cabecalho.periodoA=à +cabecalho.dataHora=Data/Hora: +cabecalho.impressorPor=Impressor por: +cabecalho.pagina=Página +cabecalho.de=de +cabecalho.filtros=Filtros: + +label.nomeCliente=Nome +label.cpfCliente=CPF +label.emailCliente=Email +label.telCliente=Tel +label.sigla=Tipo +label.bilhete=Bilhete +label.linha=Linha +label.origem=Origem +label.destino=Destino +label.servico=Serviço +label.classe=Classe +label.poltrona=Polt. +label.dataVenda=Venda +label.dataViagem=Viagem +label.tarifa=Tarifa +label.taxas=Taxas +label.formapago=F. Pgto +label.parcelas=Parcelas + +label.totais=TOTAIS: \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_pt_BR.properties new file mode 100644 index 000000000..e7b873e63 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_pt_BR.properties @@ -0,0 +1,33 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. + +#Labels cabeçalho +cabecalho.relatorio=Relatório: +cabecalho.periodo=Período: +cabecalho.periodoA=à +cabecalho.dataHora=Data/Hora: +cabecalho.impressorPor=Impressor por: +cabecalho.pagina=Página +cabecalho.de=de +cabecalho.filtros=Filtros: + +label.nomeCliente=Nome +label.cpfCliente=CPF +label.emailCliente=Email +label.telCliente=Tel +label.sigla=Tipo +label.bilhete=Bilhete +label.linha=Linha +label.origem=Origem +label.destino=Destino +label.servico=Serviço +label.classe=Classe +label.poltrona=Polt. +label.dataVenda=Venda +label.dataViagem=Viagem +label.tarifa=Tarifa +label.taxas=Taxas +label.formapago=F. Pgto +label.parcelas=Parcelas + +label.totais=TOTAIS: \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientes_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientes_es.properties index 2f6485486..b541353de 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientes_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientes_es.properties @@ -11,10 +11,23 @@ cabecalho.pagina=P cabecalho.de=de cabecalho.filtros=Filtros: -#Labels header -label.aidf=AIDF -label.empresa=Empresa -label.agencia=Agencia -label.serie=Serie -label.bilhete=Bilhetes -label.numeracao=Numeração +label.nomeCliente=Nome: +label.cpfCliente=CPF: +label.emailCliente=Email: +label.telCliente=Tel: +label.sigla=Tipo +label.bilhete=Bilhete +label.linha=Linha +label.origem=Origem +label.destino=Destino +label.servico=Serviço +label.classe=Classe +label.poltrona=Polt. +label.dataVenda=Venda +label.dataViagem=Viagem +label.tarifa=Tarifa +label.taxas=Taxas +label.formapago=F. Pgto +label.parcelas=Parcelas + +label.totais=TOTAIS: \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientes.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientes.jasper index c599837e29a41409c2669d4668f48d5d5a8eea8b..438685c9a8d67df8442facf891d2a9bedda7e707 100644 GIT binary patch delta 14591 zcmeHNd3aPswy#rFCQWjIgoG_11PBDOCyJ~Ak`Ty360!mUhECE64cSPVMFg5fc95kM zPz1pZ1qSp5g5U{b8xY*Er(Yq6OA)~h0sTurltcwLtQb%U;;rc52A{|& zAcn;TH_VBe48oWf*zj5OB!EPbn;6uP6Z=Vf;gcNPkUX*o#EO)_hNnkO1+iy-U_
4BM_@umA@p4KboEJ+bhKShFDeg~akwu`yC$;s6 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 ZJm=&8$?}k^%ztzgtpC-KXn1 + @@ -38,6 +39,7 @@ + @@ -207,6 +209,7 @@ $F{cpfCliente}.substring(0,3) + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jasper new file mode 100644 index 0000000000000000000000000000000000000000..0cfed350a314ad16ec833d95c756c3473c3678ee GIT binary patch literal 43935 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 HSseL)GbA_( literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jrxml new file mode 100644 index 000000000..82d8cb52c --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jrxml @@ -0,0 +1,378 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="79" splitType="Stretch"> + <textField pattern="" isBlankWhenNull="false"> + <reportElement uuid="da52f710-3882-4beb-ba6f-870e03f6800d" mode="Transparent" x="0" y="0" width="495" height="41" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> + <font fontName="SansSerif" size="14" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression> + </textField> + <textField evaluationTime="Report" pattern="" isBlankWhenNull="false"> + <reportElement uuid="2f4f1314-9363-4e6d-822f-c85c1890998b" mode="Transparent" x="819" y="25" width="21" height="16" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> + <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> + </textField> + <textField pattern="" isBlankWhenNull="false"> + <reportElement uuid="c8a70b8d-369e-48ae-a911-a5d9692316f7" mode="Transparent" x="736" y="42" width="104" height="15" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> + <font fontName="SansSerif" size="10" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false"> + <reportElement uuid="ad4bbfb8-582d-4aa2-904d-8dfe60e54442" mode="Transparent" x="736" y="0" width="104" height="25" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> + <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> + </textField> + <textField pattern="" isBlankWhenNull="false"> + <reportElement uuid="8601bf20-f5f8-4fed-9445-7adfe580d236" mode="Transparent" x="551" y="25" width="267" height="16" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> + <font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="b48a0903-0b2a-4ae5-ae04-811d097a9f91" x="551" y="0" width="185" height="25"/> + <textElement textAlignment="Right"> + <font size="9" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression> + </textField> + <line> + <reportElement uuid="3c577f75-c6d6-4c11-a846-bfe71a8a1b42" x="0" y="58" width="839" height="1"/> + </line> + <textField isStretchWithOverflow="true"> + <reportElement uuid="aff6535e-c25b-4f31-ad3a-baacc52e4974" x="0" y="59" width="840" height="15"/> + <textElement verticalAlignment="Middle"> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression> + </textField> + <line> + <reportElement uuid="84641d2c-21a5-47f0-b4a8-afe7bf700cb6" positionType="Float" x="0" y="78" width="839" height="1"/> + </line> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioHistoricoClientesController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioHistoricoClientesController.java index db43b5502..dca2e3a40 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioHistoricoClientesController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioHistoricoClientesController.java @@ -17,6 +17,7 @@ import org.zkoss.zhtml.Messagebox; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Bandbox; +import org.zkoss.zul.Checkbox; import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; import org.zkoss.zul.Paging; @@ -66,6 +67,7 @@ public class RelatorioHistoricoClientesController extends MyGenericForwardCompos private MyListbox linhaList; private MyListbox linhaListSelList; private Textbox txtPalavraPesquisaLinha; + private Checkbox chcAgrupar; @Autowired private EmpresaService empresaService; @@ -161,6 +163,7 @@ public class RelatorioHistoricoClientesController extends MyGenericForwardCompos parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioHistoricoClientesController.window.title")); parametros.put("USUARIO", UsuarioLogado.getUsuarioLogado().getUsuarioId().toString()); parametros.put("USUARIO_NOME", UsuarioLogado.getUsuarioLogado().getNombusuario()); + parametros.put("AGRUPAR", chcAgrupar.isChecked()); lsNumLinha = new ArrayList(Arrays.asList(linhaListSelList.getData())); parametros.put("lsNumLinha", lsNumLinha); diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index a40b1c864..a081e1dc4 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -467,6 +467,7 @@ relatorioHistoricoClientesController.lblDataEmbarqueFin.value = Data Embarque Fi relatorioHistoricoClientesController.MSG.informarDatas = Favor informar um filtro de data. relatorioHistoricoClientesController.MSG.informarDataVenda = Favor informar o período completo de venda. relatorioHistoricoClientesController.MSG.informarDataEmbarque = Favor infromar o período completo de embarque. +relatorioHistoricoClientesController.lblAgruparPorCliente.value = Agrupar por Cliente # Relatorio OCD Empresa relatorioOCDController.window.title=Reporte OCD por la empresa diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 8724a4fc1..f0c754eb0 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -490,6 +490,7 @@ relatorioHistoricoClientesController.lblDataEmbarqueFin.value = Data Embarque Fi relatorioHistoricoClientesController.MSG.informarDatas = Favor informar um filtro de data. relatorioHistoricoClientesController.MSG.informarDataVenda = Favor informar o período completo de venda. relatorioHistoricoClientesController.MSG.informarDataEmbarque = Favor infromar o período completo de embarque. +relatorioHistoricoClientesController.lblAgruparPorCliente.value = Agrupar por Cliente # Relatorio OCD Empresa relatorioOCDController.window.title=Relatório OCD por Empresa diff --git a/web/gui/relatorios/filtroRelatorioHistoricoClientes.zul b/web/gui/relatorios/filtroRelatorioHistoricoClientes.zul index b09173b2d..d2e7b29af 100644 --- a/web/gui/relatorios/filtroRelatorioHistoricoClientes.zul +++ b/web/gui/relatorios/filtroRelatorioHistoricoClientes.zul @@ -7,7 +7,7 @@ + height="484px" width="728px" border="normal"> @@ -16,7 +16,7 @@ - + + + + + + +