From a523cfca9bc65555d3bcb4f682f920c39fcd1bda Mon Sep 17 00:00:00 2001 From: luis Date: Tue, 14 Nov 2017 17:36:45 +0000 Subject: [PATCH] Issue #10054: ESPEC 001 Santa Cruz - Arredondamento ARTESP git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@76414 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../tarifas/EditarRedondeoController.java | 35 +++++++++++++++++-- .../utilerias/render/RenderRedondeoCtrl.java | 8 +++++ web/WEB-INF/i3-label_es_MX.label | 2 ++ web/WEB-INF/i3-label_pt_BR.label | 2 ++ web/gui/tarifas/busquedaRedondeo.zul | 3 ++ web/gui/tarifas/editarRedondeo.zul | 5 +++ 6 files changed, 53 insertions(+), 2 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarRedondeoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarRedondeoController.java index 3388ea20d..7e111ce2d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarRedondeoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarRedondeoController.java @@ -73,6 +73,7 @@ public class EditarRedondeoController extends MyGenericForwardComposer { private Combobox cmbMarca; private Checkbox chkIndaplicadescuento; private Checkbox chkIndaplicapricing; + private Checkbox chkIndaplicaArtesp; private static Logger log = Logger.getLogger(EditarRedondeoController.class); @Override @@ -97,6 +98,12 @@ public class EditarRedondeoController extends MyGenericForwardComposer { } else { chkIndaplicadescuento.setChecked(redondeoCtrl.getIndaplicadescuento()); chkIndaplicapricing.setChecked(redondeoCtrl.getIndaplicapricing()); + chkIndaplicaArtesp.setChecked(redondeoCtrl.getIndaplicaArtesp() == null ? Boolean.FALSE : redondeoCtrl.getIndaplicaArtesp()); + + if(chkIndaplicaArtesp.isChecked()){ + chkIndaplicapricing.setDisabled(true); + chkIndaplicadescuento.setDisabled(true); + } redondeoCtrl = redondeoCtrlService.obtenerID(redondeoCtrl.getRedondeoctrlId()); @@ -117,6 +124,7 @@ public class EditarRedondeoController extends MyGenericForwardComposer { Boolean aplicaDescuento = chkIndaplicadescuento.isChecked(); Boolean aplicaPricing = chkIndaplicapricing.isChecked(); + Boolean aplicaArtesp = chkIndaplicaArtesp.isChecked(); try { if (redondeoList.getData().length == 0) { @@ -138,10 +146,12 @@ public class EditarRedondeoController extends MyGenericForwardComposer { redondeoCtrl.setIndaplicadescuento(aplicaDescuento); redondeoCtrl.setIndaplicapricing(aplicaPricing); - + redondeoCtrl.setIndaplicaArtesp(aplicaArtesp); + if (podeSalvar()) { redondeoCtrl.setIndaplicadescuento(aplicaDescuento); redondeoCtrl.setIndaplicapricing(aplicaPricing); + redondeoCtrl.setIndaplicaArtesp(aplicaArtesp); redondeoCtrl.setActivo(Boolean.TRUE); redondeoCtrl.setFecmodif(Calendar.getInstance().getTime()); @@ -187,7 +197,8 @@ public class EditarRedondeoController extends MyGenericForwardComposer { //Traslapa Redondeo for (Redondeo r : lsRedondeoNuevos) { - List lsCtrl = redondeoCtrlService.buscarTraslapa(iDMarcas, r.getValorinicial(), r.getValorfinal(), redondeoCtrl.getIndaplicadescuento(), redondeoCtrl.getIndaplicapricing()); + List lsCtrl = redondeoCtrlService.buscarTraslapa(iDMarcas, r.getValorinicial(), r.getValorfinal(), + redondeoCtrl.getIndaplicadescuento(), redondeoCtrl.getIndaplicapricing(), redondeoCtrl.getIndaplicaArtesp()); if (!lsCtrl.isEmpty()) { if (redondeoCtrl.getRedondeoctrlId() != null) { for (RedondeoCtrl rc : lsCtrl) { @@ -424,6 +435,18 @@ public class EditarRedondeoController extends MyGenericForwardComposer { Messagebox.OK, Messagebox.ERROR); } } + + public void onClick$chkIndaplicaArtesp(){ + if(chkIndaplicaArtesp.isChecked()){ + chkIndaplicadescuento.setChecked(false); + chkIndaplicapricing.setChecked(false); + chkIndaplicadescuento.setDisabled(true); + chkIndaplicapricing.setDisabled(true); + }else{ + chkIndaplicadescuento.setDisabled(false); + chkIndaplicapricing.setDisabled(false); + } + } public Button getBtnApagar() { return btnApagar; @@ -560,4 +583,12 @@ public class EditarRedondeoController extends MyGenericForwardComposer { public void setRedondeoService(RedondeoService redondeoService) { this.redondeoService = redondeoService; } + + public Checkbox getChkIndaplicaArtesp() { + return chkIndaplicaArtesp; + } + + public void setChkIndaplicaArtesp(Checkbox chkIndaplicaArtesp) { + this.chkIndaplicaArtesp = chkIndaplicaArtesp; + } } diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRedondeoCtrl.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRedondeoCtrl.java index 9d57f8361..0f22077cf 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRedondeoCtrl.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRedondeoCtrl.java @@ -40,6 +40,14 @@ public class RenderRedondeoCtrl implements ListitemRenderer { lc = new Listcell(Labels.getLabel("MSG.NO")); } lc.setParent(lstm); + + Boolean aplicaArtesp = redondeoCtrl.getIndaplicaArtesp(); + if (aplicaArtesp != null && aplicaArtesp) { + lc = new Listcell(Labels.getLabel("MSG.SI")); + } else { + lc = new Listcell(Labels.getLabel("MSG.NO")); + } + lc.setParent(lstm); StringBuilder sb = new StringBuilder(); for (RedondeoMarca rm : redondeoCtrl.getRedondeoMarcaList()) { diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index a4053362e..6767f87b4 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -4025,6 +4025,8 @@ busquedaRedondeoController.lhvalorfinal.label = Valor final busquedaRedondeoController.lhvalorredondeo.label = Valor redondeo busquedaRedondeoController.lhindaplicadescuento.label = Aplica descuento busquedaRedondeoController.lhindaplicapricing.label = Aplica pricing +busquedaRedondeoController.lhindaplicaartesp.label = Redondeo ARTESP +busquedaRedondeoController.colhdindaplicaartesp.label = ARTESP busquedaRedondeoController.btnPesquisa.label = Búsqueda # Editar Redondeo diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index df3389acb..cfd98f767 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -4249,6 +4249,8 @@ busquedaRedondeoController.lhvalorfinal.label = Valor Final busquedaRedondeoController.lhvalorredondeo.label = Valor Arredondamento busquedaRedondeoController.lhindaplicadescuento.label = Aplica Desconto busquedaRedondeoController.lhindaplicapricing.label = Aplica Pricing +busquedaRedondeoController.lhindaplicaartesp.label = Arredondamento ARTESP +busquedaRedondeoController.colhdindaplicaartesp.label = ARTESP busquedaRedondeoController.btnPesquisa.label = Pesquisa # Editar Arredondamento diff --git a/web/gui/tarifas/busquedaRedondeo.zul b/web/gui/tarifas/busquedaRedondeo.zul index a7db9cc4e..22f078e1b 100644 --- a/web/gui/tarifas/busquedaRedondeo.zul +++ b/web/gui/tarifas/busquedaRedondeo.zul @@ -67,6 +67,9 @@ + diff --git a/web/gui/tarifas/editarRedondeo.zul b/web/gui/tarifas/editarRedondeo.zul index 0bc3487ff..2dbcf269c 100644 --- a/web/gui/tarifas/editarRedondeo.zul +++ b/web/gui/tarifas/editarRedondeo.zul @@ -37,6 +37,11 @@ + +