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

17430: Inserir campo de pesquisa por IMEI - Agência Digital 

fixes bug#17430
dev: 
qua:juliana


git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@99276 d1611594-4594-4d17-8e1d-87c2c4800839
master
leonardo 2019-12-06 17:22:47 +00:00
parent 3878d62979
commit 61476235d8
5 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaEstacionController.java
View File

@ -47,6 +47,7 @@ public class BusquedaEstacionController extends MyGenericForwardComposer {
private Textbox txtDescEstacion;
private Combobox cmbPuntoVenta;
private Textbox txtMAC;
private Textbox txtIMEI;
private Longbox txtNumCaja;
private static Logger log = Logger.getLogger(BusquedaEstacionController.class);
@ -100,6 +101,9 @@ public class BusquedaEstacionController extends MyGenericForwardComposer {
estacionBusqueda.addSortAsc("descestacion");
estacionBusqueda.addFilterEqual("activo", Boolean.TRUE);
if (txtIMEI.getValue() != null && !txtIMEI.getValue().isEmpty()) {
estacionBusqueda.addFilterLike("imei", txtIMEI.getValue());
}
if (txtMAC.getValue() != null && !txtMAC.getValue().isEmpty()) {
if(txtMAC.getValue().length() != 17){
try {

3
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderEstacion.java
View File

@ -65,6 +65,9 @@ public class RenderEstacion implements ListitemRenderer {
}
lc.setParent(lstm);
lc = new Listcell(estacion.getImei());
lc.setParent(lstm);
lstm.setAttribute("data", estacion);
}
}

1
web/WEB-INF/i3-label_es_MX.label
View File

@ -4321,6 +4321,7 @@ busquedaEstacionController.lhDescMac.label = Descripción MAC
busquedaEstacionController.lhIMEI.label = IMEI
busquedaEstacionController.lhNumCaja.label = Caja
busquedaEstacionController.lhPuntoVenta.label = Punto de venta
busquedaEstacionController.lhImei.label = IMEI
busquedaEstacionController.lhMAC.label = MAC
busquedaEstacionController.btnPesquisa.label = Búsqueda
busquedaEstacionController.nomeImpressora.label = Impresora

1
web/WEB-INF/i3-label_pt_BR.label
View File

@ -4554,6 +4554,7 @@ busquedaEstacionController.lhUtilizaCartaoLibercard.label = Utiliza cartão Libe
busquedaEstacionController.lhStockCentral.label = Stock Central
busquedaEstacionController.lblVoucherBPe.label = Gerar Voucher BPe (UF: BPe/Estação NBPe)
busquedaEstacionController.lhPuntoVenta.label = Ponto Venda
busquedaEstacionController.lhImei.label = IMEI
busquedaEstacionController.lhMAC.label = MAC
busquedaEstacionController.btnPesquisa.label = Pesquisa
busquedaEstacionController.nomeImpressora.label = Impressora

8
web/gui/seguridad/busquedaEstacion.zul
View File

@ -55,6 +55,11 @@
value="${c:l('busquedaEstacionController.lhMAC.label')}" />
<textbox id="txtMAC" width="300px" maxlength="17" />
</row>
<row>
<label
value="${c:l('busquedaEstacionController.lhIMEI.label')}" />
<textbox id="txtIMEI" width="300px" maxlength="17" />
</row>
</rows>
</grid>
@ -86,6 +91,9 @@
<listheader image="/gui/img/create_doc.gif"
label="${c:l('busquedaEstacionController.lhPuntoVenta.label')}"
sort="auto(puntoVenta.nombpuntoventa)" />
<listheader image="/gui/img/create_doc.gif"
label="${c:l('busquedaEstacionController.lhImei.label')}"
sort="auto(imei)" />
</listhead>
</listbox>
</window>