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

fixes bug#23073 

dev: wallace
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@109166 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2021-10-18 11:46:59 +00:00
parent b9aca41faa
commit 289ffc5182
22 changed files with 338 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoNovo.java
View File

@ -41,18 +41,20 @@ public class RelatorioAgenciaFechamentoNovo extends Relatorio {
String empresa = parametros.get("empresa") != null ? parametros.get("empresa").toString() : ""; String empresa = parametros.get("empresa") != null ? parametros.get("empresa").toString() : "";
String empresaNome = parametros.get("empresaNome") != null ? parametros.get("empresaNome").toString() : ""; String empresaNome = parametros.get("empresaNome") != null ? parametros.get("empresaNome").toString() : "";
String puntoVenta = parametros.get("NUMPUNTOVENTA") != null ? parametros.get("NUMPUNTOVENTA").toString() : null; String puntoVenta = parametros.get("NUMPUNTOVENTA") != null ? parametros.get("NUMPUNTOVENTA").toString() : null;
lsDadosRelatorio = new ArrayList<RelatorioAgenciaFechamentoBean>(); lsDadosRelatorio = new ArrayList<RelatorioAgenciaFechamentoBean>();
String sql = carregarDadosTotaisdeVenda(puntoVenta, empresa); String sql = carregarDadosTotaisdeVenda(puntoVenta, empresa);
log.debug(sql);
NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql); NamedParameterStatement stmt = new NamedParameterStatement(conexao, sql);
ResultSet rset1 = null; ResultSet rset1 = null;
ResultSet rset2 = null; ResultSet rset2 = null;
SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy hh:mm:ss");
if (parametros.get("MOEDA_ID") != null)
stmt.setInt("MOEDA_ID", (Integer) parametros.get("MOEDA_ID"));
else
stmt.setNull("MOEDA_ID", java.sql.Types.INTEGER);
stmt.setTimestamp("de", new java.sql.Timestamp(sdf.parse(fecInicio).getTime())); stmt.setTimestamp("de", new java.sql.Timestamp(sdf.parse(fecInicio).getTime()));
stmt.setTimestamp("ate", new java.sql.Timestamp(sdf.parse(fecFinal).getTime())); stmt.setTimestamp("ate", new java.sql.Timestamp(sdf.parse(fecFinal).getTime()));
@ -241,7 +243,9 @@ public class RelatorioAgenciaFechamentoNovo extends Relatorio {
if (empresa != null && !empresa.equals("") && !empresa.equals("-1")) { if (empresa != null && !empresa.equals("") && !empresa.equals("-1")) {
sql.append(" AND m.empresa_id = "+empresa+" "); sql.append(" AND m.empresa_id = "+empresa+" ");
} }
sql.append(" AND C.ACTIVO = 1 "); sql.append(" AND C.ACTIVO = 1 ");
sql.append(" AND C.MONEDA_ID = :MOEDA_ID ");
sql.append(" GROUP BY pv.PUNTOVENTA_ID, pv.nombpuntoventa "); sql.append(" GROUP BY pv.PUNTOVENTA_ID, pv.nombpuntoventa ");
sql.append(" ORDER BY pv.nombpuntoventa "); sql.append(" ORDER BY pv.nombpuntoventa ");

7
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidos.java
View File

@ -96,12 +96,19 @@ public class RelatorioBilhetesVendidos extends Relatorio {
} }
} }
} }
if (parametros.get("NUMPUNTOVENTA") != null && !parametros.get("NUMPUNTOVENTA").equals("-1")) { if (parametros.get("NUMPUNTOVENTA") != null && !parametros.get("NUMPUNTOVENTA").equals("-1")) {
sql.append(" and pv.PUNTOVENTA_ID IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")"); sql.append(" and pv.PUNTOVENTA_ID IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")");
} }
if (parametros.get("MOEDA_ID") != null) {
sql.append(" and B.MONEDA_ID = "+parametros.get("MOEDA_ID") );
}
if (parametros.get("ESTADO_ID") != null && !parametros.get("ESTADO_ID").equals("-1")) { if (parametros.get("ESTADO_ID") != null && !parametros.get("ESTADO_ID").equals("-1")) {
sql.append(" and est.estado_id = " + parametros.get("ESTADO_ID").toString() + ""); sql.append(" and est.estado_id = " + parametros.get("ESTADO_ID").toString() + "");
} }
if (parametros.get("STATUS") != null) { if (parametros.get("STATUS") != null) {
if ( !(parametros.get("STATUS").toString().contains("V") && parametros.get("STATUS").toString().contains("C")) ) { if ( !(parametros.get("STATUS").toString().contains("V") && parametros.get("STATUS").toString().contains("C")) ) {
if (parametros.get("STATUS").toString().contains("C")) { if (parametros.get("STATUS").toString().contains("C")) {

7
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBilhetesVendidosNovoLayout.java
View File

@ -112,12 +112,19 @@ public class RelatorioBilhetesVendidosNovoLayout extends Relatorio {
sql.append(" and c.FECHORVENTA >= :DATA_INICIAL and c.FECHORVENTA <= :DATA_FINAL "); sql.append(" and c.FECHORVENTA >= :DATA_INICIAL and c.FECHORVENTA <= :DATA_FINAL ");
sql.append(" and c.activo = 1"); sql.append(" and c.activo = 1");
sql.append(" and ei.activo = 1"); sql.append(" and ei.activo = 1");
if (parametros.get("NUMPUNTOVENTA") != null && !parametros.get("NUMPUNTOVENTA").equals("-1")) { if (parametros.get("NUMPUNTOVENTA") != null && !parametros.get("NUMPUNTOVENTA").equals("-1")) {
sql.append(" and pv.PUNTOVENTA_ID IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")"); sql.append(" and pv.PUNTOVENTA_ID IN (" + parametros.get("NUMPUNTOVENTA").toString() + ")");
} }
if (parametros.get("ESTADO_ID") != null && !parametros.get("ESTADO_ID").equals("-1")) { if (parametros.get("ESTADO_ID") != null && !parametros.get("ESTADO_ID").equals("-1")) {
sql.append(" and est.estado_id = " + parametros.get("ESTADO_ID").toString() + ""); sql.append(" and est.estado_id = " + parametros.get("ESTADO_ID").toString() + "");
} }
if (parametros.get("MOEDA_ID") != null) {
sql.append(" and c.MONEDA_ID = "+parametros.get("MOEDA_ID") );
}
if (parametros.get("STATUS") != null) { if (parametros.get("STATUS") != null) {
if (parametros.get("STATUS").toString().contains("V") && parametros.get("STATUS").toString().contains("C")) { if (parametros.get("STATUS").toString().contains("V") && parametros.get("STATUS").toString().contains("C")) {
sql.append(" and ((c.INDSTATUSBOLETO = 'C' AND c.MOTIVOCANCELACION_ID IS NOT NULL) OR (c.INDSTATUSBOLETO = 'V' AND c.MOTIVOCANCELACION_ID IS NULL)) "); sql.append(" and ((c.INDSTATUSBOLETO = 'C' AND c.MOTIVOCANCELACION_ID IS NOT NULL) OR (c.INDSTATUSBOLETO = 'V' AND c.MOTIVOCANCELACION_ID IS NULL)) ");

4
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java
View File

@ -45,6 +45,7 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
String tramoIds = parametros.get("tramoIds").toString(); String tramoIds = parametros.get("tramoIds").toString();
String linhaIds = parametros.get("linhaIds").toString(); String linhaIds = parametros.get("linhaIds").toString();
String empresa = parametros.get("empresa") != null ? parametros.get("empresa").toString() : ""; String empresa = parametros.get("empresa") != null ? parametros.get("empresa").toString() : "";
String moeda = parametros.get("MOEDA_ID") != null ? parametros.get("MOEDA_ID").toString() : "";
String sql = getSql(fecInicioVenda, fecFinalVenda, linhaIds, tramoIds, empresa); String sql = getSql(fecInicioVenda, fecFinalVenda, linhaIds, tramoIds, empresa);
@ -63,6 +64,8 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
stmt.setInt("empresa_id", Integer.parseInt(empresa)); stmt.setInt("empresa_id", Integer.parseInt(empresa));
} }
stmt.setInt("MOEDA_ID", Integer.parseInt(moeda));
ResultSet rset = null; ResultSet rset = null;
rset = stmt.executeQuery(); rset = stmt.executeQuery();
@ -220,6 +223,7 @@ public class RelatorioOperacionalFinanceiro extends Relatorio {
sql.append(" AND c.tipoventa_id <> 6 "); sql.append(" AND c.tipoventa_id <> 6 ");
//sql.append(" AND c.indreimpresion = 0 "); //sql.append(" AND c.indreimpresion = 0 ");
sql.append(" AND c.feccorte BETWEEN :fecInicioVenda AND :fecFinalVenda "); sql.append(" AND c.feccorte BETWEEN :fecInicioVenda AND :fecFinalVenda ");
sql.append(" AND c.MONEDA_ID = :MOEDA_ID ");
if (tramo != null && !tramo.equals("Todas") ) { if (tramo != null && !tramo.equals("Todas") ) {
sql.append(" AND t.TRAMO_ID in (").append(tramo).append(") "); sql.append(" AND t.TRAMO_ID in (").append(tramo).append(") ");

8
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioReceitaDiariaAgencia.java
View File

@ -135,7 +135,7 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio {
stmt.setString("ISESTADOTODOS", "N"); stmt.setString("ISESTADOTODOS", "N");
} }
else { else {
stmt.setNull("ESTADO_ID", java.sql.Types.INTEGER); stmt.setNull("ESTADO_ID", java.sql.Types.INTEGER);
stmt.setString("ISESTADOTODOS", "S"); stmt.setString("ISESTADOTODOS", "S");
} }
@ -143,11 +143,16 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio {
stmt.setInt("EMPRESA_ID", (Integer) parametros.get("EMPRESA_ID")); stmt.setInt("EMPRESA_ID", (Integer) parametros.get("EMPRESA_ID"));
else else
stmt.setNull("EMPRESA_ID", java.sql.Types.INTEGER); stmt.setNull("EMPRESA_ID", java.sql.Types.INTEGER);
if (parametros.get("TIPOPTOVTA_ID") != null) if (parametros.get("TIPOPTOVTA_ID") != null)
stmt.setInt("TIPOPTOVTA_ID", (Integer) parametros.get("TIPOPTOVTA_ID")); stmt.setInt("TIPOPTOVTA_ID", (Integer) parametros.get("TIPOPTOVTA_ID"));
else else
stmt.setNull("TIPOPTOVTA_ID", java.sql.Types.INTEGER); stmt.setNull("TIPOPTOVTA_ID", java.sql.Types.INTEGER);
if (parametros.get("MOEDA_ID") != null)
stmt.setInt("MOEDA_ID", (Integer) parametros.get("MOEDA_ID"));
else
stmt.setNull("MOEDA_ID", java.sql.Types.INTEGER);
if ((Boolean) parametros.get("B_DATA_FECHAMENTO")){ if ((Boolean) parametros.get("B_DATA_FECHAMENTO")){
stmt.setDate("DATA_INICIO", new java.sql.Date(((java.util.Date) parametros.get("DATA_INICIO")).getTime())); stmt.setDate("DATA_INICIO", new java.sql.Date(((java.util.Date) parametros.get("DATA_INICIO")).getTime()));
@ -808,6 +813,7 @@ public class RelatorioReceitaDiariaAgencia extends Relatorio {
sql.append(" AND PO.CIUDAD_ID = CO.CIUDAD_ID "); sql.append(" AND PO.CIUDAD_ID = CO.CIUDAD_ID ");
sql.append(" AND PD.CIUDAD_ID = CD.CIUDAD_ID "); sql.append(" AND PD.CIUDAD_ID = CD.CIUDAD_ID ");
sql.append(" AND CJ.INDSTATUSOPERACION = 'F' "); sql.append(" AND CJ.INDSTATUSOPERACION = 'F' ");
sql.append(" AND CJ.MONEDA_ID = :MOEDA_ID ");
sql.append(" AND ((CJ.TIPOVENTA_ID <> 18 AND CJ.INDREIMPRESION = 0) OR (CJ.TIPOVENTA_ID = 18)) "); sql.append(" AND ((CJ.TIPOVENTA_ID <> 18 AND CJ.INDREIMPRESION = 0) OR (CJ.TIPOVENTA_ID = 18)) ");
sql.append(" AND PV.TIPOPTOVTA_ID = NVL(:TIPOPTOVTA_ID, PV.TIPOPTOVTA_ID) "); sql.append(" AND PV.TIPOPTOVTA_ID = NVL(:TIPOPTOVTA_ID, PV.TIPOPTOVTA_ID) ");
sql.append(" AND TP.TIPOPTOVTA_ID = PV.TIPOPTOVTA_ID "); sql.append(" AND TP.TIPOPTOVTA_ID = PV.TIPOPTOVTA_ID ");

2
src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioOperacionalFinanceiro_pt_BR.properties
View File

@ -14,6 +14,8 @@ header.filtro.grupo=Grupo de Linhas\:
header.empresa=Empresa\: header.empresa=Empresa\:
header.periodo.viagem=Período Viagem\: header.periodo.viagem=Período Viagem\:
header.periodo.venda=Período Venda\: header.periodo.venda=Período Venda\:
header.periodo.corte=Período Corte\:
header.moeda=Moeda\:
header.tipopassagem=Tipo Passagem\: header.tipopassagem=Tipo Passagem\:
header.filtro.total.trecho=Total Trecho: header.filtro.total.trecho=Total Trecho:
header.filtro.total.linha=Total Linha: header.filtro.total.linha=Total Linha:

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

Binary file not shown.

145
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOperacionalFinanceiro.jrxml
View File

@ -2,7 +2,7 @@
<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="RelatorioOperacionalFinanceiro" pageWidth="950" pageHeight="595" orientation="Landscape" columnWidth="930" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" uuid="3ee05e26-199e-4ad2-a96b-dd421627aceb"> <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="RelatorioOperacionalFinanceiro" pageWidth="950" pageHeight="595" orientation="Landscape" columnWidth="930" leftMargin="10" rightMargin="10" topMargin="20" bottomMargin="20" uuid="3ee05e26-199e-4ad2-a96b-dd421627aceb">
<property name="ireport.zoom" value="1.239669421487605"/> <property name="ireport.zoom" value="1.239669421487605"/>
<property name="ireport.x" value="0"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="59"/> <property name="ireport.y" value="11"/>
<property name="net.sf.jasperreports.export.xls.exclude.origin.band.2" value="pageHeader"/> <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.exclude.origin.keep.first.band.2" value="columnHeader"/>
<property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/> <property name="net.sf.jasperreports.export.xls.remove.empty.space.between.rows" value="true"/>
@ -14,6 +14,7 @@
<parameter name="fecFinalVenda" class="java.lang.String"/> <parameter name="fecFinalVenda" class="java.lang.String"/>
<parameter name="nomb_empresa" class="java.lang.String"/> <parameter name="nomb_empresa" class="java.lang.String"/>
<parameter name="tramos" class="java.lang.String"/> <parameter name="tramos" class="java.lang.String"/>
<parameter name="descMoeda" class="java.lang.String"/>
<field name="tramoID" class="java.lang.String"/> <field name="tramoID" class="java.lang.String"/>
<field name="descTramo" class="java.lang.String"/> <field name="descTramo" class="java.lang.String"/>
<field name="descRuta" class="java.lang.String"/> <field name="descRuta" class="java.lang.String"/>
@ -307,7 +308,7 @@ $F{seguro}]]></variableExpression>
<groupHeader> <groupHeader>
<band height="20"> <band height="20">
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="86" y="0" width="844" height="20" uuid="b17c286b-b200-4718-9512-d804bd4d9d69"/> <reportElement uuid="b17c286b-b200-4718-9512-d804bd4d9d69" stretchType="RelativeToTallestObject" x="86" y="0" width="844" height="20"/>
<box leftPadding="5"> <box leftPadding="5">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
@ -319,7 +320,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$F{ruta} + " - " + $F{descRuta}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{ruta} + " - " + $F{descRuta}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="86" height="20" uuid="6b1adbde-9a51-4c5e-b1c3-570f389db804"/> <reportElement uuid="6b1adbde-9a51-4c5e-b1c3-570f389db804" stretchType="RelativeToBandHeight" x="0" y="0" width="86" height="20"/>
<box> <box>
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
@ -335,7 +336,7 @@ $F{seguro}]]></variableExpression>
<groupFooter> <groupFooter>
<band height="20"> <band height="20">
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="240" height="20" uuid="80a039a6-f791-4e3a-be58-5154fc917d04"/> <reportElement uuid="80a039a6-f791-4e3a-be58-5154fc917d04" stretchType="RelativeToTallestObject" x="0" y="0" width="240" height="20"/>
<box leftPadding="0"> <box leftPadding="0">
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -346,7 +347,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$R{header.filtro.total.linha}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{header.filtro.total.linha}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="417" y="0" width="126" height="20" uuid="7ac053bb-1883-4292-ad2c-020d22a4d35e"/> <reportElement uuid="7ac053bb-1883-4292-ad2c-020d22a4d35e" stretchType="RelativeToTallestObject" x="417" y="0" width="126" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -357,7 +358,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalLinhaPedagio}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalLinhaPedagio}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="841" y="0" width="89" height="20" uuid="338a967b-af06-4c03-809c-2c0d70a3b95f"/> <reportElement uuid="338a967b-af06-4c03-809c-2c0d70a3b95f" stretchType="RelativeToTallestObject" x="841" y="0" width="89" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -368,7 +369,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalLinhaGeral}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalLinhaGeral}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="543" y="0" width="126" height="20" uuid="7322a004-1807-46d6-acd3-fabdf1b54df7"/> <reportElement uuid="7322a004-1807-46d6-acd3-fabdf1b54df7" stretchType="RelativeToTallestObject" x="543" y="0" width="126" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -379,7 +380,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalLinhaSeguro}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalLinhaSeguro}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="240" y="0" width="91" height="20" uuid="8d889f0e-3a61-4d6f-9786-460c8c334fa3"/> <reportElement uuid="8d889f0e-3a61-4d6f-9786-460c8c334fa3" stretchType="RelativeToTallestObject" x="240" y="0" width="91" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -390,7 +391,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalLinhaQte}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalLinhaQte}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="331" y="0" width="86" height="20" uuid="40c07af6-4165-4761-ac70-bc145d0f4399"/> <reportElement uuid="40c07af6-4165-4761-ac70-bc145d0f4399" stretchType="RelativeToTallestObject" x="331" y="0" width="86" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -401,7 +402,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalLinhaTarifa}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalLinhaTarifa}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="669" y="0" width="86" height="20" uuid="ab046c7d-7177-4973-a564-829ea3d808e3"/> <reportElement uuid="ab046c7d-7177-4973-a564-829ea3d808e3" stretchType="RelativeToTallestObject" x="669" y="0" width="86" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -412,7 +413,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalLinhaTaxaEmbarque}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalLinhaTaxaEmbarque}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="755" y="0" width="86" height="20" uuid="1eacb9ad-448a-4ffe-9ca5-dbd980e47d56"/> <reportElement uuid="1eacb9ad-448a-4ffe-9ca5-dbd980e47d56" stretchType="RelativeToTallestObject" x="755" y="0" width="86" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -430,7 +431,7 @@ $F{seguro}]]></variableExpression>
<groupHeader> <groupHeader>
<band height="20"> <band height="20">
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="95" height="20" uuid="7d010e8b-f719-412a-9d83-8e4f39bfb42e"/> <reportElement uuid="7d010e8b-f719-412a-9d83-8e4f39bfb42e" stretchType="RelativeToBandHeight" x="0" y="0" width="95" height="20"/>
<box leftPadding="10"> <box leftPadding="10">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
@ -442,7 +443,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$R{detail.trecho}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.trecho}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="95" y="0" width="836" height="20" uuid="8f8ca4a1-bacc-4eed-9013-bf68dacc1818"/> <reportElement uuid="8f8ca4a1-bacc-4eed-9013-bf68dacc1818" stretchType="RelativeToTallestObject" x="95" y="0" width="836" height="20"/>
<box leftPadding="5"> <box leftPadding="5">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
@ -456,7 +457,7 @@ $F{seguro}]]></variableExpression>
</band> </band>
<band height="20"> <band height="20">
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToBandHeight" x="331" y="0" width="86" height="20" uuid="f1fb4c10-0b23-48a3-ab44-ec9423860a3a"/> <reportElement uuid="f1fb4c10-0b23-48a3-ab44-ec9423860a3a" stretchType="RelativeToBandHeight" x="331" y="0" width="86" height="20"/>
<box> <box>
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
@ -468,7 +469,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$R{detail.tarifa}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.tarifa}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToBandHeight" x="0" y="0" width="240" height="20" uuid="aa6e1262-d10a-466f-9b10-736d01b43c08"/> <reportElement uuid="aa6e1262-d10a-466f-9b10-736d01b43c08" stretchType="RelativeToBandHeight" x="0" y="0" width="240" height="20"/>
<box leftPadding="20"> <box leftPadding="20">
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
@ -480,7 +481,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$R{detail.tipo}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.tipo}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToBandHeight" x="240" y="0" width="91" height="20" uuid="9ef59886-6218-4cf5-8926-f7f2e1e95cc6"/> <reportElement uuid="9ef59886-6218-4cf5-8926-f7f2e1e95cc6" stretchType="RelativeToBandHeight" x="240" y="0" width="91" height="20"/>
<box> <box>
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
@ -492,7 +493,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$R{detail.quantidade}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.quantidade}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToBandHeight" x="755" y="0" width="86" height="20" uuid="86f8576e-d934-4f0d-9b87-4a40bef953ab"/> <reportElement uuid="86f8576e-d934-4f0d-9b87-4a40bef953ab" stretchType="RelativeToBandHeight" x="755" y="0" width="86" height="20"/>
<box> <box>
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
@ -504,7 +505,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$R{detail.outros}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.outros}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToBandHeight" x="417" y="0" width="126" height="20" uuid="a1aab05d-496e-4fe5-9c2e-760b7592a7fd"/> <reportElement uuid="a1aab05d-496e-4fe5-9c2e-760b7592a7fd" stretchType="RelativeToBandHeight" x="417" y="0" width="126" height="20"/>
<box> <box>
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
@ -516,7 +517,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$R{detail.pedagio}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.pedagio}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToBandHeight" x="543" y="0" width="126" height="20" uuid="7778d2ac-5f98-4955-9bbf-e474a1f16dad"/> <reportElement uuid="7778d2ac-5f98-4955-9bbf-e474a1f16dad" stretchType="RelativeToBandHeight" x="543" y="0" width="126" height="20"/>
<box> <box>
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
@ -528,7 +529,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$R{detail.seguro}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.seguro}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToBandHeight" x="841" y="0" width="89" height="20" uuid="3eb6f2e7-2aad-4354-8cff-3938c90800ee"/> <reportElement uuid="3eb6f2e7-2aad-4354-8cff-3938c90800ee" stretchType="RelativeToBandHeight" x="841" y="0" width="89" height="20"/>
<box> <box>
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
@ -540,7 +541,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$R{detail.valortotal}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{detail.valortotal}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToBandHeight" x="669" y="0" width="86" height="20" uuid="8aea1354-22f0-45a4-9382-21623ef9a45d"/> <reportElement uuid="8aea1354-22f0-45a4-9382-21623ef9a45d" stretchType="RelativeToBandHeight" x="669" y="0" width="86" height="20"/>
<box> <box>
<topPen lineWidth="0.5"/> <topPen lineWidth="0.5"/>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
@ -556,7 +557,7 @@ $F{seguro}]]></variableExpression>
<groupFooter> <groupFooter>
<band height="20"> <band height="20">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="417" y="0" width="126" height="20" uuid="56a43e72-3b34-492f-814b-d4d91af9827a"/> <reportElement uuid="56a43e72-3b34-492f-814b-d4d91af9827a" stretchType="RelativeToTallestObject" x="417" y="0" width="126" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -567,7 +568,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalTrechoPedagio}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalTrechoPedagio}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="543" y="0" width="126" height="20" uuid="6a3f6820-eef8-4c4a-8fe8-99dffd4c0387"/> <reportElement uuid="6a3f6820-eef8-4c4a-8fe8-99dffd4c0387" stretchType="RelativeToTallestObject" x="543" y="0" width="126" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -578,7 +579,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalTrechoSeguro}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalTrechoSeguro}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="669" y="0" width="86" height="20" uuid="6824eef6-a2aa-4fa8-94b0-51b752ed991b"/> <reportElement uuid="6824eef6-a2aa-4fa8-94b0-51b752ed991b" stretchType="RelativeToTallestObject" x="669" y="0" width="86" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -589,7 +590,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalTrechoTaxaEmbarque}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalTrechoTaxaEmbarque}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="755" y="0" width="86" height="20" uuid="701d1919-2074-4e36-9334-4b9867268fd7"/> <reportElement uuid="701d1919-2074-4e36-9334-4b9867268fd7" stretchType="RelativeToTallestObject" x="755" y="0" width="86" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -600,7 +601,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalTrechoOutros}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalTrechoOutros}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="331" y="0" width="86" height="20" uuid="16f4cb28-d52a-4906-87fc-119866b0216e"/> <reportElement uuid="16f4cb28-d52a-4906-87fc-119866b0216e" stretchType="RelativeToTallestObject" x="331" y="0" width="86" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -611,7 +612,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalTrechoTarifa}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalTrechoTarifa}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="240" y="0" width="91" height="20" uuid="51962a23-3050-4c64-8ef4-5200e9f89b24"/> <reportElement uuid="51962a23-3050-4c64-8ef4-5200e9f89b24" stretchType="RelativeToTallestObject" x="240" y="0" width="91" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -622,7 +623,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalTrechoQte}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalTrechoQte}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="841" y="0" width="89" height="20" uuid="30f159f7-6b91-4978-bb6f-f9bdee08c0b1"/> <reportElement uuid="30f159f7-6b91-4978-bb6f-f9bdee08c0b1" stretchType="RelativeToTallestObject" x="841" y="0" width="89" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -633,7 +634,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalTrechoGeral}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalTrechoGeral}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="240" height="20" uuid="c1d96c2e-a62c-4ffd-a9db-5a29ca226468"/> <reportElement uuid="c1d96c2e-a62c-4ffd-a9db-5a29ca226468" stretchType="RelativeToTallestObject" x="0" y="0" width="240" height="20"/>
<box leftPadding="10"> <box leftPadding="10">
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -649,32 +650,34 @@ $F{seguro}]]></variableExpression>
<pageHeader> <pageHeader>
<band height="40"> <band height="40">
<textField> <textField>
<reportElement x="0" y="0" width="711" height="40" uuid="12b3d65f-d956-477d-8b65-5ea6f0d2b533"/> <reportElement uuid="12b3d65f-d956-477d-8b65-5ea6f0d2b533" x="0" y="0" width="711" height="40"/>
<textElement markup="styled"> <textElement markup="styled">
<font size="24" isBold="true"/> <font size="24" isBold="true"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression> <textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression>
</textField> </textField>
<textField pattern="dd/MM/yyyy HH:mm"> <textField pattern="dd/MM/yyyy HH:mm">
<reportElement x="824" y="0" width="105" height="20" uuid="52e12d24-5bb1-4fc1-af61-f420e798c66a"/> <reportElement uuid="52e12d24-5bb1-4fc1-af61-f420e798c66a" x="824" y="0" width="105" height="20"/>
<textElement textAlignment="Left"/> <textElement textAlignment="Left"/>
<textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="883" y="20" width="24" height="20" uuid="cfa42b69-85c9-4d48-9b1b-d8f2582879b0"/> <reportElement uuid="cfa42b69-85c9-4d48-9b1b-d8f2582879b0" x="883" y="20" width="24" height="20"/>
<textElement textAlignment="Right"/> <textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression> <textFieldExpression><![CDATA[$V{PAGE_NUMBER}+" de"]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="711" y="0" width="113" height="40" uuid="c5f15e11-33dc-41c8-be0f-7f055efada1d"/> <reportElement uuid="c5f15e11-33dc-41c8-be0f-7f055efada1d" x="711" y="0" width="113" height="40"/>
<textElement/>
<textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="824" y="20" width="60" height="20" uuid="761f8d56-3236-45ff-a746-81ec2dc02d36"/> <reportElement uuid="761f8d56-3236-45ff-a746-81ec2dc02d36" x="824" y="20" width="60" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{header.pagina}]]></textFieldExpression>
</textField> </textField>
<textField evaluationTime="Report"> <textField evaluationTime="Report">
<reportElement x="907" y="20" width="22" height="20" uuid="1180fadc-8df9-49ca-a2b4-4b4740dd9edd"/> <reportElement uuid="1180fadc-8df9-49ca-a2b4-4b4740dd9edd" x="907" y="20" width="22" height="20"/>
<textElement textAlignment="Right"/> <textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression> <textFieldExpression><![CDATA[" " + $V{PAGE_NUMBER}]]></textFieldExpression>
</textField> </textField>
@ -684,43 +687,62 @@ $F{seguro}]]></variableExpression>
<band height="80"> <band height="80">
<printWhenExpression><![CDATA[$V{PAGE_NUMBER} < 2]]></printWhenExpression> <printWhenExpression><![CDATA[$V{PAGE_NUMBER} < 2]]></printWhenExpression>
<textField> <textField>
<reportElement x="0" y="40" width="130" height="20" isRemoveLineWhenBlank="true" uuid="033d8246-bdcb-4f51-99fb-9a7e1e040846"/> <reportElement uuid="033d8246-bdcb-4f51-99fb-9a7e1e040846" x="0" y="40" width="130" height="20" isRemoveLineWhenBlank="true"/>
<textElement/>
<textFieldExpression><![CDATA[$R{header.filtro.linha}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{header.filtro.linha}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="130" y="0" width="799" height="20" uuid="bc4fb484-e5b9-4e00-a875-fa1a34fb1b5a"/> <reportElement uuid="bc4fb484-e5b9-4e00-a875-fa1a34fb1b5a" x="130" y="0" width="287" height="20"/>
<textElement/>
<textFieldExpression><![CDATA[( $P{fecInicioVenda} != null ? ($P{fecInicioVenda} + " à " + $P{fecFinalVenda}) : "" )]]></textFieldExpression> <textFieldExpression><![CDATA[( $P{fecInicioVenda} != null ? ($P{fecInicioVenda} + " à " + $P{fecFinalVenda}) : "" )]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="130" y="20" width="799" height="20" isRemoveLineWhenBlank="true" uuid="0a122127-8dc3-48ee-8d8d-1996a5d48095"/> <reportElement uuid="0a122127-8dc3-48ee-8d8d-1996a5d48095" x="130" y="20" width="799" height="20" isRemoveLineWhenBlank="true"/>
<textElement/>
<textFieldExpression><![CDATA[$P{nomb_empresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$P{nomb_empresa}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="130" y="40" width="799" height="20" isRemoveLineWhenBlank="true" uuid="30cc417c-ec71-4991-9038-c22af291bcfa"/> <reportElement uuid="30cc417c-ec71-4991-9038-c22af291bcfa" x="130" y="40" width="799" height="20" isRemoveLineWhenBlank="true"/>
<textElement/>
<textFieldExpression><![CDATA[$P{linhas}]]></textFieldExpression> <textFieldExpression><![CDATA[$P{linhas}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="130" y="60" width="799" height="20" isRemoveLineWhenBlank="true" uuid="e112c89a-df7d-48ce-b4f8-924b4d6a7b75"/> <reportElement uuid="e112c89a-df7d-48ce-b4f8-924b4d6a7b75" x="130" y="60" width="799" height="20" isRemoveLineWhenBlank="true"/>
<textElement/>
<textFieldExpression><![CDATA[$P{tramos}]]></textFieldExpression> <textFieldExpression><![CDATA[$P{tramos}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="0" y="0" width="130" height="20" uuid="9cd4764a-478f-4eb1-9659-23f4e59706d6"/> <reportElement uuid="9cd4764a-478f-4eb1-9659-23f4e59706d6" x="0" y="0" width="130" height="20"/>
<textFieldExpression><![CDATA[$R{header.periodo.venda}]]></textFieldExpression> <textElement/>
<textFieldExpression><![CDATA[$R{header.periodo.corte}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="0" y="20" width="130" height="20" isRemoveLineWhenBlank="true" uuid="5b59df28-472e-4312-b332-5970a3abfca4"/> <reportElement uuid="5b59df28-472e-4312-b332-5970a3abfca4" x="0" y="20" width="130" height="20" isRemoveLineWhenBlank="true"/>
<textElement/>
<textFieldExpression><![CDATA[$R{header.empresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{header.empresa}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement x="0" y="60" width="130" height="20" isRemoveLineWhenBlank="true" uuid="b08a215e-6d67-4a14-a4b1-4445c5e4d21f"/> <reportElement uuid="b08a215e-6d67-4a14-a4b1-4445c5e4d21f" x="0" y="60" width="130" height="20" isRemoveLineWhenBlank="true"/>
<textElement/>
<textFieldExpression><![CDATA[$R{header.trecho}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{header.trecho}]]></textFieldExpression>
</textField> </textField>
<textField>
<reportElement uuid="5e1c0c95-5e71-4694-affb-a7dedd9583f5" x="417" y="0" width="126" height="20"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$R{header.moeda}]]></textFieldExpression>
</textField>
<textField>
<reportElement uuid="b993e75c-8390-4a88-a94f-ff7547f79c68" x="543" y="0" width="387" height="20"/>
<box leftPadding="2"/>
<textElement/>
<textFieldExpression><![CDATA[$P{descMoeda}]]></textFieldExpression>
</textField>
</band> </band>
</columnHeader> </columnHeader>
<detail> <detail>
<band height="20" splitType="Prevent"> <band height="20" splitType="Prevent">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="417" y="0" width="126" height="20" uuid="e91ddf3d-5ee2-42d3-b8d4-01c92a2f462a"/> <reportElement uuid="e91ddf3d-5ee2-42d3-b8d4-01c92a2f462a" stretchType="RelativeToTallestObject" x="417" y="0" width="126" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -731,7 +753,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="543" y="0" width="126" height="20" uuid="d9ec1d06-efc7-4a65-96a2-e88e89f4ca91"/> <reportElement uuid="d9ec1d06-efc7-4a65-96a2-e88e89f4ca91" stretchType="RelativeToTallestObject" x="543" y="0" width="126" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -742,7 +764,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$F{seguro}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{seguro}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="240" height="20" uuid="aeca5093-6645-4f7d-814f-48abec2773bc"/> <reportElement uuid="aeca5093-6645-4f7d-814f-48abec2773bc" stretchType="RelativeToTallestObject" x="0" y="0" width="240" height="20"/>
<box leftPadding="20"> <box leftPadding="20">
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -753,7 +775,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{tipo}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="240" y="0" width="91" height="20" uuid="6a5746f1-e112-4ea2-ac52-f3c4bf6f7c96"/> <reportElement uuid="6a5746f1-e112-4ea2-ac52-f3c4bf6f7c96" stretchType="RelativeToTallestObject" x="240" y="0" width="91" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -764,7 +786,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$F{qtde}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{qtde}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="331" y="0" width="86" height="20" uuid="1ae38af7-3815-4fc0-ba8c-a87f6a26914a"/> <reportElement uuid="1ae38af7-3815-4fc0-ba8c-a87f6a26914a" stretchType="RelativeToTallestObject" x="331" y="0" width="86" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -775,7 +797,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$F{tarifa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{tarifa}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="755" y="0" width="86" height="20" uuid="bde0e80b-872a-4b26-b882-83efc01c25b7"/> <reportElement uuid="bde0e80b-872a-4b26-b882-83efc01c25b7" stretchType="RelativeToTallestObject" x="755" y="0" width="86" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -786,7 +808,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$F{outros}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{outros}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="669" y="0" width="86" height="20" uuid="7e10a3dc-7e63-49cf-ab5a-87bd2e7aa213"/> <reportElement uuid="7e10a3dc-7e63-49cf-ab5a-87bd2e7aa213" stretchType="RelativeToTallestObject" x="669" y="0" width="86" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -797,7 +819,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$F{taxaembarque}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{taxaembarque}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="841" y="0" width="89" height="20" uuid="e4dc6a7f-049d-45e1-9c6d-231303fb288c"/> <reportElement uuid="e4dc6a7f-049d-45e1-9c6d-231303fb288c" stretchType="RelativeToTallestObject" x="841" y="0" width="89" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -812,7 +834,7 @@ $F{seguro}]]></variableExpression>
<summary> <summary>
<band height="20"> <band height="20">
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="417" y="0" width="126" height="20" uuid="5476b82a-2529-4b0f-baca-6f68e9a5f3bc"/> <reportElement uuid="5476b82a-2529-4b0f-baca-6f68e9a5f3bc" stretchType="RelativeToTallestObject" x="417" y="0" width="126" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -823,7 +845,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalPedagio}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalPedagio}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="0" y="0" width="240" height="20" uuid="6430a76b-5907-4783-9efc-08f108b1a19b"/> <reportElement uuid="6430a76b-5907-4783-9efc-08f108b1a19b" stretchType="RelativeToTallestObject" x="0" y="0" width="240" height="20"/>
<box leftPadding="0"> <box leftPadding="0">
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -834,7 +856,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$R{header.filtro.total}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{header.filtro.total}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="841" y="0" width="89" height="20" uuid="45b3533b-d863-423d-b6a0-682d2336d6ca"/> <reportElement uuid="45b3533b-d863-423d-b6a0-682d2336d6ca" stretchType="RelativeToTallestObject" x="841" y="0" width="89" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -845,7 +867,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalGeral}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalGeral}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="240" y="0" width="91" height="20" uuid="40caa383-bae0-43f5-9a2a-b93264740668"/> <reportElement uuid="40caa383-bae0-43f5-9a2a-b93264740668" stretchType="RelativeToTallestObject" x="240" y="0" width="91" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -856,7 +878,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalQte}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalQte}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="669" y="0" width="86" height="20" uuid="892dea7f-0a9d-40ab-8f69-7e950fefd73b"/> <reportElement uuid="892dea7f-0a9d-40ab-8f69-7e950fefd73b" stretchType="RelativeToTallestObject" x="669" y="0" width="86" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -867,7 +889,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalTaxaEmbarque}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalTaxaEmbarque}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="331" y="0" width="86" height="20" uuid="8dbbd30a-18f8-4c7d-bf8a-e526b28971fa"/> <reportElement uuid="8dbbd30a-18f8-4c7d-bf8a-e526b28971fa" stretchType="RelativeToTallestObject" x="331" y="0" width="86" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -878,7 +900,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalTarifa}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalTarifa}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="755" y="0" width="86" height="20" uuid="e423dc37-408c-4d74-bcb2-cd0e199b37aa"/> <reportElement uuid="e423dc37-408c-4d74-bcb2-cd0e199b37aa" stretchType="RelativeToTallestObject" x="755" y="0" width="86" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -889,7 +911,7 @@ $F{seguro}]]></variableExpression>
<textFieldExpression><![CDATA[$V{totalOutros}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{totalOutros}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true"> <textField isStretchWithOverflow="true" pattern="#,##0.00" isBlankWhenNull="true">
<reportElement stretchType="RelativeToTallestObject" x="543" y="0" width="126" height="20" uuid="df545e3c-3cd3-40e2-a440-c3ae45c27a5d"/> <reportElement uuid="df545e3c-3cd3-40e2-a440-c3ae45c27a5d" stretchType="RelativeToTallestObject" x="543" y="0" width="126" height="20"/>
<box> <box>
<leftPen lineWidth="0.0"/> <leftPen lineWidth="0.0"/>
<bottomPen lineWidth="0.0"/> <bottomPen lineWidth="0.0"/>
@ -904,7 +926,8 @@ $F{seguro}]]></variableExpression>
<noData> <noData>
<band height="22"> <band height="22">
<textField> <textField>
<reportElement x="1" y="0" width="930" height="22" uuid="254c9278-71b2-4ffa-926c-5b0055e02cda"/> <reportElement uuid="254c9278-71b2-4ffa-926c-5b0055e02cda" x="1" y="0" width="930" height="22"/>
<textElement/>
<textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression>
</textField> </textField>
</band> </band>

