From 0239ee198a01520bbc34bd5484837dc1247d6be5 Mon Sep 17 00:00:00 2001 From: wilian Date: Wed, 1 Jul 2015 17:25:12 +0000 Subject: [PATCH] fixes bug #6427 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@45591 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../tarifas/BusquedaPrecoApanheController.java | 6 +++--- .../tarifas/EditarPrecoApanheController.java | 3 ++- .../web/utilerias/MyComboboxColonia.java | 12 ++++++------ .../menu/item/tarifas/ItemMenuPrecoApanhe.java | 2 +- web/gui/tarifas/editarPrecoApanhe.zul | 6 +++--- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaPrecoApanheController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaPrecoApanheController.java index 3992961df..c8ca97584 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaPrecoApanheController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaPrecoApanheController.java @@ -67,10 +67,10 @@ public class BusquedaPrecoApanheController extends MyGenericForwardComposer { } private void refreshLista() { - HibernateSearchObject hotelBusqueda = new HibernateSearchObject(PrecoApanhe.class, pagingPrecoApanhe.getPageSize()); + HibernateSearchObject precoApanhes = new HibernateSearchObject(PrecoApanhe.class, pagingPrecoApanhe.getPageSize()); - hotelBusqueda.addFilterEqual("activo", Boolean.TRUE); - plwPrecoApanhe.init(hotelBusqueda, precoApanheList, pagingPrecoApanhe); + precoApanhes.addFilterEqual("activo", Boolean.TRUE); + plwPrecoApanhe.init(precoApanhes, precoApanheList, pagingPrecoApanhe); if (precoApanheList.getData().length == 0) { try { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarPrecoApanheController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarPrecoApanheController.java index 7c39f3da8..fee3e7b88 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarPrecoApanheController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarPrecoApanheController.java @@ -74,7 +74,7 @@ public class EditarPrecoApanheController extends MyGenericForwardComposer { } - public void onClick$btnSalvar(Event ev) throws InterruptedException { + public void onClick$btnSalvar(Event ev) throws InterruptedException { try { txtPreco.getValue(); cmbCiudad.getValue(); @@ -92,6 +92,7 @@ public class EditarPrecoApanheController extends MyGenericForwardComposer { precoApanhe.setActivo(Boolean.TRUE); precoApanhe.setFecmodif(Calendar.getInstance().getTime()); precoApanhe.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + precoApanhe.setPreco(txtPreco.getValueDecimal()); if (precoApanhe.getPrecoapanheId() == null) { precoApanheService.suscribir(precoApanhe); diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxColonia.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxColonia.java index cce7e1c97..495ce2f98 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxColonia.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxColonia.java @@ -63,8 +63,8 @@ public class MyComboboxColonia extends Combobox { } else { lsColonia.clear(); - BindingListModel listModelCiudad = new BindingListModelList(lsColonia, true); - MyComboboxColonia.this.setModel(listModelCiudad); + BindingListModel listModelColonia = new BindingListModelList(lsColonia, true); + MyComboboxColonia.this.setModel(listModelColonia); } } }); @@ -73,8 +73,8 @@ public class MyComboboxColonia extends Combobox { public void onEvent(Event event) throws Exception { InputEvent ev = (InputEvent) event; - String strCiudad = ev.getValue(); - if (strCiudad.length() < 2) { + String strColonia = ev.getValue(); + if (strColonia.length() < 2) { lsColonia.clear(); BindingListModel listModelColonia = new BindingListModelList(lsColonia, true); @@ -90,11 +90,11 @@ public class MyComboboxColonia extends Combobox { return initialValue; } - public void setInitialValue(Ciudad initialValue) { + public void setInitialValue(Colonia initialValue) { if (initialValue == null) { return; } - List ls = new ArrayList(); + List ls = new ArrayList(); ls.add(initialValue); this.setModel(new BindingListModelList(ls, false)); diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/tarifas/ItemMenuPrecoApanhe.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/tarifas/ItemMenuPrecoApanhe.java index e2a044733..6520c18dc 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/tarifas/ItemMenuPrecoApanhe.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/tarifas/ItemMenuPrecoApanhe.java @@ -19,7 +19,7 @@ public class ItemMenuPrecoApanhe extends DefaultItemMenuSistema { @Override public void ejecutar() { PantallaUtileria.openWindow("/gui/tarifas/busquedaPrecoApanhe.zul", - Labels.getLabel("busquedaPrecoApanheContorller.window.title"), getArgs(), desktop); + Labels.getLabel("busquedaPrecoApanheController.window.title"), getArgs(), desktop); } diff --git a/web/gui/tarifas/editarPrecoApanhe.zul b/web/gui/tarifas/editarPrecoApanhe.zul index 468dd9f58..aec48a59a 100644 --- a/web/gui/tarifas/editarPrecoApanhe.zul +++ b/web/gui/tarifas/editarPrecoApanhe.zul @@ -63,9 +63,9 @@