From 8d4d93e22427f22a6e34617b8efde5da1c1d0ef9 Mon Sep 17 00:00:00 2001 From: walace Date: Tue, 30 Apr 2019 20:38:37 +0000 Subject: [PATCH] fixes bug#13947 qua:renato dev:lucas git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@92638 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioGratuidadeSimplificado.java | 12 + ...atorioGratuidadeSimplificado_es.properties | 56 ++++ ...rioGratuidadeSimplificado_pt_BR.properties | 56 ++++ .../RelatorioGratuidadeSimplificado.jasper | Bin 0 -> 41402 bytes .../RelatorioGratuidadeSimplificado.jrxml | 286 ++++++++++++++++++ .../RelatorioGratuidadeController.java | 22 +- web/WEB-INF/i3-label_es_MX.label | 2 + web/WEB-INF/i3-label_pt_BR.label | 2 + .../relatorios/filtroRelatorioGratuidade.zul | 8 +- 9 files changed, 437 insertions(+), 7 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeSimplificado.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeSimplificado_es.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeSimplificado_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeSimplificado.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeSimplificado.jrxml diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeSimplificado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeSimplificado.java new file mode 100644 index 000000000..43a440bf4 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeSimplificado.java @@ -0,0 +1,12 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.util.Map; + +public class RelatorioGratuidadeSimplificado extends RelatorioGratuidade { + + public RelatorioGratuidadeSimplificado(Map parametros, Connection conexao) throws Exception { + super(parametros, conexao); + } + +} \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeSimplificado_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeSimplificado_es.properties new file mode 100644 index 000000000..3bf1616e0 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeSimplificado_es.properties @@ -0,0 +1,56 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. +msg.a=à + +#Labels header +header.periodo=Período: +header.data.hora=Data/Hora\: +header.pagina=Página\: +header.filtro=Filtro\: +header.filtro.servico=Serviço\: +header.filtro.linha=Linha\: +header.filtro.grupo=Grupo de Linhas\: +header.empresa=Empresa\: +header.periodo.viagem=Período Viagem +header.periodo.venda=Período Venda + +#Labels detail + +detail.data=Data +detail.dataServico=Data Serviço +detail.origen=Origem +detail.destino=Destino +detail.km=Km +detail.linha=Linha +detail.servicio=Serviço +detail.hora=Horário do Serviço +detail.tipobilhete=Tipo Venda +detail.tipopassagem=Tipo Passagem +detail.pasajero=Nome Passageiro +detail.documento=Doc +detail.precio=Preço +detail.desconto=Valor do Desconto +detail.valorCobrado=Vlr.Cobrado +detail.tarifa=Tarifa +detail.bilheteiro=Bilheteiro +detail.agencia=Agência +detail.dataMD=Data MD +detail.empresa=Empresa +detail.tipo=Tipo de Passagem +detail.tipoDoc=Tipo Doc. +detail.tarifa=Tarifa +detail.seguro=Seguro +detail.utr=UTR +detail.tpp=TPP +detail.pedagio=Pedágio +detail.rg=RG +detail.status=Status +detail.codOrigem=Cod. Origem +detail.codDestino=Cod. Destino +detail.total=Total +detail.ccf=CCf + +linhas=Linhas + +detail.numfoliosistema=Bilhete +detail.numasiento=Poltrona diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeSimplificado_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeSimplificado_pt_BR.properties new file mode 100644 index 000000000..35322a8d6 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioGratuidadeSimplificado_pt_BR.properties @@ -0,0 +1,56 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. +msg.a=à + +#Labels header +header.periodo=Período: +header.data.hora=Data/Hora\: +header.pagina=Página\: +header.filtro=Filtro\: +header.filtro.servico=Serviço\: +header.filtro.linha=Linha\: +header.filtro.grupo=Grupo de Linhas\: +header.empresa=Empresa\: +header.periodo.viagem=Período Viagem +header.periodo.venda=Período Venda + +#Labels detail + +detail.data=Data +detail.dataServico=Data Serviço +detail.origen=Origem +detail.destino=Destino +detail.km=Km +detail.linha=Linha +detail.servicio=Serviço +detail.hora=Horário do Serviço +detail.tipobilhete=Tipo Venda +detail.tipopassagem=Tipo Passagem +detail.pasajero=Nome Passageiro +detail.documento=Doc +detail.precio=Preço +detail.desconto=Valor do Desconto +detail.valorCobrado=Vlr.Cobrado +detail.tarifa=Tarifa +detail.bilheteiro=Bilheteiro +detail.agencia=Agência +detail.dataMD=Data +detail.empresa=Empresa +detail.tipo=Tipo de Passagem +detail.tipoDoc=Tipo Doc. +detail.tarifa=Tarifa +detail.seguro=Seguro +detail.utr=UTR +detail.tpp=TPP +detail.pedagio=Pedágio +detail.rg=RG +detail.status=Status +detail.codOrigem=Cod. Origem +detail.codDestino=Cod. Destino +detail.total=Total +detail.ccf=CCf + +linhas=Linhas + +detail.numfoliosistema=Bilhete +detail.numasiento=Poltrona diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeSimplificado.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeSimplificado.jasper new file mode 100644 index 0000000000000000000000000000000000000000..6e11aefb2a5a5d5ceeaf4ae7241041a92834e7d9 GIT binary patch literal 41402 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 Z=&VF4`>8o>22rO-7GMKFvp(yQ_%E|qz%Kv* literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeSimplificado.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeSimplificado.jrxml new file mode 100644 index 000000000..4b453ab29 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioGratuidadeSimplificado.jrxml @@ -0,0 +1,286 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="144"> + <textField> + <reportElement x="0" y="0" width="318" height="37" uuid="652312bd-292a-424d-a234-5f157e3699c6"/> + <textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="0" y="37" width="148" height="23" uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716"/> + <textFieldExpression><![CDATA[$R{header.periodo.viagem}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="739" y="37" width="72" height="23" uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60"/> + <textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression> + </textField> + <textField evaluationTime="Report"> + <reportElement x="1070" y="37" width="62" height="23" uuid="8ca68351-fc00-4f19-b94f-f2fd1f41964f"/> + <textElement textAlignment="Right"/> + <textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="930" y="37" width="95" height="23" uuid="be1692e9-f130-4d08-9173-6ca3e4699030"/> + <textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="148" y="37" width="170" height="23" uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50"/> + <textFieldExpression><![CDATA[( $P{fecInicioViagem} != null ? ($P{fecInicioViagem} + " à " + $P{fecFinalViagem}) : "" )]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy HH:mm"> + <reportElement x="811" y="37" width="119" height="23" uuid="6f671365-868e-41a6-81ee-a308d1d91e1d"/> + <textElement textAlignment="Left"/> + <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> + </textField> + <textField> + <reportElement x="1025" y="37" width="45" height="23" uuid="7548d623-fb6c-48d4-b8b7-504f5437a79a"/> + <textElement textAlignment="Right"/> + <textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression> + </textField> + <textField> + <reportElement x="0" y="60" width="148" height="21" uuid="a79c03e0-bbe4-4b1c-8297-533a0d137b27"/> + <textFieldExpression><![CDATA[$R{header.periodo.venda}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="148" y="60" width="170" height="21" uuid="b31b00a3-1ced-4f9c-acb7-470646f7b335"/> + <textFieldExpression><![CDATA[( $P{fecInicioVenda} != null ? ($P{fecInicioVenda} + " à " + $P{fecFinalVenda}) : "" )]]></textFieldExpression> + </textField> + <textField> + <reportElement x="0" y="81" width="148" height="20" uuid="8fb67bb3-6ff2-40d1-b338-714f199ea7f0"/> + <textFieldExpression><![CDATA[$R{header.empresa}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="1" y="114" width="147" height="26" uuid="2c09f3ff-c554-4ce2-886e-eaab93fa15eb"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.origen}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="148" y="114" width="170" height="26" uuid="e18edb89-17f4-417e-8041-664f11245cbd"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="739" y="114" width="72" height="26" uuid="0948a2fc-fc39-4f2d-ab06-d7c97a66df39"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.numasiento}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="318" y="114" width="96" height="26" uuid="c4b5d11d-79a1-4850-8294-8ccaa0898bca"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.numfoliosistema}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="414" y="114" width="93" height="26" uuid="2af7bea7-e8bf-424a-9813-c9d2be7c0459"/> + <textElement textAlignment="Center"> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.dataMD}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="930" y="114" width="95" height="27" uuid="7b62e459-04bc-4227-be76-24bf5938d552"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.tipo}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="1025" y="114" width="107" height="26" uuid="17200d3a-6195-42d1-bc36-ff2baffb56ce"/> + <textElement textAlignment="Center"> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.hora}]]></textFieldExpression> + </textField> + <line> + <reportElement x="1" y="140" width="1131" height="1" uuid="8e2d6686-e4d7-43d5-b3a9-46adc3e58350"/> + </line> + <textField> + <reportElement x="148" y="81" width="170" height="20" uuid="3541e1b0-8dfe-404e-9461-64d10d85531a"/> + <textFieldExpression><![CDATA[$P{nomb_empresa}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="811" y="114" width="119" height="26" uuid="c79866b7-1c62-4d05-99ac-7149916a1a03"/> + <textElement> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.desconto}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="507" y="114" width="232" height="26" uuid="ba5886a6-f2fe-4bec-a845-96569ac6e9ee"/> + <textElement textAlignment="Center"> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.pasajero}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeController.java index fcc770281..69aa28d9d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeController.java @@ -26,6 +26,7 @@ import com.rjconsultores.ventaboletos.entidad.Parada; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.entidad.Ruta; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioGratuidade; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioGratuidadeSimplificado; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.service.CategoriaService; import com.rjconsultores.ventaboletos.service.EmpresaService; @@ -106,12 +107,15 @@ public class RelatorioGratuidadeController extends MyGenericForwardComposer { public void setListSelectedTipoGratuidade(List listSelectedTipoGratuidade) { this.listSelectedTipoGratuidade = listSelectedTipoGratuidade; } + - private void executarRelatorio() throws Exception { + private void executarRelatorio(boolean isAnalitico) throws Exception { Map parametros = new HashMap(); SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + + parametros.put("isAnalitico", true); if (this.datInicialViagem.getValue() != null) { parametros.put("fecInicioViagem", sdf.format(this.datInicialViagem.getValue())); } @@ -208,8 +212,13 @@ public class RelatorioGratuidadeController extends MyGenericForwardComposer { parametros.put("TITULO", Labels.getLabel("relatorioGratuidadeController.window.title")); carregarParametroMotivoCancelamentoAlteracaoPoltrona(parametros); - - Relatorio relatorio = new RelatorioGratuidade(parametros, dataSourceRead.getConnection()); + Relatorio relatorio; + if(isAnalitico) { + relatorio = new RelatorioGratuidade(parametros, dataSourceRead.getConnection()); + }else { + relatorio = new RelatorioGratuidadeSimplificado(parametros, dataSourceRead.getConnection()); + } + Map args = new HashMap(); args.put("relatorio", relatorio); @@ -226,8 +235,11 @@ public class RelatorioGratuidadeController extends MyGenericForwardComposer { } } - public void onClick$btnExecutarRelatorio(Event ev) throws Exception { - executarRelatorio(); + public void onClick$btnExecutarRelatorioAnalitico(Event ev) throws Exception { + executarRelatorio(true); + } + public void onClick$btnExecutarRelatorioSimplificado(Event ev) throws Exception { + executarRelatorio(false); } @Override diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 9fa06a8f5..5b580fad9 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -6783,6 +6783,8 @@ relatorioGratuidadeController.lbTipoGratuidade.value = Tipo de Gratuidade relatorioGratuidadeController.lbDataIni.value = Fecha Inicio relatorioGratuidadeController.lbDataFin.value = Fecha Final relatorioGratuidadeController.orgao = Orgão +relatorioGratuidadeController.btnExecutarRelatorio = Ejecutar Reporte Análitico +relatorioGratuidadeController.btnExecutarRelatorioSimplificado = Ejecutar Reporte Análitico Simplificado # Reporte Gratuidade ANTT relatorioGratuidadeANTTController.window.title = Reporte Gratuidade ANTT diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index de9905210..01794d226 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -7123,6 +7123,8 @@ relatorioGratuidadeController.lbDataIniVenda.value = Data Inicio relatorioGratuidadeController.lbDataFinVenda.value = Data Final relatorioGratuidadeController.lvVenda = Venda relatorioGratuidadeController.orgao = Orgão +relatorioGratuidadeController.btnExecutarRelatorio = Executar Relatorio Analítico +relatorioGratuidadeController.btnExecutarRelatorioSimplificado = Executar Relatorio Analítico Simplificado # Relatório Gratuidade ANTT relatorioGratuidadeANTTController.window.title = Relatório Gratuidades ANTT diff --git a/web/gui/relatorios/filtroRelatorioGratuidade.zul b/web/gui/relatorios/filtroRelatorioGratuidade.zul index 255a0bc2e..b2a1c7578 100644 --- a/web/gui/relatorios/filtroRelatorioGratuidade.zul +++ b/web/gui/relatorios/filtroRelatorioGratuidade.zul @@ -148,8 +148,12 @@ -