From 924bbcff64cbd86b4726602da8658b20fa863899 Mon Sep 17 00:00:00 2001 From: "daniel.zauli" Date: Fri, 18 Mar 2016 12:18:59 +0000 Subject: [PATCH] FIXES BUG #7242 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@53993 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../tarifas/GenerarTarifaOrgaoController.java | 43 +++++++++++++++---- .../web/utilerias/render/RenderRutaDesc.java | 28 ++++++++++++ web/WEB-INF/i3-label_es_MX.label | 4 ++ web/WEB-INF/i3-label_pt_BR.label | 4 ++ web/gui/tarifas/generarTarifaOrgao.zul | 17 ++++++++ 5 files changed, 88 insertions(+), 8 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRutaDesc.java diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java index 70f8bcd33..194872e49 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java @@ -4,6 +4,7 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.tarifas; +import java.util.ArrayList; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -26,6 +27,8 @@ import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService; import com.rjconsultores.ventaboletos.service.RutaService; import com.rjconsultores.ventaboletos.service.TarifaOficialService; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; +import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRutaDesc; /** * @@ -60,6 +63,8 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer { private Checkbox chkSeguro; private Checkbox chkZerarTabela; private Checkbox chkPedagio; + private List listSelectedRutas; + private MyListbox selectedRutasList; public List getLsRuta() { return lsRuta; @@ -81,6 +86,8 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer { lsEmpresa = empresaService.obtenerTodos(); super.doAfterCompose(comp); + selectedRutasList.setItemRenderer(new RenderRutaDesc()); + listSelectedRutas = new ArrayList(); } public void onClick$chkZerarTabela(Event ev) @@ -112,13 +119,11 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer { public void onClick$btnGenerarVigencia(Event ev) throws InterruptedException { cmbOrgaoConcedente.getValue(); - Integer rutaId = null; + List lsRuta = new ArrayList(); Integer orgaoConcedenteId = null; Integer empresaId = null; - if (cmbRuta.getSelectedItem() != null) { - rutaId = ((Ruta) cmbRuta.getSelectedItem().getValue()).getRutaId(); - } + lsRuta = listSelectedRutas; if (cmbOrgaoConcedente.getSelectedItem() != null) { orgaoConcedenteId = ((OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue()).getOrgaoConcedenteId(); @@ -143,17 +148,17 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer { try { if (chkTarifa.isChecked()) { - tarifaOficialService.gerarAtualizarTarifa(rutaId, orgaoConcedenteId, empresaId); + tarifaOficialService.gerarAtualizarTarifa(lsRuta, orgaoConcedenteId, empresaId); } boolean gerarTabelaZerada = !chkTarifa.isChecked(); if (chkTaxaEmbarque.isChecked()) { - tarifaOficialService.atualizarTaxaEmbarque(rutaId, orgaoConcedenteId,gerarTabelaZerada, empresaId); + tarifaOficialService.atualizarTaxaEmbarque(lsRuta, orgaoConcedenteId,gerarTabelaZerada, empresaId); } if (chkSeguro.isChecked()) { - tarifaOficialService.atualizarSeguro(rutaId, orgaoConcedenteId); + tarifaOficialService.atualizarSeguro(lsRuta, orgaoConcedenteId); } if (chkPedagio.isChecked()) { @@ -176,7 +181,7 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer { }else{ try{ - tarifaOficialService.gerarAtualizarTabelaZerada(rutaId, orgaoConcedenteId, empresaId); + tarifaOficialService.gerarAtualizarTabelaZerada(lsRuta, orgaoConcedenteId, empresaId); Messagebox.show(Labels.getLabel("generarTarifaOrgaoController.MSG.suscribirOK"), Labels.getLabel("indexController.mniGenerarTarifaOrgao.label"), @@ -190,5 +195,27 @@ public class GenerarTarifaOrgaoController extends MyGenericForwardComposer { } } + + public List getListSelectedRutas() { + return listSelectedRutas; + } + + public void setListSelectedRutas(List listSelectedRutas) { + this.listSelectedRutas = listSelectedRutas; + } + public void onClick$btnAddRuta(Event ev) throws InterruptedException { + if(cmbRuta.getSelectedItem() != null){ + listSelectedRutas.add((Ruta)cmbRuta.getSelectedItem().getValue()); + selectedRutasList.setData(listSelectedRutas); + cmbRuta.setSelectedItem(null); + } + } + + public void onClick$btnRemoveRuta(Event ev) throws InterruptedException { + Ruta ruta = (Ruta) selectedRutasList.getSelected(); + listSelectedRutas.remove(ruta); + selectedRutasList.setData(listSelectedRutas); + } + } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRutaDesc.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRutaDesc.java new file mode 100644 index 000000000..4f46a350d --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRutaDesc.java @@ -0,0 +1,28 @@ +package com.rjconsultores.ventaboletos.web.utilerias.render; + +import org.zkoss.zul.Listcell; +import org.zkoss.zul.Listitem; +import org.zkoss.zul.ListitemRenderer; + +import com.rjconsultores.ventaboletos.entidad.Ruta; + +public class RenderRutaDesc implements ListitemRenderer { + + public void render(Listitem lstm, Object o) throws Exception { + Ruta ruta = (Ruta) o; + + Listcell lc = new Listcell(ruta.getDescruta()); + lc.setParent(lstm); + + + if (ruta.getOrgaoConcedente() == null) { + lc = new Listcell(""); + } else { + lc = new Listcell(ruta.getOrgaoConcedente().getDescOrgao()); + } + lc.setParent(lstm); + + lstm.setAttribute("data", ruta); + } + +} diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index a05b7656d..f1153152d 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -4824,6 +4824,10 @@ generarTarifaOrgaoController.labelComponenteSeguro.value=Seguro generarTarifaOrgaoController.labelComponentePedagio.value=Peaje generarTarifaOrgaoController.labelGerarTabelaZerada.value=Gerar Tabela Zerada generarTarifaOrgaoController.labelGerarTabelaTarifasZeradas.value=Gerar Tabela com Tarifas Zeradas +generarTarifaOrgaoController.labelAddRuta.value = Adicionar Ruta +generarTarifaOrgaoController.labelRemoveRuta.value = Remover Ruta +generarTarifaOrgaoController.labelRuta.value = Ruta +generarTarifaOrgaoController.labelOrgao.value = Instituición #Copiar Tarifa Oficial copiarTarifaOficialController.MSG.copiaOK=Tarifa se copió existosamente diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 722fa2bf4..645d4125b 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -4882,6 +4882,10 @@ generarTarifaOrgaoController.labelComponenteSeguro.value=Seguro generarTarifaOrgaoController.labelComponentePedagio.value=Pedágio generarTarifaOrgaoController.labelGerarTabelaZerada.value=Gerar Tabela Zerada generarTarifaOrgaoController.labelGerarTabelaTarifasZeradas.value=Gerar Tabela com Tarifas Zeradas +generarTarifaOrgaoController.labelAddRuta.value = Adicionar Linha +generarTarifaOrgaoController.labelRemoveRuta.value = Remover Linha +generarTarifaOrgaoController.labelRuta.value = Linha +generarTarifaOrgaoController.labelOrgao.value = Órgão #Copiar Tarifa Oficial copiarTarifaOficialController.MSG.copiaOK=Tarifa copia com sucesso diff --git a/web/gui/tarifas/generarTarifaOrgao.zul b/web/gui/tarifas/generarTarifaOrgao.zul index 34692ed23..e005d0810 100644 --- a/web/gui/tarifas/generarTarifaOrgao.zul +++ b/web/gui/tarifas/generarTarifaOrgao.zul @@ -18,6 +18,13 @@