fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bug#AL-3817

master
Gleison da Cruz 2024-03-08 14:20:23 -03:00
parent 8a957cd856
commit ab5d345f67
12 changed files with 255 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.55.6</version>
<version>1.55.7</version>
<packaging>war</packaging>
<properties>

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSimplificadoSumarizado.java
View File

@ -295,7 +295,11 @@ public class RelatorioResumoLinhasAnaliticoSimplificadoSumarizado extends Relato
sql.append(" nvl(gr.descgrupo, 'Não Definido') grupo_linha, ");
sql.append(" ( ");
sql.append(" SELECT ");
sql.append(" SUM(nvl(TR.CANTKMREAL, 0)) ");
if (parametros.get("SOMAR_KM_RODADOS_POR").equals("SEQUENCIA")) {
sql.append(" SUM(nvl(rs.kmoriginal, 0)) ");
}else {
sql.append(" SUM(nvl(TR.CANTKMREAL, 0)) ");
}
sql.append(" FROM ");
sql.append(" ruta_secuencia rs, ");
sql.append(" tramo tr ");

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java
View File

@ -215,7 +215,11 @@ public class RelatorioResumoLinhasAnaliticoSumarizado extends Relatorio {
sqlSb.append(" ELSE 'N' ");
sqlSb.append(" END INTERESTADUAL, ");
sqlSb.append(" NVL(GR.DESCGRUPO, 'Não Definido') GRUPO_LINHA, ");
sqlSb.append(" (SELECT SUM(NVL(TR.CANTKMREAL, 0)) ");
if (parametros.get("SOMAR_KM_RODADOS_POR").equals("SEQUENCIA")) {
sqlSb.append(" (SELECT SUM(NVL(RS.KMORIGINAL,0)) ");
}else {
sqlSb.append(" (SELECT SUM(NVL(TR.CANTKMREAL, 0)) ");
}
sqlSb.append(" FROM RUTA_SECUENCIA RS, ");
sqlSb.append(" TRAMO TR ");
sqlSb.append(" WHERE RS.RUTA_ID = RT.RUTA_ID ");

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jasper
View File

Binary file not shown.

85
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jrxml
View File

@ -38,6 +38,7 @@
<parameter name="DATA" class="java.util.Date"/>
<parameter name="NOME_USUARIO" class="java.lang.String"/>
<parameter name="CRIANCA_ID" class="java.lang.String"/>
<parameter name="SQL_KM_RODADOS" class="java.lang.String"/>
<queryString>
<![CDATA[SELECT TAB.*,
ROUND((SELECT SUM((DECODE(NVL(TR.CANTKMREAL,0), 0, 1, NVL(TR.CANTKMREAL,0)) /
@ -78,7 +79,7 @@
RT.NUMRUTA,
RT.DESCRUTA,
CR.ROLOPERATIVO_ID,
(SELECT SUM(NVL(TR.CANTKMREAL,0))
(SELECT SUM(NVL( $P{SQL_KM_RODADOS} ,0))
FROM RUTA_SECUENCIA RS, TRAMO TR
WHERE RS.RUTA_ID = RT.RUTA_ID
AND RS.TRAMO_ID = TR.TRAMO_ID
@ -135,53 +136,53 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<groupHeader>
<band height="31">
<staticText>
<reportElement x="0" y="18" width="50" height="11" uuid="9c579f27-ee14-4804-b73d-64994a6e41ec"/>
<reportElement uuid="9c579f27-ee14-4804-b73d-64994a6e41ec" x="0" y="18" width="50" height="11"/>
<textElement>
<font size="8" isBold="true"/>
</textElement>
<text><![CDATA[Data]]></text>
</staticText>
<staticText>
<reportElement x="111" y="18" width="64" height="11" uuid="7b8a8f38-e513-4a8c-a82b-a9c6ffd21f6f"/>
<reportElement uuid="7b8a8f38-e513-4a8c-a82b-a9c6ffd21f6f" x="111" y="18" width="64" height="11"/>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
</textElement>
<text><![CDATA[Passageiros]]></text>
</staticText>
<staticText>
<reportElement x="224" y="17" width="42" height="11" uuid="4f8fcbb3-73e7-4b15-9687-30ff12bb1526"/>
<reportElement uuid="4f8fcbb3-73e7-4b15-9687-30ff12bb1526" x="224" y="17" width="42" height="11"/>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
</textElement>
<text><![CDATA[Viagens]]></text>
</staticText>
<textField>
<reportElement mode="Opaque" x="0" y="2" width="30" height="12" backcolor="#CDCDCD" uuid="9e40c4ad-b386-4e8a-9d84-977a27bfebcc"/>
<reportElement uuid="9e40c4ad-b386-4e8a-9d84-977a27bfebcc" mode="Opaque" x="0" y="2" width="30" height="12" backcolor="#CDCDCD"/>
<textElement verticalAlignment="Bottom">
<font size="9" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA["Linha: "]]></textFieldExpression>
</textField>
<line>
<reportElement x="0" y="1" width="554" height="1" uuid="afaaa1cf-1a3e-4a42-9fa3-e634a66fc3d3"/>
<reportElement uuid="afaaa1cf-1a3e-4a42-9fa3-e634a66fc3d3" x="0" y="1" width="554" height="1"/>
<graphicElement>
<pen lineWidth="0.5"/>
</graphicElement>
</line>
<line>
<reportElement x="0" y="16" width="554" height="1" uuid="04a75f17-3686-484b-be43-7b7e22e9def7"/>
<reportElement uuid="04a75f17-3686-484b-be43-7b7e22e9def7" x="0" y="16" width="554" height="1"/>
<graphicElement>
<pen lineWidth="0.5"/>
</graphicElement>
</line>
<line>
<reportElement x="0" y="30" width="554" height="1" uuid="d9f712d0-01a8-4241-a1e6-dc096b4ee773"/>
<reportElement uuid="d9f712d0-01a8-4241-a1e6-dc096b4ee773" x="0" y="30" width="554" height="1"/>
<graphicElement>
<pen lineWidth="0.5"/>
</graphicElement>
</line>
<staticText>
<reportElement mode="Transparent" x="313" y="18" width="65" height="11" forecolor="#000000" backcolor="#FFFFFF" uuid="7b817589-f754-49f1-bf53-856be52946fb"/>
<reportElement uuid="7b817589-f754-49f1-bf53-856be52946fb" mode="Transparent" x="313" y="18" width="65" height="11" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="8" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -189,7 +190,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<text><![CDATA[KM Rodados]]></text>
</staticText>
<staticText>
<reportElement mode="Transparent" x="417" y="18" width="98" height="11" forecolor="#000000" backcolor="#FFFFFF" uuid="4e931a04-04b4-41b7-90c2-e66083daf0fe"/>
<reportElement uuid="4e931a04-04b4-41b7-90c2-e66083daf0fe" mode="Transparent" x="417" y="18" width="98" height="11" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="8" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -197,49 +198,49 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<text><![CDATA[PAX. KM]]></text>
</staticText>
<textField>
<reportElement mode="Opaque" x="28" y="2" width="184" height="12" backcolor="#CDCDCD" uuid="d97e582d-1e88-4841-8aa4-bc589f2a486a"/>
<reportElement uuid="d97e582d-1e88-4841-8aa4-bc589f2a486a" mode="Opaque" x="28" y="2" width="184" height="12" backcolor="#CDCDCD"/>
<textElement verticalAlignment="Bottom">
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$F{NUMRUTA}+" - "+$F{DESCRUTA}]]></textFieldExpression>
</textField>
<textField>
<reportElement mode="Opaque" x="212" y="2" width="54" height="12" backcolor="#CDCDCD" uuid="a2466836-6444-4afd-95e0-b920d2514a9b"/>
<reportElement uuid="a2466836-6444-4afd-95e0-b920d2514a9b" mode="Opaque" x="212" y="2" width="54" height="12" backcolor="#CDCDCD"/>
<textElement textAlignment="Right" verticalAlignment="Bottom">
<font size="9" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA["Extensão: "]]></textFieldExpression>
</textField>
<textField>
<reportElement mode="Opaque" x="266" y="2" width="69" height="12" backcolor="#CDCDCD" uuid="f4196d5c-5656-42cb-8f0e-c200044c844a"/>
<reportElement uuid="f4196d5c-5656-42cb-8f0e-c200044c844a" mode="Opaque" x="266" y="2" width="69" height="12" backcolor="#CDCDCD"/>
<textElement verticalAlignment="Bottom">
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[new java.text.DecimalFormat("###0.00").format($F{EXTENSAO_KM})]]></textFieldExpression>
</textField>
<textField>
<reportElement mode="Opaque" x="335" y="2" width="43" height="12" backcolor="#CDCDCD" uuid="019480ff-577f-48a2-9bcc-984c592b308a"/>
<reportElement uuid="019480ff-577f-48a2-9bcc-984c592b308a" mode="Opaque" x="335" y="2" width="43" height="12" backcolor="#CDCDCD"/>
<textElement textAlignment="Right" verticalAlignment="Bottom">
<font size="9" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA["Empresa: "]]></textFieldExpression>
</textField>
<textField>
<reportElement mode="Opaque" x="378" y="2" width="95" height="12" backcolor="#CDCDCD" uuid="8697043c-3c96-4ead-9a13-b22febaba3b5"/>
<reportElement uuid="8697043c-3c96-4ead-9a13-b22febaba3b5" mode="Opaque" x="378" y="2" width="95" height="12" backcolor="#CDCDCD"/>
<textElement verticalAlignment="Bottom">
<font size="7"/>
</textElement>
<textFieldExpression><![CDATA[$P{EMPRESA}]]></textFieldExpression>
</textField>
<textField>
<reportElement mode="Opaque" x="473" y="2" width="42" height="12" backcolor="#CDCDCD" uuid="14af2efb-fe6b-4be6-ae66-43a2ce8ed03a"/>
<reportElement uuid="14af2efb-fe6b-4be6-ae66-43a2ce8ed03a" mode="Opaque" x="473" y="2" width="42" height="12" backcolor="#CDCDCD"/>
<textElement textAlignment="Right" verticalAlignment="Bottom">
<font size="9" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA["Sentido: "]]></textFieldExpression>
</textField>
<textField>
<reportElement mode="Opaque" x="515" y="2" width="39" height="12" backcolor="#CDCDCD" uuid="238edf00-2a59-4367-ab86-62aea2afd2ab"/>
<reportElement uuid="238edf00-2a59-4367-ab86-62aea2afd2ab" mode="Opaque" x="515" y="2" width="39" height="12" backcolor="#CDCDCD"/>
<textElement verticalAlignment="Bottom">
<font size="7"/>
</textElement>
@ -250,34 +251,34 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<groupFooter>
<band height="20">
<textField>
<reportElement x="111" y="1" width="64" height="13" uuid="102eebb5-25f0-4175-ab9b-78fbca54bc06"/>
<reportElement uuid="102eebb5-25f0-4175-ab9b-78fbca54bc06" x="111" y="1" width="64" height="13"/>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{PASSAGEIROS_1}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="224" y="0" width="42" height="12" uuid="9f6ea621-a236-429f-bb13-ae57118ff5b3"/>
<reportElement uuid="9f6ea621-a236-429f-bb13-ae57118ff5b3" x="224" y="0" width="42" height="12"/>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{VIAGENS_1}]]></textFieldExpression>
</textField>
<line>
<reportElement x="0" y="0" width="554" height="1" uuid="422ef3af-efca-47b0-80ba-16120724ca36"/>
<reportElement uuid="422ef3af-efca-47b0-80ba-16120724ca36" x="0" y="0" width="554" height="1"/>
<graphicElement>
<pen lineWidth="0.5"/>
</graphicElement>
</line>
<textField pattern="#,##0.00">
<reportElement x="313" y="2" width="65" height="12" uuid="3a2d351f-134e-43d6-acea-e3556fc61897"/>
<reportElement uuid="3a2d351f-134e-43d6-acea-e3556fc61897" x="313" y="2" width="65" height="12"/>
<textElement textAlignment="Right">
<font size="8" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$V{EXTENSAO_1}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="false">
<reportElement mode="Transparent" x="417" y="2" width="98" height="12" forecolor="#000000" backcolor="#FFFFFF" uuid="7fc513ea-f587-433c-88fa-6357bdb9ed55"/>
<reportElement uuid="7fc513ea-f587-433c-88fa-6357bdb9ed55" mode="Transparent" x="417" y="2" width="98" height="12" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="8" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -285,7 +286,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<textFieldExpression><![CDATA[$V{PAX_KM_1}]]></textFieldExpression>
</textField>
<staticText>
<reportElement x="0" y="1" width="50" height="11" uuid="984a2f82-b446-4dc7-8202-0d092824ee4d"/>
<reportElement uuid="984a2f82-b446-4dc7-8202-0d092824ee4d" x="0" y="1" width="50" height="11"/>
<textElement>
<font size="8" isBold="true"/>
</textElement>
@ -300,7 +301,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<pageHeader>
<band height="66" splitType="Stretch">
<textField pattern="" isBlankWhenNull="false">
<reportElement mode="Opaque" x="0" y="21" width="443" height="15" forecolor="#000000" backcolor="#CDCDCD" uuid="2ed4524d-5c06-487c-a8f1-abc59a8ef7fc"/>
<reportElement uuid="2ed4524d-5c06-487c-a8f1-abc59a8ef7fc" mode="Opaque" x="0" y="21" width="443" height="15" forecolor="#000000" backcolor="#CDCDCD"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -308,7 +309,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<textFieldExpression><![CDATA[$P{NOME_RELATORIO}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="false">
<reportElement mode="Opaque" x="0" y="36" width="50" height="15" forecolor="#000000" backcolor="#CDCDCD" uuid="fc199edd-4f2f-4b5f-9397-44f4af50a920"/>
<reportElement uuid="fc199edd-4f2f-4b5f-9397-44f4af50a920" mode="Opaque" x="0" y="36" width="50" height="15" forecolor="#000000" backcolor="#CDCDCD"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -316,7 +317,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<textFieldExpression><![CDATA[$R{cabecalho.periodo}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
<reportElement mode="Opaque" x="50" y="36" width="61" height="15" forecolor="#000000" backcolor="#CDCDCD" uuid="f64c2e3c-d936-4072-a0b1-d914f408bbbb"/>
<reportElement uuid="f64c2e3c-d936-4072-a0b1-d914f408bbbb" mode="Opaque" x="50" y="36" width="61" height="15" forecolor="#000000" backcolor="#CDCDCD"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -324,7 +325,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<textFieldExpression><![CDATA[$P{DATA_INICIAL}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy" isBlankWhenNull="false">
<reportElement mode="Opaque" x="111" y="36" width="332" height="15" forecolor="#000000" backcolor="#CDCDCD" uuid="00093c35-d3a5-4b0e-8a7a-26a86912dd25"/>
<reportElement uuid="00093c35-d3a5-4b0e-8a7a-26a86912dd25" mode="Opaque" x="111" y="36" width="332" height="15" forecolor="#000000" backcolor="#CDCDCD"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -332,7 +333,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<textFieldExpression><![CDATA[$P{DATA_FINAL}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="false">
<reportElement mode="Transparent" x="101" y="36" width="10" height="14" forecolor="#000000" backcolor="#FFFFFF" uuid="def1b81c-a286-4749-9ef7-f90984a3a5eb"/>
<reportElement uuid="def1b81c-a286-4749-9ef7-f90984a3a5eb" mode="Transparent" x="101" y="36" width="10" height="14" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -340,7 +341,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<textFieldExpression><![CDATA[$R{cabecalho.periodoA}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="false">
<reportElement mode="Opaque" x="0" y="0" width="417" height="21" forecolor="#000000" backcolor="#CDCDCD" uuid="5dfea5f4-257a-43bc-94cb-bdead81ef7ac"/>
<reportElement uuid="5dfea5f4-257a-43bc-94cb-bdead81ef7ac" mode="Opaque" x="0" y="0" width="417" height="21" forecolor="#000000" backcolor="#CDCDCD"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="12" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -348,7 +349,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<textFieldExpression><![CDATA[$P{EMPRESA}]]></textFieldExpression>
</textField>
<textField pattern="dd/MM/yyyy HH:mm" isBlankWhenNull="false">
<reportElement mode="Opaque" x="463" y="0" width="92" height="21" forecolor="#000000" backcolor="#CDCDCD" uuid="ea4dfc22-27b5-4600-8e8b-7d74460ed744"/>
<reportElement uuid="ea4dfc22-27b5-4600-8e8b-7d74460ed744" mode="Opaque" x="463" y="0" width="92" height="21" forecolor="#000000" backcolor="#CDCDCD"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -356,14 +357,14 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField>
<textField>
<reportElement mode="Opaque" x="417" y="0" width="46" height="21" backcolor="#CDCDCD" uuid="a46c91f5-fb60-48d8-93c1-3814ce0160dd"/>
<reportElement uuid="a46c91f5-fb60-48d8-93c1-3814ce0160dd" mode="Opaque" x="417" y="0" width="46" height="21" backcolor="#CDCDCD"/>
<textElement>
<font size="9" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$R{cabecalho.dataHora}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="false">
<reportElement mode="Opaque" x="417" y="34" width="138" height="17" forecolor="#000000" backcolor="#CDCDCD" uuid="623b5d82-e7b3-4439-96c5-f44833fb8864"/>
<reportElement uuid="623b5d82-e7b3-4439-96c5-f44833fb8864" mode="Opaque" x="417" y="34" width="138" height="17" forecolor="#000000" backcolor="#CDCDCD"/>
<textElement verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -371,7 +372,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<textFieldExpression><![CDATA[$R{cabecalho.impressorPor}+" "+$P{USUARIO}+"-"+$P{NOME_USUARIO}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="false">
<reportElement mode="Opaque" x="0" y="51" width="50" height="15" forecolor="#000000" backcolor="#CDCDCD" uuid="ccec8b66-ed79-418b-b66d-15d9ed3bf2ce"/>
<reportElement uuid="ccec8b66-ed79-418b-b66d-15d9ed3bf2ce" mode="Opaque" x="0" y="51" width="50" height="15" forecolor="#000000" backcolor="#CDCDCD"/>
<textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -379,14 +380,14 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<textFieldExpression><![CDATA[$R{cabecalho.filtros}]]></textFieldExpression>
</textField>
<textField>
<reportElement mode="Opaque" x="50" y="51" width="505" height="15" backcolor="#CDCDCD" uuid="98fc1c7e-3fee-4c70-924f-2cbb17fd243f"/>
<reportElement uuid="98fc1c7e-3fee-4c70-924f-2cbb17fd243f" mode="Opaque" x="50" y="51" width="505" height="15" backcolor="#CDCDCD"/>
<textElement>
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{FILTROS}]]></textFieldExpression>
</textField>
<textField pattern="" isBlankWhenNull="false">
<reportElement mode="Opaque" x="417" y="21" width="125" height="13" forecolor="#000000" backcolor="#CDCDCD" uuid="6aae4c9b-2e2a-4fd5-9115-760449d3c263"/>
<reportElement uuid="6aae4c9b-2e2a-4fd5-9115-760449d3c263" mode="Opaque" x="417" y="21" width="125" height="13" forecolor="#000000" backcolor="#CDCDCD"/>
<textElement verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -394,7 +395,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<textFieldExpression><![CDATA[$R{cabecalho.pagina}+" "+$V{PAGE_NUMBER}+" "+$R{cabecalho.de}]]></textFieldExpression>
</textField>
<textField evaluationTime="Report" pattern="" isBlankWhenNull="false">
<reportElement mode="Opaque" x="542" y="21" width="13" height="13" forecolor="#000000" backcolor="#CDCDCD" uuid="5a57c3a1-ed8e-46fb-836f-d250116a238a"/>
<reportElement uuid="5a57c3a1-ed8e-46fb-836f-d250116a238a" mode="Opaque" x="542" y="21" width="13" height="13" forecolor="#000000" backcolor="#CDCDCD"/>
<textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="9" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -406,21 +407,21 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<detail>
<band height="13">
<textField pattern="dd/MM/yyyy">
<reportElement x="0" y="0" width="50" height="12" uuid="ee9c23bd-e562-43d1-a766-851d09848504"/>
<reportElement uuid="ee9c23bd-e562-43d1-a766-851d09848504" x="0" y="0" width="50" height="12"/>
<textElement>
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{FECCORRIDA}]]></textFieldExpression>
</textField>
<textField>
<reportElement x="111" y="0" width="64" height="12" uuid="9557122b-0661-4f5e-9a89-b0bfd74dabe3"/>
<reportElement uuid="9557122b-0661-4f5e-9a89-b0bfd74dabe3" x="111" y="0" width="64" height="12"/>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{PASSAGEIROS}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="false">
<reportElement mode="Transparent" x="417" y="0" width="98" height="12" forecolor="#000000" backcolor="#FFFFFF" uuid="beb097c0-f4c1-4fe3-a62e-badfdf823c0c"/>
<reportElement uuid="beb097c0-f4c1-4fe3-a62e-badfdf823c0c" mode="Transparent" x="417" y="0" width="98" height="12" forecolor="#000000" backcolor="#FFFFFF"/>
<textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none">
<font fontName="SansSerif" size="8" isBold="false" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/>
<paragraph lineSpacing="Single"/>
@ -428,14 +429,14 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<textFieldExpression><![CDATA[$F{PAX_KM}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00">
<reportElement x="313" y="1" width="65" height="12" uuid="21f73b7d-c377-4047-9960-41e085463aa0"/>
<reportElement uuid="21f73b7d-c377-4047-9960-41e085463aa0" x="313" y="1" width="65" height="12"/>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{VIAGENS}.multiply($F{EXTENSAO_KM})]]></textFieldExpression>
</textField>
<textField>
<reportElement x="224" y="1" width="42" height="12" uuid="01a234c4-7c30-4ac3-9a7c-dc09d0ebe314"/>
<reportElement uuid="01a234c4-7c30-4ac3-9a7c-dc09d0ebe314" x="224" y="1" width="42" height="12"/>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
@ -446,7 +447,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]>
<noData>
<band height="39">
<textField>
<reportElement x="0" y="8" width="555" height="20" uuid="a640c0eb-ead8-4a2a-bda4-675165e8bc7d"/>
<reportElement uuid="a640c0eb-ead8-4a2a-bda4-675165e8bc7d" x="0" y="8" width="555" height="20"/>
<textElement textAlignment="Center" markup="none">
<font size="11" isBold="true"/>
</textElement>

BIN
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jasper
View File

Binary file not shown.

299
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml
View File

File diff suppressed because it is too large Load Diff

14
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioResumoLinhasController.java
View File

@ -70,6 +70,7 @@ public class RelatorioResumoLinhasController extends MyGenericForwardComposer {
private MyComboboxEstandar cmbEmpresa;
private MyComboboxEstandar cmbGrupoRuta;
private Radio rdAnalitico;
private Radio rdSequencia;
private Checkbox chcSumarizar;
private Checkbox chcSimplificadoSumarizado;
private static String CONSTANTE_GRATUIDADE_CRIANCA;
@ -131,6 +132,9 @@ public class RelatorioResumoLinhasController extends MyGenericForwardComposer {
SimpleDateFormat df = new SimpleDateFormat("dd/MM/yyyy");
filtro.append(" DATA: " + df.format(new Date()));
parametros.put("DATA", new Date());
parametros.put("SOMAR_KM_RODADOS_POR", rdSequencia.isChecked() ? "SEQUENCIA" : "COMBINACAO");
parametros.put("FILTROS", filtro.toString());
String tituloRelatorio = "relatorioResumoLinhasController.window.title";
@ -142,9 +146,19 @@ public class RelatorioResumoLinhasController extends MyGenericForwardComposer {
relatorio = new RelatorioResumoLinhasAnaliticoSimplificadoSumarizado(parametros, dataSourceRead.getConnection());
tituloRelatorio = "relatorioResumoLinhasAnaliticoSumarizadoSimplificadoController.window.title";
}else {
if (rdSequencia.isChecked()){
parametros.put("SQL_KM_RODADOS", " (SELECT SUM(NVL(RS.KMORIGINAL,0)) FROM RUTA_SECUENCIA RS, TRAMO TR WHERE RS.RUTA_ID = RT.RUTA_ID AND RS.TRAMO_ID = TR.TRAMO_ID AND RS.ACTIVO = 1) EXTENSAO_KM, ");
}else {
parametros.put("SQL_KM_RODADOS", " TR.CANTKMREAL AS EXTENSAO_KM, ");
}
relatorio = new RelatorioResumoLinhasAnalitico(parametros, dataSourceRead.getConnection());
}
}else {
if (rdSequencia.isChecked()){
parametros.put("SQL_KM_RODADOS", " RS.KMORIGINAL ");
}else {
parametros.put("SQL_KM_RODADOS", " TR.CANTKMREAL ");
}
relatorio = new RelatorioResumoLinhas(parametros, dataSourceRead.getConnection());
}
Map args = new HashMap();

4
web/WEB-INF/i3-label_en.label
View File

@ -592,6 +592,10 @@ relatorioResumoLinhasController.lbAte.value = até
relatorioResumoLinhasController.lbGrupoRuta.label = Grupo de Linhas
relatorioResumoLinhasController.lblSumarizar.value = Sumarizar por linhas (Completo)
relatorioResumoLinhasController.lblSimplificadoSumarizado.value = Sumarizar por linhas (Simplificado)
relatorioResumoLinhasController.lbKMConsiderarExtensao.label=Considerar para extensão total
relatorioResumoLinhasController.lbKMConsiderarExtensao.ajuda=Selecione Sequência caso queira o total da KM rodado considerando o cadastro da sequencia, se não será considerado a KM da Combinação.
relatorioResumoLinhasController.lbKMConsiderarExtensaoSequencia.label=Sequência
relatorioResumoLinhasController.lbKMConsiderarExtensaoCobinacao.label=Combinação
#Km Programada
relatorioKmProgramadaController.window.title = Relatório Resumo de Linhas
relatorioKmProgramadaController.lbRuta.value = Linha

4
web/WEB-INF/i3-label_es_MX.label
View File

@ -534,6 +534,10 @@ relatorioResumoLinhasController.lbLote.value = Lote
relatorioResumoLinhasController.lbAte.value = Hasta
relatorioResumoLinhasController.lblSumarizar.value = Sumarizar por linhas (Completo)
relatorioResumoLinhasController.lblSimplificadoSumarizado.value = Sumarizar por linhas (Simplificado)
relatorioResumoLinhasController.lbKMConsiderarExtensao.label=Considerar para extensão total
relatorioResumoLinhasController.lbKMConsiderarExtensao.ajuda=Selecione Sequência caso queira o total da KM rodado considerando o cadastro da sequencia, se não será considerado a KM da Combinação.
relatorioResumoLinhasController.lbKMConsiderarExtensaoSequencia.label=Sequência
relatorioResumoLinhasController.lbKMConsiderarExtensaoCobinacao.label=Combinação
#DesempenhoPorLinha

6
web/WEB-INF/i3-label_pt_BR.label
View File

@ -351,7 +351,7 @@ indexController.mniRelatorioMovimentacaoBilhete.label = Movimentações de Bilhe
indexController.mniRelatorioEncerramentoCheckin.label = Encerramento do Checkin
indexController.mniRelatorioGratuidade.label = Relatório Tipo Passagem
indexController.mniRelatorioGratuidadeANTT.label = Relatório Gratuidades ANTT
indexController.mniRelatorioGratuidadeAGR.label = Relatório Gratuidades AGR
indexController.mnirELRelatorioGratuidadeAGR.label = Relatório Gratuidades AGR
indexController.mniRelatorioPassagensAGR.label = Relatório Passagens AGR
indexController.mnSubMenuAGR.label=Relatório AGR
indexController.mniRelatorioComissao.label = Relatório Comissão
@ -593,6 +593,10 @@ relatorioResumoLinhasController.lbAte.value = até
relatorioResumoLinhasController.lbGrupoRuta.label = Grupo de Linhas
relatorioResumoLinhasController.lblSumarizar.value = Sumarizar por linhas (Completo)
relatorioResumoLinhasController.lblSimplificadoSumarizado.value = Sumarizar por linhas (Simplificado)
relatorioResumoLinhasController.lbKMConsiderarExtensao.label=Considerar para extensão total
relatorioResumoLinhasController.lbKMConsiderarExtensao.ajuda=Selecione Sequência caso queira o total da KM rodado considerando o cadastro da sequencia, se não será considerado a KM da Combinação.
relatorioResumoLinhasController.lbKMConsiderarExtensaoSequencia.label=Sequência
relatorioResumoLinhasController.lbKMConsiderarExtensaoCobinacao.label=Combinação
#Km Programada
relatorioKmProgramadaController.window.title = Relatório Resumo de Linhas
relatorioKmProgramadaController.lbRuta.value = Linha

23
web/gui/relatorios/filtroRelatorioResumoLinhas.zul
View File

@ -12,8 +12,8 @@
<grid fixedLayout="true">
<columns>
<column width="30%" />
<column width="35%" />
<column width="35%" />
<column width="30%" />
<column width="40%" />
</columns>
<rows>
@ -88,6 +88,25 @@
</checkbox>
</cell>
</row>
<row>
<cell colspan="2">
<label
value="${c:l('relatorioResumoLinhasController.lbKMConsiderarExtensao.label')}"/>
<label value= " "/>
<image src="/gui/img/Question_mark_1.png" tooltiptext="${c:l('relatorioResumoLinhasController.lbKMConsiderarExtensao.ajuda')}"
style="cursor: help" />
</cell>
<cell colspan="2">
<radiogroup id="rdKMConsiderarExtensao" />
<radio id="rdSequencia" checked="true" label="${c:l('relatorioResumoLinhasController.lbKMConsiderarExtensaoSequencia.label')}"
radiogroup="rdKMConsiderarExtensao" />
<label value= " "/>
<radio id="rdCombinacao" label="${c:l('relatorioResumoLinhasController.lbKMConsiderarExtensaoCobinacao.label')}"
radiogroup="rdKMConsiderarExtensao">
</radio>
</cell>
</row>
</rows>
</grid>
<toolbar>