From a6cdd64946d79a7041fc58b57f7205e88f1fddab Mon Sep 17 00:00:00 2001 From: fabio Date: Fri, 29 Sep 2017 20:03:22 +0000 Subject: [PATCH] Fixes bug #9072 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@74373 d1611594-4594-4d17-8e1d-87c2c4800839 --- ...tarPricingEspecificoAgenciaController.java | 208 ------------------ ...ricingEspecificoCanalVendasController.java | 201 ----------------- .../EditarPricingEspecificoController.java | 154 +++++++------ web/WEB-INF/i3-label_es_MX.label | 2 + web/WEB-INF/i3-label_pt_BR.label | 2 + web/gui/pricing/editarPricingEspecifico.zul | 66 +++--- .../editarPricingEspecificoAgencia.zul | 42 ---- .../editarPricingEspecificoCanalVendas.zul | 45 ---- 8 files changed, 128 insertions(+), 592 deletions(-) delete mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoAgenciaController.java delete mode 100644 src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoCanalVendasController.java delete mode 100644 web/gui/pricing/editarPricingEspecificoAgencia.zul delete mode 100644 web/gui/pricing/editarPricingEspecificoCanalVendas.zul diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoAgenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoAgenciaController.java deleted file mode 100644 index bc609fe94..000000000 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoAgenciaController.java +++ /dev/null @@ -1,208 +0,0 @@ -package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; - -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; - -import org.apache.log4j.Logger; -import org.hibernate.Hibernate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; - -import com.rjconsultores.ventaboletos.entidad.PricingEspecifico; -import com.rjconsultores.ventaboletos.entidad.PricingEspecificoAgencia; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.service.PricingEspecificoAgenciaService; -import com.rjconsultores.ventaboletos.service.PricingEspecificoService; -import com.rjconsultores.ventaboletos.service.PuntoVentaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta; -import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; -import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; - -@Controller("editarPricingEspecificoAgenciaController") -@Scope("prototype") -public class EditarPricingEspecificoAgenciaController extends MyGenericForwardComposer { - - private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarPricingEspecificoAgenciaController.class); - - private PricingEspecifico pricingEspecifico; - private PricingEspecificoAgencia pricingEspecificoAgencia; - private MyListbox pricingListEspAgencia; - private List lspricingAgencia; - private List pricingEspecificoADesativarAgencia; - - @Autowired - private PricingEspecificoService pricingEspecificoService; - - private MyComboboxPuntoVenta cmbPuntoVenta; - - @Autowired - private PricingEspecificoAgenciaService pricingEspecificoAgenciaService; - - @Autowired - private PuntoVentaService puntoVentaService; - - private Boolean isEdicao; - - @Override - public void doAfterCompose(Component comp) throws Exception { - pricingEspecifico = (PricingEspecifico) Executions.getCurrent().getArg().get("pricingEspecifico"); - -// if(pricingEspecifico.getPricingespecificoId() == null){ -// pricingEspecifico = pricingEspecificoService.obtenerID(pricingEspecifico.getPricingespecificoId()); -// -// -// } - if(pricingEspecifico.getPricingEspecificoAgenciasList() == null){ - pricingEspecifico.setPricingEspecificoAgenciasList( new ArrayList()); - } - lspricingAgencia = pricingEspecifico.getPricingEspecificoAgenciasList(); - - pricingEspecificoAgencia = (PricingEspecificoAgencia) Executions.getCurrent().getArg().get("pricingEspecificoAgencia"); - pricingListEspAgencia = (MyListbox) Executions.getCurrent().getArg().get("pricingListEspAgencia"); - pricingEspecificoADesativarAgencia = (List) Executions.getCurrent().getArg().get("pricingEspecificoADesativarAgencia"); - isEdicao = (Boolean) Executions.getCurrent().getArg().get("isEdicao"); - - - super.doAfterCompose(comp); - Locale locale = new Locale("pt", "BR"); - - - } - - public void onClick$btnAdicionarPricingEspAgencia(Event ev) throws Exception { - if((PricingEspecifico) Executions.getCurrent().getArg().get("pricingEspecifico") != null){ - pricingEspecifico = (PricingEspecifico) Executions.getCurrent().getArg().get("pricingEspecifico"); - } - - PricingEspecificoAgencia pricingAgencia = new PricingEspecificoAgencia((PuntoVenta)cmbPuntoVenta.getSelectedItem().getValue(), pricingEspecifico, UsuarioLogado.getUsuarioLogado().getUsuarioId()); - - List peoList = null; - - if (lspricingAgencia == null || lspricingAgencia.isEmpty()) { - peoList = new ArrayList(); - } else { - peoList = pricingEspecifico.getPricingEspecificoAgenciasList(); - } - Hibernate.initialize(pricingEspecifico); - Hibernate.initialize(pricingEspecificoAgencia); - - if (peoList.contains(pricingAgencia)) { - int index = peoList.indexOf(pricingAgencia); - if(index >= 0) { - peoList.set(index, pricingAgencia); - } - } else { - - pricingEspecificoAgencia.setActivo(Boolean.TRUE); - - if(!pricingEspecifico.getPricingEspecificoAgenciasList().contains(pricingAgencia)){ - pricingListEspAgencia.addItemNovo(pricingAgencia); - pricingEspecifico.getPricingEspecificoAgenciasList().add(pricingAgencia); - peoList.add(pricingAgencia); - - } - - - if(pricingAgencia.getPuntoVenta().getPuntoventaId() != -1){ - PuntoVenta tpv = puntoVentaService.obtenerID(new Integer("-1")); - PricingEspecificoAgencia pecv = new PricingEspecificoAgencia(); - pecv.setPuntoVenta(tpv); - pecv.setActivo(Boolean.TRUE); - pecv.setPricingEspecifico(pricingEspecifico); - pricingListEspAgencia.removeItem(pecv); - pricingEspecificoADesativarAgencia.add(pecv); - if(pricingEspecifico.getPricingEspecificoAgenciasList().indexOf(pecv)>-1){ - pricingEspecifico.getPricingEspecificoAgenciasList().get(pricingEspecifico.getPricingEspecificoAgenciasList().indexOf(pecv)).setActivo(Boolean.FALSE); - } - - } else if(pricingListEspAgencia.getSize()>=1 && pricingAgencia.getPuntoVenta().getPuntoventaId() == -1 ){ - for (PricingEspecificoAgencia pricingEspecificoAgencia : peoList) { - if(pricingEspecificoAgencia.getPuntoVenta().getPuntoventaId() != -1 && pricingEspecificoAgencia.getActivo().equals(Boolean.TRUE)){ - - pricingListEspAgencia.removeItem(pricingEspecificoAgencia); - if(pricingEspecifico.getPricingEspecificoAgenciasList().indexOf(pricingEspecificoAgencia)>-1){ - int index = pricingEspecifico.getPricingEspecificoAgenciasList().indexOf(pricingEspecificoAgencia); - if(index >= 0) { - pricingEspecificoAgencia.setActivo(Boolean.FALSE); - pricingEspecifico.getPricingEspecificoAgenciasList().set(index, pricingEspecificoAgencia); - } -// pricingEspecifico.getPricingEspecificoCanalVendasList().get(pricingEspecifico.getPricingEspecificoCanalVendasList().indexOf(pricingEspecificoCanalVendas)).setActivo(Boolean.FALSE); - } - } - } - - } - } - - super.arg.put("pricingEspecifico", pricingEspecifico); - closeWindow(); - - -// PricingEspecificoAgencia pricingAgencia = new PricingEspecificoAgencia((PuntoVenta)cmbPuntoVenta.getSelectedItem().getValue(), pricingEspecifico, UsuarioLogado.getUsuarioLogado().getUsuarioId()); -// -// List peoList = null; -// if (lspricingAgencia == null || lspricingAgencia.isEmpty()) { -// peoList = new ArrayList(); -// } else { -// peoList = pricingEspecifico.getPricingEspecificoAgenciasList(); -// } -// Hibernate.initialize(pricingEspecifico); -// Hibernate.initialize(pricingEspecificoAgencia); -// -// if (pricingEspecificoAgencia.getPricingEspecificoAgenciaId() != null && peoList.contains(pricingAgencia)) { -// int index = peoList.indexOf(pricingAgencia); -// if(index >= 0) { -// peoList.set(index, pricingAgencia); -// } -// } else { -// peoList.add(pricingAgencia); -// } -// if (pricingEspecifico != null && pricingEspecifico.getPricingespecificoId() != null) { -// pricingEspecifico = pricingEspecificoService.obtenerID(pricingEspecifico.getPricingespecificoId().longValue()); -// } -// -// pricingEspecificoAgencia.setActivo(Boolean.TRUE); -// pricingEspecifico.setPricingEspecificoAgenciasList(peoList); -// pricingListEspAgencia.addItemNovo(pricingAgencia); -// closeWindow(); - } - public void onClick$btnApagarPricingEspAgencia(Event ev) throws Exception { - PricingEspecificoAgencia pricingAgencia = new PricingEspecificoAgencia((PuntoVenta)cmbPuntoVenta.getSelectedItem().getValue(), pricingEspecifico, UsuarioLogado.getUsuarioLogado().getUsuarioId()); - - List peoList = null; - if (lspricingAgencia == null || lspricingAgencia.isEmpty()) { - peoList = new ArrayList(); - } else { - peoList = pricingEspecifico.getPricingEspecificoAgenciasList(); - } - Hibernate.initialize(pricingEspecifico); - Hibernate.initialize(pricingEspecificoAgencia); - - if (pricingEspecificoAgencia.getPricingEspecificoAgenciaId() != null && peoList.contains(pricingAgencia)) { - int index = peoList.indexOf(pricingAgencia); - if(index >= 0) { - peoList.set(index, pricingAgencia); - } - } else { - peoList.add(pricingAgencia); - } - if (pricingEspecifico != null && pricingEspecifico.getPricingespecificoId() != null) { - pricingEspecifico = pricingEspecificoService.obtenerID(pricingEspecifico.getPricingespecificoId().longValue()); - } - - pricingEspecificoAgencia.setActivo(Boolean.TRUE); - pricingEspecifico.setPricingEspecificoAgenciasList(peoList); - pricingListEspAgencia.addItemNovo(pricingAgencia); - closeWindow(); - } - - - -} diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoCanalVendasController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoCanalVendasController.java deleted file mode 100644 index cfb2ec287..000000000 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoCanalVendasController.java +++ /dev/null @@ -1,201 +0,0 @@ -package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; - -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; - -import org.apache.log4j.Logger; -import org.hibernate.Hibernate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -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 com.rjconsultores.ventaboletos.entidad.PricingEspecifico; -import com.rjconsultores.ventaboletos.entidad.PricingEspecificoCanalVendas; -import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; -import com.rjconsultores.ventaboletos.service.PricingEspecificoCanalVendasService; -import com.rjconsultores.ventaboletos.service.PricingEspecificoService; -import com.rjconsultores.ventaboletos.service.TipoPuntoVentaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; -import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; - -@Controller("editarPricingEspecificoCanalVendasController") -@Scope("prototype") -public class EditarPricingEspecificoCanalVendasController extends MyGenericForwardComposer { - - private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarPricingEspecificoCanalVendasController.class); - - private PricingEspecifico pricingEspecifico; - private PricingEspecificoCanalVendas pricingEspecificoCanal; - private MyListbox pricingListEspCanalVenda; - private List lspricingCanal; - private List lsPtovata; - private List pricingEspecificoADesativarCanal; - public List getLsPtovata() { - return lsPtovata; - } - - public void setLsPtovata(List lsPtovata) { - this.lsPtovata = lsPtovata; - } - @Autowired - private PricingEspecificoService pricingEspecificoService; - @Autowired - private TipoPuntoVentaService puntoVentaService; - - private Combobox cmbPtovta; - - @Autowired - private PricingEspecificoCanalVendasService pricingEspecificoCanalService; - - private Boolean isEdicao; - - @Override - public void doAfterCompose(Component comp) throws Exception { - lsPtovata = puntoVentaService.obtenerTodos(); - pricingEspecifico = (PricingEspecifico) Executions.getCurrent().getArg().get("pricingEspecifico"); - -// if(pricingEspecifico.getPricingespecificoId() == null){ -// pricingEspecifico = pricingEspecificoService.obtenerID(pricingEspecifico.getPricingespecificoId()); -// lspricingCanal = pricingEspecifico.getPricingEspecificoCanalVendasList(); -// -// }else{ -// -// } - if(pricingEspecifico.getPricingEspecificoCanalVendasList() == null ){ - pricingEspecifico.setPricingEspecificoCanalVendasList(new ArrayList()); - } - lspricingCanal = pricingEspecifico.getPricingEspecificoCanalVendasList(); - - pricingEspecificoCanal = (PricingEspecificoCanalVendas) Executions.getCurrent().getArg().get("pricingEspecificoCanal"); - pricingEspecificoADesativarCanal = (List) Executions.getCurrent().getArg().get("pricingEspecificoADesativarCanal"); - pricingListEspCanalVenda = (MyListbox) Executions.getCurrent().getArg().get("pricingListEspCanal"); - isEdicao = (Boolean) Executions.getCurrent().getArg().get("isEdicao"); - - - super.doAfterCompose(comp); - Locale locale = new Locale("pt", "BR"); - - - } - public void onClick$btnAdicionarPricingEspCanal(Event ev) throws Exception { - if((PricingEspecifico) Executions.getCurrent().getArg().get("pricingEspecifico") != null){ - pricingEspecifico = (PricingEspecifico) Executions.getCurrent().getArg().get("pricingEspecifico"); - } - - PricingEspecificoCanalVendas pricingCanal = new PricingEspecificoCanalVendas((TipoPuntoVenta)cmbPtovta.getSelectedItem().getValue(), pricingEspecifico, UsuarioLogado.getUsuarioLogado().getUsuarioId()); - - List peoList = null; - if (lspricingCanal == null || lspricingCanal.isEmpty()) { - peoList = new ArrayList(); - } else { - peoList = pricingEspecifico.getPricingEspecificoCanalVendasList(); - } - Hibernate.initialize(pricingEspecifico); - Hibernate.initialize(pricingEspecificoCanal); - - if (peoList.contains(pricingCanal)) { - int index = peoList.indexOf(pricingCanal); - if(index >= 0) { - peoList.set(index, pricingCanal); - } - } else { - - pricingEspecificoCanal.setActivo(Boolean.TRUE); - - if(!pricingEspecifico.getPricingEspecificoCanalVendasList().contains(pricingCanal)){ - pricingListEspCanalVenda.addItemNovo(pricingCanal); - pricingEspecifico.getPricingEspecificoCanalVendasList().add(pricingCanal); - peoList.add(pricingCanal); - - } - - if(pricingCanal.getTipoPtovta().getTipoptovtaId() != -1){ - TipoPuntoVenta tpv = puntoVentaService.obtenerID(new Short("-1")); - PricingEspecificoCanalVendas pecv = new PricingEspecificoCanalVendas(); - pecv.setTipoPtovta(tpv); - pecv.setActivo(Boolean.TRUE); - pecv.setPricingEspecifico(pricingEspecifico); - pricingListEspCanalVenda.removeItem(pecv); - pricingEspecificoADesativarCanal.add(pecv); - if(pricingEspecifico.getPricingEspecificoCanalVendasList().indexOf(pecv)>-1){ - pricingEspecifico.getPricingEspecificoCanalVendasList().get(pricingEspecifico.getPricingEspecificoCanalVendasList().indexOf(pecv)).setActivo(Boolean.FALSE); - } - - } else if(pricingListEspCanalVenda.getSize()>=1 && pricingCanal.getTipoPtovta().getTipoptovtaId() == -1 ){ - for (PricingEspecificoCanalVendas pricingEspecificoCanalVendas : peoList) { - if(pricingEspecificoCanalVendas.getTipoPtovta().getTipoptovtaId() != -1 && pricingEspecificoCanalVendas.getActivo().equals(Boolean.TRUE)){ - - pricingListEspCanalVenda.removeItem(pricingEspecificoCanalVendas); - if(pricingEspecifico.getPricingEspecificoCanalVendasList().indexOf(pricingEspecificoCanalVendas)>-1){ - int index = pricingEspecifico.getPricingEspecificoCanalVendasList().indexOf(pricingEspecificoCanalVendas); - if(index >= 0) { - pricingEspecificoCanalVendas.setActivo(Boolean.FALSE); - pricingEspecifico.getPricingEspecificoCanalVendasList().set(index, pricingEspecificoCanalVendas); - } -// pricingEspecifico.getPricingEspecificoCanalVendasList().get(pricingEspecifico.getPricingEspecificoCanalVendasList().indexOf(pricingEspecificoCanalVendas)).setActivo(Boolean.FALSE); - } - } - } - - } - } - - super.arg.put("pricingEspecifico", pricingEspecifico); - closeWindow(); - } - public void onClick$btnApagarPricingEspCanal(Event ev) throws Exception { - PricingEspecificoCanalVendas pricingCanal = new PricingEspecificoCanalVendas((TipoPuntoVenta)cmbPtovta.getSelectedItem().getValue(), pricingEspecifico, UsuarioLogado.getUsuarioLogado().getUsuarioId()); - - List peoList = null; - if (lspricingCanal == null || lspricingCanal.isEmpty()) { - peoList = new ArrayList(); - } else { - peoList = pricingEspecifico.getPricingEspecificoCanalVendasList(); - } - Hibernate.initialize(pricingEspecifico); - Hibernate.initialize(pricingEspecificoCanal); - - if (pricingEspecificoCanal.getPricingEspecificoCanalId() != null && peoList.contains(pricingCanal)) { - int index = peoList.indexOf(pricingCanal); - if(index >= 0) { - peoList.set(index, pricingCanal); - } - } else { - peoList.add(pricingCanal); - } - if (pricingEspecifico != null && pricingEspecifico.getPricingespecificoId() != null) { - pricingEspecifico = pricingEspecificoService.obtenerID(pricingEspecifico.getPricingespecificoId().longValue()); - } - - pricingEspecificoCanal.setActivo(Boolean.TRUE); - pricingEspecifico.setPricingEspecificoCanalVendasList(peoList); - pricingListEspCanalVenda.addItemNovo(pricingCanal); - closeWindow(); - } - - public PricingEspecifico getPricingEspecifico() { - return pricingEspecifico; - } - - public void setPricingEspecifico(PricingEspecifico pricingEspecifico) { - this.pricingEspecifico = pricingEspecifico; - } - - public Combobox getCmbPtovta() { - return cmbPtovta; - } - - public void setCmbPtovta(Combobox cmbPtovta) { - this.cmbPtovta = cmbPtovta; - } - - - -} diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java index 17dcf0a8e..65435e698 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java @@ -14,6 +14,7 @@ import java.util.List; import java.util.Map; import org.apache.log4j.Logger; +import org.hibernate.Hibernate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -54,6 +55,7 @@ import com.rjconsultores.ventaboletos.service.PricingEspecificoService; import com.rjconsultores.ventaboletos.service.PuntoVentaService; import com.rjconsultores.ventaboletos.service.TipoPuntoVentaService; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPricingAgencia; @@ -66,6 +68,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPricingEspecifi */ @Controller("editarPricingEspecificoController") @Scope("prototype") +@SuppressWarnings({ "unchecked", "rawtypes", "unused" }) public class EditarPricingEspecificoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; @@ -123,6 +126,7 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer private MyListbox pricingListEspOcupacion; private MyListbox pricingListEspAgencia; private MyListbox pricingListEspCanal; + private MyComboboxPuntoVenta cmbPuntoVenta; private List pricingEspecificoADesativar; private List pricingEspecificoADesativarAgencia; @@ -180,7 +184,6 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer fechaInicio.focus(); } - @SuppressWarnings({ "unchecked", "rawtypes" }) public void verPricingEspecificoOcupacion(PricingEspecificoOcupacion especificoOcupacion, Boolean isEdicao) { Map args = new HashMap(); @@ -192,42 +195,87 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer openWindow("/gui/pricing/editarPricingEspecificoOcupacion.zul", Labels.getLabel("editarPricingController.window.title"), args, MODAL); } - @SuppressWarnings({ "unchecked", "rawtypes" }) - public void verPricingEspecificoAgencia(PricingEspecificoAgencia especificoAgencia, Boolean isEdicao) { - - Map args = new HashMap(); - args.put("pricingEspecifico", pricingEspecifico); - args.put("pricingEspecificoAgencia", especificoAgencia); - args.put("isEdicao", isEdicao); - args.put("pricingListEspAgencia", pricingListEspAgencia); - args.put("pricingEspecificoADesativarAgencia",pricingEspecificoADesativarAgencia); - - openWindow("/gui/pricing/editarPricingEspecificoAgencia.zul", - Labels.getLabel("editarPricingController.window.title"), args, MODAL); - } - @SuppressWarnings({ "unchecked", "rawtypes" }) - public void verPricingEspecificoCanal(PricingEspecificoCanalVendas especificoCanalVendas, Boolean isEdicao) { - - Map args = new HashMap(); - args.put("pricingEspecifico", pricingEspecifico); - args.put("pricingEspecificoCanal", especificoCanalVendas); - args.put("isEdicao", isEdicao); - args.put("pricingListEspCanal", pricingListEspCanal); - args.put("pricingEspecificoADesativarCanal",pricingEspecificoADesativarCanal); - - openWindow("/gui/pricing/editarPricingEspecificoCanalVendas.zul", - Labels.getLabel("editarPricingController.window.title"), args, MODAL); - } public void onClick$btnNovoPricingEspOcup(Event ev) throws InterruptedException { verPricingEspecificoOcupacion(new PricingEspecificoOcupacion(), false); } - public void onClick$btnNovoPricingAgencia(Event ev) throws InterruptedException { - verPricingEspecificoAgencia(new PricingEspecificoAgencia(), false); + public void onClick$btnNovoPricingAgencia(Event ev) throws InterruptedException { + PricingEspecificoAgencia pricingAgencia = new PricingEspecificoAgencia((PuntoVenta)cmbPuntoVenta.getSelectedItem().getValue(), pricingEspecifico, UsuarioLogado.getUsuarioLogado().getUsuarioId()); + + if (pricingEspecifico.getPricingEspecificoAgenciasList().contains(pricingAgencia)) { + Messagebox.show( + Labels.getLabel("editarPricingEspecificoOcupacionController.MSG.noPricingEspecificoAgenciaJaCadastrado"), + Labels.getLabel("busquedaPricingEspecificoController.window.title"), + Messagebox.OK, Messagebox.EXCLAMATION); + } else { + pricingListEspAgencia.addItemNovo(pricingAgencia); + pricingEspecifico.getPricingEspecificoAgenciasList().add(pricingAgencia); + + + //se não estiver adicionando TODOS + if(pricingAgencia.getPuntoVenta().getPuntoventaId() != -1){ + + //busca o todos na lista + for (PricingEspecificoAgencia pea : pricingEspecifico.getPricingEspecificoAgenciasList() ) { + if(pea.getPuntoVenta().getPuntoventaId().equals(new Integer("-1"))) { + pricingListEspAgencia.removeItem(pea); + pricingEspecificoADesativarAgencia.add(pea); + break; + } + } + + }else { + //se adicionou TODOS remove os outros + for (PricingEspecificoAgencia p : pricingEspecifico.getPricingEspecificoAgenciasList() ) { + if(!p.getPuntoVenta().getPuntoventaId().equals(new Integer("-1"))) { + pricingListEspAgencia.removeItem(p); + pricingEspecificoADesativarAgencia.add(p); + } + } + } + } + + cmbPuntoVenta.setValue(""); } + public void onClick$btnNovoPricingCanal(Event ev) throws InterruptedException { - verPricingEspecificoCanal(new PricingEspecificoCanalVendas(), false); + PricingEspecificoCanalVendas pricingCanal = new PricingEspecificoCanalVendas((TipoPuntoVenta)cmbPtovta.getSelectedItem().getValue(), pricingEspecifico, UsuarioLogado.getUsuarioLogado().getUsuarioId()); + + if (pricingEspecifico.getPricingEspecificoCanalVendasList().contains(pricingCanal)) { + Messagebox.show( + Labels.getLabel("editarPricingEspecificoOcupacionController.MSG.noPricingEspecificoCanalJaCadastrado"), + Labels.getLabel("busquedaPricingEspecificoController.window.title"), + Messagebox.OK, Messagebox.EXCLAMATION); + } else { + pricingListEspCanal.addItemNovo(pricingCanal); + pricingEspecifico.getPricingEspecificoCanalVendasList().add(pricingCanal); + + + //se não estiver adicionando TODOS + if(pricingCanal.getTipoPtovta().getTipoptovtaId() != -1){ + + //busca o todos na lista + for (PricingEspecificoCanalVendas pecv : pricingEspecifico.getPricingEspecificoCanalVendasList() ) { + if(pecv.getTipoPtovta().getTipoptovtaId().equals(new Short("-1"))) { + pricingListEspCanal.removeItem(pecv); + pricingEspecificoADesativarCanal.add(pecv); + break; + } + } + + }else { + //se adicionou TODOS remove os outros + for (PricingEspecificoCanalVendas p : pricingEspecifico.getPricingEspecificoCanalVendasList() ) { + if(!p.getTipoPtovta().getTipoptovtaId().equals(new Short("-1"))) { + pricingListEspCanal.removeItem(p); + pricingEspecificoADesativarCanal.add(p); + } + } + } + } + + cmbPtovta.setValue(""); } public void onClick$btnApagarPricingEspOcup(Event ev) throws InterruptedException { @@ -253,6 +301,7 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer } } } + public void onClick$btnApagarPricingEspAgencia(Event ev) throws InterruptedException { if (pricingListEspAgencia.getSelected() == null) { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), @@ -276,6 +325,7 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer } } } + public void onClick$btnApagarPricingEspCanal(Event ev) throws InterruptedException { if (pricingListEspCanal.getSelected() == null) { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), @@ -330,11 +380,13 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer pricingEspecifico.getPricingEspecificoOcupacionsList().remove(index - 1); } } + private void removerPricingAgencia(PricingEspecificoAgencia especificoAgencia) { if (especificoAgencia.getPricingEspecificoAgenciaId() != null) { pricingEspecifico.getPricingEspecificoAgenciasList().remove(especificoAgencia); } } + private void removerPricingCanalVendas(PricingEspecificoCanalVendas especificoCanalVendas) { if (especificoCanalVendas.getPricingEspecificoCanalId() != null) { pricingEspecifico.getPricingEspecificoCanalVendasList().remove(especificoCanalVendas); @@ -396,6 +448,7 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer } } + List pecv = (List) pricingListEspCanal.getModel(); for (PricingEspecificoCanalVendas pricingEspecificoCanalVendas : pecv) { if(pricingEspecificoCanalVendas.getActivo().equals(Boolean.FALSE)){ @@ -520,8 +573,7 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer } if (podeSalvar) { - if(pricingEspecifico.getPricingEspecificoAgenciasList() == null ){ - + if(pricingEspecifico.getPricingEspecificoAgenciasList() == null ){ pricingEspecifico.setPricingEspecificoAgenciasList(new ArrayList()); } if (pricingEspecifico.getPricingEspecificoAgenciasList().isEmpty()){ @@ -552,25 +604,13 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer return; } - - -// PricingEspecificoAgencia pea1 = new PricingEspecificoAgencia(); -// pea1.setPricingEspecifico(pricingEspecifico); -// PuntoVenta pv = puntoVenService.obtenerID(-1); -// pea1.setPuntoVenta(pv); -// pea1.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); -// pea1.setFecmodif(new Date()); -// pea1.setActivo(Boolean.TRUE); -// pricingEspecifico.setPricingEspecificoAgenciasList(new ArrayList()); -// pricingEspecifico.getPricingEspecificoAgenciasList().add(pea1); - } - if(pricingEspecifico.getPricingEspecificoCanalVendasList() == null ){ - - pricingEspecifico.setPricingEspecificoCanalVendasList(new ArrayList()); - } - if (pricingEspecifico.getPricingEspecificoCanalVendasList().isEmpty()){ - + + if(pricingEspecifico.getPricingEspecificoCanalVendasList() == null ){ + pricingEspecifico.setPricingEspecificoCanalVendasList(new ArrayList()); + } + + if (pricingEspecifico.getPricingEspecificoCanalVendasList().isEmpty()){ int resp = Messagebox.show( Labels.getLabel("editarPricingEspecificoCanalVendaController.MSG.perguntaAdicionarTodosCanalVendas"), @@ -593,17 +633,6 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer return; } - - -// PricingEspecificoCanalVendas pea1 = new PricingEspecificoCanalVendas(); -// pea1.setPricingEspecifico(pricingEspecifico); -// TipoPuntoVenta tpv = puntoVentaService.obtenerID(new Short("-1")); -// pea1.setTipoPtovta(tpv); -// pea1.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); -// pea1.setFecmodif(new Date()); -// pea1.setActivo(Boolean.TRUE); -// pricingEspecifico.setPricingEspecificoCanalVendasList(new ArrayList()); -// pricingEspecifico.getPricingEspecificoCanalVendasList().add(pea1); } if (pricingEspecifico.getPricingespecificoId() == null) { @@ -645,6 +674,7 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer pricingEspecificoAgenciaService.actualizacion(p); } } + private void desativarPricingEspecificoCanalDesativados() { for (PricingEspecificoCanalVendas p : pricingEspecificoADesativarCanal) { p.setActivo(Boolean.FALSE); @@ -1058,8 +1088,6 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer this.rdExibirVendaNo = rdExibirVendaNo; } - - @SuppressWarnings({ "rawtypes", "unchecked" }) public void onClick$btnCopiar(Event ev) throws InterruptedException { Map args = new HashMap(); diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 9b77b4601..93e26d9bd 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -3096,6 +3096,8 @@ editarPricingEspecificoOcupacionController.tarifaAberto.label=Tasa em Abierto editarPricingEspecificoOcupacionController.ocupacionInicial.label=Ocupación Inicial editarPricingEspecificoOcupacionController.ocupacionFinal.label=Ocupación Final editarPricingEspecificoOcupacionController.MSG.borrarPergunta = Desea eliminar ocupacion? +editarPricingEspecificoOcupacionController.MSG.noPricingEspecificoCanalJaCadastrado=Canal de ventas ya registrado +editarPricingEspecificoOcupacionController.MSG.noPricingEspecificoAgenciaJaCadastrado=Agência ya registrado editarPricingEspecificoOcupacionController.ocupacao.label = Ocupacion editarPricingEspecificoOcupacionController.MSG.noPricingEspecificoOcupacion = Ocupación no informado. editarPricingEspecificoOcupacionController.MSG.pricingEspecificoOcupacionInicial = La lista de ocupaciones debería comenzar con la ocupación inicial igual a 1. diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 7725f31d4..f4e2b3a1d 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -3314,6 +3314,8 @@ editarPricingEspecificoOcupacionController.tarifaAberto.label=Tarifa em Aberto editarPricingEspecificoOcupacionController.ocupacionInicial.label=Ocupação Inicial editarPricingEspecificoOcupacionController.ocupacionFinal.label=Ocupação Final editarPricingEspecificoOcupacionController.MSG.borrarPergunta = Deseja Eliminar Ocupação? +editarPricingEspecificoOcupacionController.MSG.noPricingEspecificoCanalJaCadastrado=Canal de Vendas já cadastrado +editarPricingEspecificoOcupacionController.MSG.noPricingEspecificoAgenciaJaCadastrado=Agência já registrada editarPricingEspecificoAgenciaController.MSG.borrarPergunta = Deseja Eliminar Agência? editarPricingEspecificoCanalVendaController.MSG.borrarPergunta = Deseja Eliminar Canal Venda? editarPricingEspecificoAgenciaController.MSG.perguntaAdicionarTodosAgencia = Agência está vazio! Deseja adicionar "Todas"? diff --git a/web/gui/pricing/editarPricingEspecifico.zul b/web/gui/pricing/editarPricingEspecifico.zul index 6324e4576..f5d416924 100644 --- a/web/gui/pricing/editarPricingEspecifico.zul +++ b/web/gui/pricing/editarPricingEspecifico.zul @@ -212,21 +212,21 @@ - - -