4
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMonedaController.java
View File

@ -47,6 +47,7 @@ public class EditarMonedaController extends MyGenericForwardComposer {
private BusquedaMonedaController busquedaMonedaController; private BusquedaMonedaController busquedaMonedaController;
private static Logger log = Logger.getLogger(EditarMonedaController.class); private static Logger log = Logger.getLogger(EditarMonedaController.class);
private MyTextbox txtNome; private MyTextbox txtNome;
private MyTextbox txtSimbolo;
private Row rowEquivalencia; private Row rowEquivalencia;
public Button getBtnApagar() { public Button getBtnApagar() {
@ -112,6 +113,7 @@ public class EditarMonedaController extends MyGenericForwardComposer {
public void onClick$btnSalvar(Event ev) throws InterruptedException { public void onClick$btnSalvar(Event ev) throws InterruptedException {
txtNome.getValue(); txtNome.getValue();
txtSimbolo.getValue();
try { try {
moneda.setActivo(true); moneda.setActivo(true);
moneda.setFecmodif(Calendar.getInstance().getTime()); moneda.setFecmodif(Calendar.getInstance().getTime());
@ -138,7 +140,7 @@ public class EditarMonedaController extends MyGenericForwardComposer {
Messagebox.OK, Messagebox.EXCLAMATION); Messagebox.OK, Messagebox.EXCLAMATION);
} else { } else {
monedaService.suscribir(moneda); monedaService.suscribir(moneda);
monedaList.addItem(moneda); monedaList.addItemNovo(moneda);
Messagebox.show( Messagebox.show(
Labels.getLabel("editarMonedaController.MSG.suscribirOK"), Labels.getLabel("editarMonedaController.MSG.suscribirOK"),

30
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAgenciaFechamentoController.java
View File

@ -18,11 +18,13 @@ import org.zkoss.zhtml.Messagebox;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Bandbox; import org.zkoss.zul.Bandbox;
import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Datebox; import org.zkoss.zul.Datebox;
import org.zkoss.zul.Paging; import org.zkoss.zul.Paging;
import org.zkoss.zul.Radio; import org.zkoss.zul.Radio;
import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.Moneda;
import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAgenciaFechamentoAntigo; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAgenciaFechamentoAntigo;
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAgenciaFechamentoDiario; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAgenciaFechamentoDiario;
@ -31,6 +33,7 @@ import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioAgenciaFechamento
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.EmpresaService;
import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxMoeda;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox;
@ -53,6 +56,7 @@ public class RelatorioAgenciaFechamentoController extends MyGenericForwardCompos
private Datebox datInicial; private Datebox datInicial;
private Datebox datFinal; private Datebox datFinal;
private MyComboboxEstandar cmbEmpresa; private MyComboboxEstandar cmbEmpresa;
private MyComboboxMoeda cmbMoeda;
private Bandbox bbPesquisaPuntoVenta; private Bandbox bbPesquisaPuntoVenta;
@Autowired @Autowired
private transient PagedListWrapper<PuntoVenta> plwPuntoVenta; private transient PagedListWrapper<PuntoVenta> plwPuntoVenta;
@ -68,6 +72,7 @@ public class RelatorioAgenciaFechamentoController extends MyGenericForwardCompos
private List<Empresa> lsEmpresas; private List<Empresa> lsEmpresas;
@SuppressWarnings({"unchecked", "rawtypes"})
private void executarRelatorio() throws Exception { private void executarRelatorio() throws Exception {
Map<String, Object> parametros = new HashMap<String, Object>(); Map<String, Object> parametros = new HashMap<String, Object>();
@ -82,6 +87,13 @@ public class RelatorioAgenciaFechamentoController extends MyGenericForwardCompos
} }
parametros.put("TITULO", Labels.getLabel("indexController.mniRelatorioAgenciaFechamento.label")); parametros.put("TITULO", Labels.getLabel("indexController.mniRelatorioAgenciaFechamento.label"));
Comboitem itemMoeda = cmbMoeda.getSelectedItem();
if (itemMoeda != null ) {
Moneda moeda = (Moneda) itemMoeda.getValue();
parametros.put("MOEDA_ID", moeda.getMonedaId());
parametros.put("MOEDA_SIMBOLO", moeda.getSimbolo());
}
String puntoVentaIds = ""; String puntoVentaIds = "";
String puntoVentas = ""; String puntoVentas = "";
List<PuntoVenta> lsPuntoVentaSelecionados = new ArrayList(Arrays.asList(puntoVentaSelList.getData())); List<PuntoVenta> lsPuntoVentaSelecionados = new ArrayList(Arrays.asList(puntoVentaSelList.getData()));
@ -100,6 +112,7 @@ public class RelatorioAgenciaFechamentoController extends MyGenericForwardCompos
puntoVentas = puntoVentas.substring(0, puntoVentas.length() - 1); puntoVentas = puntoVentas.substring(0, puntoVentas.length() - 1);
parametros.put("NUMPUNTOVENTA", puntoVentaIds); parametros.put("NUMPUNTOVENTA", puntoVentaIds);
} }
Relatorio relatorio; Relatorio relatorio;
Map<String, Object> args = new HashMap<String, Object>(); Map<String, Object> args = new HashMap<String, Object>();
if (radLayoutNovo.isChecked()) { if (radLayoutNovo.isChecked()) {
@ -155,6 +168,7 @@ public class RelatorioAgenciaFechamentoController extends MyGenericForwardCompos
Labels.getLabel("relatorioVendasBilheteiroController.window.title"), Labels.getLabel("relatorioVendasBilheteiroController.window.title"),
Messagebox.OK, Messagebox.INFORMATION); Messagebox.OK, Messagebox.INFORMATION);
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
log.error(ex);
} }
} }
} }
@ -219,4 +233,20 @@ public class RelatorioAgenciaFechamentoController extends MyGenericForwardCompos
public void setRadLayoutDiario(Radio radLayoutDiario) { public void setRadLayoutDiario(Radio radLayoutDiario) {
this.radLayoutDiario = radLayoutDiario; this.radLayoutDiario = radLayoutDiario;
} }
public MyComboboxMoeda getCmbMoeda() {
return cmbMoeda;
}
public void setCmbMoeda(MyComboboxMoeda cmbMoeda) {
this.cmbMoeda = cmbMoeda;
}
public Radio getRadLayoutResumo() {
return radLayoutResumo;
}
public void setRadLayoutResumo(Radio radLayoutResumo) {
this.radLayoutResumo = radLayoutResumo;
}
} }

