From de39b225a9e48a01bd7dd3f6df54e99a2422cd58 Mon Sep 17 00:00:00 2001 From: edgar Date: Mon, 12 Dec 2016 11:14:13 +0000 Subject: [PATCH] fixes bug #8301 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@63460 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/imagens/artesp.png | Bin 0 -> 21219 bytes .../relatorios/impl/RelatorioTabelaPreco.java | 52 +-- .../RelatorioTabelaPrecoArtesp_es.properties | 22 ++ ...elatorioTabelaPrecoArtesp_pt_BR.properties | 22 ++ .../RelatorioTabelaPrecoArtesp.jasper | Bin 0 -> 33969 bytes .../RelatorioTabelaPrecoArtesp.jrxml | 305 ++++++++++++++++++ .../RelatorioTabelaPrecoController.java | 58 +++- .../web/utilerias/MyComboboxEstandar.java | 9 +- .../web/utilerias/MyComboboxParada.java | 9 +- web/WEB-INF/i3-label_es_MX.label | 3 +- web/WEB-INF/i3-label_pt_BR.label | 3 +- .../relatorios/filtroRelatorioTabelaPreco.zul | 52 +-- 12 files changed, 484 insertions(+), 51 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/imagens/artesp.png create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPrecoArtesp_es.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPrecoArtesp_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jrxml diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/imagens/artesp.png b/src/java/com/rjconsultores/ventaboletos/relatorios/imagens/artesp.png new file mode 100644 index 0000000000000000000000000000000000000000..a5bdd82352707fa155a2c7d954f42a3602e09a21 GIT binary patch literal 21219 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 literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java index 8923353a6..1bd4c1b17 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java @@ -3,17 +3,21 @@ package com.rjconsultores.ventaboletos.relatorios.impl; import java.sql.Connection; import java.sql.ResultSet; import java.util.HashMap; +import java.util.List; import java.util.Map; +import com.rjconsultores.ventaboletos.entidad.Tramo; import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; public class RelatorioTabelaPreco extends Relatorio { + private Boolean isLayoutArtesp; public RelatorioTabelaPreco(final Map parametros, Connection conexao) throws Exception { super(parametros, conexao); - + + this.isLayoutArtesp = (Boolean) parametros.get("isLayoutArtesp"); this.setCustomDataSource(new ArrayDataSource(this) { public void initDados() throws Exception { @@ -23,7 +27,7 @@ public class RelatorioTabelaPreco extends Relatorio { while (rset.next()) { Map dataResult = new HashMap(); - + dataResult.put("origem", rset.getString("origem")); dataResult.put("destino", rset.getString("destino")); dataResult.put("tarifa", rset.getBigDecimal("tarifa")); @@ -38,7 +42,7 @@ public class RelatorioTabelaPreco extends Relatorio { dataResult.put("dataVigenciaFinal", rset.getDate("dataVigenciaFinal")); dataResult.put("idLinha", rset.getInt("idLinha")); dataResult.put("idVigencia", rset.getInt("idVigencia")); - + this.dados.add(dataResult); } @@ -85,26 +89,36 @@ public class RelatorioTabelaPreco extends Relatorio { sql.append("AND tr.ACTIVO = 1 "); sql.append("AND tr.ORIGEN_ID = t.ORIGEN_ID "); sql.append("AND tr.DESTINO_ID = t.DESTINO_ID "); - - if(parametros.get("VIGENCIA_ID") != null){ - sql.append(" AND vt.VIGENCIATARIFA_ID = " + parametros.get("VIGENCIA_ID")); - } - - if (parametros.get("EMPRESA_ID") != null) { - sql.append(" AND e.empresa_id = " + parametros.get("EMPRESA_ID")); - } - - if (parametros.get("LINHAS_ID") != null) { + sql.append(" AND vt.VIGENCIATARIFA_ID = " + parametros.get("VIGENCIA_ID")); + sql.append(" AND e.empresa_id = " + parametros.get("EMPRESA_ID")); + + List linha = (List) parametros.get("LINHAS_ID"); + if (linha != null && !linha.isEmpty()) { sql.append(" AND r.RUTA_ID IN (" + parametros.get("LINHAS_ID") + ")"); } - - if(parametros.get("ORGAO_CONCEDENTE_ID") != null){ + + if (parametros.get("ORGAO_CONCEDENTE_ID") != null) { sql.append(" AND r.ORGAOCONCEDENTE_ID = " + parametros.get("ORGAO_CONCEDENTE_ID")); } - - sql.append( " ORDER BY r.RUTA_ID, vt.FECINICIOVIGENCIA "); - - return sql.toString(); + + if (parametros.get("origemId") != null) { + sql.append(" AND tr.ORIGEN_ID= " + parametros.get("origemId")); + } + + if (parametros.get("destinoId") != null) { + sql.append(" AND tr.DESTINO_ID= " + parametros.get("destinoId")); + } + + sql.append(" ORDER BY r.RUTA_ID, vt.FECINICIOVIGENCIA "); + + return sql.toString(); } + @Override + public String getNome() { + if (isLayoutArtesp) { + return "RelatorioTabelaPrecoArtesp"; + } + return this.getClass().getSimpleName(); + } } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPrecoArtesp_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPrecoArtesp_es.properties new file mode 100644 index 000000000..a66115839 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPrecoArtesp_es.properties @@ -0,0 +1,22 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. + +#Labels header +label.origem=Origem +label.destino=Destino +label.tarifa=Tarifa +label.pedagio=Pedágio +label.taxaEmbarque=Taxa +label.seguro=Seguro +label.outros=Outros +label.tipoClasse=Classe +label.linha=Linha(s) +label.empresa=Empresa +label.dataVigencia=Vigência +label.total=Total +label.orgacaoConcedente=Orgão Concedente + +label.totalSemSeguro=Total Sem Seguro Facultativo +label.totalComSeguro=Total Com Seguro Facultativo +label.valorSeguro=Valor do Seguro Facultativo +label.msgAviso=A CONTRATAÇÃO DO SEGURO DE ACIDENTES PESSOAIS É FACULTATIVA \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPrecoArtesp_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPrecoArtesp_pt_BR.properties new file mode 100644 index 000000000..a66115839 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPrecoArtesp_pt_BR.properties @@ -0,0 +1,22 @@ +#geral +msg.noData=Não foi possivel obter dados com os parâmetros informados. + +#Labels header +label.origem=Origem +label.destino=Destino +label.tarifa=Tarifa +label.pedagio=Pedágio +label.taxaEmbarque=Taxa +label.seguro=Seguro +label.outros=Outros +label.tipoClasse=Classe +label.linha=Linha(s) +label.empresa=Empresa +label.dataVigencia=Vigência +label.total=Total +label.orgacaoConcedente=Orgão Concedente + +label.totalSemSeguro=Total Sem Seguro Facultativo +label.totalComSeguro=Total Com Seguro Facultativo +label.valorSeguro=Valor do Seguro Facultativo +label.msgAviso=A CONTRATAÇÃO DO SEGURO DE ACIDENTES PESSOAIS É FACULTATIVA \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper new file mode 100644 index 0000000000000000000000000000000000000000..81adbe97e717670c10437906487ee9abf3135010 GIT binary patch literal 33969 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 eeF2}w*;$<(@UI!=I?Z4^fo#Xp*PwRQNc< + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="30" splitType="Stretch"> + <textField> + <reportElement uuid="5d83d8a8-01aa-4022-9583-6808e65d2ec8" mode="Opaque" x="0" y="0" width="264" height="29" backcolor="#FFFF66"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="14" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="2c5b01a1-51db-478a-a307-83c9df5cea6e" x="264" y="0" width="538" height="29"/> + <textElement verticalAlignment="Middle"> + <font size="14" isBold="true"/> + <paragraph leftIndent="4"/> + </textElement> + <textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java index cf7270789..f51ed3cb5 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTabelaPrecoController.java @@ -15,20 +15,27 @@ import org.zkoss.util.resource.Labels; import org.zkoss.zhtml.Messagebox; 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.ListModelArray; +import org.zkoss.zul.ListModelList; import org.zkoss.zul.Paging; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.Parada; import com.rjconsultores.ventaboletos.entidad.Ruta; import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioTabelaPreco; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService; +import com.rjconsultores.ventaboletos.service.ParadaService; +import com.rjconsultores.ventaboletos.service.TramoService; import com.rjconsultores.ventaboletos.service.VigenciaTarifaService; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; @@ -43,13 +50,11 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; private MyComboboxEstandar cmbVigencia; - private List lsVigencia; private MyComboboxEstandar cmbEmpresa; - private List lsEmpresa; private MyComboboxEstandar cmbOrgaoConcedente; - private List lsOrcaoConcedente; - @Autowired - private transient PagedListWrapper plwRuta; + private MyComboboxParada cmbOrigem; + private MyComboboxEstandar cmbDestino; + private Checkbox chkLayoutArtesp; private Paging pagingLinha; private MyTextbox txtLinha; @@ -62,12 +67,20 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer { private EmpresaService empresaService; @Autowired private OrgaoConcedenteService orgaocConcedenteService; - + @Autowired + private transient PagedListWrapper plwRuta; + @Autowired + private ParadaService paradaService; @Autowired private DataSource dataSourceRead; + private List destinoList; + private List lsVigencia; + private List lsEmpresa; + private List lsOrcaoConcedente; + @Override - public void doAfterCompose(Component comp) throws Exception { + public void doAfterCompose(Component comp) throws Exception { lsVigencia = vigenciaTarifaService.obtenerTodos(); lsEmpresa = empresaService.obtenerTodos(); lsOrcaoConcedente = orgaocConcedenteService.obtenerTodos(); @@ -109,6 +122,16 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer { parametros.put("ORGAO_CONCEDENTE", orgaoConcedente.getDescOrgao()); } + if (cmbOrigem.getSelectedItem() != null) { + parametros.put("origemId", cmbOrigem.getSelectedObject().getParadaId()); + } + + if (cmbDestino.getSelectedItem() != null) { + parametros.put("destinoId", cmbDestino.getSelecteObject(Parada.class).getParadaId()); + } + + parametros.put("isLayoutArtesp", chkLayoutArtesp.isChecked()); + String rutaIds = ""; String rutas = ""; List lsLinhasSelecionadas = convertTypedList(linhaSelList.getData()); @@ -162,6 +185,22 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer { linhaSelList.addItemNovo(ruta); } + public void onChange$cmbOrigem(Event ev) { + Parada origem = cmbOrigem.getSelectedObject(); + destinoList = paradaService.obterPossiveisDestinos(origem); + cmbDestino.setModel(new ListModelList(destinoList)); + if (destinoList.isEmpty()) { + cmbDestino.setSelectedIndex(-1); + } + + if (origem == null) { + chkLayoutArtesp.setVisible(false); + chkLayoutArtesp.setChecked(false); + } else { + chkLayoutArtesp.setVisible(true); + } + } + private void executarPesquisa() { HibernateSearchObject rutaBusqueda = new HibernateSearchObject( Ruta.class, pagingLinha.getPageSize()); @@ -176,6 +215,7 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer { OrgaoConcedente orgaoConcedente = (OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue(); rutaBusqueda.addFilterEqual("orgaoConcedente", orgaoConcedente); } + rutaBusqueda.addFilterILike("descruta", "%" + txtLinha.getValue() + "%"); rutaBusqueda.addFilterEqual("activo", Boolean.TRUE); @@ -240,4 +280,8 @@ public class RelatorioTabelaPrecoController extends MyGenericForwardComposer { this.lsOrcaoConcedente = lsOrcaoConcedente; } + public List getDestinoList() { + return destinoList; + } + } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxEstandar.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxEstandar.java index b777d30fa..2bcc8011e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxEstandar.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxEstandar.java @@ -12,7 +12,7 @@ import org.zkoss.zul.Combobox; * * @author gleimar */ -public class MyComboboxEstandar extends Combobox { +public class MyComboboxEstandar extends Combobox { private static final long serialVersionUID = 1L; @@ -33,4 +33,11 @@ public class MyComboboxEstandar extends Combobox { } }); } + + public T getSelecteObject(Class cType) { + if (this.getSelectedItem() != null) { + return cType.cast(this.getSelectedItem().getValue()); + } + return null; + } } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxParada.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxParada.java index 824d73a0a..4e1a6413b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxParada.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxParada.java @@ -25,7 +25,7 @@ import com.rjconsultores.ventaboletos.service.ParadaService; * * @author Administrador */ -public class MyComboboxParada extends Combobox { +public class MyComboboxParada extends Combobox { private static final long serialVersionUID = 1L; private static Logger log = Logger.getLogger(MyComboboxParada.class); @@ -127,6 +127,13 @@ public class MyComboboxParada extends Combobox { return super.getValue(); } + + public Parada getSelectedObject() { + if (this.getSelectedItem() != null) { + return (Parada) this.getSelectedItem().getValue(); + } + return null; + } public boolean isSinTodos() { return sinTodos; diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 1f0deecdc..390ec9b35 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -1,4 +1,4 @@ -# V. 1.4 +# V. 1.4 # Para alterar esta planilha, seleccione Ferramentas | Planilhas # E abrir a planilha no editor. @@ -4527,6 +4527,7 @@ relatorioTabelaPrecoController.orgaoConcedente.value = Instituición Concedente relatorioTabelaPrecoController.lbEmpresa.value = Empresa relatorioTabelaPrecoController.lbLinha.value = Linea relatorioTabelaPrecoController.msg.informarLinha = Es obligatorio informar al menos una linea en el filtro. +relatorioTabelaPrecoController.lbLayoutArtesp=Layout ARTESP # Editar Motivo cancelación equivalencia editarMotivoCancelacionEquivalenciaController.window.title = Equivalencia motivo de cancelación diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 18580659e..0b3b07187 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -1,4 +1,4 @@ -# V. 1.4 +# V. 1.4 # Para alterar esta planilha, selecione Ferramentas | Planilhas # E abrir a planilha no editor. @@ -4600,6 +4600,7 @@ relatorioTabelaPrecoController.orgaoConcedente.value = Orgão Concedente relatorioTabelaPrecoController.lbEmpresa.value = Empresa relatorioTabelaPrecoController.lbLinha.value = Linha relatorioTabelaPrecoController.msg.informarLinha = É obrigatório informar pelo menos uma linha no filtro. +relatorioTabelaPrecoController.lbLayoutArtesp=Layout ARTESP # Editar Motivo cancelamento equivalencia editarMotivoCancelacionEquivalenciaController.window.title = Equivalencia Motivo de Cancelamento diff --git a/web/gui/relatorios/filtroRelatorioTabelaPreco.zul b/web/gui/relatorios/filtroRelatorioTabelaPreco.zul index 838518259..42423a5d7 100644 --- a/web/gui/relatorios/filtroRelatorioTabelaPreco.zul +++ b/web/gui/relatorios/filtroRelatorioTabelaPreco.zul @@ -4,50 +4,58 @@ - + + height="312px" width="700px" border="normal"> - - - - + + + + - + - + width="100%" constraint="no empty" /> + + + + + +