From 891aea0ed1f3f426689d9b40061e978dc64ed2ce Mon Sep 17 00:00:00 2001 From: Fernando Uc Date: Tue, 8 Oct 2024 15:35:47 -0600 Subject: [PATCH 1/5] =?UTF-8?q?Se=20corrige=20error=20en=20visualizaci?= =?UTF-8?q?=C3=B3n=20de=20listado=20de=20Cotizaci=C3=B3n=20de=20Expresos.?= =?UTF-8?q?=20Fixes=20bug#AL-4552?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../utilerias/render/RenderDocumentosExpresos.java | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fc95837ae..1a8471f9c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.152.6 + 1.152.7 war diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderDocumentosExpresos.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderDocumentosExpresos.java index 01f018d47..ff9212dc8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderDocumentosExpresos.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderDocumentosExpresos.java @@ -2,6 +2,7 @@ package com.rjconsultores.ventaboletos.web.utilerias.render; import java.io.ByteArrayInputStream; import java.io.InputStream; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -26,6 +27,10 @@ import com.rjconsultores.ventaboletos.web.gui.controladores.expressos.ExpressosP import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria; import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; +import net.sf.jasperreports.engine.JasperFillManager; +import net.sf.jasperreports.engine.JasperPrint; +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + public class RenderDocumentosExpresos implements ListitemRenderer { private SolicitudExpreso expreso; @@ -35,10 +40,12 @@ public class RenderDocumentosExpresos implements ListitemRenderer { TrayectosExpresosService trayectosServices; DocumentosExpresosController winDocumentosExpresosController; + EventListener listenerGenerico; - public RenderDocumentosExpresos(DocumentosExpresosController window) { + public RenderDocumentosExpresos(DocumentosExpresosController window, EventListener listenerGenerico) { super(); winDocumentosExpresosController = window; + this.listenerGenerico = listenerGenerico; } @Override @@ -132,6 +139,10 @@ public class RenderDocumentosExpresos implements ListitemRenderer { lc.appendChild(btnVerFuec); Button btnVerListaPasajeros = new Button(Labels.getLabel("expresosController.lbl.btnVerListaPasajeros")); + btnVerListaPasajeros.setAttribute("data", data); + btnVerListaPasajeros.addEventListener("onClick", listenerGenerico); + + /* btnVerListaPasajeros.addEventListener("onClick", new EventListener() { @Override public void onEvent(Event event) throws Exception { @@ -145,6 +156,7 @@ public class RenderDocumentosExpresos implements ListitemRenderer { } } }); + */ lc.appendChild(btnVerListaPasajeros); item.setAttribute("data", expresos); From c5cab4777d7bed5a4c592f25858aa62b1c4e2c09 Mon Sep 17 00:00:00 2001 From: Fernando Uc Date: Tue, 8 Oct 2024 15:37:11 -0600 Subject: [PATCH 2/5] =?UTF-8?q?Se=20corrige=20error=20en=20visualizaci?= =?UTF-8?q?=C3=B3n=20de=20listado=20de=20Cotizaci=C3=B3n=20de=20Expresos.?= =?UTF-8?q?=20Fixes=20bug#AL-4552?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/utilerias/render/RenderExpresosPorCotizar.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderExpresosPorCotizar.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderExpresosPorCotizar.java index 862c333ba..7d065a633 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderExpresosPorCotizar.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderExpresosPorCotizar.java @@ -35,9 +35,6 @@ public class RenderExpresosPorCotizar implements ListitemRenderer { @Autowired SolicitudExpresosService expresosService; - @Autowired - ConstanteService constanteService; - @Autowired private LogAuditoriaService logAuditoriaService; @@ -141,6 +138,7 @@ public class RenderExpresosPorCotizar implements ListitemRenderer { lc.appendChild(btnCotizar); break; case 2: + ConstanteService constanteService = (ConstanteService)AppContext.getApplicationContext().getBean("constanteService"); Constante constante = constanteService.buscarPorNomeConstante("FORMAPAGOCREDITO_ID"); String pagoCreditoConstante = constante == null ? "" : constante.getValorconstante(); From 4e23dfa196f7d6c98ec925acf67cdcf0c535b812 Mon Sep 17 00:00:00 2001 From: Fernando Uc Date: Wed, 9 Oct 2024 08:47:21 -0600 Subject: [PATCH 3/5] Se agregan validaciones de nulos para pantalla de Cotizar Expresos. Fixes bug#AL-4549 --- pom.xml | 2 +- .../expressos/CotizarExpresoController.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 1a8471f9c..7f7c6048c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.152.7 + 1.152.8 war diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/expressos/CotizarExpresoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/expressos/CotizarExpresoController.java index fea744e85..9a9669fc8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/expressos/CotizarExpresoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/expressos/CotizarExpresoController.java @@ -150,14 +150,14 @@ public class CotizarExpresoController extends MyGenericForwardComposer{ } }); - txtNumSolicitud.setValue(expreso.getSolicitudExpresoId().toString()); + txtNumSolicitud.setValue(expreso.getSolicitudExpresoId() == null ? "" : expreso.getSolicitudExpresoId().toString()); txtRuta.setValue(expreso.getCiudadOrigen().getDescparada() + " - " + expreso.getCiudadDestino().getDescparada()); txtIdaRegreso.setValue(expreso.getIndViajeRedondo() == true ? Labels.getLabel("expresosController.lbl.idaVuelta") : Labels.getLabel("expresosController.lbl.ida")); - txtCantPasajeros.setValue(expreso.getCantidadPasajeros().toString()); - txtFechaIda.setValue(expreso.getFechaHoraIda().toString()); - txtFechaRegreso.setValue(expreso.getFechaHoraRegreso().toString()); - txtSitioRecogidaIda.setValue(expreso.getDescSitioPartidaIda()); - txtSitioRecogidaRegreso.setValue(expreso.getDescSitioPartidaRegreso()); + txtCantPasajeros.setValue(expreso.getCantidadPasajeros() == null ? "" : expreso.getCantidadPasajeros().toString()); + txtFechaIda.setValue(expreso.getFechaHoraIda() == null ? "" : expreso.getFechaHoraIda().toString()); + txtFechaRegreso.setValue(expreso.getFechaHoraRegreso() == null ? "" : expreso.getFechaHoraRegreso().toString()); + txtSitioRecogidaIda.setValue(expreso.getDescSitioPartidaIda() == null ? "" : expreso.getDescSitioPartidaIda()); + txtSitioRecogidaRegreso.setValue(expreso.getDescSitioPartidaRegreso() == null ? "" : expreso.getDescSitioPartidaRegreso()); refreshLista(); } From 822f58a3527d905a4f4859b2c71fb9a78bc5f058 Mon Sep 17 00:00:00 2001 From: Fernando Uc Date: Wed, 9 Oct 2024 08:50:47 -0600 Subject: [PATCH 4/5] Fixes bug#AL-4549 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f7c6048c..1a8471f9c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.152.8 + 1.152.7 war From 16ee0e03812dd793579bbf238ad565dc495f7b8f Mon Sep 17 00:00:00 2001 From: Fernando Uc Date: Wed, 9 Oct 2024 09:16:46 -0600 Subject: [PATCH 5/5] Fixes bug#AL-4552 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 54dab3cc9..29a580974 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.152.7 + 1.152.8 war