29
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioBilhetesVendidosController.java
View File

@ -17,6 +17,7 @@ import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Bandbox; import org.zkoss.zul.Bandbox;
import org.zkoss.zul.Checkbox; import org.zkoss.zul.Checkbox;
import org.zkoss.zul.Combobox;
import org.zkoss.zul.Comboitem; import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Datebox; import org.zkoss.zul.Datebox;
import org.zkoss.zul.Paging; import org.zkoss.zul.Paging;
@ -24,6 +25,7 @@ import org.zkoss.zul.Radiogroup;
import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.Estado; import com.rjconsultores.ventaboletos.entidad.Estado;
import com.rjconsultores.ventaboletos.entidad.Moneda;
import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
import com.rjconsultores.ventaboletos.enums.IndStatusBoleto; import com.rjconsultores.ventaboletos.enums.IndStatusBoleto;
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBilhetesVendidos; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioBilhetesVendidos;
@ -59,6 +61,7 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose
private Datebox datFinal; private Datebox datFinal;
private MyComboboxEstandar cmbEmpresa; private MyComboboxEstandar cmbEmpresa;
private MyComboboxEstandar cmbEstado; private MyComboboxEstandar cmbEstado;
private Combobox cmbMoeda;
private List<Empresa> lsEmpresa; private List<Empresa> lsEmpresa;
private List<Estado> lsEstado; private List<Estado> lsEstado;
@Autowired @Autowired
@ -183,8 +186,18 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose
puntoVentas = puntoVentas.substring(0, puntoVentas.length() - 1); puntoVentas = puntoVentas.substring(0, puntoVentas.length() - 1);
parametros.put("NUMPUNTOVENTA", puntoVentaIds); parametros.put("NUMPUNTOVENTA", puntoVentaIds);
} }
filtro.append(puntoVentas).append(";"); filtro.append(puntoVentas).append(";");
filtro.append(" Moeda: ");
Comboitem itemMoeda = cmbMoeda.getSelectedItem();
if (itemMoeda != null ) {
Moneda moeda = (Moneda) itemMoeda.getValue();
parametros.put("MOEDA_ID", moeda.getMonedaId());
parametros.put("MOEDA_SIMBOLO", moeda.getSimbolo());
filtro.append(moeda.getDescmoneda() + ";");
}
parametros.put("DATA_INICIAL", (java.util.Date) this.datInicial.getValue()); parametros.put("DATA_INICIAL", (java.util.Date) this.datInicial.getValue());
parametros.put("DATA_FINAL", (java.util.Date) this.datFinal.getValue()); parametros.put("DATA_FINAL", (java.util.Date) this.datFinal.getValue());
parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioBilhetesVendidosController.window.title")); parametros.put("NOME_RELATORIO", Labels.getLabel("relatorioBilhetesVendidosController.window.title"));
@ -243,4 +256,20 @@ public class RelatorioBilhetesVendidosController extends MyGenericForwardCompose
openWindow("/component/reportView.zul", Labels.getLabel("relatorioBilhetesVendidosController.window.title"), args, MODAL); openWindow("/component/reportView.zul", Labels.getLabel("relatorioBilhetesVendidosController.window.title"), args, MODAL);
} }
public Combobox getCmbMoeda() {
return cmbMoeda;
}
public void setCmbMoeda(Combobox cmbMoeda) {
this.cmbMoeda = cmbMoeda;
}
public Checkbox getChkEmitido() {
return chkEmitido;
}
public void setChkEmitido(Checkbox chkEmitido) {
this.chkEmitido = chkEmitido;
}
} }

