From f8d26d91f8676e6e1be1c9e1d96712b09d488e21 Mon Sep 17 00:00:00 2001
From: walace <walace@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 1 Sep 2021 13:11:15 +0000
Subject: [PATCH] fixes bug#22871 qua:silvania dev:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@108572 d1611594-4594-4d17-8e1d-87c2c4800839
---
 ...RelatorioAcompanhamentoEquivalentes.jasper | Bin 129189 -> 129220 bytes
 .../RelatorioAcompanhamentoEquivalentes.jrxml |  42 +++++++++---------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jasper
index 091a13c36ba9440b7417dec8736f3ca481df13ea..4e2176858edb758fb2275dd1da4fe8e67eff96cf 100644
GIT binary patch
delta 3567
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
Q_ii|LX6a%D@y&wcUtDn<;s5{u

delta 3410
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
W?CM_7jLx*dv6E2?quB8WVEY%dgX3}l

diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml
index 503f107a8..bd2d7d3e0 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioAcompanhamentoEquivalentes.jrxml
@@ -1,8 +1,8 @@
 <?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="RelatorioAcompanhamentoEquivalentes" pageWidth="852" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="832" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
+<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="RelatorioAcompanhamentoEquivalentes" pageWidth="858" pageHeight="595" orientation="Landscape" whenNoDataType="NoDataSection" columnWidth="838" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" isFloatColumnFooter="true" uuid="efbc89d4-6f08-4ea5-802f-d4f48ed208e2">
 	<property name="ireport.zoom" value="5.1784068215896575"/>
-	<property name="ireport.x" value="2680"/>
-	<property name="ireport.y" value="456"/>
+	<property name="ireport.x" value="3174"/>
+	<property name="ireport.y" value="442"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/>
 	<property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.2" value="columnHeader"/>
 	<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
@@ -246,13 +246,13 @@
 		<groupHeader>
 			<band height="12">
 				<line>
-					<reportElement uuid="5bdcd7b5-6a5b-4ee1-b271-23c38689cbc0" x="0" y="0" width="832" height="1"/>
+					<reportElement uuid="5bdcd7b5-6a5b-4ee1-b271-23c38689cbc0" x="0" y="0" width="838" height="1"/>
 					<graphicElement>
 						<pen lineWidth="0.5"/>
 					</graphicElement>
 				</line>
 				<textField>
-					<reportElement uuid="9bf6af16-4242-4e39-b90e-3e0d3fe8cbdb" x="0" y="1" width="832" height="11"/>
+					<reportElement uuid="9bf6af16-4242-4e39-b90e-3e0d3fe8cbdb" x="0" y="1" width="838" height="11"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$F{INTERESTADUAL}.equals( "S" )?"Linhas Interestaduais":"Linhas Intermunicipais"]]></textFieldExpression>
 				</textField>
@@ -264,12 +264,12 @@
 		<groupHeader>
 			<band height="10">
 				<textField>
-					<reportElement uuid="2bce894e-4df1-466e-90ba-6bd518ea4376" x="0" y="1" width="832" height="9"/>
+					<reportElement uuid="2bce894e-4df1-466e-90ba-6bd518ea4376" x="0" y="1" width="838" height="9"/>
 					<textElement/>
 					<textFieldExpression><![CDATA[$F{GRUPO_LINHA}]]></textFieldExpression>
 				</textField>
 				<line>
-					<reportElement uuid="095b53f2-ed2e-4c2f-8b03-fd362ba20e4a" x="0" y="0" width="832" height="1"/>
+					<reportElement uuid="095b53f2-ed2e-4c2f-8b03-fd362ba20e4a" x="0" y="0" width="838" height="1"/>
 					<graphicElement>
 						<pen lineWidth="0.5"/>
 					</graphicElement>
@@ -473,11 +473,11 @@
 				</textField>
 				<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
 					<reportElement uuid="7c3d5ad1-0b32-4024-81b4-065189471321" x="798" y="0" width="17" height="16"/>
-					<textElement textAlignment="Right" verticalAlignment="Middle"/>
+					<textElement textAlignment="Center" verticalAlignment="Middle"/>
 					<textFieldExpression><![CDATA[$V{MEDIA}]]></textFieldExpression>
 				</textField>
 				<textField pattern="" isBlankWhenNull="true">
-					<reportElement uuid="68978ea2-ea41-458b-adce-df2cf786a1e9" x="815" y="0" width="17" height="16"/>
+					<reportElement uuid="68978ea2-ea41-458b-adce-df2cf786a1e9" x="815" y="0" width="23" height="16"/>
 					<textElement textAlignment="Right" verticalAlignment="Middle"/>
 					<textFieldExpression><![CDATA[$V{TOTAL}]]></textFieldExpression>
 					<patternExpression><![CDATA[!$P{INDICADOR}.equals(6) ? "#,##0.00;-#,##0.00" : "###0"]]></patternExpression>
@@ -521,24 +521,24 @@
 				<text><![CDATA[Mês/Ano:]]></text>
 			</staticText>
 			<textField>
