fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ajuste na tela de buscar pricing 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@23943 d1611594-4594-4d17-8e1d-87c2c4800839
master
carla 2013-01-29 18:20:00 +00:00
parent 68934d50c4
commit 0af390fbee
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingController.java
View File

@ -5,6 +5,7 @@
package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; package com.rjconsultores.ventaboletos.web.gui.controladores.pricing;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -59,8 +60,7 @@ public class BusquedaPricingController extends MyGenericForwardComposer {
private Textbox txtNome; private Textbox txtNome;
private Datebox fechaInicio; private Datebox fechaInicio;
private Datebox fechaFin; private Datebox fechaFin;
private static Logger log = Logger private static Logger log = Logger.getLogger(BusquedaPricingController.class);
.getLogger(BusquedaPricingController.class);
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
@ -114,15 +114,15 @@ public class BusquedaPricingController extends MyGenericForwardComposer {
+ "%"); + "%");
} }
if (fechaInicio.getValue() != null) { if (fechaInicio.getValue() != null){
pricingSearch.addFilterGreaterOrEqual( pricingSearch.addFilterGreaterOrEqual("pricingVigenciaList.fecinicioviaje", fechaInicio.getValue());
"pricingVigenciaList.fecinicioviaje", fechaInicio.getValue());
} }
if (fechaFin.getValue() != null) { if (fechaFin.getValue() != null) {
pricingSearch.addFilterLessOrEqual( pricingSearch.addFilterLessOrEqual("pricingVigenciaList.fecfinviaje", fechaFin.getValue());
"pricingVigenciaList.fecfinviaje", fechaFin.getValue());
} }
pricingSearch.addFilterEqual("activo", Boolean.TRUE); pricingSearch.addFilterEqual("activo", Boolean.TRUE);
pricingSearch.addSortAsc("nombPricing"); pricingSearch.addSortAsc("nombPricing");

2
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderPricing.java
View File

@ -49,7 +49,7 @@ public class RenderPricing implements ListitemRenderer {
} }
lc.setParent(lstm); lc.setParent(lstm);
SimpleDateFormat dt = new SimpleDateFormat("dd/MM/yyyy"); SimpleDateFormat dt = new SimpleDateFormat("dd/MM/yyyy HH:mm");
if (!p.getPricingVigenciaList().isEmpty()) { if (!p.getPricingVigenciaList().isEmpty()) {
String data = ""; String data = "";
for(PricingVigencia pv : p.getPricingVigenciaList()){ for(PricingVigencia pv : p.getPricingVigenciaList()){

8
web/gui/pricing/busquedaPricing.zul
View File

@ -7,7 +7,7 @@
<zk xmlns="http://www.zkoss.org/2005/zul"> <zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winBusquedaPricing" title="${c:l('busquedaPricingController.window.title')}" <window id="winBusquedaPricing" title="${c:l('busquedaPricingController.window.title')}"
apply="${busquedaPricingController}" contentStyle="overflow:auto" apply="${busquedaPricingController}" contentStyle="overflow:auto"
height="520px" width="700px" border="normal" > height="520px" width="720px" border="normal" >
<toolbar> <toolbar>
<button id="btnRefresh" image="/gui/img/refresh.png" width="35px" <button id="btnRefresh" image="/gui/img/refresh.png" width="35px"
tooltiptext="${c:l('busquedaPricingController.btnRefresh.tooltiptext')}" /> tooltiptext="${c:l('busquedaPricingController.btnRefresh.tooltiptext')}" />
@ -43,9 +43,9 @@
<label value="${c:l('editarPricingController.vigHoraInicioViaje.value')}"/> <label value="${c:l('editarPricingController.vigHoraInicioViaje.value')}"/>
<hbox> <hbox>
<datebox width="150px" id="fechaInicio" format="dd/MM/yyyy HH:mm" mold="rounded" lenient="false"/> <datebox width="150px" id="fechaInicio" mold="rounded" lenient="false"/>
<label value="${c:l('editarPricingController.vigHoraFinViaje.value')}"/> <label value="${c:l('editarPricingController.vigHoraFinViaje.value')}"/>
<datebox width="150px" id="fechaFin" format="dd/MM/yyyy HH:mm" mold="rounded" lenient="false"/> <datebox width="150px" id="fechaFin" mold="rounded" lenient="false"/>
</hbox> </hbox>
</row> </row>
</rows> </rows>
@ -69,7 +69,7 @@
<listheader image="/gui/img/create_doc.gif" <listheader image="/gui/img/create_doc.gif"
label="${c:l('busquedaPricingController.lhEmpresa.label')}" label="${c:l('busquedaPricingController.lhEmpresa.label')}"
sort="auto(empresa.nombempresa)"/> sort="auto(empresa.nombempresa)"/>
<listheader image="/gui/img/create_doc.gif" width="160px" <listheader image="/gui/img/create_doc.gif" width="230px"
label="${c:l('busquedaPricingController.lhDataInicioFimViagem.label')}" label="${c:l('busquedaPricingController.lhDataInicioFimViagem.label')}"
/> />
</listhead> </listhead>