From 65e39852eec1f79e304932bb242bbba89de9fe43 Mon Sep 17 00:00:00 2001 From: julio Date: Thu, 13 Nov 2014 11:48:37 +0000 Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit P14 - Pricing Específico - Parametrizar ocupação (bug #5763) Tempo: 1 hora git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@39531 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../EditarPricingEspecificoController.java | 19 ++++++++++--------- ...rPricingEspecificoOcupacionController.java | 6 +++--- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java index 7fdc4b366..3f76e98eb 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java @@ -107,6 +107,8 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer super.doAfterCompose(comp); + pricingListEspOcupacion.setItemRenderer(new RenderPricingEspecificoOcupacion()); + if (pricingEspecifico.getPricingespecificoId() == null) { btnApagar.setVisible(Boolean.FALSE); } else { @@ -121,7 +123,7 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer } pricingEspecifico = pricingEspecificoService.obtenerID(pricingEspecifico.getPricingespecificoId()); - pricingListEspOcupacion.setItemRenderer(new RenderPricingEspecificoOcupacion()); + pricingListEspOcupacion.setData(pricingEspecifico.getPricingEspecificoOcupacionsList()); pricingListEspOcupacion.addEventListener("onDoubleClick", new EventListener() { @@ -149,7 +151,7 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer } public void onClick$btnNovoPricingEspOcup(Event ev) throws InterruptedException { - verPricingEspecificoOcupacion(null); + verPricingEspecificoOcupacion(new PricingEspecificoOcupacion()); } public void onClick$btnApagarPricingEspOcup(Event ev) throws InterruptedException { @@ -163,15 +165,15 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer PricingEspecificoOcupacion especificoOcupacion = (PricingEspecificoOcupacion) o; pricingEspecifico.getPricingEspecificoOcupacionsList().remove(especificoOcupacion); - + especificoOcupacion.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); especificoOcupacion.setFecmodif(Calendar.getInstance().getTime()); especificoOcupacion.setActivo(false); - + pricingListEspOcupacion.updateItem(especificoOcupacion); - + } - + pricingListEspOcupacion.setData(pricingEspecifico.getPricingEspecificoOcupacionsList()); } } else { @@ -227,7 +229,6 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer fechaFin.getValue(); tarifaAbierto.getValue(); - if (pricingEspecifico.getTipoPtovta() == null) { Messagebox.show(Labels.getLabel("editarPricingController.MSG.tipoPtoVta"), Labels.getLabel("busquedaPricingEspecificoController.window.title"), @@ -352,7 +353,7 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer Labels.getLabel("busquedaPricingEspecificoController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } - + } /** @@ -677,7 +678,7 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer public void setPricingListEspOcupacion(MyListbox pricingListEspOcupacion) { this.pricingListEspOcupacion = pricingListEspOcupacion; } - + public Textbox getTarifaAbierto() { return tarifaAbierto; } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoOcupacionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoOcupacionController.java index ca890b969..039853627 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoOcupacionController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoOcupacionController.java @@ -42,7 +42,7 @@ public class EditarPricingEspecificoOcupacionController extends MyGenericForward super.doAfterCompose(comp); - if (pricingEspecificoOcupacion != null) { + if (pricingEspecificoOcupacion.getPricingEspecificoOcupacionId() != null) { tarifa.setValue(pricingEspecificoOcupacion.getTarifa() == null ? StringUtils.EMPTY : pricingEspecificoOcupacion.getTarifa().toString()); ocupacioninicial.setValue(pricingEspecificoOcupacion.getOcupacioninicial() == null ? StringUtils.EMPTY : pricingEspecificoOcupacion.getOcupacioninicial().toString()); ocupacionfinal.setValue(pricingEspecificoOcupacion.getOcupacionfinal() == null ? StringUtils.EMPTY : pricingEspecificoOcupacion.getOcupacionfinal().toString()); @@ -56,7 +56,7 @@ public class EditarPricingEspecificoOcupacionController extends MyGenericForward try { boolean esEdicion = false; - if (pricingEspecificoOcupacion == null) + if (pricingEspecificoOcupacion.getPricingEspecificoOcupacionId() == null) pricingEspecificoOcupacion = new PricingEspecificoOcupacion(); else esEdicion = true; @@ -96,7 +96,7 @@ public class EditarPricingEspecificoOcupacionController extends MyGenericForward closeWindow(); } catch (Exception ex) { - log.error("Erro ao adicionar pricing Pricing Especifico Ocupacion: " + ex); + log.error("Erro ao adicionar pricing Pricing Especifico Ocupacion: ", ex); } }