15
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOperacionalFinanceiroController.java
View File

@ -16,10 +16,12 @@ import org.zkoss.util.resource.Labels;
import org.zkoss.zhtml.Messagebox; import org.zkoss.zhtml.Messagebox;
import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Datebox; import org.zkoss.zul.Datebox;
import org.zkoss.zul.Textbox; import org.zkoss.zul.Textbox;
import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.Moneda;
import com.rjconsultores.ventaboletos.entidad.Parada; import com.rjconsultores.ventaboletos.entidad.Parada;
import com.rjconsultores.ventaboletos.entidad.Ruta; import com.rjconsultores.ventaboletos.entidad.Ruta;
import com.rjconsultores.ventaboletos.entidad.Tramo; import com.rjconsultores.ventaboletos.entidad.Tramo;
@ -29,6 +31,7 @@ import com.rjconsultores.ventaboletos.service.EmpresaService;
import com.rjconsultores.ventaboletos.service.RutaService; import com.rjconsultores.ventaboletos.service.RutaService;
import com.rjconsultores.ventaboletos.service.TramoService; import com.rjconsultores.ventaboletos.service.TramoService;
import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar;
import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxMoeda;
import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
@ -52,6 +55,7 @@ public class RelatorioOperacionalFinanceiroController extends MyGenericForwardCo
private Datebox datInicialVenda; private Datebox datInicialVenda;
private Datebox datFinalVenda; private Datebox datFinalVenda;
private MyComboboxEstandar cmbEmpresa; private MyComboboxEstandar cmbEmpresa;
private MyComboboxMoeda cmbMoeda;
private MyComboboxParada cmbParadaOrigem; private MyComboboxParada cmbParadaOrigem;
private MyComboboxParada cmbParadaDestino; private MyComboboxParada cmbParadaDestino;
@ -210,7 +214,16 @@ public class RelatorioOperacionalFinanceiroController extends MyGenericForwardCo
parametros.put("nomb_empresa", "Todas"); parametros.put("nomb_empresa", "Todas");
} }
parametros.put("TITULO", Labels.getLabel("relatorioOperacionalFinanceiroController.window.title")); Comboitem itemMoeda = cmbMoeda.getSelectedItem();
if (itemMoeda != null ) {
Moneda moeda = (Moneda) itemMoeda.getValue();
parametros.put("MOEDA_ID", moeda.getMonedaId());
parametros.put("MOEDA_SIMBOLO", moeda.getSimbolo());
parametros.put("descMoeda", moeda.getDescmoneda());
}
parametros.put("TITULO", Labels.getLabel("relatorioOpe"
+ "racionalFinanceiroController.window.title"));
Relatorio relatorio = new RelatorioOperacionalFinanceiro(parametros, dataSourceRead.getConnection()); Relatorio relatorio = new RelatorioOperacionalFinanceiro(parametros, dataSourceRead.getConnection());

