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

fixes bug #07034 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@51939 d1611594-4594-4d17-8e1d-87c2c4800839
master
daniel.zauli 2016-01-15 17:11:36 +00:00
parent eeb0129e4e
commit 083f290d07
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/BusquedaAidfController.java
View File

@ -4,6 +4,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -15,6 +16,7 @@ import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zul.Combobox; import org.zkoss.zul.Combobox;
import org.zkoss.zul.Comboitem; import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Paging; import org.zkoss.zul.Paging;
import org.zkoss.zul.Textbox;
import com.rjconsultores.ventaboletos.entidad.Aidf; import com.rjconsultores.ventaboletos.entidad.Aidf;
import com.rjconsultores.ventaboletos.entidad.AidfEspecie; import com.rjconsultores.ventaboletos.entidad.AidfEspecie;
@ -63,6 +65,9 @@ public class BusquedaAidfController extends MyGenericForwardComposer {
private Combobox cmbEmpresa; private Combobox cmbEmpresa;
private List<Empresa> lsEmpresas; private List<Empresa> lsEmpresas;
private Textbox txtDocFiscal;
private Textbox txtSerie;
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
@ -146,6 +151,14 @@ public class BusquedaAidfController extends MyGenericForwardComposer {
aidfBusqueda.addFilterIn("empresa", lsEmpresas); aidfBusqueda.addFilterIn("empresa", lsEmpresas);
} }
if(!StringUtils.isBlank(txtDocFiscal.getValue())){
aidfBusqueda.addFilterLike("docfiscal", txtDocFiscal.getValue());
}
if(!StringUtils.isBlank(txtSerie.getValue())){
aidfBusqueda.addFilterLike("serie", txtSerie.getValue());
}
aidfBusqueda.addSortDesc("fecvencimiento"); aidfBusqueda.addSortDesc("fecvencimiento");
plwAidf.init(aidfBusqueda, aidfList, pagingAidf); plwAidf.init(aidfBusqueda, aidfList, pagingAidf);
@ -192,4 +205,20 @@ public class BusquedaAidfController extends MyGenericForwardComposer {
lsEmpresas = _lsEmpresas; lsEmpresas = _lsEmpresas;
} }
public Textbox getTxtDocFiscal() {
return txtDocFiscal;
}
public void setTxtDocFiscal(Textbox txtDocFiscal) {
this.txtDocFiscal = txtDocFiscal;
}
public Textbox getTxtSerie() {
return txtSerie;
}
public void setTxtSerie(Textbox txtSerie) {
this.txtSerie = txtSerie;
}
} }

9
web/gui/gr/busquedaAidf.zul
View File

@ -58,6 +58,15 @@
model="@{winBusquedaAidf$composer.lsEmpresas}" /> model="@{winBusquedaAidf$composer.lsEmpresas}" />
</row> </row>
<row>
<label value="${c:l('busquedaAidfController.docfiscal.label')}"/>
<textbox id="txtDocFiscal" width="100px"
maxlength="20" use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
<label value="${c:l('busquedaAidfController.serie.label')}"/>
<textbox id="txtSerie" width="80px"
maxlength="8" use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
</row>
</rows> </rows>
</grid> </grid>