From 07a2e9885fcd72a63996590862eadc1fe7679953 Mon Sep 17 00:00:00 2001
From: carla <carla@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 17 Oct 2012 17:31:13 +0000
Subject: [PATCH] =?UTF-8?q?corre=C3=A7=C3=A3o=20da=20valida=C3=A7=C3=A3o?=
 =?UTF-8?q?=20do=20campo=20numCorrida?=
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@22114 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../EditarCorridaController.java                   | 14 ++++----------
 web/gui/esquema_operacional/editarCorrida.zul      |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java
index b2aad4969..f8a374033 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java
@@ -213,7 +213,6 @@ public class EditarCorridaController extends MyGenericForwardComposer {
 				txtNumCorridaPisoExtra.setVisible(Boolean.TRUE);
 				cmbRolOperativoDoblePiso.setVisible(true);
 				cmbClaseDoblePiso.setVisible(true);
-				txtNumCorridaPisoExtra.setConstraint("no empty");
 				cmbRolOperativoDoblePiso.setConstraint("no empty");
 				cmbClaseDoblePiso.setConstraint("no empty");
 				
@@ -409,10 +408,9 @@ public class EditarCorridaController extends MyGenericForwardComposer {
 			}
 
 			if (ruta != null) {
-				Boolean existeNumCorrida = esquemaCorridaService.buscarNumCorrida(esquemaCorrida.getNumCorrida());
-				Boolean existeNumCorridaPisoExtra = esquemaCorridaService.buscarNumCorridaPisoExtra(esquemaCorrida.getNumCorridaPisoExtra());
-				if (!existeNumCorrida){
-					if(!existeNumCorridaPisoExtra){
+				Boolean existeNumCorrida = esquemaCorridaService.buscarNumCorrida(esquemaCorrida.getNumCorrida(), esquemaCorrida.getNumCorridaPisoExtra());		
+				if ((!existeNumCorrida)&& !(esquemaCorrida.getNumCorrida().equals(esquemaCorrida.getNumCorridaPisoExtra())) ){
+					
 						dataAte.setSeconds(59);
 						if (dataDe.before(dataAte)) {
 							if (!lsEsquemaTramo.isEmpty()) {
@@ -667,11 +665,7 @@ public class EditarCorridaController extends MyGenericForwardComposer {
 									Labels.getLabel("editarConfiguracionCorridaController.window.title"),
 									Messagebox.OK, Messagebox.EXCLAMATION);
 						}
-					}else{
-						Messagebox.show(Labels.getLabel("editarConfiguracionCorridaController.MSG.NumCorridaPisoExtra"),
-								Labels.getLabel("editarConfiguracionCorridaController.window.title"),
-								Messagebox.OK, Messagebox.EXCLAMATION);
-					}
+
 				}else{
 					Messagebox.show(Labels.getLabel("editarConfiguracionCorridaController.MSG.NumCorrida"),
 							Labels.getLabel("editarConfiguracionCorridaController.window.title"),
diff --git a/web/gui/esquema_operacional/editarCorrida.zul b/web/gui/esquema_operacional/editarCorrida.zul
index ab9270afb..1ca54bd20 100644
--- a/web/gui/esquema_operacional/editarCorrida.zul
+++ b/web/gui/esquema_operacional/editarCorrida.zul
@@ -301,7 +301,7 @@
 							</row>
 							<row>
 								<label id="lbNumCorridaPisoExtra" value="${c:l('editarConfiguracionCorridaController.lbNumCorridaPisoExtra.label')}" visible="false"/>
-	                  			 <intbox id="txtNumCorridaPisoExtra"   maxlength="4" width="120px"
+	                  			 <intbox id="txtNumCorridaPisoExtra"   maxlength="4" width="120px" constraint="no empty"
 	                  			 	value="@{winEditarCorrida$composer.esquemaCorrida.numCorridaPisoExtra}"  visible="false"/>
 							</row>