From 40bef7e3bcc1236b84c610eedee906fc37a2c779 Mon Sep 17 00:00:00 2001
From: "thiago.clemente" <thiago.clemente@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Mon, 20 Jan 2020 21:46:06 +0000
Subject: [PATCH] fixes bug#17512 dev: qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@99821 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../BusquedaCorridaController.java            | 35 ++++++++++++++++++-
 web/WEB-INF/i3-label_es_MX.label              |  1 +
 web/WEB-INF/i3-label_pt_BR.label              |  1 +
 .../esquema_operacional/busquedaCorrida.zul   | 23 ++++++++----
 4 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/BusquedaCorridaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/BusquedaCorridaController.java
index 029e293a6..961afff3a 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/BusquedaCorridaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/BusquedaCorridaController.java
@@ -7,6 +7,7 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.esquemaoperacional;
 import java.sql.Time;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -21,6 +22,7 @@ import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.InputEvent;
 import org.zkoss.zkplus.databind.BindingListModelList;
 import org.zkoss.zul.Button;
+import org.zkoss.zul.Checkbox;
 import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Comboitem;
 import org.zkoss.zul.Datebox;
@@ -76,6 +78,7 @@ public class BusquedaCorridaController extends MyGenericForwardComposer {
 	private Intbox txtID;
 	private Intbox txtNumCorrida;
 	private Timebox hora;
+	private Checkbox chkNaoIncluirLinhaInativa;
 
 	public Combobox getCmbClase() {
 		return cmbClase;
@@ -205,8 +208,16 @@ public class BusquedaCorridaController extends MyGenericForwardComposer {
 		this.hora = hora;
 	}
 	
+	public Checkbox getChkNaoIncluirLinhaInativa() {
+		return chkNaoIncluirLinhaInativa;
+	}
+	
+	public void setChkNaoIncluirLinhaInativa(Checkbox chkNaoIncluirLinhaInativa) {
+		this.chkNaoIncluirLinhaInativa = chkNaoIncluirLinhaInativa;
+	}
 
 	public void onChange$cmbMarca(InputEvent ev) {
+		chkNaoIncluirLinhaInativa.setChecked(false);
 
 		if (ev.isChangingBySelectBack()) {
 			return;
@@ -214,7 +225,7 @@ public class BusquedaCorridaController extends MyGenericForwardComposer {
 		lsRuta = rutaService.obtenerPorEmpresa(((Marca) cmbMarca.getSelectedItem().getValue()).getEmpresa());
 		BindingListModelList l = new BindingListModelList(lsRuta, true);
 		cmbRuta.setModel(l);
-		cmbRuta.setSelectedItem(null);
+		cmbRuta.setSelectedItem(null);		
 	}
 
 	@Override
@@ -347,4 +358,26 @@ public class BusquedaCorridaController extends MyGenericForwardComposer {
 			}
 		}
 	}
+	
+	public void onClick$chkNaoIncluirLinhaInativa(Event ev) {
+		if (chkNaoIncluirLinhaInativa.isChecked()) {
+			for (Iterator<Ruta> it = lsRuta.iterator(); it.hasNext();) {
+				Ruta ruta = it.next();
+				if (Boolean.TRUE.equals(ruta.getIndRutaCancelada())) {
+					it.remove();
+				}
+			}
+		} else {
+			//Volta aos itens iniciais
+			if (cmbMarca.getSelectedItem()==null) {
+				lsRuta = rutaService.obtenerTodos();
+			} else {
+				lsRuta = rutaService.obtenerPorEmpresa(((Marca) cmbMarca.getSelectedItem().getValue()).getEmpresa());
+			}
+		}
+		
+		BindingListModelList l = new BindingListModelList(lsRuta, true);
+		cmbRuta.setModel(l);
+		cmbRuta.setSelectedItem(null);
+	}
 }
diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label
index 8f0e88f2b..1a6c476ca 100644
--- a/web/WEB-INF/i3-label_es_MX.label
+++ b/web/WEB-INF/i3-label_es_MX.label
@@ -2748,6 +2748,7 @@ editarConfiguracionCorridaController.lbTipoPassagem.value = Tipo Passagem
 editarConfiguracionCorridaController.rdSentado.value = Sentado
 editarConfiguracionCorridaController.rdEmPe.value = Em Pé
 editarConfiguracionCorridaController.rdAmbos.value = Ambos
+editarConfiguracionCorridaController.chkNaoIncluirLinhaInativa = Não incluir inativas
 
 
 #Planeacion de Poltrona Controller
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index a7bf51d20..5f0187265 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -2941,6 +2941,7 @@ editarConfiguracionCorridaController.lbTipoPassagem.value = Tipo Passagem
 editarConfiguracionCorridaController.rdSentado.value = Sentado
 editarConfiguracionCorridaController.rdEmPe.value = Em Pé
 editarConfiguracionCorridaController.rdAmbos.value = Ambos
+editarConfiguracionCorridaController.chkNaoIncluirLinhaInativa = Não incluir inativas
 
 #Planeacion de Poltrona Controller
 editarConfiguracionCorridaAsientoController.window.title = Planejamento de poltronas
diff --git a/web/gui/esquema_operacional/busquedaCorrida.zul b/web/gui/esquema_operacional/busquedaCorrida.zul
index b68d504df..d7f452045 100644
--- a/web/gui/esquema_operacional/busquedaCorrida.zul
+++ b/web/gui/esquema_operacional/busquedaCorrida.zul
@@ -87,12 +87,23 @@
 						model="@{winBusquedaCorrida$composer.lsMarca}" />
 				</row>
 				<row spans="1,2,1,2">
-					<label
-						value="${c:l('editarConfiguracionCorridaController.cmbRuta.value')}" />
-					<combobox id="cmbRuta"
-						use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
-						mold="rounded" buttonVisible="true" width="90%"
-						model="@{winBusquedaCorrida$composer.lsRuta}" />
+					<label value="${c:l('editarConfiguracionCorridaController.cmbRuta.value')}" />
+					
+					<hbox>
+						<h:table border="0">
+							<h:tr>
+								<h:td>
+									<combobox id="cmbRuta" 
+										use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
+										mold="rounded" buttonVisible="true" width="90%"
+										model="@{winBusquedaCorrida$composer.lsRuta}" />
+								</h:td>
+								<h:td>
+									<checkbox id="chkNaoIncluirLinhaInativa" label="${c:l('editarConfiguracionCorridaController.chkNaoIncluirLinhaInativa')}"/>
+								</h:td>
+							</h:tr>
+						</h:table>
+					</hbox>
 
 					<label
 						value="${c:l('editarConfiguracionCorridaController.cmbEmpresaCorrida.value')}" />