From 121fd124f31a4c56b58417161d28d776c82a04f9 Mon Sep 17 00:00:00 2001 From: thiago Date: Thu, 30 Mar 2017 20:09:45 +0000 Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#8661=20-=20Corre=C3=A7=C3=A3o=20?= =?UTF-8?q?de=20bug,=20pontos=20de=20venda=20j=C3=A1=20excluidos=20ainda?= =?UTF-8?q?=20apareciam=20em=20tela=20de=20configura=C3=A7=C3=A3o=20de=20p?= =?UTF-8?q?arametros=20de=20ocd?= 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@67436 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../catalogos/EditarOCDParamController.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java index 41f1e89a6..be5cf096b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java @@ -127,9 +127,19 @@ public class EditarOCDParamController extends MyGenericForwardComposer { btnApagar.setVisible(Boolean.FALSE); ocdParamCorrente.setListOCDPtoVtaParam(new ArrayList()); }else{ - ptoVtaOCDParamList.setData(ocdParamCorrente.getListOCDPtoVtaParam()); + ptoVtaOCDParamList.setData(removerOCDPtoVtaParamInativo(ocdParamCorrente.getListOCDPtoVtaParam())); } } + + private List removerOCDPtoVtaParamInativo(List listOCDPtoVtaParam){ + List retorno = new ArrayList(); + for (OCDPtoVtaParam ocdPtoVtaParam : listOCDPtoVtaParam) { + if(ocdPtoVtaParam.getActivo()){ + retorno.add(ocdPtoVtaParam); + } + } + return retorno; + } private void initRadios(Boolean indPenalizacionOCD) { rdPenalizacionOCD.setChecked(ocdParamCorrente.getIndPenalizacionOCD()); @@ -241,7 +251,7 @@ public class EditarOCDParamController extends MyGenericForwardComposer { ocdParamCorrente.addOCDPtoVtaParam(ocdPtoVtaParam); - ptoVtaOCDParamList.setData(ocdParamCorrente.getListOCDPtoVtaParam()); + ptoVtaOCDParamList.setData(removerOCDPtoVtaParamInativo(ocdParamCorrente.getListOCDPtoVtaParam())); } } @@ -261,7 +271,7 @@ public class EditarOCDParamController extends MyGenericForwardComposer { ocdPtoVtaParamService.borrar(ocdPtoVtaParam); } ocdParamCorrente.removePtovtaOCDParam(ocdPtoVtaParam); - ptoVtaOCDParamList.setData(ocdParamCorrente.getListOCDPtoVtaParam()); + ptoVtaOCDParamList.setData(removerOCDPtoVtaParamInativo(ocdParamCorrente.getListOCDPtoVtaParam())); } } } catch (Exception ex) {