diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper index 3a969c4f6..4a207d166 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml index 29757977b..73bbf2230 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml @@ -1,8 +1,8 @@ - + - + @@ -101,166 +101,172 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + + - + + - + + - + - + - + - + - + + - + + - + + - + - + - + - + - + @@ -271,182 +277,184 @@ - + - + - + - + - + - + 0?new BigDecimal("100.00"):$V{sum_por_equivalente}]]> - + 0?new BigDecimal("100.00"):$V{sum_porc_abs}]]> - + - + - + - + - + - + - + - + - + - + - + + - + + - + - + - + - + - + - + - + - + - + @@ -456,79 +464,90 @@ - + + - + + - + + - + + - + + - + - + + - + + - + - + + - + + - + + - + - + + @@ -540,49 +559,50 @@ <band height="82" splitType="Stretch"> <staticText> - <reportElement x="0" y="0" width="391" height="20" uuid="58b5b133-43e0-42f0-a904-5cc3645d3df3"/> + <reportElement uuid="58b5b133-43e0-42f0-a904-5cc3645d3df3" x="0" y="0" width="391" height="20"/> <textElement verticalAlignment="Middle"> <font size="14" isBold="true"/> </textElement> <text><![CDATA[ORIGEM/DESTINO OD]]></text> </staticText> <textField pattern="dd/MM/yyyy HH:mm"> - <reportElement x="391" y="0" width="374" height="20" uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5"/> + <reportElement uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5" x="391" y="0" width="374" height="20"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <staticText> - <reportElement x="0" y="63" width="74" height="19" uuid="bb8d0dec-2060-456e-bca1-c69d7c272fa3"/> + <reportElement uuid="bb8d0dec-2060-456e-bca1-c69d7c272fa3" x="0" y="63" width="74" height="19"/> <textElement verticalAlignment="Middle"> <font isBold="true"/> </textElement> <text><![CDATA[Serviço(s):]]></text> </staticText> <textField> - <reportElement x="0" y="20" width="765" height="20" uuid="a16eb33b-78ca-4fb4-80c2-f5c85a0d09c3"/> + <reportElement uuid="a16eb33b-78ca-4fb4-80c2-f5c85a0d09c3" x="0" y="20" width="765" height="20"/> <textElement verticalAlignment="Middle"> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA["Período: " + $P{DATA_DE} + " a " + $P{DATA_ATE}]]></textFieldExpression> </textField> <line> - <reportElement x="0" y="81" width="765" height="1" uuid="3f36efc2-5272-4015-95bb-b8efdc893b89"/> + <reportElement uuid="3f36efc2-5272-4015-95bb-b8efdc893b89" x="0" y="81" width="765" height="1"/> </line> <staticText> - <reportElement x="0" y="40" width="74" height="23" uuid="3857502f-b69a-4362-97fe-6f7a7f6ee32b"/> + <reportElement uuid="3857502f-b69a-4362-97fe-6f7a7f6ee32b" x="0" y="40" width="74" height="23"/> <textElement verticalAlignment="Middle"> <font isBold="true"/> </textElement> <text><![CDATA[Empresa(s):]]></text> </staticText> <textField> - <reportElement x="74" y="40" width="691" height="23" isPrintWhenDetailOverflows="true" uuid="7f31cdf0-886d-4eef-b64c-28bc94c05b77"/> + <reportElement uuid="7f31cdf0-886d-4eef-b64c-28bc94c05b77" x="74" y="40" width="691" height="23" isPrintWhenDetailOverflows="true"/> + <textElement/> <textFieldExpression><![CDATA[$P{EMPRESAS}]]></textFieldExpression> </textField> <textField> - <reportElement x="74" y="63" width="691" height="19" isPrintWhenDetailOverflows="true" uuid="44b1c344-61df-4dd0-b661-cae5f2f8e699"/> + <reportElement uuid="44b1c344-61df-4dd0-b661-cae5f2f8e699" x="74" y="63" width="691" height="19" isPrintWhenDetailOverflows="true"/> <textElement> <font isBold="false" isUnderline="false" isStrikeThrough="false"/> </textElement> @@ -596,10 +616,10 @@ <pageHeader> <band height="21" splitType="Stretch"> <line> - <reportElement x="0" y="20" width="763" height="1" uuid="4f39b5b4-849a-4fe2-9365-06930866fbaa"/> + <reportElement uuid="4f39b5b4-849a-4fe2-9365-06930866fbaa" x="0" y="20" width="763" height="1"/> </line> <textField> - <reportElement x="0" y="0" width="765" height="20" uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec"/> + <reportElement uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec" x="0" y="0" width="765" height="20"/> <textElement textAlignment="Right"> <font isBold="true"/> </textElement> @@ -613,65 +633,67 @@ <detail> <band height="21" splitType="Stretch"> <textField> - <reportElement x="329" y="0" width="77" height="21" uuid="c45c70fb-1c4e-46a8-9a39-f804605e85b5"/> + <reportElement uuid="c45c70fb-1c4e-46a8-9a39-f804605e85b5" x="430" y="0" width="57" height="21"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{ABSOLUTOS}]]></textFieldExpression> </textField> <textField> - <reportElement x="108" y="0" width="41" height="21" uuid="87a6161e-e6ed-4330-bbff-34a87a5fb1a6"/> + <reportElement uuid="87a6161e-e6ed-4330-bbff-34a87a5fb1a6" x="239" y="0" width="41" height="21"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{KM_TRAMO}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement x="662" y="0" width="51" height="21" uuid="22d22d0b-ed49-44a7-8725-c4a62b7fbb41"/> + <reportElement uuid="22d22d0b-ed49-44a7-8725-c4a62b7fbb41" x="699" y="0" width="32" height="21"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{porc_abs}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement x="713" y="0" width="50" height="21" uuid="5ecd33c0-2648-482f-b87a-d5197d2f193e"/> + <reportElement uuid="5ecd33c0-2648-482f-b87a-d5197d2f193e" x="731" y="0" width="32" height="21"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{por_equivalente}]]></textFieldExpression> </textField> <textField> - <reportElement x="610" y="0" width="52" height="21" uuid="0de4edf8-49c8-49d2-b2d6-0476fb8ab3ed"/> + <reportElement uuid="0de4edf8-49c8-49d2-b2d6-0476fb8ab3ed" x="661" y="0" width="38" height="21"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{pax_km}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement x="406" y="0" width="64" height="21" uuid="c88714a3-010d-4e26-801d-8982acc15a19"/> + <reportElement uuid="c88714a3-010d-4e26-801d-8982acc15a19" x="487" y="0" width="64" height="21"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{RECEITA}]]></textFieldExpression> </textField> <textField pattern="###0.00;-###0.00" isBlankWhenNull="true"> - <reportElement x="193" y="0" width="77" height="21" uuid="3a76b131-6ebf-4234-a367-ba5e1527886a"/> + <reportElement uuid="3a76b131-6ebf-4234-a367-ba5e1527886a" x="315" y="0" width="66" height="21"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{IMPORTETAXAEMBARQUE}]]></textFieldExpression> </textField> <textField pattern="###0.00;-###0.00" isBlankWhenNull="true"> - <reportElement x="270" y="0" width="59" height="21" uuid="32534bbc-2bf6-4786-b5cd-e68c4062d3ec"/> + <reportElement uuid="32534bbc-2bf6-4786-b5cd-e68c4062d3ec" x="381" y="0" width="49" height="21"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{IMPORTEPEDAGIO}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement x="470" y="0" width="66" height="21" uuid="0fe8352f-f787-46b6-adcb-e8dda60b4d9d"/> + <reportElement uuid="0fe8352f-f787-46b6-adcb-e8dda60b4d9d" x="551" y="0" width="51" height="21"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{rec_abs}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement x="536" y="0" width="74" height="21" uuid="5ad372c0-5127-4441-aae3-be6ca2949a93"/> + <reportElement uuid="5ad372c0-5127-4441-aae3-be6ca2949a93" x="602" y="0" width="59" height="21"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{equivalente}]]></textFieldExpression> </textField> <textField> - <reportElement x="1" y="0" width="58" height="21" uuid="b3bae3e1-ad19-4ed0-8188-b4700f493c28"/> + <reportElement uuid="b3bae3e1-ad19-4ed0-8188-b4700f493c28" x="1" y="0" width="131" height="21"/> + <textElement/> <textFieldExpression><![CDATA[$F{ORIGEM}]]></textFieldExpression> </textField> <textField> - <reportElement x="59" y="0" width="49" height="21" uuid="e3a13390-06e7-4bda-bb55-8afbfb15d6fb"/> + <reportElement uuid="e3a13390-06e7-4bda-bb55-8afbfb15d6fb" x="132" y="0" width="107" height="21"/> + <textElement/> <textFieldExpression><![CDATA[$F{DESTINO}]]></textFieldExpression> </textField> <textField pattern="###0.00;-###0.00"> - <reportElement x="149" y="0" width="44" height="21" uuid="9fef3b4f-3c79-4b11-8702-0f4c5757b81e"/> + <reportElement uuid="9fef3b4f-3c79-4b11-8702-0f4c5757b81e" x="280" y="0" width="35" height="21"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{PRECIOBASE}]]></textFieldExpression> </textField>