From f84ad13b32802dbdba1ec84fcb3b4765f5401c76 Mon Sep 17 00:00:00 2001
From: "thiago.penido" <thiago.penido@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 28 Dec 2015 18:41:28 +0000
Subject: [PATCH] =?UTF-8?q?Conclus=C3=A3o=20mantis=206967=20Filtro=20de=20?=
 =?UTF-8?q?Numero=20da=20linha?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fixes bug 6967

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@51592 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../BusquedaCatalogoDeRutaController.java                 | 8 +++++++-
 web/gui/esquema_operacional/busquedaRuta.zul              | 4 ++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/BusquedaCatalogoDeRutaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/BusquedaCatalogoDeRutaController.java
index 8b98af3be..b8681eeeb 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/BusquedaCatalogoDeRutaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/BusquedaCatalogoDeRutaController.java
@@ -64,6 +64,7 @@ public class BusquedaCatalogoDeRutaController extends MyGenericForwardComposer {
 	private MyListbox rutaList;
 	private Paging pagingRuta;
 	private Textbox txtNombre;
+	private Textbox txtNumRuta;
 	private Intbox txtId;
 	private Combobox cmbClaseServicio;
 	private Combobox cmbOrgaoConcedente;
@@ -155,6 +156,10 @@ public class BusquedaCatalogoDeRutaController extends MyGenericForwardComposer {
 		if (txtId.getValue() != null) {
 			rutaBusqueda.addFilterEqual("rutaId", txtId.getValue());
 		}
+		
+		if(txtNumRuta.getValue() != null && !txtNumRuta.getValue().isEmpty()) {
+			rutaBusqueda.addFilterEqual("numRuta", txtNumRuta.getValue());
+		}
 
 		rutaBusqueda.addFilterLike("descruta", "%" + txtNombre.getText().trim().concat("%"));
 
@@ -200,4 +205,5 @@ public class BusquedaCatalogoDeRutaController extends MyGenericForwardComposer {
 	public void onClick$btnNovo(Event ev) {
 		verRuta(new Ruta());
 	}
-}
+	
+}
\ No newline at end of file
diff --git a/web/gui/esquema_operacional/busquedaRuta.zul b/web/gui/esquema_operacional/busquedaRuta.zul
index 8f5efd621..b614c08f6 100644
--- a/web/gui/esquema_operacional/busquedaRuta.zul
+++ b/web/gui/esquema_operacional/busquedaRuta.zul
@@ -72,6 +72,10 @@
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
 						mold="rounded" buttonVisible="true" width="95%"
 						model="@{winBusquedaCatalogoDeRutas$composer.lsEmpresa}" />
+						
+					<label	value="${c:l('editarCatalogoDeRutaController.lblNumRuta.value')}" />
+					<textbox id="txtNumRuta" width="95%" maxlength="30"
+						use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />						
 				</row>
 			</rows>
 		</grid>