From 4ab75a38de2eab062f2cec3904240cdc5e207127 Mon Sep 17 00:00:00 2001 From: "wallace.henrique" Date: Tue, 20 Aug 2024 21:51:44 -0300 Subject: [PATCH] fixes bug#AL-4732 --- pom.xml | 2 +- .../web/gui/controladores/gr/BusquedaAidfController.java | 6 ++++++ web/WEB-INF/i3-label_en.label | 1 + web/WEB-INF/i3-label_es_MX.label | 1 + web/WEB-INF/i3-label_fr_FR.label | 1 + web/WEB-INF/i3-label_pt_BR.label | 2 ++ web/gui/gr/busquedaAidf.zul | 5 ++++- 7 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 078872d68..0aeb0ac8a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.126.4 + 1.127.0 war 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 f697f39f1..af2f17052 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 @@ -15,6 +15,7 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zul.Combobox; import org.zkoss.zul.Comboitem; +import org.zkoss.zul.Intbox; import org.zkoss.zul.Paging; import org.zkoss.zul.Textbox; @@ -63,6 +64,7 @@ public class BusquedaAidfController extends MyGenericForwardComposer { private Textbox txtDocFiscal; private Textbox txtSerie; + private Intbox txtAidf; @Override @@ -155,6 +157,10 @@ public class BusquedaAidfController extends MyGenericForwardComposer { aidfBusqueda.addFilterLike("serie", txtSerie.getValue()); } + if(txtAidf.getValue() != null){ + aidfBusqueda.addFilterEqual("aidfId", txtAidf.getValue()); + } + aidfBusqueda.addSortDesc("fecvencimiento"); aidfBusqueda.addSortDesc("aidfId"); diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label index ee3e80b9a..62443838e 100644 --- a/web/WEB-INF/i3-label_en.label +++ b/web/WEB-INF/i3-label_en.label @@ -239,6 +239,7 @@ busquedaAidfController.lbTipoValidaAIDF.value = Sale Type busquedaAidfController.serie.label = Series busquedaAidfController.subserie.label = SubSeries busquedaAidfController.window.title = AIDF +busquedaAidfController.aidf.label = AIDF (ID) busquedaAlertaCtrlController.btnCerrar.tooltiptext = Close busquedaAlertaCtrlController.btnNovo.tooltiptext = Include busquedaAlertaCtrlController.btnPesquisa.label = Search diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index 76c63fbae..bfbaceb7e 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -237,6 +237,7 @@ busquedaAidfController.lbTipoValidaAIDF.value = Tipo Venta busquedaAidfController.serie.label = Série busquedaAidfController.subserie.label = Subserie busquedaAidfController.window.title = AIDF +busquedaAidfController.aidf.label = AIDF (ID) busquedaAlertaCtrlController.btnCerrar.tooltiptext = Cerrar busquedaAlertaCtrlController.btnNovo.tooltiptext = Incluir busquedaAlertaCtrlController.btnPesquisa.label = Búsqueda diff --git a/web/WEB-INF/i3-label_fr_FR.label b/web/WEB-INF/i3-label_fr_FR.label index 02076314d..ee62db2dd 100644 --- a/web/WEB-INF/i3-label_fr_FR.label +++ b/web/WEB-INF/i3-label_fr_FR.label @@ -239,6 +239,7 @@ busquedaAidfController.lbTipoValidaAIDF.value = Type de vente busquedaAidfController.serie.label = Série busquedaAidfController.subserie.label = Sous-Série busquedaAidfController.window.title = AIDF +busquedaAidfController.aidf.label = AIDF (ID) busquedaAlertaCtrlController.btnCerrar.tooltiptext = Fermer busquedaAlertaCtrlController.btnNovo.tooltiptext = Inclure busquedaAlertaCtrlController.btnPesquisa.label = Recherche diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 7cf3145b6..958a0d5f5 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -236,6 +236,8 @@ busquedaAidfController.lbTipoValidaAIDF.value = Tipo Venda busquedaAidfController.serie.label = Série busquedaAidfController.subserie.label = SubSérie busquedaAidfController.window.title = AIDF +busquedaAidfController.aidf.label = AIDF (ID) + busquedaAlertaCtrlController.btnCerrar.tooltiptext = Fechar busquedaAlertaCtrlController.btnNovo.tooltiptext = Incluir busquedaAlertaCtrlController.btnPesquisa.label = Pesquisa diff --git a/web/gui/gr/busquedaAidf.zul b/web/gui/gr/busquedaAidf.zul index 538b97105..1baafd7a8 100644 --- a/web/gui/gr/busquedaAidf.zul +++ b/web/gui/gr/busquedaAidf.zul @@ -65,7 +65,10 @@