From 43cf9d40cd059bfa8e6d7602f09c4e03edd9c181 Mon Sep 17 00:00:00 2001 From: frederico Date: Thu, 3 Mar 2016 20:43:58 +0000 Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#7142=20#7166=20-=20corre=C3=A7?= =?UTF-8?q?=C3=A3o=20bug=20pricing=20espec=C3=ADfico=20e=20troca=20de=20va?= =?UTF-8?q?lor=20padr=C3=A3o=20de=20venda=20para=20'Sim'=20na=20combina?= =?UTF-8?q?=C3=A7=C3=A3o=20em=20gera=C3=A7=C3=A3o=20autom=C3=A1tica=20de?= =?UTF-8?q?=20Linhas?= 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@53525 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../GridRutaTramoCoeficiente.java | 6 +++--- ...rPricingEspecificoOcupacionController.java | 19 +++++++++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridRutaTramoCoeficiente.java b/src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridRutaTramoCoeficiente.java index 7fbd9b897..456218909 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridRutaTramoCoeficiente.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridRutaTramoCoeficiente.java @@ -289,7 +289,7 @@ public class GridRutaTramoCoeficiente extends Grid implements RowRenderer, Rende cboVenda.setReadonly(true); cboVenda.setWidth("100%"); cboVenda.setConstraint("no empty"); - + ListModelList listCboVenda = new ListModelList(); final Comboitem cbiSim = new Comboitem("Sim"); @@ -302,8 +302,8 @@ public class GridRutaTramoCoeficiente extends Grid implements RowRenderer, Rende listCboVenda.add(cbiNao.getValue()); if (secuenciaRutaTramoCoeficienteVO.getPermiteVenda() == null && this.getId().equalsIgnoreCase("gridrutasecuenciaida")){ - listCboVenda.addSelection(cbiNao.getValue()); - secuenciaRutaTramoCoeficienteVO.setPermiteVenda(Boolean.FALSE); + listCboVenda.addSelection(cbiSim.getValue()); + secuenciaRutaTramoCoeficienteVO.setPermiteVenda(Boolean.TRUE); } else if (this.getId().equalsIgnoreCase("gridrutasecuenciavolta")){ listCboVenda.addSelection(secuenciaRutaTramoCoeficienteVO.getPermiteVenda()?cbiSim.getValue():cbiNao.getValue()); } 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 076bcd56e..f9caf7eb6 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 @@ -7,6 +7,8 @@ import java.util.Locale; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; +import org.hibernate.Hibernate; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; import org.zkoss.zk.ui.Component; @@ -15,6 +17,7 @@ import org.zkoss.zk.ui.event.Event; import com.rjconsultores.ventaboletos.entidad.PricingEspecifico; import com.rjconsultores.ventaboletos.entidad.PricingEspecificoOcupacion; +import com.rjconsultores.ventaboletos.service.PricingEspecificoService; import com.rjconsultores.ventaboletos.utilerias.BigDecimalUtil; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; @@ -35,18 +38,20 @@ public class EditarPricingEspecificoOcupacionController extends MyGenericForward private MyTextboxDecimal tarifa; private MyTextboxDecimal ocupacioninicial; private MyTextboxDecimal ocupacionfinal; + + @Autowired + private PricingEspecificoService pricingEspecificoService; @Override public void doAfterCompose(Component comp) throws Exception { pricingEspecifico = (PricingEspecifico) Executions.getCurrent().getArg().get("pricingEspecifico"); pricingEspecificoOcupacion = (PricingEspecificoOcupacion) Executions.getCurrent().getArg().get("pricingEspecificoOcupacion"); pricingListEspOcupacion = (MyListbox) Executions.getCurrent().getArg().get("pricingListEspOcupacion"); - + super.doAfterCompose(comp); - if (pricingEspecificoOcupacion.getPricingEspecificoOcupacionId() != null) { Locale locale = new Locale("pt", "BR"); - + tarifa.setValue(pricingEspecificoOcupacion.getTarifa() == null ? StringUtils.EMPTY : BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(pricingEspecificoOcupacion.getTarifa(), locale)); ocupacioninicial.setValue(pricingEspecificoOcupacion.getOcupacioninicial() == null ? StringUtils.EMPTY : BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(pricingEspecificoOcupacion.getOcupacioninicial(), locale)); ocupacionfinal.setValue(pricingEspecificoOcupacion.getOcupacionfinal() == null ? StringUtils.EMPTY : BigDecimalUtil.getBigDecimalToStringDouble2CasasDecimaisFormatado(pricingEspecificoOcupacion.getOcupacionfinal(), locale)); @@ -72,13 +77,19 @@ public class EditarPricingEspecificoOcupacionController extends MyGenericForward pricingEspecificoOcupacion.setFecmodif(Calendar.getInstance().getTime()); pricingEspecificoOcupacion.setActivo(true); + if (pricingEspecifico != null && pricingEspecifico.getPricingespecificoId() != null) { + pricingEspecifico = pricingEspecificoService.obtenerID(pricingEspecifico.getPricingespecificoId().longValue()); + } + Hibernate.initialize(pricingEspecifico); + Hibernate.initialize(pricingEspecificoOcupacion); + List peoList = null; if (pricingEspecifico.getPricingEspecificoOcupacionsList() == null || pricingEspecifico.getPricingEspecificoOcupacionsList().isEmpty()) { peoList = new ArrayList(); } else { peoList = pricingEspecifico.getPricingEspecificoOcupacionsList(); } - + if (pricingEspecificoOcupacion.getPricingEspecificoOcupacionId() != null && peoList.contains(pricingEspecificoOcupacion)) { int index = peoList.indexOf(pricingEspecificoOcupacion); if(index >= 0) {