From 3b4ad710da16dae303d5b0bee70608210e473970 Mon Sep 17 00:00:00 2001 From: "lucas.taia" Date: Tue, 12 Feb 2019 21:49:28 +0000 Subject: [PATCH] bug#13595 dev:lucas qua: git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@89790 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../tarifas/EditarTarifaMinimaController.java | 25 +++++++++++++------ web/gui/tarifas/editarTarifasMinimas.zul | 8 +++--- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java index 6098af387..3f61565b7 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java @@ -213,7 +213,7 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer { tarifaMinima.setFecmodif(Calendar.getInstance().getTime()); tarifaMinima.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); tarifaMinima.setActivo(Boolean.TRUE); - + Comboitem cbiRuta = cmbRuta.getSelectedItem(); Ruta ruta = null; if (cbiRuta != null) { @@ -251,9 +251,10 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer { } } } catch (Exception ex) { - log.error("Editar tarida minimas: " + ex); + log.error("Editar tarifa minimas: " , ex); MensagensUtils.showMessageError(MSG_ERROR, TITULO_TARIFA_MINIMA); } + } private boolean isCamposObrigatoriosValidos() { @@ -289,6 +290,7 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer { private void salvarEdicaoTarifa() { tarifaMinimaService.actualizacion(tarifaMinima); tarifaMinimaList.updateItem(tarifaMinima); + salvarTarifaMinimaCategoria(); MensagensUtils.showMessageInformation("editarTarifaMinimaController.btnFechar.MSG.SuscbrirOK", TITULO_TARIFA_MINIMA); closeWindow(); } @@ -298,6 +300,7 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer { if (listaTarifaMinima.isEmpty()) { tarifaMinimaService.suscribir(tarifaMinima); tarifaMinimaList.addItem(tarifaMinima); + salvarTarifaMinimaCategoria(); MensagensUtils.showMessageInformation("editarTarifaMinimaController.btnFechar.MSG.SuscbrirOK", TITULO_TARIFA_MINIMA); closeWindow(); } else { @@ -320,21 +323,19 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer { closeWindow(); } } catch (Exception ex) { - log.error(ex); + log.error("", ex); } } public void onClick$btnAdicionarCategoria(Event ev) throws InterruptedException { try { - Categoria categoria = (Categoria) cmbCategorias.getSelectedItem().getValue(); + Categoria categoria = (Categoria) (cmbCategorias.getSelectedItem() != null ? cmbCategorias.getSelectedItem().getValue() : null); if(categoria != null) { TarifaMinimaCategoria tarifaMinimaCategoria = new TarifaMinimaCategoria(); tarifaMinimaCategoria.setCategoria(categoria); tarifaMinimaCategoria.setTarifaMinima(tarifaMinima); - - tarifaMinimaCategoria = tarifaMinimaService.adicionarTarifaMinimaCategoria(tarifaMinimaCategoria); tarifaMinimaCategoriaList.updateItem(tarifaMinimaCategoria); @@ -354,7 +355,6 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer { if (resp == Messagebox.YES) { TarifaMinimaCategoria tarifaMinimaCategoria = (TarifaMinimaCategoria) tarifaMinimaCategoriaList.getSelected(); - tarifaMinimaService.removerTarifaMinimaCategoria(tarifaMinimaCategoria); tarifaMinimaCategoriaList.removeItem(tarifaMinimaCategoria); MensagensUtils.showMessageInformation("editarTarifaMinimaController.msg.removerTarifaMinimaCategoria", TITULO_TARIFA_MINIMA); @@ -388,6 +388,17 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer { cmbRuta.setModel(l); } + private void salvarTarifaMinimaCategoria() { + //Remove todas categorias salvas e insere de acordo com o escolhido para salvar + List tarifaMinimaCategoriaSalva = (List) (tarifaMinima.getTarifaMinimaCategorias() == null ? tarifaMinimaCategoriaList.getModel() : tarifaMinima.getTarifaMinimaCategorias()); + for (TarifaMinimaCategoria tarifaMinimaCategoria : tarifaMinimaCategoriaSalva) { + tarifaMinimaService.removerTarifaMinimaCategoria(tarifaMinimaCategoria); + } + for (int i = 0; i < tarifaMinimaCategoriaList.getModel().getSize(); i++) { + TarifaMinimaCategoria tarifaMinimaCategoria = (TarifaMinimaCategoria) tarifaMinimaCategoriaList.getModel().getElementAt(i); + tarifaMinimaCategoria = tarifaMinimaService.adicionarTarifaMinimaCategoria(tarifaMinimaCategoria); + } + } public List getLsOrgaoConcedente() { return lsOrgaoConcedente; diff --git a/web/gui/tarifas/editarTarifasMinimas.zul b/web/gui/tarifas/editarTarifasMinimas.zul index 4a6211000..48a9052dd 100644 --- a/web/gui/tarifas/editarTarifasMinimas.zul +++ b/web/gui/tarifas/editarTarifasMinimas.zul @@ -142,7 +142,7 @@ selectedItem="@{winEditarTarifaMinima$composer.tarifaMinima.destino}"/> - +