From a0237bde238782c0e841de9df00265005b8966b6 Mon Sep 17 00:00:00 2001 From: valdevir Date: Wed, 9 Dec 2020 11:49:33 +0000 Subject: [PATCH] fixes bug#20799 qua: dev:Valdir Realizado alteracao para mostrar relatorio linha sumarizado. git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@104638 d1611594-4594-4d17-8e1d-87c2c4800839 --- ...atorioResumoLinhasAnaliticoSumarizado.java | 35 + ...umoLinhasAnaliticoSumarizado_es.properties | 16 + ...LinhasAnaliticoSumarizado_pt_BR.properties | 16 + ...orioResumoLinhasAnaliticoSumarizado.jasper | Bin 0 -> 104948 bytes ...torioResumoLinhasAnaliticoSumarizado.jrxml | 1203 +++++++++++++++++ .../RelatorioResumoLinhasAnaliticoBean.java | 247 ++++ .../RelatorioResumoLinhasController.java | 13 +- web/WEB-INF/i3-label_en.label | 2 + web/WEB-INF/i3-label_es_MX.label | 1 + web/WEB-INF/i3-label_pt_BR.label | 2 +- .../filtroRelatorioResumoLinhas.zul | 5 + 11 files changed, 1536 insertions(+), 4 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioResumoLinhasAnaliticoSumarizado_es.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioResumoLinhasAnaliticoSumarizado_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSumarizado.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSumarizado.jrxml create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioResumoLinhasAnaliticoBean.java diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java new file mode 100644 index 000000000..3e3ea9dc8 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java @@ -0,0 +1,35 @@ +/** + * + */ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.util.Map; + +import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; + +/** + * @author Bruno H. G. Gouvêa + * + */ +public class RelatorioResumoLinhasAnaliticoSumarizado extends Relatorio { + + /** + * @param parametros + * @param conexao + */ + public RelatorioResumoLinhasAnaliticoSumarizado(Map parametros, Connection conexao) { + super(parametros, conexao); + // TODO Auto-generated constructor stub + } + + /* + * (non-Javadoc) + * + * @see com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio#processaParametros() + */ + @Override + public void processaParametros() throws Exception { + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioResumoLinhasAnaliticoSumarizado_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioResumoLinhasAnaliticoSumarizado_es.properties new file mode 100644 index 000000000..e1826f5f2 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioResumoLinhasAnaliticoSumarizado_es.properties @@ -0,0 +1,16 @@ +#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: + +rodape.pagina=Página +rodape.de=de \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioResumoLinhasAnaliticoSumarizado_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioResumoLinhasAnaliticoSumarizado_pt_BR.properties new file mode 100644 index 000000000..e1826f5f2 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioResumoLinhasAnaliticoSumarizado_pt_BR.properties @@ -0,0 +1,16 @@ +#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: + +rodape.pagina=Página +rodape.de=de \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSumarizado.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnaliticoSumarizado.jasper new file mode 100644 index 0000000000000000000000000000000000000000..ed472cbf4a311ec65fe2e3889afbf745be7ebcb4 GIT binary patch literal 104948 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 + + + + + + + + + + + + + + + + + + + + + CD.ESTADO_ID + THEN 'S' + ELSE 'N' + END INTERESTADUAL, + NVL(GR.DESCGRUPO, 'Não Definido') GRUPO_LINHA, + (SELECT SUM(NVL(RS.KMORIGINAL,0)) + FROM RUTA_SECUENCIA RS, + TRAMO TR + WHERE RS.RUTA_ID = RT.RUTA_ID + AND RS.TRAMO_ID = TR.TRAMO_ID + AND RS.ACTIVO = 1 + ) EXTENSAO_KM, + NVL(SUM(NVL(BL.IMPORTESEGURO,0)), 0) RECEITA_SEGURO, + 0 RECEITA_BAGAGEM, + 0 RECEITA_SEGURO_OUTROS, + SUM(NVL(BL.IMPORTEPEDAGIO,0)) RECEITA_PEDAGIO, + SUM(NVL(BL.IMPORTETAXAEMBARQUE,0)) RECEITA_EMBARQUE, + COUNT(1) PASSAGEIROS, + COUNT(DISTINCT + CASE + WHEN CR.TIPOSERVICIO_ID = 2 + THEN CR.FECCORRIDA + || CR.CORRIDA_ID + ELSE NULL + END) VIAGENS_EXTRA, + COUNT(DISTINCT + CASE + WHEN CR.TIPOSERVICIO_ID <> 2 + THEN CR.FECCORRIDA + || CR.CORRIDA_ID + ELSE NULL + END) VIAGENS, + NVL(CS.CVECLASE, ' ') CVE_CLASE_SERVICIO + FROM RUTA RT, + BOLETO BL, + CORRIDA CR, + TRAMO TR, + VIGENCIA_TARIFA VT, + GRUPO_RUTA GR, + PARADA PO, + PARADA PD, + CIUDAD CO, + CIUDAD CD, + CLASE_SERVICIO CS + WHERE RT.RUTA_ID = CR.RUTA_ID + AND CS.CLASESERVICIO_ID = RT.CLASESERVICIO_ID + AND CR.FECCORRIDA = BL.FECCORRIDA + AND CR.RUTA_ID = NVL($P{RUTA_ID}, CR.RUTA_ID) + AND DECODE($P{GRUPORUTA_ID}, NULL, 1, RT.GRUPORUTA_ID) = DECODE($P{GRUPORUTA_ID}, NULL, 1, $P{GRUPORUTA_ID}) + AND CR.CORRIDA_ID = BL.CORRIDA_ID + AND CR.EMPRESACORRIDA_ID = 10 + AND CR.ORIGEN_ID = PO.PARADA_ID + AND CR.DESTINO_ID = PD.PARADA_ID + AND PO.CIUDAD_ID = CO.CIUDAD_ID + AND PD.CIUDAD_ID = CD.CIUDAD_ID + AND RT.GRUPORUTA_ID = GR.GRUPORUTA_ID(+) + AND TR.ORIGEN_ID = CR.ORIGEN_ID + AND TR.DESTINO_ID = CR.DESTINO_ID + AND BL.MOTIVOCANCELACION_ID IS NULL + AND BL.INDSTATUSOPERACION = 'F' + AND VT.ACTIVO = 1 + AND CR.FECCORRIDA BETWEEN VT.FECINICIOVIGENCIA AND VT.FECFINVIGENCIA + AND CR.FECCORRIDA BETWEEN $P{DATA_INICIAL} AND $P{DATA_FINAL} + AND CR.ACTIVO = 1 + GROUP BY RT.RUTA_ID, + RT.NUMRUTA, + CR.FECCORRIDA, + RT.DESCRUTA, + GR.DESCGRUPO, + CO.ESTADO_ID, + CD.ESTADO_ID, + RT.INDSENTIDOIDA, + CS.CVECLASE, + BL.BOLETO_ID, + BL.preciopagado + ) DADOS + GROUP BY RUTA_ID, + INDSENTIDOIDA, + NUMRUTA, + FECCORRIDA, + DESCRUTA, + INTERESTADUAL, + GRUPO_LINHA, + EXTENSAO_KM, + RECEITA_SEGURO, + RECEITA_BAGAGEM, + RECEITA_SEGURO_OUTROS, + RECEITA_PEDAGIO, + RECEITA_EMBARQUE, + PASSAGEIROS, + VIAGENS_EXTRA, + VIAGENS, + CVE_CLASE_SERVICIO + ) TAB1 + )TAB + GROUP BY TAB.RUTA_ID, + TAB.NUMRUTA, + TAB.DESCRUTA, + TAB.INTERESTADUAL, + TAB.GRUPO_LINHA, + TAB.EXTENSAO_KM, + TAB.CVE_CLASE_SERVICIO, + TAB.INDSENTIDOIDA + ) SUB +WHERE (DECODE(NVL(SUB.VIAGENS_TOTAL,0), 0, 1, NVL(SUB.VIAGENS_TOTAL,0)) != 0) +AND DECODE(NVL(SUB.VIAGENS_TOTAL,0), 0, 1, NVL(SUB.VIAGENS_TOTAL,0)) != 0 +AND DECODE(NVL(SUB.KM_RODADO,0), 0, 1, NVL(SUB.KM_RODADO,0)) != 0 +AND DECODE(NVL(SUB.VIAGENS_TOTAL,0), 0, 1, NVL(SUB.VIAGENS_TOTAL,0)) != 0 +AND DECODE(NVL(SUB.VIAGENS_TOTAL,0), 0, 1, NVL(SUB.VIAGENS_TOTAL,0)) != 0 +ORDER BY SUB.DESCRUTA, + SUB.INDSENTIDOIDA]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioResumoLinhasAnaliticoBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioResumoLinhasAnaliticoBean.java new file mode 100644 index 000000000..1df895d9d --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioResumoLinhasAnaliticoBean.java @@ -0,0 +1,247 @@ +package com.rjconsultores.ventaboletos.relatorios.utilitarios; + +import java.math.BigDecimal; + +public class RelatorioResumoLinhasAnaliticoBean { + + private Integer rutaId; + private Integer numRuta; + private Boolean indSentidoIda; + private String descruta; + private BigDecimal tarifa; + private Integer grupoRutaId; + private Integer assentos; + private Integer rolOperativoId; + private String interestadual; + private String grupoLinha; + private BigDecimal extensaoKm; + private String cveClaseServicio; + private BigDecimal receitaSeguro; + private BigDecimal receitaBagagem; + private BigDecimal receitaSeguroOutros; + private BigDecimal receitaTarifa; + private BigDecimal receitaPedagio; + private BigDecimal receitaEmbarque; + private Integer passageiros; + private Integer viagensExtra; + private Integer viagens; + private BigDecimal receitaTotal; + private Integer viagensTotal; + private BigDecimal kmRodado; + private BigDecimal passageirosEquivalentes; + private BigDecimal passageirosMpa; + private BigDecimal passageirosMpe; + private BigDecimal receitaKm; + private BigDecimal receitaViagem; + private BigDecimal equivalencia; + private BigDecimal paxKm; + private BigDecimal paxOfertado; + private BigDecimal iap; + + public Integer getRutaId() { + return rutaId; + } + public void setRutaId(Integer rutaId) { + this.rutaId = rutaId; + } + public Integer getNumRuta() { + return numRuta; + } + public void setNumRuta(Integer numRuta) { + this.numRuta = numRuta; + } + public Boolean getIndSentidoIda() { + return indSentidoIda; + } + public void setIndSentidoIda(Boolean indSentidoIda) { + this.indSentidoIda = indSentidoIda; + } + public String getDescruta() { + return descruta; + } + public void setDescruta(String descruta) { + this.descruta = descruta; + } + public BigDecimal getTarifa() { + return tarifa; + } + public void setTarifa(BigDecimal tarifa) { + this.tarifa = tarifa; + } + public Integer getGrupoRutaId() { + return grupoRutaId; + } + public void setGrupoRutaId(Integer grupoRutaId) { + this.grupoRutaId = grupoRutaId; + } + public Integer getAssentos() { + return assentos; + } + public void setAssentos(Integer assentos) { + this.assentos = assentos; + } + public Integer getRolOperativoId() { + return rolOperativoId; + } + public void setRolOperativoId(Integer rolOperativoId) { + this.rolOperativoId = rolOperativoId; + } + public String getInterestadual() { + return interestadual; + } + public void setInterestadual(String interestadual) { + this.interestadual = interestadual; + } + public String getGrupoLinha() { + return grupoLinha; + } + public void setGrupoLinha(String grupoLinha) { + this.grupoLinha = grupoLinha; + } + public BigDecimal getExtensaoKm() { + return extensaoKm; + } + public void setExtensaoKm(BigDecimal extensaoKm) { + this.extensaoKm = extensaoKm; + } + public String getCveClaseServicio() { + return cveClaseServicio; + } + public void setCveClaseServicio(String cveClaseServicio) { + this.cveClaseServicio = cveClaseServicio; + } + public BigDecimal getReceitaSeguro() { + return receitaSeguro; + } + public void setReceitaSeguro(BigDecimal receitaSeguro) { + this.receitaSeguro = receitaSeguro; + } + public BigDecimal getReceitaBagagem() { + return receitaBagagem; + } + public void setReceitaBagagem(BigDecimal receitaBagagem) { + this.receitaBagagem = receitaBagagem; + } + public BigDecimal getReceitaSeguroOutros() { + return receitaSeguroOutros; + } + public void setReceitaSeguroOutros(BigDecimal receitaSeguroOutros) { + this.receitaSeguroOutros = receitaSeguroOutros; + } + public BigDecimal getReceitaTarifa() { + return receitaTarifa; + } + public void setReceitaTarifa(BigDecimal receitaTarifa) { + this.receitaTarifa = receitaTarifa; + } + public BigDecimal getReceitaPedagio() { + return receitaPedagio; + } + public void setReceitaPedagio(BigDecimal receitaPedagio) { + this.receitaPedagio = receitaPedagio; + } + public BigDecimal getReceitaEmbarque() { + return receitaEmbarque; + } + public void setReceitaEmbarque(BigDecimal receitaEmbarque) { + this.receitaEmbarque = receitaEmbarque; + } + public Integer getPassageiros() { + return passageiros; + } + public void setPassageiros(Integer passageiros) { + this.passageiros = passageiros; + } + public Integer getViagensExtra() { + return viagensExtra; + } + public void setViagensExtra(Integer viagensExtra) { + this.viagensExtra = viagensExtra; + } + public Integer getViagens() { + return viagens; + } + public void setViagens(Integer viagens) { + this.viagens = viagens; + } + public BigDecimal getReceitaTotal() { + return receitaTotal; + } + public void setReceitaTotal(BigDecimal receitaTotal) { + this.receitaTotal = receitaTotal; + } + public Integer getViagensTotal() { + return viagensTotal; + } + public void setViagensTotal(Integer viagensTotal) { + this.viagensTotal = viagensTotal; + } + public BigDecimal getKmRodado() { + return kmRodado; + } + public void setKmRodado(BigDecimal kmRodado) { + this.kmRodado = kmRodado; + } + public BigDecimal getPassageirosEquivalentes() { + return passageirosEquivalentes; + } + public void setPassageirosEquivalentes(BigDecimal passageirosEquivalentes) { + this.passageirosEquivalentes = passageirosEquivalentes; + } + public BigDecimal getPassageirosMpa() { + return passageirosMpa; + } + public void setPassageirosMpa(BigDecimal passageirosMpa) { + this.passageirosMpa = passageirosMpa; + } + public BigDecimal getPassageirosMpe() { + return passageirosMpe; + } + public void setPassageirosMpe(BigDecimal passageirosMpe) { + this.passageirosMpe = passageirosMpe; + } + public BigDecimal getReceitaKm() { + return receitaKm; + } + public void setReceitaKm(BigDecimal receitaKm) { + this.receitaKm = receitaKm; + } + public BigDecimal getReceitaViagem() { + return receitaViagem; + } + public void setReceitaViagem(BigDecimal receitaViagem) { + this.receitaViagem = receitaViagem; + } + public BigDecimal getEquivalencia() { + return equivalencia; + } + public void setEquivalencia(BigDecimal equivalencia) { + this.equivalencia = equivalencia; + } + public BigDecimal getPaxKm() { + return paxKm; + } + public void setPaxKm(BigDecimal paxKm) { + this.paxKm = paxKm; + } + public BigDecimal getPaxOfertado() { + return paxOfertado; + } + public void setPaxOfertado(BigDecimal paxOfertado) { + this.paxOfertado = paxOfertado; + } + public BigDecimal getIap() { + return iap; + } + public void setIap(BigDecimal iap) { + this.iap = iap; + } + + + + + + + + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioResumoLinhasController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioResumoLinhasController.java index 917137fd7..8214d3ff7 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioResumoLinhasController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioResumoLinhasController.java @@ -18,6 +18,7 @@ import org.springframework.stereotype.Controller; import org.zkoss.util.resource.Labels; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Checkbox; import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; import org.zkoss.zul.Radio; @@ -27,6 +28,7 @@ import com.rjconsultores.ventaboletos.entidad.GrupoRuta; import com.rjconsultores.ventaboletos.entidad.Ruta; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioResumoLinhas; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioResumoLinhasAnalitico; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioResumoLinhasAnaliticoSumarizado; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.GrupoRutaService; @@ -64,6 +66,7 @@ public class RelatorioResumoLinhasController extends MyGenericForwardComposer { private MyComboboxEstandar cmbEmpresa; private MyComboboxEstandar cmbGrupoRuta; private Radio rdAnalitico; + private Checkbox chcSumarizar; public void onClick$btnExecutarRelatorio(Event ev) throws Exception { executarRelatorio(); @@ -120,11 +123,15 @@ public class RelatorioResumoLinhasController extends MyGenericForwardComposer { parametros.put("DATA", new Date()); parametros.put("FILTROS", filtro.toString()); - if (rdAnalitico.isChecked()) + if (rdAnalitico.isChecked()) { + if(chcSumarizar.isChecked()) { + relatorio = new RelatorioResumoLinhasAnaliticoSumarizado(parametros, dataSourceRead.getConnection()); + }else { relatorio = new RelatorioResumoLinhasAnalitico(parametros, dataSourceRead.getConnection()); - else + } + }else { relatorio = new RelatorioResumoLinhas(parametros, dataSourceRead.getConnection()); - + } Map args = new HashMap(); args.put("relatorio", relatorio); diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label index 5723ce90d..147cd13ab 100644 --- a/web/WEB-INF/i3-label_en.label +++ b/web/WEB-INF/i3-label_en.label @@ -520,6 +520,8 @@ relatorioResumoLinhasController.lbConexao.value=Conexão relatorioResumoLinhasController.lbLote.value=Lote relatorioResumoLinhasController.lbAte.value=até relatorioResumoLinhasController.lbGrupoRuta.label=Grupo de Linhas +relatorioResumoLinhasController.lblSumarizar.value = Sumarizar por linhas + #Km Programada relatorioKmProgramadaController.window.title=Relatório Resumo de Linhas diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index cb387dc24..75cd90104 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -484,6 +484,7 @@ relatorioResumoLinhasController.lbEmpresa.value = Empresa relatorioResumoLinhasController.lbConexao.value = Conexión relatorioResumoLinhasController.lbLote.value = Lote relatorioResumoLinhasController.lbAte.value = Hasta +relatorioResumoLinhasController.lblSumarizar.value = Sumarizar por linhas #Aproveitamento diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index ea27463f3..1345debc9 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -523,7 +523,7 @@ relatorioResumoLinhasController.lbConexao.value = Conexão relatorioResumoLinhasController.lbLote.value = Lote relatorioResumoLinhasController.lbAte.value = até relatorioResumoLinhasController.lbGrupoRuta.label = Grupo de Linhas - +relatorioResumoLinhasController.lblSumarizar.value = Sumarizar por linhas #Km Programada relatorioKmProgramadaController.window.title = Relatório Resumo de Linhas relatorioKmProgramadaController.lbRuta.value = Linha diff --git a/web/gui/relatorios/filtroRelatorioResumoLinhas.zul b/web/gui/relatorios/filtroRelatorioResumoLinhas.zul index b7b6687bc..3240a554a 100644 --- a/web/gui/relatorios/filtroRelatorioResumoLinhas.zul +++ b/web/gui/relatorios/filtroRelatorioResumoLinhas.zul @@ -56,6 +56,11 @@ use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" model="@{winFiltroRelatorioResumoLinhas$composer.lsEmpresa}" constraint="no empty" /> + + + +