21
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaDiariaAgenciaController.java
View File

@ -38,6 +38,7 @@ import org.zkoss.zul.api.Row;
import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Empresa;
import com.rjconsultores.ventaboletos.entidad.Estado; import com.rjconsultores.ventaboletos.entidad.Estado;
import com.rjconsultores.ventaboletos.entidad.GrupoRuta; import com.rjconsultores.ventaboletos.entidad.GrupoRuta;
import com.rjconsultores.ventaboletos.entidad.Moneda;
import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta;
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioReceitaDiariaAgencia; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioReceitaDiariaAgencia;
@ -61,6 +62,7 @@ import com.trg.search.Filter;
*/ */
@Controller("relatorioReceitaDiariaAgenciaController") @Controller("relatorioReceitaDiariaAgenciaController")
@Scope("prototype") @Scope("prototype")
@SuppressWarnings({"unchecked", "rawtypes"})
public class RelatorioReceitaDiariaAgenciaController extends MyGenericForwardComposer { public class RelatorioReceitaDiariaAgenciaController extends MyGenericForwardComposer {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -98,6 +100,7 @@ public class RelatorioReceitaDiariaAgenciaController extends MyGenericForwardCom
private Textbox txtPalavraPesquisa; private Textbox txtPalavraPesquisa;
private Combobox cmbEstado; private Combobox cmbEstado;
private Combobox cmbMoeda;
private Combobox cmbEmpresa; private Combobox cmbEmpresa;
private Combobox cmbPuntoVenta; private Combobox cmbPuntoVenta;
private Combobox cmbTipoPuntoVenta; private Combobox cmbTipoPuntoVenta;
@ -319,6 +322,7 @@ public class RelatorioReceitaDiariaAgenciaController extends MyGenericForwardCom
* @throws Exception * @throws Exception
* *
*/ */
private void executarRelatorio() throws Exception { private void executarRelatorio() throws Exception {
Map<String, Object> parametros = new HashMap<String, Object>(); Map<String, Object> parametros = new HashMap<String, Object>();
@ -402,7 +406,14 @@ public class RelatorioReceitaDiariaAgenciaController extends MyGenericForwardCom
else else
filtro.append("Data da Venda;"); filtro.append("Data da Venda;");
filtro.append(" Moeda: ");
Comboitem itemMoeda = cmbMoeda.getSelectedItem();
if (itemMoeda != null ) {
Moneda moeda = (Moneda) itemMoeda.getValue();
parametros.put("MOEDA_ID", moeda.getMonedaId());
parametros.put("MOEDA_SIMBOLO", moeda.getSimbolo());
filtro.append(moeda.getDescmoneda() + ";");
}
parametros.put("FILTROS", filtro.toString()); parametros.put("FILTROS", filtro.toString());
@ -477,4 +488,12 @@ public class RelatorioReceitaDiariaAgenciaController extends MyGenericForwardCom
estadoList.setData(lsEstado); estadoList.setData(lsEstado);
} }
public Combobox getCmbMoeda() {
return cmbMoeda;
}
public void setCmbMoeda(Combobox cmbMoeda) {
this.cmbMoeda = cmbMoeda;
}
} }

