From 07963d50bd1003cfda79d79e16722cc9eaa4b560 Mon Sep 17 00:00:00 2001
From: walace <walace@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 17 Aug 2021 18:23:59 +0000
Subject: [PATCH] fixes bug#23060 qua: dev: Feito ajutes no tamanho do campo e
 retirado algumas celulas mescladas

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@108358 d1611594-4594-4d17-8e1d-87c2c4800839
---
 .../RelatorioLinhasHorarioSimplificado.jasper | Bin 87976 -> 87969 bytes
 .../RelatorioLinhasHorarioSimplificado.jrxml  |  56 +++++++++---------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jasper
index d3b64c10c26541237e8804784f60c185933aec37..d1e346af347a13c43816541fe150541c13ca774a 100644
GIT binary patch
delta 484
zcmZ3no^|1R)(ycTthNjcjOQoMR}<ZwD{@_&Rf2(m$ppyN++3t%$H*A6d84i=3#%{#
z1H)gisEE-!QK+7Yo|>BtJl=6Y^?<lOf&PrFAwVNaCWE*qgAzHRiVr4fZjOj?;)E&&
zaZjXrfGiM9Uj$RsSgE=BVSynFR1t{lP<oaLsEDsZhnexzX6tHwemOy7JtIR?V+&&-
zX#fJIg$#8pTT2+2O${t7CfAv1Z{E^%QJ*yf=nkIAd3!WBZ{D?yk##H3qv4zL_M|bg
zZUHeT3+~d~%(PF84eG*&w=_4q9f=iyS`Ok~yy6P;4#*gnYr8-W{(t>4)8q+iT#!)N
z{P0#TGo$Th|9hV~Ca>@pnw;~Hd$PkT!OaEFofx5J#Xpn)3q5$@3^NZXwAta+4kpw1
zQ~!4D0|u`ivoa%tMo?-_Vo82cX1-5mUPfZEM}AQvkP~lcW@Kq(WMXV;Vq|I@Z*I8R
Z;H_?!m=K1zSqX#DWJ7kD>65}4#Q*{|nyCN)

delta 507
zcmZ3uo^{1~)(ycTtTqe`jOQoMR}<ZwD{@_&Rg8gw$q2~R++3t%$H*A4d84i=3#%Xl
z1H(VCsEE-!QK+7Yo|>BtJl=6Y^?<lOf&PrF0YD>4CWE*qgAzHRiVr4fZjOj?;)E&&
zaZjXrfGiM9Uj$RsSgE=BVSynFR1t{lP<oaLsEDsZhncZ`vvsvTzr2u<o{6EUxtXZ}
z6c`#8GSsnbEn#3bGB&7~TxX`ed2`oAeb#iKLwF`n+@ZO7)2?ldteb&8jR13}?XiV%
z1$Jp}X51&n26blOKF!UpM`8t_E&y>aTycf_322n_wOt@r|GR#fiJy~!5g0Ha00|(F
za?aZ>%#1dh{qB9{00kS9;^er85|iy;32x4R?!*W+7bbN7g)_`-pwMRfS38(2l1}~G
zwGU{d9<wqdgLY7APGU)ZQD(kRW?n{Ou}6MUB9IerXl7&q1ZKv@7M4cwmc|x_#+!BC
Y>SjrbVv{l}VKAC($SyOzJDgDr084h7!vFvP

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jrxml
index 58fe3ed39..f5cfd6351 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioLinhasHorarioSimplificado.jrxml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="RelatorioLinhasHorario" pageWidth="842" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="812" leftMargin="20" rightMargin="10" topMargin="20" bottomMargin="20" uuid="ae2cbb01-bc79-4d18-8206-3b59273fe793">
-	<property name="ireport.zoom" value="2.4157650000000013"/>
-	<property name="ireport.x" value="230"/>
+	<property name="ireport.zoom" value="3.215383215000005"/>
+	<property name="ireport.x" value="509"/>
 	<property name="ireport.y" value="0"/>
 	<parameter name="NOMBEMPRESA" class="java.lang.String"/>
 	<parameter name="DATA_INICIO" class="java.util.Date">
@@ -231,7 +231,7 @@
 					<textFieldExpression><![CDATA[$V{linha_passagens_group}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="09708c24-ac71-4328-a5ad-bdf2e3234e9e" stretchType="RelativeToTallestObject" x="463" y="0" width="60" height="13" isPrintWhenDetailOverflows="true"/>
+					<reportElement uuid="09708c24-ac71-4328-a5ad-bdf2e3234e9e" stretchType="RelativeToTallestObject" x="463" y="0" width="61" height="13" isPrintWhenDetailOverflows="true"/>
 					<textElement textAlignment="Right">
 						<font size="6" isBold="true"/>
 					</textElement>
@@ -273,14 +273,14 @@
 					<textFieldExpression><![CDATA[$V{linha_extra_group}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement uuid="79f8053c-7ef8-4b11-8f97-2f44339edd1a" stretchType="RelativeToTallestObject" x="562" y="0" width="22" height="13" isPrintWhenDetailOverflows="true"/>
+					<reportElement uuid="79f8053c-7ef8-4b11-8f97-2f44339edd1a" stretchType="RelativeToTallestObject" x="564" y="0" width="24" height="13" isPrintWhenDetailOverflows="true"/>
 					<textElement textAlignment="Right">
 						<font size="6" isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{linhas_totalViagem_group}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement uuid="0673ec04-c56b-44aa-bd37-aabefea66d0b" stretchType="RelativeToTallestObject" x="628" y="0" width="80" height="13" isPrintWhenDetailOverflows="true"/>
+					<reportElement uuid="0673ec04-c56b-44aa-bd37-aabefea66d0b" stretchType="RelativeToTallestObject" x="628" y="0" width="84" height="13" isPrintWhenDetailOverflows="true"/>
 					<textElement textAlignment="Center">
 						<font size="6" isBold="true"/>
 					</textElement>
@@ -325,7 +325,7 @@
 					<textFieldExpression><![CDATA[$V{passagens_group}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="27802809-5617-44e5-a89b-cc64e8bde961" stretchType="RelativeToTallestObject" x="463" y="1" width="60" height="12" isPrintWhenDetailOverflows="true"/>
+					<reportElement uuid="27802809-5617-44e5-a89b-cc64e8bde961" stretchType="RelativeToTallestObject" x="463" y="1" width="61" height="12" isPrintWhenDetailOverflows="true"/>
 					<textElement textAlignment="Right">
 						<font size="6" isBold="true"/>
 					</textElement>
@@ -370,14 +370,14 @@
 					<textFieldExpression><![CDATA[$V{extra_group}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement uuid="04e07f25-0557-4747-84ee-d2b7a8599a35" stretchType="RelativeToTallestObject" x="562" y="1" width="22" height="12" isPrintWhenDetailOverflows="true"/>
+					<reportElement uuid="04e07f25-0557-4747-84ee-d2b7a8599a35" stretchType="RelativeToTallestObject" x="564" y="1" width="24" height="12" isPrintWhenDetailOverflows="true"/>
 					<textElement textAlignment="Right">
 						<font size="6" isBold="true"/>
 					</textElement>
 					<textFieldExpression><![CDATA[$V{totalViagem_group}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement uuid="c3d522d1-a1f6-4926-866d-ba85a0e91497" stretchType="RelativeToTallestObject" x="628" y="1" width="80" height="12" isPrintWhenDetailOverflows="true"/>
+					<reportElement uuid="c3d522d1-a1f6-4926-866d-ba85a0e91497" stretchType="RelativeToTallestObject" x="628" y="1" width="84" height="12" isPrintWhenDetailOverflows="true"/>
 					<textElement textAlignment="Center">
 						<font size="6" isBold="true"/>
 					</textElement>
@@ -391,7 +391,7 @@
 		<groupHeader>
 			<band height="14">
 				<textField isBlankWhenNull="true">
-					<reportElement uuid="5d48a200-7033-4282-af5c-98c5b290afea" x="0" y="1" width="135" height="13"/>
+					<reportElement uuid="5d48a200-7033-4282-af5c-98c5b290afea" x="0" y="1" width="202" height="13"/>
 					<textElement>
 						<font size="6" isBold="true"/>
 					</textElement>
@@ -426,7 +426,7 @@
 					<textFieldExpression><![CDATA[$V{seguro_ruta}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-					<reportElement uuid="47bdfe76-1b48-45e6-8cb1-53feb9e40340" stretchType="RelativeToTallestObject" x="463" y="2" width="60" height="9" isPrintWhenDetailOverflows="true"/>
+					<reportElement uuid="47bdfe76-1b48-45e6-8cb1-53feb9e40340" stretchType="RelativeToTallestObject" x="463" y="2" width="61" height="9" isPrintWhenDetailOverflows="true"/>
 					<textElement textAlignment="Right">
 						<font size="6" isBold="true"/>
 					</textElement>
@@ -447,7 +447,7 @@
 					<textFieldExpression><![CDATA[$V{extra_ruta}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement uuid="8ec4ba62-187a-4048-b1c3-0598ef412475" stretchType="RelativeToTallestObject" x="562" y="2" width="22" height="9" isPrintWhenDetailOverflows="true"/>
+					<reportElement uuid="8ec4ba62-187a-4048-b1c3-0598ef412475" stretchType="RelativeToTallestObject" x="564" y="2" width="24" height="9" isPrintWhenDetailOverflows="true"/>
 					<textElement textAlignment="Right">
 						<font size="6" isBold="true"/>
 					</textElement>
@@ -461,7 +461,7 @@
 					<textFieldExpression><![CDATA[$V{kmRodado_ruta}]]></textFieldExpression>
 				</textField>
 				<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-					<reportElement uuid="3140905a-a51a-4227-bc64-4ee1b1fa33eb" stretchType="RelativeToTallestObject" x="628" y="2" width="80" height="9" isPrintWhenDetailOverflows="true"/>
+					<reportElement uuid="3140905a-a51a-4227-bc64-4ee1b1fa33eb" stretchType="RelativeToTallestObject" x="628" y="2" width="84" height="9" isPrintWhenDetailOverflows="true"/>
 					<textElement textAlignment="Center">
 						<font size="6" isBold="true"/>
 					</textElement>
@@ -544,7 +544,7 @@
 				<reportElement uuid="9c896277-f8e2-41ce-bf13-95499b7d3da7" x="712" y="77" width="100" height="1"/>
 			</line>
 			<textField>
-				<reportElement uuid="169274ca-49ff-4136-9eb3-3f3384ebcdb8" x="524" y="67" width="103" height="10"/>
+				<reportElement uuid="169274ca-49ff-4136-9eb3-3f3384ebcdb8" x="524" y="67" width="104" height="10"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
@@ -554,14 +554,14 @@
 				<reportElement uuid="5e64ae31-94b7-4b72-872c-d68ac8262db5" x="532" y="77" width="95" height="1"/>
 			</line>
 			<textField>
-				<reportElement uuid="b350299e-c005-4896-b5b3-2a20af2166ce" x="344" y="67" width="179" height="10"/>
+				<reportElement uuid="b350299e-c005-4896-b5b3-2a20af2166ce" x="343" y="67" width="181" height="10"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.receita}]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement uuid="c4e021a7-182e-4edc-a927-b3fbba87f5cc" x="344" y="77" width="179" height="1"/>
+				<reportElement uuid="c4e021a7-182e-4edc-a927-b3fbba87f5cc" x="343" y="77" width="180" height="1"/>
 			</line>
 			<textField>
 				<reportElement uuid="c0f124b2-3691-4f49-9b86-69d76f249584" x="0" y="80" width="22" height="10"/>
@@ -592,7 +592,7 @@
 				<textFieldExpression><![CDATA[$R{detail.passagens}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="723b5317-9cfc-4722-900f-5d94c2050b39" x="463" y="80" width="60" height="10"/>
+				<reportElement uuid="723b5317-9cfc-4722-900f-5d94c2050b39" x="463" y="80" width="61" height="10"/>
 				<textElement textAlignment="Right" markup="none">
 					<font size="6" isBold="true"/>
 				</textElement>
@@ -666,14 +666,14 @@
 				<textFieldExpression><![CDATA[$R{detail.extra}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="fec8e223-0aac-493b-af61-c7e024a96494" x="562" y="80" width="22" height="10"/>
+				<reportElement uuid="fec8e223-0aac-493b-af61-c7e024a96494" x="564" y="80" width="24" height="10"/>
 				<textElement textAlignment="Center">
 					<font size="6" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$R{detail.totalViagem}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="a788082c-5a44-4738-a552-dc38a7a66b49" x="628" y="67" width="80" height="10"/>
+				<reportElement uuid="a788082c-5a44-4738-a552-dc38a7a66b49" x="628" y="67" width="84" height="10"/>
 				<textElement textAlignment="Center">
 					<font size="7"/>
 				</textElement>
@@ -683,7 +683,7 @@
 				<reportElement uuid="9bbfb219-95fa-48a0-88d2-435825ce9b7e" x="628" y="77" width="80" height="1"/>
 			</line>
 			<textField>
-				<reportElement uuid="1388a7bf-eeb9-47cc-afa3-719119777282" x="628" y="80" width="80" height="10"/>
+				<reportElement uuid="1388a7bf-eeb9-47cc-afa3-719119777282" x="628" y="80" width="84" height="10"/>
 				<textElement textAlignment="Center">
 					<font size="6" isBold="true"/>
 				</textElement>
@@ -697,7 +697,7 @@
 				<textFieldExpression><![CDATA[$R{detail.servico}]]></textFieldExpression>
 			</textField>
 			<textField>
-				<reportElement uuid="87858b4f-fd45-4fad-972d-a119bb115fee" x="254" y="80" width="17" height="9"/>
+				<reportElement uuid="87858b4f-fd45-4fad-972d-a119bb115fee" x="253" y="80" width="19" height="10"/>
 				<textElement textAlignment="Center" markup="none">
 					<font size="6" isBold="true"/>
 				</textElement>
@@ -711,7 +711,7 @@
 	<detail>
 		<band height="10" splitType="Stretch">
 			<textField isStretchWithOverflow="true" pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="f75ac988-7ec6-4d13-a51e-3a9f933eee66" stretchType="RelativeToTallestObject" x="463" y="0" width="60" height="10" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="f75ac988-7ec6-4d13-a51e-3a9f933eee66" stretchType="RelativeToTallestObject" x="463" y="0" width="61" height="10" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Right">
 					<font size="6"/>
 				</textElement>
@@ -788,14 +788,14 @@
 				<textFieldExpression><![CDATA[$F{extra}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="d3fdffeb-17af-4475-8748-af52d72abeed" stretchType="RelativeToTallestObject" x="562" y="0" width="22" height="10" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="d3fdffeb-17af-4475-8748-af52d72abeed" stretchType="RelativeToTallestObject" x="564" y="0" width="24" height="10" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Right">
 					<font size="6"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$F{totalViagem}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="64d39f6a-972c-43f2-adea-0e4ea6e43c4e" stretchType="RelativeToTallestObject" x="628" y="0" width="80" height="10" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="64d39f6a-972c-43f2-adea-0e4ea6e43c4e" stretchType="RelativeToTallestObject" x="628" y="0" width="84" height="10" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center">
 					<font size="6"/>
 				</textElement>
@@ -816,7 +816,7 @@
 				<textFieldExpression><![CDATA[$F{cla}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="ce6727a7-18f0-4b36-811f-db883788ded9" stretchType="RelativeToTallestObject" x="254" y="0" width="17" height="10" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="ce6727a7-18f0-4b36-811f-db883788ded9" stretchType="RelativeToTallestObject" x="253" y="0" width="19" height="10" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center">
 					<font size="6"/>
 				</textElement>
@@ -843,7 +843,7 @@
 				<textFieldExpression><![CDATA[$P{TOTAL_PASSAGENS}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
-				<reportElement uuid="7bbb0c46-57d5-449b-ac94-15eba31bae5b" positionType="Float" stretchType="RelativeToTallestObject" x="463" y="0" width="60" height="14" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="7bbb0c46-57d5-449b-ac94-15eba31bae5b" positionType="Float" stretchType="RelativeToTallestObject" x="463" y="0" width="61" height="14" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Right">
 					<font size="6" isBold="true"/>
 				</textElement>
@@ -885,21 +885,21 @@
 				<textFieldExpression><![CDATA[$P{TOTAL_ORDINARIO}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="09bf1f07-5a6a-420d-966a-d321ee6f099e" positionType="Float" stretchType="RelativeToTallestObject" x="545" y="0" width="17" height="14" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="09bf1f07-5a6a-420d-966a-d321ee6f099e" positionType="Float" stretchType="RelativeToTallestObject" x="545" y="0" width="19" height="14" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Right">
 					<font size="6" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{TOTAL_EXTRA}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="3eea7c3e-a144-4fc9-84b0-f8624986842f" positionType="Float" stretchType="RelativeToTallestObject" x="562" y="0" width="22" height="14" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="3eea7c3e-a144-4fc9-84b0-f8624986842f" positionType="Float" stretchType="RelativeToTallestObject" x="564" y="0" width="24" height="14" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Right">
 					<font size="6" isBold="true"/>
 				</textElement>
 				<textFieldExpression><![CDATA[$P{TOTAL_VIAGEM}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" isBlankWhenNull="true">
-				<reportElement uuid="b1634908-58ed-490e-98d6-b192e72df5c7" positionType="Float" stretchType="RelativeToTallestObject" x="628" y="0" width="80" height="14" isPrintWhenDetailOverflows="true"/>
+				<reportElement uuid="b1634908-58ed-490e-98d6-b192e72df5c7" positionType="Float" stretchType="RelativeToTallestObject" x="628" y="0" width="84" height="14" isPrintWhenDetailOverflows="true"/>
 				<textElement textAlignment="Center">
 					<font size="6" isBold="true"/>
 				</textElement>