diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_es.properties index ced84eb2a..bd52b3988 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_es.properties @@ -24,7 +24,7 @@ label.valorpedagio=Ped label.valorseguro=Seguro label.valoroutros=Outros label.chaveAcesso=Chave Acesso -label.numBPe=Número BPe +label.numBPe=Núm. BPe label.serie=Série label.status=Status label.obs=Observação diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_pt_BR.properties index 829b63ebf..6eae3ae00 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioBPe_pt_BR.properties @@ -25,7 +25,7 @@ label.valorpedagio=Ped label.valorseguro=Seguro label.valoroutros=Outros label.chaveAcesso=Chave Acesso -label.numBPe=Número BPe +label.numBPe=Núm. BPe label.serie=Série label.status=Status label.obs=Observação \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper index 3269e1c1b..3d07efaee 100644 Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jasper differ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml index 9afd3b6da..c0286ef66 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioBPe.jrxml @@ -1,7 +1,7 @@ - + @@ -54,22 +54,10 @@ - - - - - - - - <band height="79" splitType="Stretch"> <textField pattern="" isBlankWhenNull="false"> @@ -158,21 +146,21 @@ <textFieldExpression><![CDATA[$R{label.origem}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="3998308e-b9fe-465e-b251-47d19d7c4ddd" x="381" y="0" width="70" height="15"/> + <reportElement uuid="3998308e-b9fe-465e-b251-47d19d7c4ddd" x="375" y="0" width="70" height="15"/> <textElement textAlignment="Right"> <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.dataViagem}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="924ae914-4074-4746-97c0-b11119029cc0" x="451" y="0" width="56" height="15"/> + <reportElement uuid="924ae914-4074-4746-97c0-b11119029cc0" x="445" y="0" width="56" height="15"/> <textElement textAlignment="Right"> <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.valorBPe}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="f9f9f464-c0da-4d85-ad06-06567943eaa8" x="720" y="0" width="275" height="15"/> + <reportElement uuid="f9f9f464-c0da-4d85-ad06-06567943eaa8" x="746" y="0" width="252" height="15"/> <box leftPadding="5"/> <textElement> <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> @@ -180,7 +168,7 @@ <textFieldExpression><![CDATA[$R{label.chaveAcesso}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="aaabe6ae-6466-4b39-8f39-b94460463dc8" x="1080" y="0" width="100" height="15"/> + <reportElement uuid="aaabe6ae-6466-4b39-8f39-b94460463dc8" x="1084" y="0" width="100" height="15"/> <textElement> <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> @@ -201,61 +189,61 @@ <textFieldExpression><![CDATA[$R{label.origemPV}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="7a964b4c-f05b-47d5-9133-3857ac17793b" x="594" y="0" width="46" height="15"/> - <textElement textAlignment="Right"> - <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> - </textElement> - <textFieldExpression><![CDATA[$R{label.valorpedagio}]]></textFieldExpression> - </textField> - <textField> - <reportElement uuid="61f831c0-e2f4-41b8-bd2c-09cd8f327e72" x="640" y="0" width="40" height="15"/> - <textElement textAlignment="Right"> - <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> - </textElement> - <textFieldExpression><![CDATA[$R{label.valorseguro}]]></textFieldExpression> - </textField> - <textField> - <reportElement uuid="6eb33a55-1523-4031-9157-04b92fd09603" x="680" y="0" width="40" height="15"/> - <textElement textAlignment="Right"> - <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> - </textElement> - <textFieldExpression><![CDATA[$R{label.valoroutros}]]></textFieldExpression> - </textField> - <textField> - <reportElement uuid="3d88eb39-b6ea-40d6-93c9-ecba691cfb45" x="562" y="0" width="32" height="15"/> + <reportElement uuid="3d88eb39-b6ea-40d6-93c9-ecba691cfb45" x="550" y="0" width="49" height="15"/> <textElement textAlignment="Right"> <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.valortaxa}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="84e806d9-098f-4a0a-8436-415b4517f1e8" x="507" y="0" width="55" height="15"/> + <reportElement uuid="84e806d9-098f-4a0a-8436-415b4517f1e8" x="501" y="0" width="49" height="15"/> <textElement textAlignment="Right"> <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.valortarifa}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="abec744e-661d-407e-b21b-92cedc682316" x="1045" y="0" width="30" height="15"/> + <reportElement uuid="abec744e-661d-407e-b21b-92cedc682316" x="1054" y="0" width="30" height="15"/> <textElement> <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.serie}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="fa7c03df-c59f-4e31-96fa-8a508c19746d" x="995" y="0" width="45" height="15"/> - <textElement> - <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> - </textElement> - <textFieldExpression><![CDATA[$R{label.numBPe}]]></textFieldExpression> - </textField> - <textField> - <reportElement uuid="8080038d-0253-4fe8-a21b-75c7257d81c5" x="285" y="0" width="96" height="15"/> + <reportElement uuid="8080038d-0253-4fe8-a21b-75c7257d81c5" x="285" y="0" width="90" height="15"/> <textElement> <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.destino}]]></textFieldExpression> </textField> + <textField> + <reportElement uuid="6eb33a55-1523-4031-9157-04b92fd09603" x="697" y="0" width="49" height="15"/> + <textElement textAlignment="Right"> + <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.valoroutros}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="61f831c0-e2f4-41b8-bd2c-09cd8f327e72" x="648" y="0" width="49" height="15"/> + <textElement textAlignment="Right"> + <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.valorseguro}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="7a964b4c-f05b-47d5-9133-3857ac17793b" x="599" y="0" width="49" height="15"/> + <textElement textAlignment="Right"> + <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.valorpedagio}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="fa7c03df-c59f-4e31-96fa-8a508c19746d" x="998" y="0" width="56" height="15"/> + <textElement> + <font size="10" isBold="false" pdfFontName="Helvetica-Bold"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.numBPe}]]></textFieldExpression> + </textField> </band> </columnHeader> <detail> @@ -282,28 +270,28 @@ <textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="319b345c-ad14-4025-8fd3-3e34e8cacd54" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="285" y="0" width="96" height="15" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="319b345c-ad14-4025-8fd3-3e34e8cacd54" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="285" y="0" width="90" height="15" isPrintWhenDetailOverflows="true"/> <textElement> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{destino}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="e6244540-af1b-4d94-8b0f-d2c3e501db61" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="381" y="0" width="70" height="15" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="e6244540-af1b-4d94-8b0f-d2c3e501db61" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="375" y="0" width="70" height="15" isPrintWhenDetailOverflows="true"/> <textElement> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{dtviagem}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="6e5187d9-591a-42ab-a394-3f990ea8adc1" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="451" y="0" width="56" height="15" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="6e5187d9-591a-42ab-a394-3f990ea8adc1" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="445" y="0" width="56" height="15" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Right"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{vlbpe}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true" hyperlinkType="Reference" hyperlinkTarget="Blank"> - <reportElement uuid="6db62c93-f853-4396-89ce-afcc6d510d91" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="720" y="0" width="275" height="15" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="6db62c93-f853-4396-89ce-afcc6d510d91" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="746" y="0" width="252" height="15" isPrintWhenDetailOverflows="true"/> <box leftPadding="5"/> <textElement> <font size="9"/> @@ -312,7 +300,7 @@ <hyperlinkReferenceExpression><![CDATA[$F{qrcode}]]></hyperlinkReferenceExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="fe71d802-0ba0-4336-b76a-f72a37b23075" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="1045" y="0" width="35" height="15" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="fe71d802-0ba0-4336-b76a-f72a37b23075" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="1054" y="0" width="30" height="15" isPrintWhenDetailOverflows="true"/> <textElement> <font size="9"/> </textElement> @@ -326,42 +314,49 @@ <textFieldExpression><![CDATA[$F{locpuntoventa}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="a5e99430-53c7-4a72-b80e-222d65555557" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="507" y="0" width="55" height="15" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="a5e99430-53c7-4a72-b80e-222d65555557" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="501" y="0" width="49" height="15" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Right"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{valortarifa}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="b08970a6-b8fc-4210-a7ba-1cafd0166131" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="562" y="0" width="32" height="15" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="b08970a6-b8fc-4210-a7ba-1cafd0166131" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="550" y="0" width="49" height="15" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Right"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{valortaxa}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="a975cfcb-153b-4b43-ac6e-023701d75283" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="594" y="0" width="44" height="15" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="a975cfcb-153b-4b43-ac6e-023701d75283" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="599" y="0" width="49" height="15" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Right"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{valorpedagio}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="021b8a1b-3497-4eed-b96e-985ec4329c5b" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="638" y="0" width="42" height="15" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="021b8a1b-3497-4eed-b96e-985ec4329c5b" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="648" y="0" width="49" height="15" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Right"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{valorseguro}]]></textFieldExpression> </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement uuid="66eaa400-673d-4b37-b2ef-982910e6c78c" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="1084" y="0" width="100" height="15" isPrintWhenDetailOverflows="true"/> + <textElement> + <font size="9"/> + </textElement> + <textFieldExpression><![CDATA[$F{status}]]></textFieldExpression> + </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="5d4d7677-7d6f-493c-87bd-a15faedee6e0" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="680" y="0" width="40" height="15" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="5d4d7677-7d6f-493c-87bd-a15faedee6e0" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="697" y="0" width="49" height="15" isPrintWhenDetailOverflows="true"/> <textElement textAlignment="Right"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$F{valoroutros}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="07f16df1-fd27-46ba-9262-835eb8dddc96" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="995" y="0" width="50" height="15" isPrintWhenDetailOverflows="true"/> + <reportElement uuid="07f16df1-fd27-46ba-9262-835eb8dddc96" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="998" y="0" width="56" height="15" isPrintWhenDetailOverflows="true"/> <textElement> <font size="9"/> </textElement> @@ -374,20 +369,13 @@ </textElement> <textFieldExpression><![CDATA[$F{obs}]]></textFieldExpression> </textField> - <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="66eaa400-673d-4b37-b2ef-982910e6c78c" style="zebrado" stretchType="RelativeToTallestObject" mode="Opaque" x="1080" y="0" width="104" height="15" isPrintWhenDetailOverflows="true"/> - <textElement> - <font size="9"/> - </textElement> - <textFieldExpression><![CDATA[$F{status}]]></textFieldExpression> - </textField> </band> </detail> <lastPageFooter> <band height="8"/> </lastPageFooter> <summary> - <band height="30"> + <band height="31"> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement uuid="95d7aa90-90da-4ddb-b63d-16a69e4996aa" stretchType="RelativeToTallestObject" x="0" y="0" width="86" height="18"/> <box leftPadding="0"> @@ -400,7 +388,7 @@ <textFieldExpression><![CDATA[$R{header.filtro.total}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="f51d8633-b5be-438d-938a-d9ab8001fac0" stretchType="RelativeToTallestObject" x="562" y="0" width="32" height="18"/> + <reportElement uuid="f51d8633-b5be-438d-938a-d9ab8001fac0" stretchType="RelativeToTallestObject" x="550" y="0" width="49" height="18"/> <box> <leftPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/> @@ -411,7 +399,7 @@ <textFieldExpression><![CDATA[$V{totalTaxa}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="2998b4f4-b73e-4a24-9a40-d645ffe3b542" stretchType="RelativeToTallestObject" x="507" y="0" width="55" height="18"/> + <reportElement uuid="2998b4f4-b73e-4a24-9a40-d645ffe3b542" stretchType="RelativeToTallestObject" x="501" y="0" width="49" height="18"/> <box> <leftPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/> @@ -422,7 +410,7 @@ <textFieldExpression><![CDATA[$V{totalTarifa}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="933b9f19-86f6-40c1-a117-ac27ada061b7" stretchType="RelativeToTallestObject" x="680" y="0" width="40" height="18"/> + <reportElement uuid="933b9f19-86f6-40c1-a117-ac27ada061b7" stretchType="RelativeToTallestObject" x="697" y="0" width="49" height="18"/> <box> <leftPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/> @@ -433,7 +421,7 @@ <textFieldExpression><![CDATA[$V{totalOutros}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="b5c7952a-dda9-4351-ae90-2a281d2ecebd" stretchType="RelativeToTallestObject" x="638" y="0" width="42" height="18"/> + <reportElement uuid="b5c7952a-dda9-4351-ae90-2a281d2ecebd" stretchType="RelativeToTallestObject" x="648" y="0" width="49" height="18"/> <box> <leftPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/> @@ -444,18 +432,7 @@ <textFieldExpression><![CDATA[$V{totalSeguro}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="37014472-c5d8-4e1a-bf58-1b59a55bf44d" stretchType="RelativeToTallestObject" x="1155" y="0" width="155" height="18"/> - <box> - <leftPen lineWidth="0.0"/> - <bottomPen lineWidth="0.0"/> - </box> - <textElement textAlignment="Right" verticalAlignment="Middle" markup="styled"> - <font fontName="SansSerif" size="12" isBold="true"/> - </textElement> - <textFieldExpression><![CDATA[$V{totalGeral}]]></textFieldExpression> - </textField> - <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="9a5cf2aa-0e3e-430f-9e66-773c4ab97da6" stretchType="RelativeToTallestObject" x="594" y="0" width="44" height="18"/> + <reportElement uuid="9a5cf2aa-0e3e-430f-9e66-773c4ab97da6" stretchType="RelativeToTallestObject" x="599" y="0" width="49" height="18"/> <box> <leftPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/> @@ -466,7 +443,7 @@ <textFieldExpression><![CDATA[$V{totalPedagio}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> - <reportElement uuid="3ab6c285-6689-4eb8-8d8c-3e6d80f6df1f" stretchType="RelativeToTallestObject" x="409" y="0" width="98" height="18"/> + <reportElement uuid="3ab6c285-6689-4eb8-8d8c-3e6d80f6df1f" stretchType="RelativeToTallestObject" x="403" y="0" width="98" height="18"/> <box> <leftPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>