46
src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxMoeda.java 100644
View File

@ -0,0 +1,46 @@
package com.rjconsultores.ventaboletos.web.utilerias;
import java.util.List;
import org.apache.log4j.Logger;
import org.zkoss.zkplus.databind.BindingListModel;
import org.zkoss.zkplus.databind.BindingListModelList;
import org.zkoss.zkplus.spring.SpringUtil;
import org.zkoss.zul.Combobox;
import com.rjconsultores.ventaboletos.entidad.Moneda;
import com.rjconsultores.ventaboletos.service.MonedaService;
public class MyComboboxMoeda extends Combobox {
private static final long serialVersionUID = 1L;
private static Logger log = Logger.getLogger(MyComboboxMoeda.class);
private MonedaService moedaService;
private List<Moneda> lsMoeda;
private Moneda monedaDefault;
public MyComboboxMoeda() {
super();
moedaService = (MonedaService) SpringUtil.getBean("monedaService");
lsMoeda = getListMoneda();
this.setAutodrop(false);
this.setAutocomplete(false);
BindingListModel listModelMoeda = new BindingListModelList(lsMoeda, true);
MyComboboxMoeda.this.setModel(listModelMoeda);
if(monedaDefault == null) {
monedaDefault = moedaService.obtenerID(1);
if(monedaDefault != null) {
this.setValue(monedaDefault.getDescmoneda());
}
}
}
public List<Moneda> getListMoneda() {
return moedaService.obtenerTodosSortedByID();
}
}

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

