diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jasper index 4a207d166..9d8197bb4 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 73bbf2230..cd35f2eac 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml @@ -1,8 +1,13 @@ - + - + + + + + + @@ -101,172 +106,166 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - - + - - + - + - + - + - + - - + - - + - - + - + - + - + - + - + @@ -275,186 +274,184 @@ - + - + - + - + - + - + - + 0?new BigDecimal("100.00"):$V{sum_por_equivalente}]]> - + 0?new BigDecimal("100.00"):$V{sum_porc_abs}]]> - + - + - + - + - + - + - + - + - + - + - - + - - + - + - + - + - + - + - + - + - + - + @@ -462,92 +459,81 @@ - + - + - - + - - + - - + - - + - - + - - + - - + - + - - + - - + - - + - + - - + @@ -557,53 +543,50 @@ - <band height="82" splitType="Stretch"> + <band height="80" splitType="Stretch"> <staticText> - <reportElement uuid="58b5b133-43e0-42f0-a904-5cc3645d3df3" x="0" y="0" width="391" height="20"/> + <reportElement x="0" y="0" width="661" height="20" uuid="58b5b133-43e0-42f0-a904-5cc3645d3df3"/> <textElement verticalAlignment="Middle"> - <font size="14" isBold="true"/> + <font size="15" isBold="true"/> </textElement> <text><![CDATA[ORIGEM/DESTINO OD]]></text> </staticText> <textField pattern="dd/MM/yyyy HH:mm"> - <reportElement uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5" x="391" y="0" width="374" height="20"/> + <reportElement x="661" y="0" width="104" height="20" uuid="4d1bcd65-c9a6-44b4-8dca-cc3c4c20c9a5"/> <textElement textAlignment="Right" verticalAlignment="Middle"> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> </textField> <staticText> - <reportElement uuid="bb8d0dec-2060-456e-bca1-c69d7c272fa3" x="0" y="63" width="74" height="19"/> + <reportElement x="0" y="61" width="74" height="19" uuid="bb8d0dec-2060-456e-bca1-c69d7c272fa3"/> <textElement verticalAlignment="Middle"> <font isBold="true"/> </textElement> <text><![CDATA[Serviço(s):]]></text> </staticText> <textField> - <reportElement uuid="a16eb33b-78ca-4fb4-80c2-f5c85a0d09c3" x="0" y="20" width="765" height="20"/> + <reportElement x="0" y="20" width="765" height="20" uuid="a16eb33b-78ca-4fb4-80c2-f5c85a0d09c3"/> <textElement verticalAlignment="Middle"> <font isBold="true"/> </textElement> <textFieldExpression><![CDATA["Período: " + $P{DATA_DE} + " a " + $P{DATA_ATE}]]></textFieldExpression> </textField> - <line> - <reportElement uuid="3f36efc2-5272-4015-95bb-b8efdc893b89" x="0" y="81" width="765" height="1"/> - </line> <staticText> - <reportElement uuid="3857502f-b69a-4362-97fe-6f7a7f6ee32b" x="0" y="40" width="74" height="23"/> + <reportElement x="0" y="39" width="74" height="23" uuid="3857502f-b69a-4362-97fe-6f7a7f6ee32b"/> <textElement verticalAlignment="Middle"> <font isBold="true"/> </textElement> <text><![CDATA[Empresa(s):]]></text> </staticText> <textField> - <reportElement uuid="7f31cdf0-886d-4eef-b64c-28bc94c05b77" x="74" y="40" width="691" height="23" isPrintWhenDetailOverflows="true"/> - <textElement/> + <reportElement x="74" y="39" width="691" height="23" isPrintWhenDetailOverflows="true" uuid="7f31cdf0-886d-4eef-b64c-28bc94c05b77"/> + <textElement verticalAlignment="Middle"/> <textFieldExpression><![CDATA[$P{EMPRESAS}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="44b1c344-61df-4dd0-b661-cae5f2f8e699" x="74" y="63" width="691" height="19" isPrintWhenDetailOverflows="true"/> - <textElement> + <reportElement x="74" y="61" width="691" height="19" isPrintWhenDetailOverflows="true" uuid="44b1c344-61df-4dd0-b661-cae5f2f8e699"/> + <textElement verticalAlignment="Middle"> <font isBold="false" isUnderline="false" isStrikeThrough="false"/> </textElement> <textFieldExpression><![CDATA[$P{CORRIDAS_SELECIONADAS}]]></textFieldExpression> @@ -616,14 +599,24 @@ <pageHeader> <band height="21" splitType="Stretch"> <line> - <reportElement uuid="4f39b5b4-849a-4fe2-9365-06930866fbaa" x="0" y="20" width="763" height="1"/> + <reportElement x="0" y="20" width="763" height="1" uuid="4f39b5b4-849a-4fe2-9365-06930866fbaa"/> </line> - <textField> - <reportElement uuid="6a8a0843-7236-40a3-98ae-5fbf59b4cfec" x="0" y="0" width="765" height="20"/> - <textElement textAlignment="Right"> + <staticText> + <reportElement x="661" y="0" width="57" height="20" uuid="5f39d93c-51d4-41cd-88af-10407d4f9968"/> + <textElement verticalAlignment="Top" markup="none"> <font isBold="true"/> </textElement> - <textFieldExpression><![CDATA["Página " + $V{PAGE_NUMBER}+ " de " + $V{PAGE_NUMBER}]]></textFieldExpression> + <text><![CDATA[Página]]></text> + </staticText> + <textField evaluationTime="Report"> + <reportElement x="743" y="1" width="22" height="20" uuid="0b68046e-8819-470c-8da5-43f2a16aba7e"/> + <textElement textAlignment="Right"/> + <textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression> + </textField> + <textField> + <reportElement x="719" y="1" width="24" height="20" uuid="0e678318-ffaf-4459-a5c0-e69e6162fcf4"/> + <textElement textAlignment="Right"/> + <textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression> </textField> </band> </pageHeader> @@ -633,67 +626,65 @@ <detail> <band height="21" splitType="Stretch"> <textField> - <reportElement uuid="c45c70fb-1c4e-46a8-9a39-f804605e85b5" x="430" y="0" width="57" height="21"/> + <reportElement x="430" y="0" width="57" height="21" uuid="c45c70fb-1c4e-46a8-9a39-f804605e85b5"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{ABSOLUTOS}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="87a6161e-e6ed-4330-bbff-34a87a5fb1a6" x="239" y="0" width="41" height="21"/> + <reportElement x="239" y="0" width="41" height="21" uuid="87a6161e-e6ed-4330-bbff-34a87a5fb1a6"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{KM_TRAMO}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement uuid="22d22d0b-ed49-44a7-8725-c4a62b7fbb41" x="699" y="0" width="32" height="21"/> + <reportElement x="699" y="0" width="32" height="21" uuid="22d22d0b-ed49-44a7-8725-c4a62b7fbb41"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{porc_abs}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement uuid="5ecd33c0-2648-482f-b87a-d5197d2f193e" x="731" y="0" width="32" height="21"/> + <reportElement x="731" y="0" width="34" height="21" uuid="5ecd33c0-2648-482f-b87a-d5197d2f193e"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{por_equivalente}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="0de4edf8-49c8-49d2-b2d6-0476fb8ab3ed" x="661" y="0" width="38" height="21"/> + <reportElement x="661" y="0" width="38" height="21" uuid="0de4edf8-49c8-49d2-b2d6-0476fb8ab3ed"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{pax_km}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement uuid="c88714a3-010d-4e26-801d-8982acc15a19" x="487" y="0" width="64" height="21"/> + <reportElement x="487" y="0" width="64" height="21" uuid="c88714a3-010d-4e26-801d-8982acc15a19"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{RECEITA}]]></textFieldExpression> </textField> <textField pattern="###0.00;-###0.00" isBlankWhenNull="true"> - <reportElement uuid="3a76b131-6ebf-4234-a367-ba5e1527886a" x="315" y="0" width="66" height="21"/> + <reportElement x="315" y="0" width="66" height="21" uuid="3a76b131-6ebf-4234-a367-ba5e1527886a"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{IMPORTETAXAEMBARQUE}]]></textFieldExpression> </textField> <textField pattern="###0.00;-###0.00" isBlankWhenNull="true"> - <reportElement uuid="32534bbc-2bf6-4786-b5cd-e68c4062d3ec" x="381" y="0" width="49" height="21"/> + <reportElement x="381" y="0" width="49" height="21" uuid="32534bbc-2bf6-4786-b5cd-e68c4062d3ec"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{IMPORTEPEDAGIO}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement uuid="0fe8352f-f787-46b6-adcb-e8dda60b4d9d" x="551" y="0" width="51" height="21"/> + <reportElement x="551" y="0" width="51" height="21" uuid="0fe8352f-f787-46b6-adcb-e8dda60b4d9d"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{rec_abs}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement uuid="5ad372c0-5127-4441-aae3-be6ca2949a93" x="602" y="0" width="59" height="21"/> + <reportElement x="602" y="0" width="59" height="21" uuid="5ad372c0-5127-4441-aae3-be6ca2949a93"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$V{equivalente}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="b3bae3e1-ad19-4ed0-8188-b4700f493c28" x="1" y="0" width="131" height="21"/> - <textElement/> + <reportElement x="1" y="0" width="131" height="21" uuid="b3bae3e1-ad19-4ed0-8188-b4700f493c28"/> <textFieldExpression><![CDATA[$F{ORIGEM}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="e3a13390-06e7-4bda-bb55-8afbfb15d6fb" x="132" y="0" width="107" height="21"/> - <textElement/> + <reportElement x="132" y="0" width="107" height="21" uuid="e3a13390-06e7-4bda-bb55-8afbfb15d6fb"/> <textFieldExpression><![CDATA[$F{DESTINO}]]></textFieldExpression> </textField> <textField pattern="###0.00;-###0.00"> - <reportElement uuid="9fef3b4f-3c79-4b11-8702-0f4c5757b81e" x="280" y="0" width="35" height="21"/> + <reportElement x="280" y="0" width="35" height="21" uuid="9fef3b4f-3c79-4b11-8702-0f4c5757b81e"/> <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$F{PRECIOBASE}]]></textFieldExpression> </textField>