From 6b0094441a386f07106ddfb65794eb1f45f6292c Mon Sep 17 00:00:00 2001 From: Fernando Uc Date: Wed, 16 Oct 2024 13:37:26 -0600 Subject: [PATCH] =?UTF-8?q?Se=20ajustan=20pantallas=20de=20Ver=20Detalle.?= =?UTF-8?q?=20Se=20ajusta=20mensaje=20de=20env=C3=ADo=20de=20correo=20para?= =?UTF-8?q?=20aceptar=20cotizaci=C3=B3n.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 +- .../expressos/CotizarExpresoController.java | 3 +- .../DocumentosExpresosController.java | 2 +- .../render/RenderCargaContratoExpresos.java | 2 +- .../RenderProgramacionVehiculosExpresos.java | 39 +++++++++++++++++++ 5 files changed, 45 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 9e0fc1a33..5733c4bf1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.158.0 + 1.158.1 war 1.119.0 - 1.100.0 + 1.100.1 UTF-8 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 92e19a8f8..9d46640c4 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 @@ -243,6 +243,7 @@ public class CotizarExpresoController extends MyGenericForwardComposer{ String credenciais = valorConstante("CREDENCIAIS_API_RJ"); String tenant = valorConstante("TENANT_API_RJ"); String empresaId = valorConstante("EMPRESA_NOTIFICACOES_BOLIVARIANO"); + String urlLinkAceptarCotizacion = valorConstante("LINK_ACEPTAR_COTIZACION_EXPRESO"); urlAPIRJ = urlAPIRJ.concat("EnviarEmailGenerico"); @@ -253,7 +254,7 @@ public class CotizarExpresoController extends MyGenericForwardComposer{ List urlParameters = new ArrayList(); urlParameters.add(new BasicNameValuePair("emailCliente", expreso.getDescEmail())); urlParameters.add(new BasicNameValuePair("assunto", Labels.getLabel("expresoController.MSG.asuntoCorreoCotizacion"))); - urlParameters.add(new BasicNameValuePair("texto", Labels.getLabel("expresoController.MSG.cuerpoCorreoCotizacion", new Object[] { expreso.getDescNombre() + " " + expreso.getDescApellidos(), "[INSERT LINK HERE]" }))); + urlParameters.add(new BasicNameValuePair("texto", Labels.getLabel("expresoController.MSG.cuerpoCorreoCotizacion", new Object[] { expreso.getDescNombre() + " " + expreso.getDescApellidos(), urlLinkAceptarCotizacion + "/" + expreso.getSolicitudExpresoId() }))); urlParameters.add(new BasicNameValuePair("empresaId", empresaId)); UrlEncodedFormEntity params = new UrlEncodedFormEntity(urlParameters, "UTF-8"); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/expressos/DocumentosExpresosController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/expressos/DocumentosExpresosController.java index 024cf2d46..fa0f0a296 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/expressos/DocumentosExpresosController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/expressos/DocumentosExpresosController.java @@ -109,7 +109,7 @@ public class DocumentosExpresosController extends MyGenericForwardComposer{ JRDataSource jrDataSource = new JRResultSetDataSource(rset); HashMap parametros = new HashMap(); - parametros.put("usuario", "FAAU"); + //parametros.put("usuario", "FAAU"); InputStream is = desktop.getWebApp().getResourceAsStream( "/gui/expressos/listaPasajerosExpreso.jrxml"); diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCargaContratoExpresos.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCargaContratoExpresos.java index 5c284cbe5..86bf42612 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCargaContratoExpresos.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderCargaContratoExpresos.java @@ -112,7 +112,7 @@ public class RenderCargaContratoExpresos implements ListitemRenderer{ expreso = (SolicitudExpreso)listItem.getAttribute("data"); if(expreso.getDocCotizacion() != null) { - AMedia amedia = new AMedia("Expresos " + expreso.getSolicitudExpresoId() + ".pdf", "pdf", null, expreso.getDocCotizacion()); + AMedia amedia = new AMedia("Expresos " + expreso.getSolicitudExpresoId() + ".pdf", "pdf", null, expreso.getDocContrato()); org.zkoss.util.media.Media pdf = amedia; Filedownload.save(pdf); }else { diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderProgramacionVehiculosExpresos.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderProgramacionVehiculosExpresos.java index 364f7632e..2255168d2 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderProgramacionVehiculosExpresos.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderProgramacionVehiculosExpresos.java @@ -1,5 +1,8 @@ package com.rjconsultores.ventaboletos.web.utilerias.render; +import static org.junit.Assert.assertArrayEquals; + +import java.nio.ByteBuffer; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -24,6 +27,7 @@ import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.web.gui.controladores.expressos.DocumentosExpresosController; import com.rjconsultores.ventaboletos.web.gui.controladores.expressos.ProgramacionVehiculosExpresosController; import com.rjconsultores.ventaboletos.web.utilerias.PantallaUtileria; +import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; public class RenderProgramacionVehiculosExpresos implements ListitemRenderer { @@ -102,6 +106,40 @@ public class RenderProgramacionVehiculosExpresos implements ListitemRenderer { Listitem listItem = (Listitem) event.getTarget().getParent().getParent(); expreso = (SolicitudExpreso)listItem.getAttribute("data"); + TrayectosExpresosService trayectosServices = (TrayectosExpresosService)AppContext.getApplicationContext().getBean("trayectosExpresosService"); + trayectos = trayectosServices.obtenerTrayectosPorServicioId(expreso); + + int longitud = 0; + + for(TrayectosExpresos trayecto: trayectos) { + if(trayecto.getDocFluec() != null) { + longitud = longitud + trayecto.getDocFluec().length; + } + } + + if(longitud == 0) { + Messagebox.show( + Labels.getLabel("expresosVerDetalle.MSG.errorContratoNull"), + Labels.getLabel("winExpressoCargaContrato.title"), + Messagebox.OK, Messagebox.INFORMATION); + } else { + byte[] combined = new byte[longitud]; + ByteBuffer buffer = ByteBuffer.wrap(combined); + + for(TrayectosExpresos trayecto: trayectos) { + if(trayecto.getDocFluec() != null) { + buffer.put(trayecto.getDocFluec()); + } + } + + combined = buffer.array(); + + AMedia amedia = new AMedia("Expresos " + expreso.getSolicitudExpresoId() + ".pdf", "pdf", null, combined); + org.zkoss.util.media.Media pdf = amedia; + Filedownload.save(pdf); + } + + /* if(expreso.getDocCotizacion() != null) { AMedia amedia = new AMedia("Expresos " + expreso.getSolicitudExpresoId() + ".pdf", "pdf", null, expreso.getDocCotizacion()); org.zkoss.util.media.Media pdf = amedia; @@ -112,6 +150,7 @@ public class RenderProgramacionVehiculosExpresos implements ListitemRenderer { Labels.getLabel("winExpressoCargaContrato.title"), Messagebox.OK, Messagebox.ERROR); } + */ /* Map args = new HashMap();