From 8f934f32e14b14852f15fe39163dbef5f24d40f2 Mon Sep 17 00:00:00 2001 From: "daniel.zauli" Date: Mon, 7 Oct 2019 12:25:19 +0000 Subject: [PATCH] =?UTF-8?q?0016086:=20Andorinha=20-=20GLPI=2016701=20-=20C?= =?UTF-8?q?onfigura=C3=A7=C3=A3o=20de=20Reserva=20fixes=20bug#0016086=20de?= =?UTF-8?q?v:Thiago=20clemente=20qua:Debora?= 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@98104 d1611594-4594-4d17-8e1d-87c2c4800839 --- ...itarConfiguracionReservacionController.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionReservacionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionReservacionController.java index eb7bd1af3..7c250ab9f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionReservacionController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionReservacionController.java @@ -592,7 +592,7 @@ public class EditarConfiguracionReservacionController extends MyGenericForwardCo } // Se nao pode salvar pq translapa - if (!podeSalvarTraslapa) { + if (!podeSalvarTraslapa && !validaDias(lsTraslapa,reservacionCtrl)) { Messagebox.show( Labels.getLabel("editarConfiguracionReservacionController.MSG.conflitoVigencias"), Labels.getLabel("editarConfiguracionReservacionController.window.title"), @@ -1053,4 +1053,20 @@ public class EditarConfiguracionReservacionController extends MyGenericForwardCo public void setRa2(Radio ra2) { this.ra2 = ra2; } + + private boolean validaDias(List lsReservacionCtrl, ReservacionCtrl current) { + boolean retorno = true; + for(ReservacionCtrl i : lsReservacionCtrl) { + if(i.getIndapliclun() && i.getIndapliclun() == current.getIndapliclun() + || i.getIndaplicmar() && i.getIndaplicmar() == current.getIndaplicmar() + || i.getIndaplicmie() && i.getIndaplicmie() == current.getIndaplicmie() + || i.getIndaplicjue() && i.getIndaplicjue() == current.getIndaplicjue() + || i.getIndaplicvie() && i.getIndaplicvie() == current.getIndaplicvie() + || i.getIndaplicsab() && i.getIndaplicsab() == current.getIndaplicsab() + || i.getIndaplicdom() && i.getIndaplicdom() == current.getIndaplicdom()) { + retorno = false; + } + } + return retorno; + } }