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 7eb36053e..8faa9e070 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 @@ -178,13 +178,30 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer pricingListEspOcupacion.updateItem(especificoOcupacion); } else { pricingListEspOcupacion.removeSelectedItem(); - pricingEspecifico.getPricingEspecificoOcupacionsList().remove(especificoOcupacion); + removerPricingOcupacion(especificoOcupacion); } } } } + private void removerPricingOcupacion(PricingEspecificoOcupacion especificoOcupacion) { + if(especificoOcupacion.getPricingEspecificoOcupacionId() != null) { + pricingEspecifico.getPricingEspecificoOcupacionsList().remove(especificoOcupacion); + } else { + int index = 0; + for (PricingEspecificoOcupacion pricingEspecificoOcupacion : pricingEspecifico.getPricingEspecificoOcupacionsList()) { + if(pricingEspecificoOcupacion.getOcupacionfinal().equals(especificoOcupacion.getOcupacionfinal()) && + pricingEspecificoOcupacion.getOcupacioninicial().equals(especificoOcupacion.getOcupacioninicial()) && + pricingEspecificoOcupacion.getTarifa().equals(especificoOcupacion.getTarifa())) { + break; + } + index ++; + } + pricingEspecifico.getPricingEspecificoOcupacionsList().remove(index); + } + } + public void onClick$btnModificarPricingEspOcup(Event ev) { PricingEspecificoOcupacion especificoOcupacion = (PricingEspecificoOcupacion) pricingListEspOcupacion.getSelected(); @@ -368,7 +385,7 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer * @throws InterruptedException */ private boolean validarPricingEspecificoOcupacion() throws InterruptedException { - if(pricingEspecifico.getPricingEspecificoOcupacionsList() == null || pricingEspecifico.getPricingEspecificoOcupacionsListActivos().isEmpty()) { + if(pricingEspecifico.getPricingEspecificoOcupacionsListActivos() == null || pricingEspecifico.getPricingEspecificoOcupacionsListActivos().isEmpty()) { Messagebox.show( Labels.getLabel("editarPricingEspecificoOcupacionController.MSG.noPricingEspecificoOcupacion"), Labels.getLabel("busquedaPricingEspecificoController.window.title"), diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoOcupacionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoOcupacionController.java index 1d431ea91..c7ca927bd 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoOcupacionController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoOcupacionController.java @@ -73,7 +73,7 @@ public class EditarPricingEspecificoOcupacionController extends MyGenericForward pricingEspecificoOcupacion.setActivo(true); List peoList = null; - if (pricingEspecifico.getPricingEspecificoOcupacionsList().isEmpty()) { + if (pricingEspecifico.getPricingEspecificoOcupacionsList() == null || pricingEspecifico.getPricingEspecificoOcupacionsList().isEmpty()) { peoList = new ArrayList(); } else { peoList = pricingEspecifico.getPricingEspecificoOcupacionsList();