-				<reportElement uuid="e5254cd0-647f-4b22-be4c-cce9afc5a10f" x="694" y="15" width="138" height="20"/>
+				<reportElement uuid="e5254cd0-647f-4b22-be4c-cce9afc5a10f" x="694" y="15" width="144" height="20"/>
 				<textElement textAlignment="Right">
 					<font size="10"/>
 				</textElement>
 				<textFieldExpression><![CDATA["Página: "+$V{PAGE_NUMBER}]]></textFieldExpression>
 			</textField>
 			<textField pattern="dd/MM/yyyy">
-				<reportElement uuid="55b08ff2-e470-4b59-8c56-58e6fa05ccd5" x="694" y="0" width="138" height="15"/>
+				<reportElement uuid="55b08ff2-e470-4b59-8c56-58e6fa05ccd5" x="694" y="0" width="144" height="15"/>
 				<textElement textAlignment="Right">
 					<font size="10"/>
 				</textElement>
 				<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
 			</textField>
 			<line>
-				<reportElement uuid="afaaa1cf-1a3e-4a42-9fa3-e634a66fc3d3" x="0" y="50" width="832" height="1"/>
+				<reportElement uuid="afaaa1cf-1a3e-4a42-9fa3-e634a66fc3d3" x="0" y="50" width="838" height="1"/>
 			</line>
 			<textField>
-				<reportElement uuid="4f103585-10c9-4ec5-83e3-40076b812270" x="694" y="35" width="138" height="15"/>
+				<reportElement uuid="4f103585-10c9-4ec5-83e3-40076b812270" x="694" y="35" width="144" height="15"/>
 				<textElement textAlignment="Right">
 					<font size="10"/>
 				</textElement>
@@ -879,7 +879,7 @@
 			</staticText>
 			<staticText>
 				<reportElement uuid="2bae6074-292b-43d3-9b6c-24ad69ddf4f6" x="798" y="19" width="17" height="9"/>
-				<textElement textAlignment="Right"/>
+				<textElement textAlignment="Center"/>
 				<text><![CDATA[Média]]></text>
 			</staticText>
 			<textField>
@@ -904,8 +904,8 @@
 				<textFieldExpression><![CDATA[$P{DATA_MES_31} != null ? "31" : ""]]></textFieldExpression>
 			</textField>
 			<staticText>
-				<reportElement uuid="dca3f721-6126-4f4c-8f30-0051952842b2" x="815" y="19" width="17" height="9"/>
-				<textElement textAlignment="Center"/>
+				<reportElement uuid="dca3f721-6126-4f4c-8f30-0051952842b2" x="815" y="19" width="23" height="9"/>
+				<textElement textAlignment="Right"/>
 				<text><![CDATA[Total]]></text>
 			</staticText>
 			<staticText>
@@ -914,8 +914,8 @@
 				<text><![CDATA[]]></text>
 			</staticText>
 			<staticText>
-				<reportElement uuid="4a6c2baa-39c5-4205-9b53-20632c72f4ca" x="815" y="10" width="17" height="9"/>
-				<textElement textAlignment="Center"/>
+				<reportElement uuid="4a6c2baa-39c5-4205-9b53-20632c72f4ca" x="815" y="10" width="23" height="9"/>
+				<textElement textAlignment="Right"/>
 				<text><![CDATA[]]></text>
 			</staticText>
 			<staticText>
@@ -1121,7 +1121,7 @@
 			</textField>
 			<textField pattern="#,##0.00;-#,##0.00" isBlankWhenNull="true">
 				<reportElement uuid="6cbe547b-fd61-4a67-a3c5-96e9b9742eb1" x="798" y="0" width="17" height="23"/>
-				<textElement textAlignment="Right" verticalAlignment="Middle"/>
+				<textElement textAlignment="Center" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{MEDIA}]]></textFieldExpression>
 			</textField>
 			<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
@@ -1150,7 +1150,7 @@
 				<textFieldExpression><![CDATA[$F{HORARIO}]]></textFieldExpression>
 			</textField>
 			<textField pattern="" isBlankWhenNull="true">
-				<reportElement uuid="69ac4f91-f2bb-413c-be7f-81506f3cc2d4" x="815" y="0" width="17" height="23"/>
+				<reportElement uuid="69ac4f91-f2bb-413c-be7f-81506f3cc2d4" x="815" y="0" width="23" height="23"/>
 				<textElement textAlignment="Right" verticalAlignment="Middle"/>
 				<textFieldExpression><![CDATA[$F{TOTAL}]]></textFieldExpression>
 				<patternExpression><![CDATA[!$P{INDICADOR}.equals(6) ? "#,##0.00;-#,##0.00" : "###0"]]></patternExpression>
@@ -1165,7 +1165,7 @@
 	<noData>
 		<band height="50" splitType="Stretch">
 			<textField>
-				<reportElement uuid="a640c0eb-ead8-4a2a-bda4-675165e8bc7d" x="0" y="14" width="832" height="20"/>
+				<reportElement uuid="a640c0eb-ead8-4a2a-bda4-675165e8bc7d" x="0" y="14" width="838" height="20"/>
 				<textElement textAlignment="Center" markup="none">
 					<font size="11" isBold="true"/>
 				</textElement>