From f841b0f402825c7e4e533c053bc22e5551c383e5 Mon Sep 17 00:00:00 2001 From: gleimar Date: Tue, 5 Feb 2013 20:13:00 +0000 Subject: [PATCH] git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@24096 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../catalogos/EditarPuntoVentaController.java | 24 +++++--- .../EditarCatalogoDeRutaController.java | 61 +++++++++++-------- .../pricing/BusquedaPricingController.java | 24 ++++++-- web/WEB-INF/i3-label_pt_BR.label | 2 +- 4 files changed, 72 insertions(+), 39 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java index 1b068e859..b06fb2623 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java @@ -10,6 +10,8 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.List; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.Predicate; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; @@ -782,19 +784,27 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer { cmbPessoa.getValue(); cmbTipoConta.getValue(); cmbPosicao.getValue(); - if (puntoVenta.getPuntoventaId()== null) { + - List lsPuntoVenta = puntoVentaService.buscaPuntoVenta(txtNumPtoVta.getValue()); - if (!lsPuntoVenta.isEmpty()) { + List lsPuntoVenta = puntoVentaService.buscaPuntoVenta(txtNumPtoVta.getValue()); + + if (!lsPuntoVenta.isEmpty()) { + boolean exists = CollectionUtils.exists(lsPuntoVenta, new Predicate() { + + @Override + public boolean evaluate(Object object) { + return ((PuntoVenta)object).getPuntoventaId().equals(puntoVenta.getPuntoventaId()); + } + }); + + if (!exists){ Messagebox.show( Labels.getLabel("editarPuntoVentaController.registroNumPtoVtaExiste"), Labels.getLabel("editarPuntoVentaController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); - - return; - + + return; } - } try { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java index 2c2ab08a6..457ac9f8e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java @@ -12,6 +12,8 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.Predicate; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; @@ -231,7 +233,7 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer public void doAfterCompose(Component comp) throws Exception { lsClase = claseService.buscarTodosExceto(-1); lsVia = viaService.obtenerTodos(); - lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa(); + lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa(); lsOrgaoConcedente = orgaoConcedenteService.obtenerTodos(); ruta = (Ruta) Executions.getCurrent().getArg().get("ruta"); @@ -260,11 +262,11 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer } else { rdNo.setChecked(true); } - if(ruta.getIndSentidoIda() != null){ - if(ruta.getIndSentidoIda()){ + if (ruta.getIndSentidoIda() != null) { + if (ruta.getIndSentidoIda()) { radIda.setChecked(true); radVolta.setChecked(false); - }else{ + } else { radIda.setChecked(false); radVolta.setChecked(true); } @@ -589,20 +591,28 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer public void onClick$btnSalvar(Event ev) throws InterruptedException { txtPrefixo.getValue(); - if (ruta.getRutaId()== null) { - - List lsRuta = rutaService.buscarNumRuta(txtNumRuta.getValue()); - if (!lsRuta.isEmpty()) { + + List lsRuta = rutaService.buscarNumRuta(txtNumRuta.getValue()); + + if (!lsRuta.isEmpty()) { + boolean exists = CollectionUtils.exists(lsRuta, new Predicate() { + + @Override + public boolean evaluate(Object object) { + return ((Ruta) object).getRutaId().equals(ruta.getRutaId()); + } + }); + + if (!exists) { Messagebox.show( Labels.getLabel("editarCatalogoDeRutaController.registroNumRutaExiste"), Labels.getLabel("editarCatalogoDeRutaController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); - + return; - - } + } } - + if ((ruta.getRutaId() != null) && secuenciaFoiAlterada) { int resp = Messagebox.show( Labels.getLabel("editarCatalogoDeRutaController.msg.validacionCambionEnCombinaciones"), @@ -630,34 +640,33 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer ruta.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); ruta.setClaseServicio((ClaseServicio) cmbClase.getSelectedItem().getValue()); ruta.setVentaOffLine(chkVentaOffLine.isChecked()); - if (rdSi.isChecked()) { ruta.setIndNombreObligatorio(Boolean.TRUE); } else if (rdNo.isChecked()) { ruta.setIndNombreObligatorio(Boolean.FALSE); } - + if (radIda.isChecked()) { ruta.setIndSentidoIda(Boolean.TRUE); } else if (radVolta.isChecked()) { ruta.setIndSentidoIda(Boolean.FALSE); } - if (ruta.getRutaId() == null) { - + if (ruta.getRutaId() == null) { + ruta = rutaService.suscribir(ruta, lsParadasSequencia); rutaList.addItem(ruta); Messagebox.show(Labels.getLabel( - "editarCatalogoDeRutaController.MSG.suscribirOK").concat(" ID: " - + ruta.getRutaId().toString()), - Labels.getLabel("editarCatalogoDeRutaController.window.title"), - Messagebox.OK, - Messagebox.INFORMATION); + "editarCatalogoDeRutaController.MSG.suscribirOK").concat(" ID: " + + ruta.getRutaId().toString()), + Labels.getLabel("editarCatalogoDeRutaController.window.title"), + Messagebox.OK, + Messagebox.INFORMATION); closeWindow(); - + } else { // Gera Secuencia e Combinação Novamente se houve @@ -671,10 +680,10 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer rutaList.updateItem(ruta); Messagebox.show(Labels.getLabel( - "editarCatalogoDeRutaController.MSG.suscribirOK").concat(" ID: " - + ruta.getRutaId().toString()), - Labels.getLabel("editarCatalogoDeRutaController.window.title"), - Messagebox.OK, Messagebox.INFORMATION); + "editarCatalogoDeRutaController.MSG.suscribirOK").concat(" ID: " + + ruta.getRutaId().toString()), + Labels.getLabel("editarCatalogoDeRutaController.window.title"), + Messagebox.OK, Messagebox.INFORMATION); closeWindow(); } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingController.java index 824829573..68736fbc4 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingController.java @@ -119,31 +119,45 @@ public class BusquedaPricingController extends MyGenericForwardComposer { calendar.setTime(fechaInicio.getValue()); calendar.set(Calendar.HOUR_OF_DAY,0); - calendar.set(Calendar.MINUTE,1); + calendar.set(Calendar.MINUTE,0); + calendar.set(Calendar.SECOND,0); + calendar.set(Calendar.MILLISECOND,0); + calendar1.setTime(fechaFin.getValue()); calendar1.set(Calendar.HOUR_OF_DAY,23); calendar1.set(Calendar.MINUTE,59); - pricingSearch.addFilterGreaterOrEqual("pricingVigenciaList.fecinicioviaje", calendar.getTime()).addFilterLessOrEqual("pricingVigenciaList.fecfinviaje",calendar1.getTime()); + calendar1.set(Calendar.SECOND,59); + calendar1.set(Calendar.MILLISECOND,999); + + pricingSearch.addFilterGreaterOrEqual("pricingVigenciaList.fecinicioviaje", calendar.getTime()); + pricingSearch.addFilterLessOrEqual("pricingVigenciaList.fecfinviaje",calendar1.getTime()); }else{ if (fechaInicio.getValue() != null){ calendar.setTime(fechaInicio.getValue()); calendar.set(Calendar.HOUR_OF_DAY,0); - calendar.set(Calendar.MINUTE,1); + calendar.set(Calendar.MINUTE,0); + calendar.set(Calendar.SECOND,0); + calendar1.setTime(fechaInicio.getValue()); calendar1.set(Calendar.HOUR_OF_DAY,23); calendar1.set(Calendar.MINUTE,59); + calendar1.set(Calendar.SECOND,59); + pricingSearch.addFilterGreaterThan("pricingVigenciaList.fecinicioviaje", calendar.getTime()).addFilterLessThan("pricingVigenciaList.fecinicioviaje",calendar1.getTime()); }else if (fechaFin.getValue() != null){ calendar.setTime(fechaFin.getValue()); - calendar.set(Calendar.HOUR_OF_DAY,23); - calendar.set(Calendar.MINUTE,59); + calendar.set(Calendar.HOUR_OF_DAY,0); + calendar.set(Calendar.MINUTE,0); + calendar.set(Calendar.SECOND,0); + calendar1.setTime(fechaFin.getValue()); calendar1.set(Calendar.HOUR_OF_DAY,23); calendar1.set(Calendar.MINUTE,59); + calendar1.set(Calendar.SECOND,59); pricingSearch.addFilterGreaterThan("pricingVigenciaList.fecfinviaje",calendar.getTime()).addFilterLessThan("pricingVigenciaList.fecfinviaje",calendar1.getTime()); } } diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index b69b97441..372871371 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -7,7 +7,7 @@ # . . = XXX #Versao do VentaBoleto: -versao = ADM_20130201_1RC104 +versao = ADM_20130205_1RC105 # MSG Defaut: MSG.CONSTRAINT.PORCENTAGEM = Os valores devem estar entre 0 e 100