From 5936ded62913334d3c1d5f641389d5541f3dada5 Mon Sep 17 00:00:00 2001 From: Fernando Uc Date: Wed, 9 Oct 2024 11:43:22 -0600 Subject: [PATCH 1/3] =?UTF-8?q?Se=20ajusta=20plantilla=20jasper=20de=20gen?= =?UTF-8?q?eraci=C3=B3n=20de=20listado=20de=20pasajeros.=20Se=20ajusta=20n?= =?UTF-8?q?ombre=20de=20documento=20de=20lista=20de=20pasajeros=20generado?= =?UTF-8?q?#AL-4552?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../DocumentosExpresosController.java | 2 +- web/gui/expressos/listaPasajerosExpreso.jrxml | 21 ++++++++++++------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 16d325136..a2f42499f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.152.11 + 1.152.12 war 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 4f4fc5dc5..fb17c7650 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 @@ -125,7 +125,7 @@ public class DocumentosExpresosController extends MyGenericForwardComposer{ exporter.exportReport(); response = out.toByteArray(); - AMedia amedia = new AMedia("LISTA DE PASAJEROS - EXPRESO " + expreso.getStatusSolicitudExpresoId() + ".pdf", "pdf", null, response); + AMedia amedia = new AMedia("LISTA DE PASAJEROS - EXPRESO " + expreso.getSolicitudExpresoId() + ".pdf", "pdf", null, response); org.zkoss.util.media.Media pdf = amedia; Filedownload.save(pdf); } diff --git a/web/gui/expressos/listaPasajerosExpreso.jrxml b/web/gui/expressos/listaPasajerosExpreso.jrxml index 5afd54f3d..dbc1109aa 100644 --- a/web/gui/expressos/listaPasajerosExpreso.jrxml +++ b/web/gui/expressos/listaPasajerosExpreso.jrxml @@ -8,8 +8,8 @@ - - + + <band height="43" splitType="Stretch"> <staticText> @@ -24,11 +24,11 @@ <columnHeader> <band height="50"> <staticText> - <reportElement uuid="7848d6a3-933b-4d23-96f7-f9a8c4cd667d" x="0" y="30" width="128" height="20"/> + <reportElement uuid="7848d6a3-933b-4d23-96f7-f9a8c4cd667d" x="0" y="30" width="50" height="20"/> <textElement> <font isBold="true"/> </textElement> - <text><![CDATA[NOMBRE COMPLETO]]></text> + <text><![CDATA[NOMBRE]]></text> </staticText> <staticText> <reportElement uuid="d28fb158-5766-4b6f-9579-ee1fb2878d0c" x="237" y="29" width="132" height="20"/> @@ -45,17 +45,24 @@ <text><![CDATA[NACIONALIDAD]]></text> </staticText> <line> - <reportElement uuid="32ab9e9e-2725-4c8a-bad6-c5424fbc0cfe" x="0" y="0" width="802" height="1"/> + <reportElement uuid="32ab9e9e-2725-4c8a-bad6-c5424fbc0cfe" x="0" y="16" width="802" height="1"/> </line> <line> <reportElement uuid="22ac5ddb-4d9d-4c6d-9fef-41558f0cde21" x="0" y="49" width="802" height="1"/> </line> + <staticText> + <reportElement uuid="4d9666bc-b2c4-4d06-b199-c5508c5fe0e5" x="95" y="29" width="112" height="20"/> + <textElement> + <font isBold="true"/> + </textElement> + <text><![CDATA[APELLIDOS]]></text> + </staticText> </band> </columnHeader> <detail> <band height="21" splitType="Stretch"> <textField> - <reportElement uuid="297f8125-1310-46fd-beba-fd8ea22af291" x="0" y="1" width="100" height="20"/> + <reportElement uuid="297f8125-1310-46fd-beba-fd8ea22af291" x="0" y="1" width="50" height="20"/> <textElement/> <textFieldExpression><![CDATA[$F{DESCNOMBRE}]]></textFieldExpression> </textField> @@ -65,7 +72,7 @@ <textFieldExpression><![CDATA[$F{NUMIDENTIFICACION}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="0474c8e5-db4d-474c-9546-22ace8e02666" x="111" y="1" width="112" height="20"/> + <reportElement uuid="0474c8e5-db4d-474c-9546-22ace8e02666" x="95" y="1" width="112" height="20"/> <textElement/> <textFieldExpression><![CDATA[$F{DESCAPELLIDOS}]]></textFieldExpression> </textField> From 3cd00419a31f6a388dbfac34cdd62fb0b34f1566 Mon Sep 17 00:00:00 2001 From: Fernando Uc <fernando.uc@totvs.com> Date: Wed, 9 Oct 2024 12:01:48 -0600 Subject: [PATCH 2/3] Fixes bug#AL-4552 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a2f42499f..ace039067 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>br.com.rjconsultores</groupId> <artifactId>ventaboletosadm</artifactId> - <version>1.152.12</version> + <version>1.152.14</version> <packaging>war</packaging> <properties> From 8ce0d4c29d4dba126818974ec746a71a4c2372fb Mon Sep 17 00:00:00 2001 From: Fernando Uc <fernando.uc@totvs.com> Date: Wed, 9 Oct 2024 12:02:10 -0600 Subject: [PATCH 3/3] Fixes bug#AL-4552 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ace039067..31a7d8bbd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>br.com.rjconsultores</groupId> <artifactId>ventaboletosadm</artifactId> - <version>1.152.14</version> + <version>1.152.13</version> <packaging>war</packaging> <properties>