From 083f290d0785101a37871fce0a8701349aebc0fb Mon Sep 17 00:00:00 2001
From: "daniel.zauli" <daniel.zauli@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 15 Jan 2016 17:11:36 +0000
Subject: [PATCH] fixes bug #07034

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@51939 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../gr/BusquedaAidfController.java            | 29 +++++++++++++++++++
 web/gui/gr/busquedaAidf.zul                   | 11 ++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/BusquedaAidfController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/BusquedaAidfController.java
index 146efd40c..e815fdc89 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/BusquedaAidfController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/BusquedaAidfController.java
@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 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.Comboitem;
 import org.zkoss.zul.Paging;
+import org.zkoss.zul.Textbox;
 
 import com.rjconsultores.ventaboletos.entidad.Aidf;
 import com.rjconsultores.ventaboletos.entidad.AidfEspecie;
@@ -63,6 +65,9 @@ public class BusquedaAidfController extends MyGenericForwardComposer {
 	private Combobox cmbEmpresa;
 	private List<Empresa> lsEmpresas;
 	
+	private Textbox txtDocFiscal;
+	private Textbox txtSerie;
+	
 	
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {		
@@ -146,6 +151,14 @@ public class BusquedaAidfController extends MyGenericForwardComposer {
 			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");
 
 		plwAidf.init(aidfBusqueda, aidfList, pagingAidf);
@@ -190,6 +203,22 @@ public class BusquedaAidfController extends MyGenericForwardComposer {
 
 	public void setLsEmpresas(List<Empresa> _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;
 	}	
 	
 }
diff --git a/web/gui/gr/busquedaAidf.zul b/web/gui/gr/busquedaAidf.zul
index fa9c30b88..b7f493e14 100644
--- a/web/gui/gr/busquedaAidf.zul
+++ b/web/gui/gr/busquedaAidf.zul
@@ -57,7 +57,16 @@
 							width="90%" mold="rounded" buttonVisible="true"
 							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>
         </grid>