@ -1400,6 +1400,7 @@ busquedaMonedaController.btnCerrar.tooltiptext=Fechar
busquedaMonedaController.btnPesquisa.label=Pesquisa busquedaMonedaController.btnPesquisa.label=Pesquisa
busquedaMonedaController.lhId.label=ID busquedaMonedaController.lhId.label=ID
busquedaMonedaController.lhDesc.label=Descrição busquedaMonedaController.lhDesc.label=Descrição
busquedaMonedaController.lhCve.label = Símbolo
busquedaMonedaController.txtNombre.label=Moeda busquedaMonedaController.txtNombre.label=Moeda
# Pantalla Editar Moeda # Pantalla Editar Moeda
@ -9319,3 +9320,5 @@ editarOperadoresDispositivoController.btnBorrarUsuario.tooltiptext = Eliminar
editarOperadoresDispositivoController.btnSalvar.tooltiptext = Salvar editarOperadoresDispositivoController.btnSalvar.tooltiptext = Salvar
editarOperadoresDispositivoController.MSG.naoAdicionadoItemNovo = Não foi adicionado ítem novo na lista editarOperadoresDispositivoController.MSG.naoAdicionadoItemNovo = Não foi adicionado ítem novo na lista
editarOperadoresDispositivoController.MSG.suscribirOK = Usuario do dipositivo alterados com sucesso editarOperadoresDispositivoController.MSG.suscribirOK = Usuario do dipositivo alterados com sucesso
myComboboxMoeda.label.moeda= Moeda

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

@ -1357,6 +1357,7 @@ busquedaMonedaController.btnCerrar.tooltiptext = Cerrar
busquedaMonedaController.btnPesquisa.label = Búsqueda busquedaMonedaController.btnPesquisa.label = Búsqueda
busquedaMonedaController.lhId.label = ID busquedaMonedaController.lhId.label = ID
busquedaMonedaController.lhDesc.label = Descripción busquedaMonedaController.lhDesc.label = Descripción
busquedaMonedaController.lhCve.label = Símbolo
busquedaMonedaController.txtNombre.label = Moneda busquedaMonedaController.txtNombre.label = Moneda
# Pantalla Editar Moneda # Pantalla Editar Moneda
@ -1839,7 +1840,6 @@ editarPuntoVentaController.lbCheckDepositoAG.value = Depósito
editarPuntoVentaController.lbCheckAdiantamentoAG.value = Adelantes editarPuntoVentaController.lbCheckAdiantamentoAG.value = Adelantes
editarPuntoVentaController.lbUTRRepasse.value = Repassa UTR editarPuntoVentaController.lbUTRRepasse.value = Repassa UTR
editarPuntoVentaController.lbQrcodeTaxaEmbarqueRodTTL.label=Imprimir QR Code Taxa de Embarque Rodoviária TTL
# Fechamento Conta Contábil Agencia # Fechamento Conta Contábil Agencia
editarPuntoVentaController.puntoventa.label = Agencia editarPuntoVentaController.puntoventa.label = Agencia
@ -9266,6 +9266,8 @@ relatorioVendaConexaoRuta.puntoVentaSelectedList.codigo = Código
relatorioVendaConexaoRuta.puntoVentaSelectedList.nome = Nombre relatorioVendaConexaoRuta.puntoVentaSelectedList.nome = Nombre
relatorioVendaConexaoRuta.lbAgencia.value = Punto Venta relatorioVendaConexaoRuta.lbAgencia.value = Punto Venta
myComboboxMoeda.label.moeda= Moeda
# Configuracao Gerador Contrato # Configuracao Gerador Contrato

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

@ -1552,6 +1552,7 @@ busquedaMonedaController.btnCerrar.tooltiptext = Fechar
busquedaMonedaController.btnPesquisa.label = Pesquisa busquedaMonedaController.btnPesquisa.label = Pesquisa
busquedaMonedaController.lhId.label = ID busquedaMonedaController.lhId.label = ID
busquedaMonedaController.lhDesc.label = Descrição busquedaMonedaController.lhDesc.label = Descrição
busquedaMonedaController.lhCve.label = Símbolo
busquedaMonedaController.txtNombre.label = Moeda busquedaMonedaController.txtNombre.label = Moeda
# Pantalla Editar Moeda # Pantalla Editar Moeda
@ -2079,8 +2080,6 @@ editarPuntoVentaController.lbQSA.value = Q.S.A.
editarPuntoVentaController.lbTipoSocioAdministrador.value = Sócio Administrador editarPuntoVentaController.lbTipoSocioAdministrador.value = Sócio Administrador
editarPuntoVentaController.lbTipoSocioProprietario.value = Sócio Proprietário editarPuntoVentaController.lbTipoSocioProprietario.value = Sócio Proprietário
editarPuntoVentaController.lbTipoProprietario.value = Proprietário editarPuntoVentaController.lbTipoProprietario.value = Proprietário
editarPuntoVentaController.lbQrcodeTaxaEmbarqueRodTTL.label=Imprimir QR Code Taxa de Embarque Rodoviária TTL
# Fechamento Conta Corrente Agencia # Fechamento Conta Corrente Agencia
editarPuntoVentaController.puntoventa.label = Agencia editarPuntoVentaController.puntoventa.label = Agencia
@ -9207,8 +9206,8 @@ relatorioOperacionalFinanceiroController.lbDestino.value = Destino
relatorioOperacionalFinanceiroController.lbTramo.value = Trecho relatorioOperacionalFinanceiroController.lbTramo.value = Trecho
relatorioOperacionalFinanceiroController.lbNumTramo.value = Num. Trecho relatorioOperacionalFinanceiroController.lbNumTramo.value = Num. Trecho
relatorioOperacionalFinanceiroController.lbTipoGratuidade.value = Tipos de Passagens relatorioOperacionalFinanceiroController.lbTipoGratuidade.value = Tipos de Passagens
relatorioOperacionalFinanceiroController.lbDataIniVenda.value = Data Inicio relatorioOperacionalFinanceiroController.lbDataIniVenda.value = Data Corte Inicio
relatorioOperacionalFinanceiroController.lbDataFinVenda.value = Data Fim relatorioOperacionalFinanceiroController.lbDataFinVenda.value = Data Corte Fim
relatorioOperacionalFinanceiroController.btnPesquisa.value = Pesquisar relatorioOperacionalFinanceiroController.btnPesquisa.value = Pesquisar
relatorioOperacionalFinanceiroController.btnLimpar.value = Limpar relatorioOperacionalFinanceiroController.btnLimpar.value = Limpar
relatorioOperacionalFinanceiroController.lbNumRuta.value = Num. Linha relatorioOperacionalFinanceiroController.lbNumRuta.value = Num. Linha
@ -9943,6 +9942,9 @@ relatorioGratuidadeAGEPANController.lbPrefixo.value = Prefixo
relatorioGratuidadeAGEPANController.lvVenda = Venda relatorioGratuidadeAGEPANController.lvVenda = Venda
relatorioGratuidadeAGEPANController.lbOrgao.value = Orgão Concedente relatorioGratuidadeAGEPANController.lbOrgao.value = Orgão Concedente
myComboboxMoeda.label.moeda= Moeda
relatorioGratuidadeAGEPANController.lbOrgao.value = Orgão Concedente
# Configuracao Gerador Contrato # Configuracao Gerador Contrato
configLayoutGeradorContratoController.window.title = Config Layout Gerador Contrato configLayoutGeradorContratoController.window.title = Config Layout Gerador Contrato

6
web/gui/catalogos/editarMoneda.zul
View File

@ -36,6 +36,12 @@
value="@{winEditarMoneda$composer.moneda.descmoneda}" value="@{winEditarMoneda$composer.moneda.descmoneda}"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"/> use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"/>
</row> </row>
<row>
<label id="lbSimbolo" value="${c:l('busquedaMonedaController.lhCve.label')}"/>
<textbox id="txtSimbolo" constraint="no empty" width="30%" maxlength="3"
value="@{winEditarMoneda$composer.moneda.simbolo}"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"/>
</row>
<row id="rowEquivalencia"> <row id="rowEquivalencia">
<label value="${c:l('lb.Equivalencia')}"/> <label value="${c:l('lb.Equivalencia')}"/>
<textbox id="txtEquivalencia" width="100px" maxlength="10" <textbox id="txtEquivalencia" width="100px" maxlength="10"

