From ecc259ca3a4707941853a0868fb1b085f26eab54 Mon Sep 17 00:00:00 2001
From: thiago <thiago@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 20 Jul 2015 13:16:37 +0000
Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#6478=20-=20Altera=C3=A7=C3=A3o?=
 =?UTF-8?q?=20em=20tela=20de=20gera=C3=A7=C3=A3o=20autom=C3=A1tica=20de=20?=
 =?UTF-8?q?linha=20para=20aceitar=20mesmo=20numero=20de=20linha=20para=20i?=
 =?UTF-8?q?da=20e=20volta.?=
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@46129 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../EditarCatalogoDeRutaController.java       |  1 -
 .../EditarTramoRutaController.java            | 38 +++++++++++++------
 2 files changed, 26 insertions(+), 13 deletions(-)

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 1cb05f24d..6aac6dff5 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
@@ -27,7 +27,6 @@ import org.zkoss.zk.ui.util.Clients;
 import org.zkoss.zul.Button;
 import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Comboitem;
-import org.zkoss.zul.Intbox;
 import org.zkoss.zul.ListModelList;
 import org.zkoss.zul.Listcell;
 import org.zkoss.zul.Listitem;
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/generaciontramosrutas/EditarTramoRutaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/generaciontramosrutas/EditarTramoRutaController.java
index f508eb7eb..1d479e82e 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/generaciontramosrutas/EditarTramoRutaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/generaciontramosrutas/EditarTramoRutaController.java
@@ -9,6 +9,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.Predicate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -18,7 +20,6 @@ import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Comboitem;
-import org.zkoss.zul.Intbox;
 import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.Radio;
 import org.zkoss.zul.Window;
@@ -96,12 +97,31 @@ public class EditarTramoRutaController extends MyGenericForwardComposer {
     public void onClick$btnCombinacion(Event e) throws InterruptedException {
 
     	List<Ruta> lsRuta = rutaService.buscarNumRuta(txtNumRuta.getValue());
+    	RutaTramoVO rutaTramoVO = new RutaTramoVO();
+    	if (radIda.isChecked()) {
+    		rutaTramoVO.setIndSentidoIda(Boolean.TRUE);
+    	} else if (radVolta.isChecked()) {
+    		rutaTramoVO.setIndSentidoIda(Boolean.FALSE);
+    	}
 		if (!lsRuta.isEmpty()) {
-			Messagebox.show(
-					Labels.getLabel("editarTramoRutaController.registroNumRutaExiste"),
-					Labels.getLabel("editarTramoRutaController.window.title"),
-					Messagebox.OK, Messagebox.EXCLAMATION);
-			return;
+			
+			boolean exists = CollectionUtils.exists(lsRuta, new Predicate() {
+
+				@Override
+				public boolean evaluate(Object object) {
+					return ((Ruta) object).getNumRuta().equals(txtNumRuta.getValue()) && ((Ruta) object).getIndSentidoIda().equals(radIda.isChecked());
+				}
+			});
+
+			if (exists) {
+				Messagebox.show(
+						Labels.getLabel("editarTramoRutaController.registroNumRutaExiste"),
+						Labels.getLabel("editarTramoRutaController.window.title"),
+						Messagebox.OK, Messagebox.EXCLAMATION);
+
+				return;
+			}
+			
 		}		
     	
     	if (lsRutaEmpresa.isEmpty()) {
@@ -118,7 +138,6 @@ public class EditarTramoRutaController extends MyGenericForwardComposer {
             return;
     	}
     	
-        RutaTramoVO rutaTramoVO = new RutaTramoVO();
         rutaTramoVO.setClaseServicio((ClaseServicio) cmbClaseServicio.getSelectedItem().getValue());
         rutaTramoVO.setOrgaoConcedente((OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue());
         rutaTramoVO.setSolicitaNombrePasajero(chkSolicitaNombrePasajero.isChecked());
@@ -129,11 +148,6 @@ public class EditarTramoRutaController extends MyGenericForwardComposer {
         rutaTramoVO.setNumRuta(txtNumRuta.getValue());
         
         
-        if (radIda.isChecked()) {
-        	rutaTramoVO.setIndSentidoIda(Boolean.TRUE);
-		} else if (radVolta.isChecked()) {
-			rutaTramoVO.setIndSentidoIda(Boolean.FALSE);
-		}
 
         Map<String, Object> params = new LinkedHashMap<String, Object>();
         params.put("rutaTramoVO", rutaTramoVO);