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 358d4c819..0ac2f4f0c 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 @@ -36,6 +36,7 @@ import org.zkoss.zul.Combobox; import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; import org.zkoss.zul.Intbox; +import org.zkoss.zul.Textbox; import org.zkoss.zul.Paging; import org.zkoss.zul.Timebox; @@ -72,6 +73,7 @@ public class BusquedaCorridaController extends MyGenericForwardComposer { private List lsRuta; private Button btnPesquisa; private Intbox txtID; + private Intbox txtNumCorrida; private Timebox hora; public Combobox getCmbClase() { @@ -261,12 +263,17 @@ public class BusquedaCorridaController extends MyGenericForwardComposer { Integer id = txtID.getValue(); busquedaCorrita.addFilterEqual("esquemacorridaId", id); + + Integer numCorrida = txtNumCorrida.getValue(); + busquedaCorrita.addFilterEqual("numCorrida", numCorrida); Date dtHora = hora.getValue(); if (dtHora != null) { Time time = new Time(dtHora.getTime()); busquedaCorrita.addFilterEqual("horasalida", time); } + + Comboitem cbiClase = cmbClase.getSelectedItem(); ClaseServicio claseServicio = null; 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 f26749be5..6a4d7bf17 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 @@ -31,6 +31,7 @@ import org.zkoss.zul.Button; import org.zkoss.zul.Combobox; import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; +import org.zkoss.zul.Intbox; import org.zkoss.zul.Label; import org.zkoss.zul.Radio; import org.zkoss.zul.Spinner; @@ -127,6 +128,7 @@ public class EditarCorridaController extends MyGenericForwardComposer { private MyListbox esquemaTramoList; private Datebox fecniciovigencia; private Datebox fecfinvigencia; + private Intbox txtNumCorrida; private Combobox cmbClase; private Combobox cmbClaseDoblePiso; private Combobox cmbMarca; @@ -374,6 +376,7 @@ public class EditarCorridaController extends MyGenericForwardComposer { public void onClick$btnSalvar(Event ev) throws InterruptedException { Date dataDe = fecniciovigencia.getValue(); Date dataAte = fecfinvigencia.getValue(); + txtNumCorrida.getValue(); try { Comboitem ciRuta = cmbRuta.getSelectedItem(); diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderConfiguracionCorrida.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderConfiguracionCorrida.java index 7e450647b..082a14ca8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderConfiguracionCorrida.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderConfiguracionCorrida.java @@ -21,6 +21,9 @@ public class RenderConfiguracionCorrida implements ListitemRenderer { Listcell lc = new Listcell(corrida.getEsquemacorridaId().toString()); lc.setParent(lstm); + + lc = new Listcell(corrida.getNumCorrida().toString()); + lc.setParent(lstm); SimpleDateFormat dt = new SimpleDateFormat("dd/MM/yy"); lc = new Listcell(dt.format(corrida.getEsquemaOperacional().getFecniciovigencia())); diff --git a/web/gui/esquema_operacional/busquedaCorrida.zul b/web/gui/esquema_operacional/busquedaCorrida.zul index da46c2b95..368719dba 100644 --- a/web/gui/esquema_operacional/busquedaCorrida.zul +++ b/web/gui/esquema_operacional/busquedaCorrida.zul @@ -29,6 +29,10 @@