diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingController.java index 2f9124cf1..40fa9db43 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingController.java @@ -5,6 +5,7 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; import java.util.ArrayList; +import java.util.Calendar; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -59,8 +60,7 @@ public class BusquedaPricingController extends MyGenericForwardComposer { private Textbox txtNome; private Datebox fechaInicio; private Datebox fechaFin; - private static Logger log = Logger - .getLogger(BusquedaPricingController.class); + private static Logger log = Logger.getLogger(BusquedaPricingController.class); @Override public void doAfterCompose(Component comp) throws Exception { @@ -113,15 +113,15 @@ public class BusquedaPricingController extends MyGenericForwardComposer { pricingSearch.addFilterILike("nombPricing", txtNome.getValue() + "%"); } - - if (fechaInicio.getValue() != null) { - pricingSearch.addFilterGreaterOrEqual( - "pricingVigenciaList.fecinicioviaje", fechaInicio.getValue()); + + if (fechaInicio.getValue() != null){ + pricingSearch.addFilterGreaterOrEqual("pricingVigenciaList.fecinicioviaje", fechaInicio.getValue()); } if (fechaFin.getValue() != null) { - pricingSearch.addFilterLessOrEqual( - "pricingVigenciaList.fecfinviaje", fechaFin.getValue()); + pricingSearch.addFilterLessOrEqual("pricingVigenciaList.fecfinviaje", fechaFin.getValue()); } + + pricingSearch.addFilterEqual("activo", Boolean.TRUE); diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricing.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricing.java index 127afd7a0..7f00b836d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricing.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricing.java @@ -49,7 +49,7 @@ public class RenderPricing implements ListitemRenderer { } lc.setParent(lstm); - SimpleDateFormat dt = new SimpleDateFormat("dd/MM/yyyy"); + SimpleDateFormat dt = new SimpleDateFormat("dd/MM/yyyy HH:mm"); if (!p.getPricingVigenciaList().isEmpty()) { String data = ""; for(PricingVigencia pv : p.getPricingVigenciaList()){ diff --git a/web/gui/pricing/busquedaPricing.zul b/web/gui/pricing/busquedaPricing.zul index 337372658..f3209011d 100644 --- a/web/gui/pricing/busquedaPricing.zul +++ b/web/gui/pricing/busquedaPricing.zul @@ -7,7 +7,7 @@ + height="520px" width="720px" border="normal" >