13
web/gui/relatorios/filtroRelatorioAgenciaFechamento.zul
View File

@ -7,14 +7,14 @@
<zk xmlns="http://www.zkoss.org/2005/zul"> <zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winRelatorioAgenciaFechamento" <window id="winRelatorioAgenciaFechamento"
apply="${relatorioAgenciaFechamentoController}" apply="${relatorioAgenciaFechamentoController}"
contentStyle="overflow:auto" height="283px" width="800px" contentStyle="overflow:auto" height="317px" width="800px"
border="normal" sizable="true"> border="normal" sizable="true">
<grid fixedLayout="true"> <grid fixedLayout="true">
<columns> <columns>
<column width="20%" /> <column width="15%" />
<column width="30%" /> <column width="40%" />
<column width="20%" /> <column width="15%" />
<column width="30%" /> <column width="30%" />
</columns> </columns>
<rows> <rows>
@ -85,6 +85,9 @@
<radio id="radLayoutDiario" label="${c:l('relatorioVendasBilheteiroController.lbLayoutDiario.value')}" /> <radio id="radLayoutDiario" label="${c:l('relatorioVendasBilheteiroController.lbLayoutDiario.value')}" />
<radio id="radLayoutResumo" label="${c:l('relatorioVendasBilheteiroController.lbLayoutResumo.value')}" /> <radio id="radLayoutResumo" label="${c:l('relatorioVendasBilheteiroController.lbLayoutResumo.value')}" />
</radiogroup> </radiogroup>
<label value="${c:l('myComboboxMoeda.label.moeda')}" />
<combobox id="cmbMoeda" width="90%" buttonVisible="true"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxMoeda" />
</row> </row>
<row spans="4"> <row spans="4">
<listbox id="puntoVentaSelList" mold="paging" <listbox id="puntoVentaSelList" mold="paging"
@ -100,6 +103,8 @@
<listheader width="5%" /> <listheader width="5%" />
</listhead> </listhead>
</listbox> </listbox>
</row>
<row spans="4">
<paging id="pagingSelPuntoVenta" pageSize="10" /> <paging id="pagingSelPuntoVenta" pageSize="10" />
</row> </row>
</rows> </rows>

20
web/gui/relatorios/filtroRelatorioBilhetesVendidos.zul
View File

@ -6,7 +6,7 @@
<zk xmlns="http://www.zkoss.org/2005/zul"> <zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winFiltroRelatorioBilhetesVendidos" <window id="winFiltroRelatorioBilhetesVendidos"
apply="${relatorioBilhetesVendidosController}" apply="${relatorioBilhetesVendidosController}"
contentStyle="overflow:auto" height="410px" width="550px" contentStyle="overflow:auto" height="427px" width="550px"
border="normal"> border="normal">
<grid fixedLayout="true"> <grid fixedLayout="true">
@ -96,6 +96,8 @@
<listheader width="5%" /> <listheader width="5%" />
</listhead> </listhead>
</listbox> </listbox>
</row>
<row spans="4">
<paging id="pagingSelPuntoVenta" pageSize="10" /> <paging id="pagingSelPuntoVenta" pageSize="10" />
</row> </row>
</rows> </rows>
@ -125,7 +127,17 @@
<radio value="DATA_EMISSAO" /> <radio value="DATA_EMISSAO" />
</radiogroup> </radiogroup>
</row> </row>
<row spans="1"> </rows>
</grid>
<grid fixedLayout="true">
<columns>
<column width="20%" />
<column width="30%" />
<column width="20%" />
<column width="30%" />
</columns>
<rows>
<row >
<label <label
value="${c:l('relatorioBilhetesVendidosController.lbEstado.value')}" /> value="${c:l('relatorioBilhetesVendidosController.lbEstado.value')}" />
<combobox id="cmbEstado" <combobox id="cmbEstado"
@ -133,6 +145,10 @@
mold="rounded" buttonVisible="true" mold="rounded" buttonVisible="true"
style="width: 150px;" style="width: 150px;"
model="@{winFiltroRelatorioBilhetesVendidos$composer.lsEstado}" /> model="@{winFiltroRelatorioBilhetesVendidos$composer.lsEstado}" />
<label value="${c:l('myComboboxMoeda.label.moeda')}" />
<combobox id="cmbMoeda" width="90%" buttonVisible="true"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxMoeda" />
</row> </row>
</rows> </rows>
</grid> </grid>

26
web/gui/relatorios/filtroRelatorioOperacionalFinanceiro.zul
View File

@ -7,26 +7,26 @@
<zk xmlns="http://www.zkoss.org/2005/zul"> <zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winFiltroRelatorioOperacionalFinanceiro" <window id="winFiltroRelatorioOperacionalFinanceiro"
apply="${relatorioOperacionalFinanceiroController}" apply="${relatorioOperacionalFinanceiroController}"
contentStyle="overflow:auto" height="470px" width="580px" contentStyle="overflow:auto" height="405px" width="580px"
border="normal"> border="normal">
<grid fixedLayout="true"> <grid fixedLayout="true">
<columns> <columns>
<column width="25%" /> <column width="20%" />
<column width="75%" /> <column width="30%" />
<column width="20%" />
<column width="30%" />
</columns> </columns>
<rows> <rows>
<row> <row>
<label <label
value="${c:l('relatorioOperacionalFinanceiroController.lbDataIniVenda.value')}" /> value="${c:l('relatorioOperacionalFinanceiroController.lbDataIniVenda.value')}" />
<datebox id="datInicialVenda" width="30%" <datebox id="datInicialVenda" width="90%"
mold="rounded" format="dd/MM/yyyy" maxlength="10" /> mold="rounded" format="dd/MM/yyyy" maxlength="10" />
</row>
<row>
<label <label
value="${c:l('relatorioOperacionalFinanceiroController.lbDataFinVenda.value')}" /> value="${c:l('relatorioOperacionalFinanceiroController.lbDataFinVenda.value')}" />
<datebox id="datFinalVenda" width="30%" <datebox id="datFinalVenda" width="90%"
mold="rounded" format="dd/MM/yyyy" maxlength="10" /> mold="rounded" format="dd/MM/yyyy" maxlength="10" />
</row> </row>
@ -37,9 +37,13 @@
maxlength="60" mold="rounded" buttonVisible="true" maxlength="60" mold="rounded" buttonVisible="true"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
model="@{winFiltroRelatorioOperacionalFinanceiro$composer.lsEmpresas}" /> model="@{winFiltroRelatorioOperacionalFinanceiro$composer.lsEmpresas}" />
<label value="${c:l('myComboboxMoeda.label.moeda')}" />
<combobox id="cmbMoeda" width="90%" buttonVisible="true"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxMoeda" />
</row> </row>
<row> <row spans="1,3">
<label <label
value="${c:l('relatorioOperacionalFinanceiroController.lbLinha.value')}" /> value="${c:l('relatorioOperacionalFinanceiroController.lbLinha.value')}" />
@ -83,7 +87,7 @@
</row> </row>
<row> <row>
<cell colspan="2"> <cell colspan="4">
<borderlayout height="100px"> <borderlayout height="100px">
<center border="0"> <center border="0">
<listbox id="linhaListSelList" <listbox id="linhaListSelList"
@ -110,7 +114,7 @@
</cell> </cell>
</row> </row>
<row> <row spans="1,3">
<label <label
value="${c:l('relatorioOperacionalFinanceiroController.lbTramo.value')}" /> value="${c:l('relatorioOperacionalFinanceiroController.lbTramo.value')}" />
@ -160,7 +164,7 @@
</row> </row>
<row> <row>
<cell colspan="2"> <cell colspan="4">
<borderlayout height="100px"> <borderlayout height="100px">
<center border="0"> <center border="0">
<listbox id="tramoListSelList" <listbox id="tramoListSelList"

19
web/gui/relatorios/filtroRelatorioReceitaDiariaAgencia.zul
View File

@ -7,7 +7,7 @@
<zk xmlns="http://www.zkoss.org/2005/zul"> <zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winFiltroRelatorioReceitaDiariaAgencia" <window id="winFiltroRelatorioReceitaDiariaAgencia"
apply="${relatorioReceitaDiariaAgenciaController}" apply="${relatorioReceitaDiariaAgenciaController}"
contentStyle="overflow:auto" height="374px" width="550px" contentStyle="overflow:auto" height="387px" width="550px"
border="normal"> border="normal">
<grid fixedLayout="true"> <grid fixedLayout="true">
<columns> <columns>
@ -174,11 +174,18 @@
</cell> </cell>
</row> </row>
<row> <row>
<label value="${c:l('financeiroGrupoLinhasController.label.grupo.linhas')}" /> <cell colspan="2">
<combobox id="cmbGrupoRuta" width="90%" <label value="${c:l('financeiroGrupoLinhasController.label.grupo.linhas')}" />
mold="rounded" buttonVisible="true" <combobox id="cmbGrupoRuta" width="90%"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar" mold="rounded" buttonVisible="true"
model="@{winFiltroRelatorioReceitaDiariaAgencia$composer.lsGrupoRuta}" /> use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar"
model="@{winFiltroRelatorioReceitaDiariaAgencia$composer.lsGrupoRuta}" />
</cell>
<cell colspan="2">
<label value="${c:l('myComboboxMoeda.label.moeda')}" />
<combobox id="cmbMoeda" width="90%" buttonVisible="true"
use="com.rjconsultores.ventaboletos.web.utilerias.MyComboboxMoeda" />
</cell>
</row> </row>
</rows> </rows>
</grid> </grid>