From d78fe65482ca5ba27e79530d3b1526e61caaeaa8 Mon Sep 17 00:00:00 2001 From: julio Date: Mon, 24 Nov 2014 13:12:45 +0000 Subject: [PATCH] =?UTF-8?q?P12=20-=20Definir=20a=20classe=20tarif=C3=A1ria?= =?UTF-8?q?=20(bug=20#5797)=20Tempo:=208=20horas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@39850 d1611594-4594-4d17-8e1d-87c2c4800839 --- ...quedaPricingClasseTarifariaController.java | 144 ++++++++++++++++++ .../pricing/BusquedaPricingController.java | 1 - .../pricing/EditarPricingController.java | 2 +- .../EditarPricingOcupaAntecipaController.java | 59 +++++-- ...ditarPricingClasseTarifariaController.java | 90 +++++++++++ .../ItemMenuPricingClasseTarifaria.java | 25 +++ .../utilerias/menu/menu_original.properties | 1 + .../render/RenderPricingClasseTarifaria.java | 26 ++++ .../render/RenderPricingOcupaAntecipa.java | 3 + src/java/spring-config.xml | 1 + web/WEB-INF/i3-label_es_MX.label | 13 ++ web/WEB-INF/i3-label_pt_BR.label | 13 ++ .../busquedaPricingClasseTarifaria.zul | 75 +++++++++ web/gui/pricing/editarPricing.zul | 4 + .../pricing/editarPricingClasseTarifaria.zul | 48 ++++++ .../pricing/editarPricingOcupaAntecipa.zul | 27 +++- 16 files changed, 511 insertions(+), 21 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingClasseTarifariaController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarPricingClasseTarifariaController.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/pricing/ItemMenuPricingClasseTarifaria.java create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricingClasseTarifaria.java create mode 100644 web/gui/pricing/busquedaPricingClasseTarifaria.zul create mode 100644 web/gui/pricing/editarPricingClasseTarifaria.zul diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingClasseTarifariaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingClasseTarifariaController.java new file mode 100644 index 000000000..11d7fbb6c --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingClasseTarifariaController.java @@ -0,0 +1,144 @@ +package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +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.zk.ui.event.EventListener; +import org.zkoss.zul.Paging; +import org.zkoss.zul.Textbox; + +import com.rjconsultores.ventaboletos.entidad.PricingClasseTarifaria; +import com.rjconsultores.ventaboletos.service.PricingClasseTarifariaService; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; +import com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchObject; +import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper; +import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPricingClasseTarifaria; + +@Controller("busquedaPricingClasseTarifariaController") +@Scope("prototype") +public class BusquedaPricingClasseTarifariaController extends MyGenericForwardComposer { + + private static final long serialVersionUID = 1L; + private static Logger log = Logger.getLogger(BusquedaPricingClasseTarifariaController.class); + + @Autowired + private transient PagedListWrapper plwPricingClasseTarifaria; + + @Autowired + private PricingClasseTarifariaService pricingClasseTarifariaService; + + private MyListbox pricingClasseTarifariaList; + private Paging pagingPricing; + + private Textbox desc; + private Textbox sigla; + + public void onClick$btnApagar(Event ev) { + try { + PricingClasseTarifaria p = (PricingClasseTarifaria) pricingClasseTarifariaList.getSelected(); + if (p != null) { + int resp = Messagebox.show(Labels.getLabel("editarPricingController.MSG.borrarPergunta"), + Labels.getLabel("busquedaPricingController.window.title"), + Messagebox.YES | Messagebox.NO, + Messagebox.QUESTION); + + if (resp == Messagebox.YES) { + pricingClasseTarifariaService.borrar(p); + Messagebox.show(Labels.getLabel("editarPricingController.MSG.borrarOK"), + Labels.getLabel("busquedaPricingController.window.title"), + Messagebox.OK, Messagebox.INFORMATION); + pricingClasseTarifariaList.removeItem(p); + } + } else { + Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), + Labels.getLabel("busquedaPricingController.window.title"), + Messagebox.OK, Messagebox.EXCLAMATION); + } + } catch (Exception ex) { + log.error("Erro ao eliminar Pricing Classe Tarifaria: ", ex); + } + } + + private void refreshLista() { + + HibernateSearchObject pricingSearch = new HibernateSearchObject( + PricingClasseTarifaria.class, pagingPricing.getPageSize()); + + if (!desc.getValue().isEmpty()) { + pricingSearch.addFilterILike("descClasseTarifaria", desc.getValue() + "%"); + } + + if (!sigla.getValue().isEmpty()) { + pricingSearch.addFilterILike("sigla", sigla.getValue()); + } + + pricingSearch.addFilterEqual("activo", Boolean.TRUE); + pricingSearch.addSortAsc("descClasseTarifaria"); + + plwPricingClasseTarifaria.init(pricingSearch, pricingClasseTarifariaList, pagingPricing); + + if (pricingClasseTarifariaList.getData().length == 0) { + try { + Messagebox.show(Labels.getLabel("MSG.ningunRegistro"), Labels + .getLabel("busquedaPricingController.window.title"), + Messagebox.OK, Messagebox.INFORMATION); + } catch (InterruptedException ex) { + } + } + } + + public void onClick$btnNovo(Event ev) { + verPricingClasseTarifaria(new PricingClasseTarifaria()); + } + + public void onClick$btnPesquisa(Event ev) throws InterruptedException { + refreshLista(); + } + + public void onClick$btnRefresh(Event ev) { + refreshLista(); + } + + @SuppressWarnings("unchecked") + private void verPricingClasseTarifaria(PricingClasseTarifaria pricingClasseTarifaria) { + if (pricingClasseTarifaria == null) { + return; + } + + @SuppressWarnings("rawtypes") + Map args = new HashMap(); + args.put("pricingClasseTarifaria", pricingClasseTarifaria); + args.put("pricingClasseTarifariaList", pricingClasseTarifariaList); + + openWindow("/gui/pricing/editarPricingClasseTarifaria.zul", + Labels.getLabel("editarPricingClasseTarifariaController.window.title"), args, MODAL); + } + + @Override + public void doAfterCompose(Component comp) throws Exception { + + super.doAfterCompose(comp); + + pricingClasseTarifariaList.setItemRenderer(new RenderPricingClasseTarifaria()); + pricingClasseTarifariaList.addEventListener("onDoubleClick", new EventListener() { + + @Override + public void onEvent(Event event) throws Exception { + PricingClasseTarifaria pricing = (PricingClasseTarifaria) pricingClasseTarifariaList.getSelected(); + verPricingClasseTarifaria(pricing); + } + }); + + refreshLista(); + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingController.java index 7ff7dd3f4..4e4020eb1 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingController.java @@ -29,7 +29,6 @@ import org.zkoss.zul.Textbox; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Parada; import com.rjconsultores.ventaboletos.entidad.Pricing; -import com.rjconsultores.ventaboletos.entidad.PricingRuta; import com.rjconsultores.ventaboletos.entidad.Ruta; import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.ParadaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java index 12733803f..8d0f334e1 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java @@ -234,7 +234,6 @@ public class EditarPricingController extends MyGenericForwardComposer { private Button btnApagarCategoria; private Button btnModificarCategoria; private Button btnModificarFormapago; - private Button btnOcupaAntecipaAutomatico; private boolean salvo = false; private Boolean gravarNovo = Boolean.TRUE; private Textbox nombrePricing; @@ -891,6 +890,7 @@ public class EditarPricingController extends MyGenericForwardComposer { return true; } + @SuppressWarnings("unchecked") public void onClick$btnSalvar(Event ev) throws InterruptedException { if (!validarObligatorios()) { return; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingOcupaAntecipaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingOcupaAntecipaController.java index 4a0cbde5c..36a05f2c0 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingOcupaAntecipaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingOcupaAntecipaController.java @@ -12,10 +12,14 @@ import org.zkoss.zhtml.Messagebox; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Combobox; import org.zkoss.zul.Intbox; +import org.zkoss.zul.api.Comboitem; import com.rjconsultores.ventaboletos.entidad.Pricing; +import com.rjconsultores.ventaboletos.entidad.PricingClasseTarifaria; import com.rjconsultores.ventaboletos.entidad.PricingOcupaAntecipa; +import com.rjconsultores.ventaboletos.service.PricingClasseTarifariaService; import com.rjconsultores.ventaboletos.service.PricingOcupaAntecipaService; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.ConstraintPorcentagem; @@ -28,6 +32,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; public class EditarPricingOcupaAntecipaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; + private static Logger log = Logger.getLogger(EditarPricingOcupaAntecipaController.class); @Autowired private PricingOcupaAntecipaService pricingOcupaAntecipaService; private PricingOcupaAntecipa pricingOcupaAntecipa; @@ -41,43 +46,56 @@ public class EditarPricingOcupaAntecipaController extends MyGenericForwardCompos private MyTextboxDecimal porcentaje; private MyTextboxDecimal importe; private List lsPricingOcupaAntecipa; - private ConstraintPorcentagem ct; - private static Logger log = Logger.getLogger(EditarPricingOcupaAntecipaController.class); - + + @Autowired + private PricingClasseTarifariaService pricingClasseTarifariaService; + private List lsClasseTarifarias; + private Combobox cmbPricingClasseTarifaria; + @Override public void doAfterCompose(Component comp) throws Exception { ct = new ConstraintPorcentagem(); - + updateEntidad(); - + super.doAfterCompose(comp); + + lsClasseTarifarias = pricingClasseTarifariaService.obtenerTodos(); + + if (pricingOcupaAntecipa.getPricingClasseTarifaria() != null) { + org.zkoss.zul.Comboitem ci = new org.zkoss.zul.Comboitem(pricingOcupaAntecipa.getPricingClasseTarifaria().toString()); + ci.setAttribute("value", pricingOcupaAntecipa.getPricingClasseTarifaria()); + ci.setValue(pricingOcupaAntecipa.getPricingClasseTarifaria()); + ci.setParent(cmbPricingClasseTarifaria); + cmbPricingClasseTarifaria.setSelectedItem(ci); + } + } - + private void updateEntidad() { - - if (pricingOcupaAntecipa == null){ + + if (pricingOcupaAntecipa == null) { pricingOcupaAntecipa = (PricingOcupaAntecipa) Executions.getCurrent().getArg().get("pricingOcupaAntecipa"); pricingOcupaAntecipaList = (MyListbox) Executions.getCurrent().getArg().get("pricingOcupaAntecipaList"); } lsPricingOcupaAntecipa = pricingOcupaAntecipaService.updateList(pricingOcupaAntecipa); pricingOcupaAntecipaList.setData(lsPricingOcupaAntecipa); - - if (lsPricingOcupaAntecipa.contains(pricingOcupaAntecipa)){ + + if (lsPricingOcupaAntecipa.contains(pricingOcupaAntecipa)) { pricingOcupaAntecipa = lsPricingOcupaAntecipa.get(lsPricingOcupaAntecipa.indexOf(pricingOcupaAntecipa)); } } - - public void onClose$winEditarPricingOcupaAntecipa(Event e){ + + public void onClose$winEditarPricingOcupaAntecipa(Event e) { updateEntidad(); } - + public void onClick$btnCerrar(Event ev) throws Exception { updateEntidad(); - } - + public void onClick$btnAdicionarOcupaAntecipa(Event ev) throws Exception { if ((cantasientosmin.getValue() != null || cantasientosmax.getValue() != null) @@ -115,6 +133,12 @@ public class EditarPricingOcupaAntecipaController extends MyGenericForwardCompos return; } + Comboitem cbiClasseTarifaria = cmbPricingClasseTarifaria.getSelectedItem(); + if (cbiClasseTarifaria != null) { + PricingClasseTarifaria pct = (PricingClasseTarifaria) cbiClasseTarifaria.getValue(); + pricingOcupaAntecipa.setPricingClasseTarifaria(pct); + } + if (porcentaje.getValueDecimal() != null && importe.getValueDecimal() != null) { Messagebox.show(Labels.getLabel("editarPricingController.ocupacionErrada.centoDin"), @@ -198,4 +222,9 @@ public class EditarPricingOcupaAntecipaController extends MyGenericForwardCompos public void setCt(ConstraintPorcentagem ct) { this.ct = ct; } + + public List getLsClasseTarifarias() { + return lsClasseTarifarias; + } + } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarPricingClasseTarifariaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarPricingClasseTarifariaController.java new file mode 100644 index 000000000..093634641 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarPricingClasseTarifariaController.java @@ -0,0 +1,90 @@ +package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Textbox; + +import com.rjconsultores.ventaboletos.entidad.PricingClasseTarifaria; +import com.rjconsultores.ventaboletos.service.PricingClasseTarifariaService; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + +@Controller("editarPricingClasseTarifariaController") +@Scope("prototype") +public class EditarPricingClasseTarifariaController extends MyGenericForwardComposer { + + private static final long serialVersionUID = 1L; + private static Logger log = Logger.getLogger(EditarPricingClasseTarifariaController.class); + + @Autowired + private PricingClasseTarifariaService pricingClasseTarifariaService; + private Textbox desc; + private Textbox sigla; + private String siglaVieja; + + private MyListbox pricingClasseTarifariaList; + private PricingClasseTarifaria pricingClasseTarifaria; + + @Override + public void doAfterCompose(Component comp) throws Exception { + + pricingClasseTarifaria = (PricingClasseTarifaria) Executions.getCurrent().getArg().get("pricingClasseTarifaria"); + pricingClasseTarifariaList = (MyListbox) Executions.getCurrent().getArg().get("pricingClasseTarifariaList"); + + super.doAfterCompose(comp); + + siglaVieja = pricingClasseTarifaria.getPricingClasseTarifariaId() != null ? pricingClasseTarifaria.getSigla() : ""; + if (pricingClasseTarifaria.getPricingClasseTarifariaId() != null) { + desc.setValue(pricingClasseTarifaria.getDescClasseTarifaria()); + sigla.setValue(pricingClasseTarifaria.getSigla()); + } + } + + public void onClick$btnAdicionarClasseTarifaria(Event ev) throws Exception { + try { + boolean validacion; + if (siglaVieja.equals(sigla.getValue())) + validacion = true; + else + validacion = pricingClasseTarifariaService.validacionSigla(sigla.getValue()); + if (validacion) { + pricingClasseTarifaria.setDescClasseTarifaria(desc.getValue()); + pricingClasseTarifaria.setSigla(sigla.getValue()); + + if (pricingClasseTarifaria.getPricingClasseTarifariaId() == null) { + pricingClasseTarifaria = pricingClasseTarifariaService.suscribir(pricingClasseTarifaria); + pricingClasseTarifariaList.addItemNovo(pricingClasseTarifaria); + + if (pricingClasseTarifaria.getPricingClasseTarifariaId() != null) { + Messagebox.show(Labels.getLabel("editarPricingClasseTarifariaController.btnAdd.resp"), + Labels.getLabel("editarPricingClasseTarifariaController.window.title"), + Messagebox.OK, Messagebox.EXCLAMATION); + } + } else { + pricingClasseTarifaria = pricingClasseTarifariaService.actualizacion(pricingClasseTarifaria); + pricingClasseTarifariaList.updateItem(pricingClasseTarifaria); + } + + closeWindow(); + } else { + Messagebox.show(Labels.getLabel("editarPricingClasseTarifariaController.MSG.Error.sigla"), + Labels.getLabel("editarPricingClasseTarifariaController.window.title"), + Messagebox.OK, Messagebox.EXCLAMATION); + } + + } catch (Exception e) { + log.error("Erro ao salvar Pricing Classe Tarifaria:", e); + Messagebox.show(e.getMessage(), + Labels.getLabel("editarPricingClasseTarifariaController.window.title"), + Messagebox.OK, Messagebox.EXCLAMATION); + } + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/pricing/ItemMenuPricingClasseTarifaria.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/pricing/ItemMenuPricingClasseTarifaria.java new file mode 100644 index 000000000..2a2fc6d62 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/pricing/ItemMenuPricingClasseTarifaria.java @@ -0,0 +1,25 @@ +package com.rjconsultores.ventaboletos.web.utilerias.menu.item.pricing; + +import org.zkoss.util.resource.Labels; + +import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria; +import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema; + +public class ItemMenuPricingClasseTarifaria extends DefaultItemMenuSistema { + + public ItemMenuPricingClasseTarifaria() { + super("editarPricingClasseTarifariaController.window.title"); + } + + @Override + public String getClaveMenu() { + return "COM.RJCONSULTORES.ADMINISTRACION.GUI.PRICING.MENU.PRICINGCLASSETARIFARIA"; + } + + @Override + public void ejecutar() { + PantallaUtileria.openWindow("/gui/pricing/busquedaPricingClasseTarifaria.zul", + Labels.getLabel("editarPricingClasseTarifariaController.window.title"), null, desktop); + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties index 48ba7e9c5..e9d9e4645 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/menu_original.properties @@ -72,6 +72,7 @@ tarifas.tarifaEscala=com.rjconsultores.ventaboletos.web.utilerias.menu.item.tari pricing=com.rjconsultores.ventaboletos.web.utilerias.menu.item.pricing.MenuPricing pricing.general=com.rjconsultores.ventaboletos.web.utilerias.menu.item.pricing.ItemMenuPricing pricing.especifico=com.rjconsultores.ventaboletos.web.utilerias.menu.item.pricing.ItemMenuPricingEspecifico +pricing.classeTarifaria=com.rjconsultores.ventaboletos.web.utilerias.menu.item.pricing.ItemMenuPricingClasseTarifaria cortesias=com.rjconsultores.ventaboletos.web.utilerias.menu.item.cortesias.MenuCortesias cortesias.grupoCortesia=com.rjconsultores.ventaboletos.web.utilerias.menu.item.cortesias.ItemMenuGrupoCortesia cortesias.tipoCortesia=com.rjconsultores.ventaboletos.web.utilerias.menu.item.cortesias.ItemMenuTipoCortesia diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricingClasseTarifaria.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricingClasseTarifaria.java new file mode 100644 index 000000000..8484b40dd --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricingClasseTarifaria.java @@ -0,0 +1,26 @@ +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.PricingClasseTarifaria; + +public class RenderPricingClasseTarifaria implements ListitemRenderer { + + public void render(Listitem lstm, Object o) throws Exception { + PricingClasseTarifaria pct = (PricingClasseTarifaria) o; + + Listcell lc = new Listcell(pct.getPricingClasseTarifariaId() == null ? "" : pct.getPricingClasseTarifariaId().toString()); + lc.setParent(lstm); + + lc = new Listcell(pct.getDescClasseTarifaria() == null ? "" : pct.getDescClasseTarifaria()); + lc.setParent(lstm); + + lc = new Listcell(pct.getSigla() == null ? "" : pct.getSigla()); + lc.setParent(lstm); + + lstm.setAttribute("data", pct); + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricingOcupaAntecipa.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricingOcupaAntecipa.java index 0238ed32c..2dd9df785 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricingOcupaAntecipa.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricingOcupaAntecipa.java @@ -36,6 +36,9 @@ public class RenderPricingOcupaAntecipa implements ListitemRenderer { lc = new Listcell(pm.getImporte() == null ? "" : pm.getImporte().toString()); lc.setParent(lstm); + + lc = new Listcell(pm.getPricingClasseTarifaria() == null ? "" : pm.getPricingClasseTarifaria().getSigla()); + lc.setParent(lstm); lstm.setAttribute("data", pm); } diff --git a/src/java/spring-config.xml b/src/java/spring-config.xml index af37a1b23..9f95636b8 100644 --- a/src/java/spring-config.xml +++ b/src/java/spring-config.xml @@ -204,6 +204,7 @@ com.rjconsultores.ventaboletos.entidad.PricingAsiento com.rjconsultores.ventaboletos.entidad.PricingEspecifico com.rjconsultores.ventaboletos.entidad.PricingEspecificoOcupacion + com.rjconsultores.ventaboletos.entidad.PricingClasseTarifaria com.rjconsultores.ventaboletos.entidad.PricingRuta com.rjconsultores.ventaboletos.entidad.ProductoServicio diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 6bc22d75c..2a462ad1e 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -2261,6 +2261,19 @@ editarPricingEspecificoOcupacionController.MSG.noPricingEspecificoOcupacion = Oc editarPricingEspecificoOcupacionController.MSG.pricingEspecificoOcupacionInicial = La lista de ocupaciones debería comenzar con la ocupación inicial igual a 1. editarPricingEspecificoOcupacionController.MSG.pricingEspecificoOcupacionNoSubsequente = La lista de ocupaciones debe ser posterior. +# Editar Pricing Classe Tarifaria +editarPricingClasseTarifariaController.window.title = Pricing Clases Arancelarias +editarPricingClasseTarifariaController.label.desc = Descripción +editarPricingClasseTarifariaController.label.sigla = Abreviatura +editarPricingClasseTarifariaController.btnAdd.resp = Nuevas Clases Arancel añadido correctamente. +editarPricingClasseTarifariaController.btnNew = Nueva Clase de Tarifa +editarPricingClasseTarifariaController.label.title = Clases Arancel +editarPricingClasseTarifariaController.btnAdd.tooltiptext = Agregar Clases Arancel +editarPricingClasseTarifariaController.btnBorrar.tooltiptext = Borrar Clases Arancel +editarPricingClasseTarifariaController.label.tooltiptext = Clase Arancel +editarPricingClasseTarifariaController.MSG.addError = Tienes una clase de tarifa matriculado. Retire registrada antes de registrar otro. +editarPricingClasseTarifariaController.MSG.Error.sigla = Tener un registro con esta sigla en el sistema. + # Búsqueda Sistema busquedaSistemaController.window.title = Sistema busquedaSistemaController.btnRefresh.tooltiptext = Actualizar diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index fcf72828b..c70a17644 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -2308,6 +2308,19 @@ editarPricingEspecificoOcupacionController.MSG.noPricingEspecificoOcupacion = Oc editarPricingEspecificoOcupacionController.MSG.pricingEspecificoOcupacionInicial = A primeira ocupação deverá ter valor de ocupação inicial igual a 1. editarPricingEspecificoOcupacionController.MSG.pricingEspecificoOcupacionNoSubsequente = A lista de ocupações deverão ser subsequentes. +# Editar Pricing Classe Tarifaria +editarPricingClasseTarifariaController.window.title = Pricing Classes Tarifarias +editarPricingClasseTarifariaController.label.desc = Descrição +editarPricingClasseTarifariaController.label.sigla = Sigla +editarPricingClasseTarifariaController.btnAdd.resp = Nova Classes Tarifarias adicionada com sucesso. +editarPricingClasseTarifariaController.btnNew = Nova Classe Tarifaria +editarPricingClasseTarifariaController.label.title = Classes Tarifarias +editarPricingClasseTarifariaController.btnAdd.tooltiptext = Adicionar Classe Tarifaria +editarPricingClasseTarifariaController.btnBorrar.tooltiptext = Remover Classe Tarifaria +editarPricingClasseTarifariaController.label.tooltiptext = Classe Tarifaria +editarPricingClasseTarifariaController.MSG.addError = Já possui uma Classe Tarifaria cadastrada. Remova a cadastrada antes de cadastrar outra. +editarPricingClasseTarifariaController.MSG.Error.sigla = Já possui um registro com esta sigla no sistema. + # Pesquisa Sistema busquedaSistemaController.window.title = Sistema busquedaSistemaController.btnRefresh.tooltiptext = Atualizar diff --git a/web/gui/pricing/busquedaPricingClasseTarifaria.zul b/web/gui/pricing/busquedaPricingClasseTarifaria.zul new file mode 100644 index 000000000..4a5e60ec3 --- /dev/null +++ b/web/gui/pricing/busquedaPricingClasseTarifaria.zul @@ -0,0 +1,75 @@ + + + + + + + + + + + +