From 087296e13cfcb6c9438ab9df0d920fe1fc6d4ae1 Mon Sep 17 00:00:00 2001 From: emerson Date: Wed, 20 Jun 2018 17:25:48 +0000 Subject: [PATCH] fixes bug#0011329 dev: thiago.veloso qua: renato.oliveira git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@82793 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioEmpresaCorrida.java | 25 +- .../RelatorioEmpresaCorridaNovoLayout.java | 68 +++ ...orioEmpresaCorridaNovoLayout_es.properties | 29 ++ ...oEmpresaCorridaNovoLayout_pt_BR.properties | 30 ++ .../RelatorioEmpresaCorrida_pt_BR.properties | 1 + .../templates/RelatorioEmpresaCorrida.jasper | Bin 41852 -> 41950 bytes .../templates/RelatorioEmpresaCorrida.jrxml | 56 +-- .../RelatorioEmpresaCorridaNovoLayout.jasper | Bin 0 -> 47810 bytes .../RelatorioEmpresaCorridaNovoLayout.jrxml | 458 ++++++++++++++++++ .../RelatorioEmpresaCorridaBean.java | 36 ++ .../RelatorioEmpresaCorridaController.java | 33 +- .../filtroRelatorioEmpresaCorrida.zul | 9 +- 12 files changed, 696 insertions(+), 49 deletions(-) create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorridaNovoLayout.java create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorridaNovoLayout_es.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorridaNovoLayout_pt_BR.properties create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorridaNovoLayout.jasper create mode 100644 src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorridaNovoLayout.jrxml diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java index 4224f3b9a..8c9747b1d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java @@ -2,6 +2,7 @@ package com.rjconsultores.ventaboletos.relatorios.impl; import java.sql.Connection; import java.sql.ResultSet; +import java.sql.SQLException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.List; @@ -57,15 +58,9 @@ public class RelatorioEmpresaCorrida extends Relatorio { log.info("Preenchendo bean:" + System.currentTimeMillis()); while (rset.next()) { - RelatorioEmpresaCorridaBean rec = new RelatorioEmpresaCorridaBean(); - rec.setRutaId(rset.getInt("ruta_id")); - rec.setAbonos(rset.getBigDecimal("abonos")); - rec.setBoletos(rset.getBigDecimal("boletos")); - rec.setEmpresa(rset.getString("nombempresa")); - rec.setLinea(rset.getString("linea")); - rec.setPasajerosTransportados(rset.getInt("passageirosTransp")); - - lsDadosRelatorio.add(rec); + RelatorioEmpresaCorridaBean bean = new RelatorioEmpresaCorridaBean(); + setDadosBean(rset, bean); + lsDadosRelatorio.add(bean); } log.info("Fim bean:" + System.currentTimeMillis()); @@ -105,8 +100,18 @@ public class RelatorioEmpresaCorrida extends Relatorio { setLsDadosRelatorio(lsAux); } } + }); } + + protected void setDadosBean(ResultSet rset, RelatorioEmpresaCorridaBean bean) throws SQLException { + bean.setRutaId(rset.getInt("ruta_id")); + bean.setAbonos(rset.getBigDecimal("abonos")); + bean.setBoletos(rset.getBigDecimal("boletos")); + bean.setEmpresa(rset.getString("nombempresa")); + bean.setLinea(rset.getString("linea")); + bean.setPasajerosTransportados(rset.getInt("passageirosTransp")); + } public void setLsDadosRelatorio(List lsDadosRelatorio) { this.setCollectionDataSource(new JRBeanCollectionDataSource(lsDadosRelatorio)); @@ -125,7 +130,7 @@ public class RelatorioEmpresaCorrida extends Relatorio { return null; } - private String getSql(String empresa) { + protected String getSql(String empresa) { StringBuilder sql = new StringBuilder(); sql.append("SELECT "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorridaNovoLayout.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorridaNovoLayout.java new file mode 100644 index 000000000..303fa241a --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorridaNovoLayout.java @@ -0,0 +1,68 @@ +package com.rjconsultores.ventaboletos.relatorios.impl; + +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Map; + +import org.apache.commons.lang.StringUtils; + +import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioEmpresaCorridaBean; + +public class RelatorioEmpresaCorridaNovoLayout extends RelatorioEmpresaCorrida { + + public RelatorioEmpresaCorridaNovoLayout(Map parametros, Connection conexao) throws Exception { + super(parametros, conexao); + } + + @Override + protected void setDadosBean(ResultSet rset, RelatorioEmpresaCorridaBean bean) throws SQLException { + super.setDadosBean(rset, bean); + bean.setDataCorrida(StringUtils.defaultString(rset.getString("dataCorrida"))); + bean.setTurnoOrigem(StringUtils.defaultString(rset.getString("turnoOrigem"))); + bean.setOrigem(StringUtils.defaultString(rset.getString("origem"))); + bean.setDestino(StringUtils.defaultString(rset.getString("destino"))); + } + + @Override + protected String getSql(String empresa) { + StringBuilder sql = new StringBuilder(); + sql.append("SELECT "); + sql.append(" e.empresa_id, "); + sql.append(" e.nombempresa, "); + sql.append(" r.ruta_id, "); + sql.append(" r.descruta AS linea, "); + sql.append(" COALESCE(SUM(CASE WHEN (cat.grupocategoria_id IS NULL OR cat.grupocategoria_id <> 4) THEN b.preciopagado ELSE 0 END), 0) boletos, "); + sql.append(" COALESCE(SUM(CASE WHEN cat.grupocategoria_id = 4 THEN b.preciopagado ELSE 0 END), 0) abonos, "); + sql.append(" COUNT(b.boleto_id) passageirosTransp, "); + sql.append(" TO_CHAR(c.feccorrida, 'dd/mm/yyyy') dataCorrida, "); + sql.append(" TO_CHAR(b.fechorviaje, 'hh24:mi') turnoOrigem, "); + sql.append(" po.descparada origem, "); + sql.append(" pd.descparada destino "); + sql.append("FROM ruta r "); + sql.append("LEFT JOIN corrida c ON c.ruta_id = r.ruta_id "); + sql.append("INNER JOIN marca m ON m.marca_id = c.marca_id "); + sql.append("INNER JOIN empresa e ON e.empresa_id = m.empresa_id "); + sql.append("LEFT JOIN boleto b ON b.corrida_id = c.corrida_id AND b.feccorrida = c.feccorrida AND b.motivocancelacion_id IS NULL "); + sql.append("LEFT JOIN categoria cat ON cat.categoria_id = b.categoria_id "); + sql.append("LEFT JOIN parada po ON po.parada_id = b.origen_id "); + sql.append("LEFT JOIN parada pd ON pd.parada_id = b.destino_id "); + sql.append("WHERE c.activo <> 0 "); + sql.append("AND r.activo = 1 "); + sql.append(StringUtils.isBlank(empresa) ? "" : "AND e.empresa_id = :empresa_id "); + sql.append("AND c.FECCORRIDA BETWEEN to_date(:fecInicio, 'DD/MM/YYYY HH24:Mi:SS') AND to_date(:fecFinal, 'DD/MM/YYYY HH24:Mi:SS') "); + sql.append("GROUP BY "); + sql.append(" e.empresa_id, "); + sql.append(" e.nombempresa, "); + sql.append(" r.ruta_id, "); + sql.append(" r.descruta, "); + sql.append(" c.feccorrida, "); + sql.append(" po.descparada, "); + sql.append(" pd.descparada, "); + sql.append(" b.fechorviaje "); + sql.append("ORDER BY r.ruta_id "); + + return sql.toString(); + } + +} diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorridaNovoLayout_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorridaNovoLayout_es.properties new file mode 100644 index 000000000..b4a9c23de --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorridaNovoLayout_es.properties @@ -0,0 +1,29 @@ +#geral +msg.noData=No se pudo obtener datos con los parámetros reportados. +msg.a=a + +#Labels header +header.periodo=Período: +header.data.hora=Fecha/Hora\: +header.pagina=Página\: +header.filtro=Filtro\: +header.filtro.servico=Servicio\: +header.filtro.linha=Línea\: +header.filtro.grupo=Grupo de líneas\: +header.km.grupo=Total recorrido en Km +#Labels detail + +detail.linea=Línea origen - destino +detail.boletos=Recaudaciones Boletos ($) +detail.abonos=Recaudaciones abonos ($) +detail.pasajerosTransportados=Pasajeros transportados +detail.kmOnibusProprio=Ómnibus propios +detail.kmOnibusArrendados=Ómnibus arrendados +detail.kmTotal=Distancia total +detail.dataCorrida=Fecha de la corrida +detail.turnoOrigem=Turno de salida de origen +detail.origem=Origen +detail.destino=Destino + +linhas=Líneas + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorridaNovoLayout_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorridaNovoLayout_pt_BR.properties new file mode 100644 index 000000000..105942597 --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorridaNovoLayout_pt_BR.properties @@ -0,0 +1,30 @@ +#geral +msg.noData=No se pudo obtener datos con los parámetros reportados. +msg.a=a + +#Labels header +header.periodo=Período: +header.data.hora=Data/Hora\: +header.pagina=Página\: +header.filtro=Filtro\: +header.filtro.servico=Serviço\: +header.filtro.linha=Linhas\: +header.filtro.grupo=Grupo de linhas\: +header.km.grupo=Total percorrido em Km +#Labels detail + +detail.linea=Linha origem - destino +detail.boletos=Boletos ($) +detail.abonos=Abonos ($) +detail.pasajerosTransportados=Passageiros transportados +detail.kmOnibusProprio=Ônibus próprio +detail.kmOnibusArrendados=Ônibus arrendados +detail.kmTotal=Distância total +detail.dataCorrida=Data da corrida +detail.turnoOrigem=Turno de origem +detail.origem=Origem +detail.destino=Destino + + +linhas=Linhas + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorrida_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorrida_pt_BR.properties index b77ac1def..a1f003471 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorrida_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEmpresaCorrida_pt_BR.properties @@ -22,5 +22,6 @@ detail.kmOnibusArrendados= detail.kmTotal=Distância total + linhas=Linhas diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jasper index cf770a8b8f9f1cf8292a6687f0ea95028ac65e57..9ce8a3738b4170df588ca2eed29b76a32e5482f3 100644 GIT binary patch delta 6925 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 delta 7213 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 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jrxml index f96be7054..9b8619463 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorrida.jrxml @@ -7,9 +7,9 @@ - + - + @@ -53,7 +53,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -70,14 +70,14 @@ - + - + @@ -85,7 +85,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -170,7 +170,7 @@ - <band height="40"> + <band height="39"> <textField> <reportElement uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716" x="0" y="19" width="49" height="20"/> <textElement/> @@ -215,7 +215,7 @@ <columnHeader> <band height="22" splitType="Stretch"> <textField> - <reportElement uuid="f5729d81-df6a-4612-b01d-d43ce1008f3f" x="487" y="0" width="68" height="22"/> + <reportElement uuid="f5729d81-df6a-4612-b01d-d43ce1008f3f" stretchType="RelativeToTallestObject" x="487" y="0" width="68" height="22"/> <textElement markup="none"> <font size="9"/> <paragraph firstLineIndent="2"/> @@ -223,7 +223,7 @@ <textFieldExpression><![CDATA[$R{detail.kmTotal}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="e0126182-4184-40df-898c-71babec8c9ac" x="251" y="0" width="75" height="22"/> + <reportElement uuid="e0126182-4184-40df-898c-71babec8c9ac" stretchType="RelativeToTallestObject" x="251" y="0" width="75" height="22"/> <textElement markup="none"> <font size="9"/> <paragraph firstLineIndent="2"/> @@ -231,7 +231,7 @@ <textFieldExpression><![CDATA[$R{detail.pasajerosTransportados}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="1ab856e3-3db6-43af-9241-f52d67972d8f" x="192" y="0" width="59" height="22"/> + <reportElement uuid="1ab856e3-3db6-43af-9241-f52d67972d8f" stretchType="RelativeToTallestObject" x="192" y="0" width="59" height="22"/> <textElement markup="none"> <font size="9"/> <paragraph firstLineIndent="2"/> @@ -239,14 +239,14 @@ <textFieldExpression><![CDATA[$R{detail.abonos}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="192f95fb-fc2c-4872-b0a4-00d0675a9882" x="132" y="0" width="60" height="22"/> + <reportElement uuid="192f95fb-fc2c-4872-b0a4-00d0675a9882" stretchType="RelativeToTallestObject" x="132" y="0" width="60" height="22"/> <textElement markup="none"> <font size="9"/> </textElement> <textFieldExpression><![CDATA[$R{detail.boletos}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="76ea0944-2fed-4c0f-a436-77489c8bb755" x="326" y="0" width="73" height="22"/> + <reportElement uuid="76ea0944-2fed-4c0f-a436-77489c8bb755" stretchType="RelativeToTallestObject" x="326" y="0" width="73" height="22"/> <textElement markup="none"> <font size="9"/> <paragraph leftIndent="2"/> @@ -254,7 +254,7 @@ <textFieldExpression><![CDATA[$R{detail.kmOnibusProprio}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="bc11eaed-fff3-4d98-b397-25e43e398699" x="399" y="0" width="88" height="22"/> + <reportElement uuid="bc11eaed-fff3-4d98-b397-25e43e398699" stretchType="RelativeToTallestObject" x="399" y="0" width="88" height="22"/> <textElement markup="none"> <font size="9"/> <paragraph firstLineIndent="2"/> @@ -262,7 +262,7 @@ <textFieldExpression><![CDATA[$R{detail.kmOnibusArrendados}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="140d9378-b983-4eef-bb17-9dbdc80d324a" x="59" y="0" width="73" height="22"/> + <reportElement uuid="140d9378-b983-4eef-bb17-9dbdc80d324a" stretchType="RelativeToTallestObject" x="59" y="0" width="73" height="22"/> <textElement markup="none"> <font size="9"/> <paragraph leftIndent="2"/> @@ -270,7 +270,7 @@ <textFieldExpression><![CDATA[$R{detail.linea}]]></textFieldExpression> </textField> <staticText> - <reportElement uuid="1e959efc-f066-48df-94d1-5ab4ba7fb79e" x="0" y="0" width="59" height="22"/> + <reportElement uuid="1e959efc-f066-48df-94d1-5ab4ba7fb79e" stretchType="RelativeToTallestObject" x="0" y="0" width="59" height="22"/> <textElement markup="none"> <font size="9"/> </textElement> @@ -279,9 +279,9 @@ </band> </columnHeader> <detail> - <band height="19" splitType="Stretch"> + <band height="17" splitType="Stretch"> <textField isBlankWhenNull="true"> - <reportElement uuid="3111776a-f727-4313-841c-55dabd804df4" x="487" y="0" width="68" height="17"/> + <reportElement uuid="3111776a-f727-4313-841c-55dabd804df4" stretchType="RelativeToTallestObject" x="487" y="0" width="68" height="17"/> <textElement textAlignment="Center"> <font size="8"/> <paragraph leftIndent="2"/> @@ -289,7 +289,7 @@ <textFieldExpression><![CDATA[$F{kmTotal}]]></textFieldExpression> </textField> <textField pattern="#,##0.00"> - <reportElement uuid="3343aea7-212b-4bd5-a29c-8dcab3cb7568" x="192" y="0" width="59" height="17"/> + <reportElement uuid="3343aea7-212b-4bd5-a29c-8dcab3cb7568" stretchType="RelativeToTallestObject" x="192" y="0" width="59" height="17"/> <textElement textAlignment="Center"> <font size="8"/> <paragraph leftIndent="2"/> @@ -297,7 +297,7 @@ <textFieldExpression><![CDATA[$F{abonos}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement uuid="cee727cd-cbc7-41d0-8020-d70aa33d8c9f" x="399" y="0" width="88" height="17"/> + <reportElement uuid="cee727cd-cbc7-41d0-8020-d70aa33d8c9f" stretchType="RelativeToTallestObject" x="399" y="0" width="88" height="17"/> <textElement textAlignment="Center"> <font size="8"/> <paragraph leftIndent="2"/> @@ -305,7 +305,7 @@ <textFieldExpression><![CDATA[$F{kmOnibusArrendados}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" pattern="" isBlankWhenNull="true"> - <reportElement uuid="9f731da4-307a-4409-a8d5-28b2c4c40fce" x="59" y="0" width="73" height="17"/> + <reportElement uuid="9f731da4-307a-4409-a8d5-28b2c4c40fce" stretchType="RelativeToTallestObject" x="59" y="0" width="73" height="17"/> <textElement textAlignment="Left"> <font size="8"/> <paragraph leftIndent="2"/> @@ -313,7 +313,7 @@ <textFieldExpression><![CDATA[$F{linea}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="c29b2244-5b3e-48a2-9adf-8e10ee2a3856" x="326" y="0" width="73" height="17"/> + <reportElement uuid="c29b2244-5b3e-48a2-9adf-8e10ee2a3856" stretchType="RelativeToTallestObject" x="326" y="0" width="73" height="17"/> <textElement textAlignment="Center"> <font size="8"/> <paragraph leftIndent="2"/> @@ -321,7 +321,7 @@ <textFieldExpression><![CDATA[$F{kmOnibusProprio}]]></textFieldExpression> </textField> <textField pattern="#,##0.00" isBlankWhenNull="false"> - <reportElement uuid="b36dbddb-2fa9-48a5-809e-0e15ad54c529" x="132" y="0" width="60" height="17"/> + <reportElement uuid="b36dbddb-2fa9-48a5-809e-0e15ad54c529" stretchType="RelativeToTallestObject" x="132" y="0" width="60" height="17"/> <textElement textAlignment="Center"> <font size="8"/> <paragraph leftIndent="2"/> @@ -329,7 +329,7 @@ <textFieldExpression><![CDATA[$F{boletos}]]></textFieldExpression> </textField> <textField isBlankWhenNull="true"> - <reportElement uuid="4a68f71a-7be1-467a-b3eb-641a0c1f9a48" x="251" y="0" width="75" height="17"/> + <reportElement uuid="4a68f71a-7be1-467a-b3eb-641a0c1f9a48" stretchType="RelativeToTallestObject" x="251" y="0" width="75" height="17"/> <textElement textAlignment="Center"> <font size="8"/> <paragraph leftIndent="2"/> @@ -337,7 +337,7 @@ <textFieldExpression><![CDATA[$F{pasajerosTransportados}]]></textFieldExpression> </textField> <textField pattern="" isBlankWhenNull="true"> - <reportElement uuid="b933abbd-d3f7-4164-a61d-0ffb2c3e4d73" x="0" y="0" width="59" height="17"/> + <reportElement uuid="b933abbd-d3f7-4164-a61d-0ffb2c3e4d73" stretchType="RelativeToTallestObject" x="0" y="0" width="59" height="17"/> <textElement textAlignment="Left"> <font size="7"/> <paragraph leftIndent="2"/> diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorridaNovoLayout.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorridaNovoLayout.jasper new file mode 100644 index 0000000000000000000000000000000000000000..af0bd6abede735bf2b56146bca837871140ec26c GIT binary patch literal 47810 zcmeHw33yaRwtrRK3u!{LhDA{nabYz91YA+GN-zs10R$amlQc;~l8&7Y1aufz+}Cks zP#o03!DXCr#9eV2_ZeqVM`v>%XMCcgqvBI%{Qpi>-P={&H=PE*_r3SN|I3%ITenWF zzp6Ut)Ov5<&iZvF*u;)#vaoAe;qpjVXEc$BcE%IQuEJ<XOROVWI8Qp(Nk=CCCcG+` zQ^f{0#oIe$ZPBtwGLmGYs+LDqMv7wbqWWke7HNyEi7ai49$v+UX>T==_Go?gvSqQJ zBpa?gw?#Tyit3YzSVs#y4$>YIrEQU}u2a}rCVCR=z-)P28tFm?>q_uQ&*0=rw)_10 z@&#qJjrHYqmBm$!3(M>3D{E^S7gUy2vhdP)G8u2LjwDdXN-9fRcY8-^yt^Y=Njagn z`p!rbvgT74#hR0?OW4p@OGi8rogYESNHP}hSi%ZoT@`KdNU~IhtBA*w(FA$ys_$-Z zk0e&tL|4IkbO{^hJ1vSOTgh#1G}0VR6n8Xxp$5mg8e++|s18%f^4p@zk}9JmY+yVQ zi*^8Tqzh7~j3L(2id+w%7n#Qr5CCejHi4*-{RDaNiaH<}@AP6Dys9<YQ4^;cY*^hH ztz!90BTXw>5`dvO$@Z%P_C;OGimY}~q}oLh!QRn~dK;q9DvKqeO_Z%9J1A?wBvLA> z>+bLaly`KuBc8B|N8v!#@A_^EB<Xen3pFFVUD0G$l1)4zYfAI#sATX;u{TGTMY`LP z^~u$3(InfykATt}g7t5XCL^¬7It==o>guY@?9ud#*W${FNBv}z@O2!kbQ!N~j z$J%9otB)p=Y>4U@-N{%R`Vr+jM4hA?H7h$r6&sAsk)(!W;WV&466?@~O|rhSl|ses zK(Ev>_wSGmK^JwX(a;t~+PZ<+jI5=V)mocsow`<K6SeZH8!a_^oz{?4Yt>0j?>nja zehZf=oxu8cQPrYV9MD&*@G3X2OLb3~jT6{_WVF4rEs~@-iu#H}@tX!60u|LSNxfE= zsKD-6x>U3JF4ZEdL&}o%bTalt132#p{J3JlVv2eyM`s>mqMlsH%LoRRJ|#!CNqtyF zMO-~EJJamn8YND$gn>uZcecfn#cgfzRng`uRv>GTGGE@)nTU3ENj@++YkB9@rThZF zL7j;>q)##y?W&G+CfR{~1fFktNB99<lp|teNjB7wFD0v!B!&k2WL+84vc@l4vn(UU zsOllX4$2YL^0sI@xb!h#q^LalBXk9Nb5m=qtvLajmq*#vt72V}M@5ZrNj5cW4gsIx z`|zGl)OrEQ;6jSBusD&3tfqK-&iL)v>z<BW?=W7;+^*P~C^aa?R=F_p{l>+3XJ_Zy z1S`x|L_(#|LWN?Yzu}BQSPz!z6UQnf$P`HtQKNbF4Rz%WrE`(W^gdHb7Z7G#)XBys zp@THkbxK8Hm^8=0PgoXfD6p88EeS($Xo&VCD`L?$qZ^FO-VFvVjmK9&tgonwu8g*o zu))!lV31NIH^kbbC2UA5a7whrI#x75zlbJF*r1dPNK4pAbf9D+nrvz%J)m}FG_edl zsfvw=bTqZb6QnDpItLYZIOJ?98QHM<7GlyH+I~SQBxNvnZd7g+O!fi@EHoh9#dXeh z_e)nSv!9Xm(Y^<gTxsMJSb;%Kpy<$^z=99ziv`d1P@W&rp-|R6{kZC)%cAIMP3h@X zu`#}%hIqU!8S6~TQ58#N*yd?oRm8eV(8^axZr$D1mShDc$3djgNCz^LpK1dXk{Ez= zLB{oaUS}kU;&$lQVfr;KL+DyFcA`0J#-O?kai0CNHE1X~OXH*|QXWP?uUBu-Wibr! z*i>XyvPin1R9bf~F#`=#`m}PB9x1jdVC#x7KhoR`UD^h!vLhL7i6#(bXc_cIYV{fi z`CboRMekG5g3&2rYv3o+R@?^to4Bja?rs4j-NI*QWuTJ9&$Z*#O}szqH{RAvDNI7< zVqKL;IM$@!2gSPPH!mx1Um9(0j(VPk$Q~VA5p8G%*KcXne#7JpwWOKYjCLCs>srtO zywMb7`H+Ov@hw1ykk+3G=Rk7SU{Z9zCXeDNiDOvRm)=*UJOb~56h@D4C>m7zP{T>% zmxIDbQR;X+?1(dVcT%iq?`Yq$;&omzMoC0k5|Pf<B#=du&N959UM;;+emenpM^l{I zkdB$0D(qIH209juL*>{f6UVT0w}A{L;%Z=}5gFvYYdDIsW>_|-Ivs<?g2q}_b_V+n zW*^CitDTi$kO;|GQ)X))l|j&%o7s2f7MgL&9D=W8mG_32%-|_|WaBB7%-0o1qqmT% zUfEF*16yCz3g$>!rxb#c0#!N+t-D#4q-zNqqeBpPEtA79Pe6hQ$ypa|kFShU%Of9> z5tp!VXS^#$!%x!JFi!4L;+5ViS-({@bgyK*2fx+O6=|5;L=29q8eD3GIXZ-9xiW_S znPk~P#qiP?Q+lC@L7I9TrLY^4!~igACh4q*uGUT2ZI3rgPJnJWfb6<Xr}SN?)$pww z+d%X!utmvkDB`>-wwvKZ+|?I}I^kg^Xgbjx2JiC?sCD8&0{}_{ddo<EY#{ZK(pIR4 zQK_&UkgoMphyv&XdML0uB?fcR2lR-*2!*;BYBU60!W`I|R?evP=mNUk-DpFeIFwrZ z0?Z^q@7ANUQQp{$6=9h6H3?tI1cy?g_Jwk-^y|Jg-*j}97*|>}#Rbi`prZ2l#=7#V z;)cqF<&6!s_@A%i&#Lwkk19+nTR`+<tf-5ts><sd8f#1Dm6tX^u~tgH9Appz4_)W% zxVHVAB8+e5u`m>$u4H|zr6iW@n#TsV$NjgS&b!9Gbi|wN(xX00Tz|&v%PTNsc%p%F z-AO~2VX2{mRttu|b>q!D&N%lFK?9e5D`^e_{Ay^*UrjeeaAMu<SB)Kb<r^0Yj6i5$ zGeAY@#hWXCBX$BIs?Z>vX<)kULfAvx4$uk>jp4F)P~x66O&0H&A0=%NdQ(p+=`ctN z%%!j49m4s(NdyK-eo_XaQh7WkL)JQ-J|$S%(O5neI#USsC$XgC=#iC_>-ZO0FOl=B z2%bWeMu@pi=PJ-rVR=f=p?WApRFiYmh^;*I&nC4{xugV{qFFllEEW8DF!_)Unw#V> zk3elp2GP7kMk;4&lWdqVaFBDz)KEI3n2OH1p`d`iZ_SUW^%G8&zHu0JvaHO<5cWX7 zN;R!i4X_@H>sYVT`Vm*EA$TAm_hAcCtkdl=rzCS9-y`M**^YCG7qb*@N4z6SU}fc` z23WqHno1xaqxEH^?NH5ELf2QL6>tx!=vyx7s(2B?$~LA}AG|?O4d##`&6P&%S9f2N zvh(Wv-1%XMmq_i`%0{?LrB}QR!%?bSWOk5tD~Xcwq8-D@$kKXn2HAeKTS&V}sXiK0 zQRH3<JcMqChe>v98d_>f%;dyVR^B27SLSSlLfjIKPEGBiooMMP4I@>1ZY2}3W=tqI zwRU%`faWo+ubGHcETt3#2oIL>O3w2e!`k5~*Sct=&8JAgHMJXUPNvlRTAVRus#0oS z{Ni6?$KJHSlYSg!pPeIPOv`l&08zqRLc9tOJ!};{o&Az*uv-5pT+!ZuflixQpQ_IH z&rpUAgEAy10yC5$Y9mKb6l6I{Hksn{FFNIcN1l21_BVz{&MZFr=+`}Nqdb)x2}=JJ zDpgE>D@}r8TJ9UIih5ioRS_(frGhB}Cfn2FQ-p;9gcQr5gcp->qApackzZw{@Lr=; zWjaX~<YYJ=*iB)ZVB^v)3c$x|z&j&dk>$}uysIG*>FA>MqDXVR%Zgrx$;7`9(H%ue z=7j$h#h)G6a?OF4j=68)+jF*-{=_TqPT()agfvzL;IF6w_?rX^f0JP0uL)W3UugkE zFWK-f48UJ6_!UN$#yfJydsxnR-*q$lb<2`#&)mJ}s;|DDIybQkc(0>YBaO2I@K)3S zyiJ0Iw@I+@)`T>?302C$*<`W)vSD2mfVIb5mSTb+nH$&>(YQC~4ED{lSIymU;k^r1 zzCWO>XnWO=T>$$^DylTD2mo7A1Hd*37T6}i0$UT(!KUQFUFdOz1vb581AJNl;G=wQ zUfU5{+Kp+NIELzRE8bqX%7Fm>#hih^`<ngVIr7kT*F7}s{q5iUv-;Xy0Dcn{SsFJ6 z0I#S4z?%dMc#~iOuL)_uYuqL9H(CJo1^n~?;CD|09&2^cj^<oB`a!^bdd}ECIQsgB zpBXe`-iSfp@45f1nvZq?`@5+0(zr7KdqoYv-XvJqn*<AcO-RGOQ-e>BJ9i5E83EX1 z9|&#eC?pj-V#T%-T4O!U6F1S6KGlO--Ngvi(3U8(lXZto%?!zEqX4o@L&=k#86s=C zGIZr{mi+vI@7;UDURT}l^*@%)-4$i%QHoa@4+m78q6So*NwBKUBv@6a3F%b_fGGzL zTR_tbR)fpiX&Eun3x}Bml&;Acs#`~#`}nof67Hh=^DjQ_wh}*UJE6BcM;VpIGXYR3 zY5-Iw!Gg*p`1$eEc#a^@LrrpAY_{@eGT<^;JJ#tbKuT{sD4>-O*R4F+o#=>TQ%(!^ zshEGgfKIGMu7k@YhEh6N+UHMNHoac7;r5jW?hxm$y|>)gvv&gYS1Ac;yb=Jqq6UC& z5-iY7f(5!JWC8sZ6CY{M2Kvk_pws@e(s&{fYffV@RM<=nom%?ea&GAt-@JVD?;1Wo zeRJgnKVDl^dG0Ro^S@F)r14Gw=!zNux=FA=HwhN#nvezbcXkT&SplGXT4OVIZN)lr zQeL1nvTZp7{_xG$zWv;LhsVEMv*7ik#vl8;T>$)30$duO1OTq60f3tX3viQQ0j>#I z0RLpC0G}NIxHlxi!g)GZNv(y@W+E!|UU)*T<~j+lH&#;JXrX!n>$en(g_wldzpqIc zxgE8q6SFAFYnE9Q>Gi5Vul?Yn=gygxnmVBzXKp1TSFhI&%d*JB`zdV6f4V3?d(Q=b zc=+_{Pp1!CwS32f(t=bYlAM^P%0jgJYG$^n8#xIUuwg->1%virQQ}x2>R(!3(@<XL zSGG(gV77!0LI7ptWj0Ms&1{+$!EBlq!EBlyf!YJ*(Uf;Q&(Ei4F<384mv;xJH%bS} zMB0oL+MKbVRH8QI{Bm64^p`h$`5_jRmUs(FozzlQmNM%&bM7Qt9dFuj@pE@S-`#pp z>7ASRnR4vQsX8W%2T*_D1HA&OB!g;XPx2>?G0KxKSAD{sieS!PsSuiA)rg8ug|KQw z6TISEH8RG}r)SAlBZmakNdJr}lOzl6J9XcErxi|{rgD=Bc;>J&8{nsp`+fdRb1vHW ztM?}S^7*HWf4z%<PbOTYF);veMGXMlBv^o(1PgFY2n2khhqM382Kb=?fDd2Mu7>fM zqe&{@?i8`5_N91P=7=&I?6<x=@n=syIpkLxyT;x;ZB5yLblBHYa{171tI8|%`mUFB zP<ua=yh~$N0Q`y?0KZAF;5P{t{F>n9#cJ=f2p#LsfImayJ}dzKe%63eBc8-auNTZS zr>?SLzW((~hJHBtkcE%`V0_sLN6y`pjya{518+Ho{7Iuc0Bc1Jz}h5OSepb3YfS*6 zncUu-#aECUSZ8qi!vnA$;x+X?XRK0foOt;#l9c|?CL7+T-!ORO9Sy&jba(s1e=Pd( z+*@`L?*_tK8hWF$#mf~n0B@6E;cXHuyfq;Z@01qcHSlbB9}$3eUfPr_)hXW%Rh0uv z&s_h>hWp+B(L5%+_xic>T6c^&_05VkyNEmO)a25L1hjKS4Zz(bSh$-63wKQj#N8hJ z5%$?|pA&%lsO-x=RLE>>eY&R@=G5eWG<L{WQ;)3fy8oct9{$~qVoU@0yK|6`T+Pjs zI?TadGg1f!@$^$DYtrZlz+X`V@HYt-{wBe~UlRiH@9^{KS+e1OWB~qom^Gm(DlfbS zoE~K=`<W_C<`hb{_I`WS3ER4Vv1QidP50fnczc<z(Mg?G>x?<zEk&+0P7A<WQ3LQc z2^QWa!NOY;0`Wf0gUNpycxTAaqXO_A7%+2^3+9<~h1oE__Uw-a_nZ1d_Vf9P$dKzR zYf=rJ(o%YQ4wzp^zNK+~0OpDsfVoMqFgFPn=9&<Q`T0K9o+TURM+adZFh!UP=9!Zy z*)YFk!Pv7u`?TWxVb{#+*};zf#V%rgE#*uaR|jCOr~#Op1PgPMU}3HaftX+ILG3@Y zVO|`7d4GHEBp0|dCkeB`{lNP(Hve?X*cYa6zHQ16?x=Nk5$;<kXVSPS0B%JMfZHTk zaGL}RZcPY;`z9Y|&yo%9k^s2#(&h#&y!|<=;b2ixP-4ysgBRLnx-(N(`b@17xwL<D zShk&pOBjxrRAVD(2^+l%o7n53UGeTjQ?xpUqmvyi4cL5x{YT5_SQ@6j`aIAo&#z(E z(a>eFHf-NYZR|l&*>J?vLMIV(iOD-MmO2=G0-Z8XoywZr*EAe$IFm=XkRSU@CuODp z2W3y`jwV+3eR}OU@<v;!Ac7@0B{-F?PT1mL$>6T0M644hZj-6Q)X1vuio*7p)p{?A z!zm;-)kqw33h8-9{^ZVZD%+trLcB79%MWnz0V0{y7g7tgU&OIzFO5L&F+H;Hg8+0C zBA^w?9jB^|bB3u=)s(VKjjE<3j(Gj)n#rGZdUK;;OsGxGHaBVPhm<j-`awTzH$(@N zP~&(80fp*IwXa@U$<A(|L!VVcaO5=W;b&}#G*1qvGKwoLTq=fcrh_|uZ*+{7Tt}zp z)jqI~W6Rini$5F_NbOR`c6;<_$tL;3AbEo+If&XOeUFg7aXmn5VM(l|EZP)n$L2ce zfkNo1wA=%vkB^Oz#;mB`W}iwYU<N72klyrbj^2A2*W?)5)5;C+S>V>PHaE|nq{z*; zsjlW2!cexdhM-l9KD(;o)kojdxTfk~J@0#6m3DyU+Erx?sU9#io5;dB=VkI@6YqS= z61F>?#geCc)CC>29p#ZGd8^41HjHSvdV>!9s)HKpLX>1Ak;K&|*kg|yR@6-b+KGHF zVc`|gXlFwlr>0x!?vl~%v5vX&)`5mNc3sG@<Pklwi7spLcqr}y$;u<=)p<U_Z8J|W z7uZG9Y&VDd8r01e9wd5y|3E2jtxGS48%}zai#SRM%u!N|8&0s%+i<cyr`V>ix2Wo) zJ0FU2WY8WGsfy34tKcvl4k9*n<7N!-Z=7Y1bu=a9{RX6_EMau=b#)i+&cJCnY^rH4 zVFMtsqw*>Ss3b;M4QmePuS!!1YD_chY_Ok?V@SIpIB}qCxbI52(<x>@$4BdGMU`fu zbeenkaYYm6%`N`E?JBl+FJ7$e-BoN<tOJJ=BW*H2Y3i9R4D%&+W{F7uQE2MY<Z$9d zc0B?>mt<$9DXxe35EG^hOOjcSK@fC>X_ciLq`4f~ue5eSO#^W}b~4BV(v@_cWV>}l zSB*<aO)Z=zPM-t`iCkno{w{NoQGo&ZaBFI7F#YUjBtQ3zOhZPJY>=K2YLo>+dH83@ zT-N1nnK`RI0y5U`n7Y~p^Klv|1A$a#hoxth);;|hDrBSY6BL=;Dj+ZYYijGNi>s7g zz$j6U0i@oPo?0HyQx}LxEWK&4q5kr?H{I^|bB|&)sYYsuC6~u(E{PqPWcf9?qD$Qj zA|orl;KF~+IQHPR<yQ}=yLQilqt8!`UL~Ct%k$+-WZx?uVlO13jNKKI<_x^1DuO@v z=7-oz5zHa16~Y|CdIS_uW^%DEs*n@3^y2>+!`F<}j=j_C*iGUnb9Z}T+6+8Z3SzeA z-}}&e4Go=6C8>(1fvS^T>JMo4F80Ep%eUvwSSd04sxO?~o0X%eI)<(ah&5##KJS+; z&tRw+2g^IV=s-2ub#}9#*QB0WQ~}?bY08TgaJVkX_U%KrfG4OG-hs;zJ=C%>5iHMo zaIa6K?riG4Pf*(%qk6%eo9BpI-)@@M_R;n4efPt;7ZOX>jjPJ*5#+r{Ei2^2BQxqE zp!<h#mbkI3c2SMYMsUxj10`8{wo!`jKXLz)pPuvlJ+tP`+49G&<=ecRQ*VH`92PCb z!4#b|0v3ohHJ}TtU;$m&Bv@To6Oc2z3uj#%&gjD90=jTMb>ZAMM5NfLw@REF*bmm8 zbo{nWck`m-E_mqE`-}J31+dErY-yA#6fAzJr~zP`1dCsq1Pg3U$N;;PT88zf`;ly_ zN_?dDzU~tMb^(E%^9peaYj5*OZdgAOnQ++0t;Ivy-uTfUXU?kmWEZfmBdnz{KLBe* z4ZzwYSXi3`3u{dPs&>PkZ{bWY*{~iTfb}R7>&%TOGX7rpND)*Dx+NhuxUX6B<kg3K ze(2+eJyh`6y{}ikw+nDL65P`GP5|7B8UVLRu;4Zc7TlVE!rO3vN5Wwm+2Gzc0B)%Y zq-}M}hOxK!o*TyBpS@$zMbG{D*7dVa-dcJ}^=Z3+F$rBEjpYFtD{277Cc(nkBv=@0 zLI%dmO?ag}8^-$uU_6GJboPaJ8LvM8A59Afs;)7`3IGDt<w5#lI?(;yq$51lfLBQF z1|y{!td_CLcW*bTryAU_{fVp3KIGU(2TW_ea`ne$e@<1DY;dF?hn0BswNFV1SgIGK zg)8IKfErWOfEqIiR*jhitHv}zBZUp1_@lH>Rpm6yY&AAKy~eCTkP(T+by6pAXk0?t z%ZRK%d&iO2t@!JUYmU5Z``>2GpL^rMa}Q1dP1R^_Wa<@PTD=w02v{aogbM@kRlyX& z!q+5N_-X>i1m>|4%IAq1>8y*z8G1}XI?_0f?Ct%|P-Qf$^Rz`9?_oLPy>-<QV+Kw* z?2K2>tp8x^OEuT+0^ZjV-qN@xpgk*U0Ny6S!rLTRcxyr$-qZpq2iF))QCYLK>Jb50 zdj}iRMt(A~UK+Qj!Q|Gs?_*z<HI1C``NH*o-s}0U5?p=bZTO)^lT+i~OhuK(EdgLF zY5>?K!2;VPSYT^H8rYOiuW{d!4e*TJCnEy@|8}P`Jxx6~?5`^-EM5P|Ei0!V^4&-G z{8QD0UBLbx!d@D82Vk$L0oa=a3wx7bVXp~k*h~Hi@F^E}?-cf<x~blpz!XyV9DIwT z$lm7V+<?F2%tt@ie8-l_!$0ab=+Hx|U)crVpP(X3<FNqX6*T~OlVAaF5-i{~Aq()2 zWdlBgqmK>%KFe`fswI!1`<e=S7u6=Um8=5P(^MYa(lt4B%I>Sas(o>fzg$+bA_X^c zjs(>HMJh$F0`xZow=`Z1fLl=m;5G>s+$O<-TNAvznES)Ui<Cw4FQ@62j0+dh=H;Jx zQm3T0p`o^#fbpmj8RLNGZUOZ+q*Z=50OQ=kmPB`FPUqgd(LioJWkc6+zJ0}^EnVC8 zoptOZWe=pPjv7Wz;^9rII%&KfP<4tLP<1B3sydTkRh=fJ^%TmdCmvomD^J=D#52Uh z?g5B@`>R;I5pQnz|E%(yku$!0?e*=i-th4iuN>RB3;2IT_)BAZ0RD;^fWJww@HYt- z{+f^l|Lr@4|Cj*$J$<Op;crU$^!DQB2Ka+V?j2$^_dL4&sm*J*wU+o3U#dIi)ZqU` zfJ@`60KgSB0C1CF0d5j3z%@bg;J>ICEq?XYPQkrL2Hezj-nQcCMdkFi-sT4Jg&Rg5 zFg1SO=OZ`uY$@NPD!KD*+8KbXDI?&(qNZj-Y!OU|ErJQLN01QzIul|i>!HOAj<RPU z#4qOpvA5GUH;C_iVDu9&_V23MJJx^f@h8s1D(=o|_0C9wSQ-VY+<sT^2_pj_R>2g( zg4iTj5Nm>j_{#u@3oLl(B^%Qo+fA+3)GO)z8!L`1t@v*czqvttS7F`@%kp0s@y+hf zF8So9ngzQ6@jis4H1-aFSWyEYHVGEQCc%PO6C}hR1VFsE1y5fP?-dB~$5tHvyx3%P z0$QT<)~J(gbX^piNU-@iUak&S=vxx7*-7oy%(5>rwXJkK3tv3>iIey7Hav~N)|afC z6pWQmKNh8H(emd2xe2Kvp1`)i_D<X((2}{O1sgc@1<}D9IQrP&IJg7*L2(5<))$Sf zBY~S^cXp!&2gtaWudaN4ZCwL)CE(Qe@eQ(``8J9Eq--m#>LWIEGbFCEk)fO-72`-9 z<NV^f;_7l7C9iL+E}m~jJV<U;kk<fX<D(UL(7fXM`Q>%Ep_p=I2Fm$MV^(~_QpKym z9mM#Eml>z}=t<WpZG|XEhx+1@6?~`;UR`{=+P9GkjczCgS)PY$&t=68#f|l~3+hVM zQArJF_5#T7P1VcI%2uRa4(dzmD(5#;m0Or(-L^Hau6QYKu*PSj{LRW%%!71xt7=P& ztE`-=J(040s^Zv$6}7^R(&6gLRT&#g7Sxp45$u+#U~FG8c3@i(c|~ietS)a{LfdPI z$7-~Or=p+_k1UZls}k!=Yh@L*<D{XnqPVo7wr;T*L)NV|vT*3RsSj&eSu4<GEUhZ8 zuWziXEiS{22uAKkrZ(HiJ>*q!`X-eX1#ZHY9cw{dRpZ=ZLZ~h%mulk@^)z^-`?VwO zb8%}$o4;+$igbjIw4$=A9DSs|whEu7Gc%U;l4MnAe0Ps3r4640u;TWsqr7@Pt_Lr# zH{(_NjAaDaf7uq$RR-1*8>y%)uPU=b8h3uvW@szP{wN3CHDMr|mFeh{64+>gqY73` zUf)|-S=X?jxT<o=PQ;20p0Px-n?5|47VC)0`o_v*u&JrMaenbJl{L6D-DV)hrYn6@ zgqJHO^@Wp3SSVRGU|F=OvLn`nTk?$J25&z`BS$Fg->IpsE<tsmri*hA6+%iC_`smv z2d<cT_Jr~m)GsKmtE_FTRHqYlC(IrwTvb^!w-{B9k15sWp1r~NsN%xP(%PL4*uSB& zVL??6DIxa~{V@Pvebs4LvbTLhJ#-^#VNV-ATG`Xo*4-Q}q!U)LjzYRSrf_;6;qW1m zz;H8??C4<W*=u^VdAU&D{G40Ty=D2JWN)|l_L{WZGhB#(z3i>(HK4?3=B_4)fMIM9 zlNGQg9&b;w0p2Ta$Mfwt?^Dtjme^E`?|KwQ+moHE3+d|VXyMXma#b|iQP?E6i{ntu zQQsnxM0{0O50pjK-z6KI8|i9=_R=r!505=D>g3-zOjO{CZpZ<(-4`F#OtvPXUHE26 zb5G|{M-wAJV+_F@N;VQ@w_w37ndpv^{fGFp>GZ-wrq7yY{LLiF_22`>u5NPL0OVA; z{LSCadYoeMz9Z=TAi%?>Bol|sqTn~CG;4ajDarUWvTXEH^7o%RH`rcp);T6Day=;^ z4`Wg3^{4EN+p(wgb<RnK^)AM?zh{Z#GWd=gbhq9I2VlIC4;0_E>BPUhz2FZ=UU^pO z(!noO`~jl|b;K&msKMLne)!VAo^{%_Q|~SF1`T1!zCZW(IRiQV6^`1}FRpJWuU5+% zj!yYx6q=`xe6nv@Mjb%blsDEa0PC;olxyF(5~aVA{76h|o!rj>RUNKLB$An~*x7Uk zmDW}*sIEy**`@6Ck}m&R0!+npb}qS$?7F#!R~xFso{mNv#3?%G$-Z;hFZWdB{_%8B z`{y2B<uYGZrrh%_^Y}vFdCbc_jlevHau2VO)D^FC>9;uLs`3kye`z*+#>gKve5Zav zwciQ`rl(DtEK=*x6dBqmsW!A%MiVHa&xkZI$+8@1(+!?6cy&JVlMDwWnYuzMm7=ke z^4ldiC?LV~b8{$TD&?SUg=Q8EEz&w!*Gqv12c#cx0ME)oFT3r&MJ|Q}<ib15XC-a! zJo^^u4Gl=Im(ze&@>w=z^^qGa)EyD5GpNs-%i|eY4$p!q%0FYtt{;^7hQ&zNnJU|F z>P!R=I1}M7od)dxcE_TWs-XUrf!@;T{fiQZU)J&0aZB3vICXqU)yJt>MioYxG6Mno zx?Gz0Q%1lHqoyjsY94&B2<8l<MOf(N#ZO}&%8ks6x3A01I<ts@5yBd4oTcdv1G|m# z+q+r{)kmq#B6s>Tj3eX>BWgJ7^q;KZTKmJ)0ks;Ufqq?aC9W((j9DjTWQ_9Db@B`A zbX*`PLX7GgDlskNL6d4HL1$<DcA_r#MuY_tqoD-y3<UsTb_7{r@!HAeTUWmF`S0Ev z_3lfjROP);@{LzFDuieD+D>Lu^wOBAD$tzlSA^LC?L-Ar1go8x1go8B0y1Q`lbK!? z{U?>c!!x~|>>toh2J5wOd~-JzZ_ct5Uf}JwWV951DW#DU#5ZiasjTdc>XVoK?AM=9 z`S{qUcM{@Kf>;`A{Ld_i6*T~2lVCw?5-f-{Ap_!KA6n0n4dMd=ARekArVDxs@xfJ0 z_!@t*LNm9D)B)s&a&E_$ceUO0PVBO2kBqwF?;lUA#u&?6xI%{nf^?-|zq-m}=JtK3 zpi3Lxm7!*eZNwEd0CAIGA#M^Z#5Dm}*p0dd8IXGq43w<Zs|*G>!AISdQPJ0526+uT zg1HQJQF;{Pj($_dj~hQl`J(e-#z;ds!cTwrX^xJ!l9$AcYT`IqBw0>w?B=Im6#Vm^ z#O?DdN4)l4+uzC|7E{%fN=+seB$jBH>`J3aL1y&@MGdGKlVH`1Nw8{06EbS1DV0fW z%hner`n7^VDylRpFsI?q0s3f%$4wbGe%uo`!k9A7_n4Z(Gt-o0uNHicq_|Pe9BI?c z#*u4hU-wjW-{B8Wnp`5c52-|uOYvRFHT&LM<*uaKkcOJlwfl*p2GoX0uxi63Shb-E z$f7L1uOuW*WTZV?ZA|iOL+>0!ZFuvEW<<ddv!&oi&*lvA86Vyh`ps*5jg7YyMAuzX z{3ElW12*3G6=CjK1g|vC2x#nz8UU|Ju;4Wb7QC8}0q+?mDt*E`IUQc`krDo}Y&l<s zx%=ouI+E@E;i{A7=A!EAqSg2tH+Sw~?d_^WUJFmDHDmEPxWPG#gUiMpH*?_!$rHuI z{c2zR=`p`B;r9~Pttp7lTu#tS<I(`=6*T~QlVCw_5-jL70a>zJ_NA#zYMb4%Nu;sw z_)|hM@X0`DN_r)vad<0QUlX3-X~KP<0jIG}O`H~CXg#_Y-E|1gWUCcWwcd)E!mMAF z!v#P1DtqC)I&Vd}y%Q@`lnC`VHD`$XbqbpB39~MIEU*+y?b-wNrN?k@1F06c=OB|Z zsvY-aQB)aJe9u{;?))fYYL@j7qJad=8;TQ3ZvW@#FZzcX-p~_*MX~4p{lFv0X(9g} zXH$FGsL(il){H}EO`9=$#_U6;9nv^!+99)MP0wQ-Auz`5^;_n20vR8I)!#3SC-RuX z*=YY(tww9PoU`orW9Z1}oU*^0;c(7|rlM0TES!x=Iq6w8f034BtBZF}S7U0~h~vV3 z-#KWNlC!-tJlI<Vxcum}x&cgY0PwaYa5gq0u(>wN*?t-HfQ47i_RR2Rtkzp)2wM8% z7+Cp*^ksPvT>gfEAR?xT)e0+DALf*Io;7-_c2@mrB-I){#|N?f<c+1lpkf&dp;j<s zl{P4A{x$=vGVB#Q&h|)U!=Hq$(fcc`_N3N#gR0(Mx91E~Ir{RqMsrz_vvDbcPAhHW z0cV4j(QS8)`mR3C3bUTMH+q4(vCNM^Pe*b#Ohss1xde!nTk!EdKMK9Y6zD1M-eKa@ z0axFvzJCL?V|&#%Q*#zp?&`!8X9Lx%ye!<$BC$Tb70M5wu82fGU8!%0qs41)L4mXB zxuWB*fS`8#sH`;t<lQIu4FR+9=qJ8=YW~~wZO%BG(OZ|Km;o?dJae{RL8+oicMqbm zeyY;h1K&q<Trl0NoK%5y6!LSW;4gO2-kL%GBj~!GBRO*>PFl#BTN-bUhB0Swcs_I4 zoG|Oh`VU}&9TjGI%2pg^A!REKvjNIh9%lK<c1)NJRJO`63oF~PVKzwFs>5usveky! z5M?_qjP*sCMtztKQ?><R+^8en7KK@XvMmm?5z2N#n2l7n?}XVXWorzx(aIJHv)z=f zDa>|PHk4?LvbBWS9?BLAvptn<MVO6Mw)QaFOWERKwzsmK5@zGrK7>J6n2lGq?l9X| z*;a+we#*8wj1wf%->G4CfU<oz%qA$?_rh$VvYioTla%eOFg}|mL!1+4Q<Ux8Fq^7u z=ZD#WtdP>ZFwBaS?cy+-rfipnF^-kg%foDjvVA{{i#Vj)Rbe($*{%t*S;}@@n9WwU zAB5S#%65I29inU-!|YIH`yppT=<W=4ky!&>@W|QVrtYp}ydC>Znz1D$$=S4t>RaBV zDHqXYfZ1QEY2{Nxn@>!$3t}Wa{G^3p_9M1AALYGO`>l{yf`-`^<$N1wA&O#QB!QZ^ zLpk0F?qsPHA$Av>Xtz_5m$y9jGc<49vc}l~I@z{JM@v!d(&g9|boeCWtK`}#%zn=9 z8OZKtTT#*+v>i)9$z%6%Z>Sbx4?w(VPUCANA@&f8m{LVT>=7_O?F$kpwNom@wt=T; zimiNv*yE@dpNYxMkRkRYIGN{WYy}Ikryx8vAwbUvv1d>xnr<i<A@&?{7Nl8(*bCg4 z9tg2tr3&in5+U~Ml&h~qgxGIUm7ewxVlSb>bka&~2(ecnJq&#z#9mEh&rlRX><{p0 zXb2(pr&NNzY7k<70aUh55MpmYCV5cRddfhEy@kqCT0n@slLFrs{~`8QNH0_FhuGgB z7Ib`R0zbsw=ghlrF~mN|O@*dLCA&Z#`w+pkC<(EDpvZ=x53x_AG7|LB<PiH5A+?AP zvCjdbCt^|}B*eaeCoRW9>`U~2&y$uzA@(&uQ8FvU{>}C6qanKP$GjLa#0C5*X&&M( zh=v>w@%~&cHS{%fpmL*+%d2JcI1;g!`9nM((EAk!;T_^(bf=Wq4)MY8VG8UJABt!! zQ61vLkw1t`Z%sGEM<5n*&;{kA(3j{v9Sy!405=H+mVAtk)dQXHiH=8}g9UJi?}fe) zT^VWX#&iRk+r-KMeuRvb_cTSZV>{jf<|%gp7fBx0(2AWt#G~{0zG%;q?@5AQm(An* zL#QKCu-C)*gnWJgpNIs(4CU@_bnb}(>4o`ZJ|&-h#HYf8jFT>GElOS3n#T*#&r+$W zi(m8jG{CGs$LOIr1H2czdeeBX3SjYG?G)xS`7DS5J{x^j$K|zseh6p1A6*Xd!%#6g zNJga{fi|IOQX>uVBhk|Jth0BtFvO3>$W43et;R}H8S`to3|&hHGc?=~uSmI@eU{Hn z0p<0Vd8ugiz#zn{^7#O>TR!5U&ON>FX3BejLi5UMVHr%a%nGdAuGeT663nz5xB6 zT3)nvSz7f3h(^D97V+cr`E<UR8ml2Xy&9Db?Sy>Zz)u8!7#HFv5%1{i#8-d8_ku!X zM53~Mc$lBeBNWlnw1B<l&Is5{0nwoxEDeNs3)*}#uCkck=KX@j_;L!gBA?w)n7cH| z9pW88Ut%iN3Czu)t99n{Q`j8z%G9cDh@)c;^g42F8wxuRy$lxF(ZYPC>QSqxMpvP$ zdS1)%El2dOC;|*a0RL47I~BnY;xr_tHrs<eM%g}4lU&T;%)k>GI&6aUbNPgJE}ziN z<rA8@d_pgmPiW=x37uR%p^?ic^l|xwHZGsg#pM&4xO_qnmrrQn@(CSWKB0ljC-iUm zg!V0;(7ojonzwvH@0L$!-SP>YTRx$2%O~`0`GmGDpU}1C6PmVsLeG{@XxZ`!9a}!3 zVaq4<Yx#tBEuYY><rA8<d_u35PiWQh37uL#p;5~x^lABoHZ7mfrR5Wvw0uI3mQQHW z@(CSUKA}O&C-i4LLy(CWJ;6KzQ}A!2UN~I8nS3uhax%Y%9Zg0F8D(TtkTI8xd1O?P zQA5UjGU~`^AY&mJ$CI&yj1$Q?iHwuUSV~4S8Oz9MC1W`mZDe$i(Md*vj3gN=$><?t z4H>7Av6hU}$vBgYv&mRT#(891K*mL6TtdcWWL!bUm1JB^#<gUuCu0K{H;{278Jm6z z2spb5=5H}Dp|3Z(7@7^hplmRPV+9z9?S>)PSPZ_#W7su;jiW&j1~}s}WZ4&B?#GVC z;Hn(Ms(GN+Vkp&sLDXUlpH9NSsR_PYF<5Fx1z<M=TZKW=X$XA=y2m;Ui7rH%mth!m z6=GYDq0dGPdTz#W=f|k1I}!WcsH*$e9QH6fl0D9jVoxKr7g#a-4J%=<;A234WM%9P zr2a0eVDGbI*hg$G`;=9(|3q&7jk0jWc8jWTq@+6L(8*KoWj~%g^<H-S<OA<zKS?1# zWoK+5y6qwinvcgYcrn6Y=%Zo~3mA6h0<M=QPZ|Ex``NvMZDaT2pW4op;SX9aC2)Dz zaw&t$qn1krTpqJr=ECI(%Vi#1eqp&(!R2Yor3Nm~S}yb9^1S6z2bW)3E)8&b(Q;V` zm)}?}$HV1!mdg^jyllCg2$$bmE+@g|HOu8>xct#_SqhgwTQ1FTdEIhZ2A4N2msYsE zZMiIm%e$6K8(iMATsq+Lcgv*{F8^V<BvQ?w0}Y?C2%67QH18%f&1N*KC|kmou{PF% z1(Q}Z+8Eo!mSZrwf;|P-SJA}ZXC3To7UzRmCm+X7;WJo*m$5FskR^F5>*j0NN`4Vr z#cyCe{4TbdKhD<hm)NOjQW!?7CdT(uO^p2s8QiWj_|Z1@5iy4;!#}oMR>I|<mP-#@ zKC@ibz-5Q!avEIz({fo0m#-|B)8X<j%jHbCd}FzsJ$Xt2=a$nta&j!E^T?^6<#a&` z>DiclV(cs+eKwFj2S~32(&qx{^ML93K>7k8eIby(h~2|3X3wxo(B&@$Vwhvlh#jaA zdzVtmQz`KQ+xP(DiEtWdIbA|dgDj`Z$Z3e>bOkvLvz)FZrvl6AYH}KBIbBOmqb;ZP z<g~lxw1J%Vu$*onr?HmPjpVeq<z#Sc1>H5^(AR?ZUI(7Jo>j3Qutv54oc4Nvc>^dL z*=_7b_6YkSIOZny4){Fh<2Y0lJ|4ikc-xPJVgJ9u?!e)8UcJW_JU4?%f2H7dSTH5u z93qs{hNTMpXiv>a_$|k8C4Oh(cL{#$@w*kjt@u5O-*54I1HTXP`x=^1K7J$d8;9Q% z{AS}<j32I&6^rm&iXS$y3EToD&cY9IiVgT7PvSoOp2F`X{NBQEJAPkauQ<;BI|%DU z@x#e%XDxo`<98)~8}UO}=N|mF;rBd#ui*D4ejnhs17+=pUjcsm;D@_0+&TDRGorf~ zzZU$u@k3tR%kkUDt2aC6J;)DO?B2^K!G4-y?=<YqWOtOG;|=#J!~JN(eWu|)(Qx0> za34DP=WOLxe&9A<gp>u|&i3BKr+7P4z8z4#S^O1mYyG!Z@phX3_8i{U_-_y4?R5Dz z9pUb@-fo;+zz^EW4+h~XSPxa!3t&B5S-%JC9A!<ydX%!pU@cbGlVB}X)_PdWm31zx z$0+L@SSyuv2CT;_>jYS<m32?#=-REkMwVF&#@l-Tjp1#Bd_$S}CwRNTe|raSH~Md{ z;BAxt_6(w*FQexV!&;}TKYNfjEXM0Xyxzx`+{?dHz#F&nCIr1m1>MS*74TL#ZRKr9 z@C+H?=L`YbxAEy-n79gaqH^_p*CU=1<%Y235AstM-^&xQ9+pY~Z&Q&21ry%~Rs|j( z1*@tFJ`h$_6P&@S;Afw~sw#!O538yP_ByNzUG@^J3Ul@>tO{NB2&@Wob~m!&HxhOW z-u%YJuECq%oY?tzTjw<yb}HWdhR53R<~LE+h&R8fvE%UOH#Js@xAXj1X5p>Jf17}} z3;eg;@s{-8sQh?4xO(bc;7?L>6_X(*7&slo0w2eI3U2i?zCR|23)#JVI(raY>mfb| z)3p`sF<!}j0q*q_Ux4Y;li2e-!d?Uy`!#RJT<1#mGGEPJ12_8vKL-<&m$29Q<?L;6 zwRiaSm_)pl{hi;&wu8HU2*LLWINU$^(`*O0+!y?1OvJsx{>9(soPUVPwvREV_BGGr z-|&GVpNGXDK2(h4!^CcUq!`CXiGBGPF@^6T3i;k*HXkPr<@<?ZzP~8rlSCDtENXe7 zSj3CO5`K_a%4dowKSZ?iLq#W_BYOCe;#6KD&f=wF9Y01~!sm+1d6n3}tHnlsoY=za z#2tL0xQ{Oq5AqYlQ~X5nEI(Pi#3SPOJSyJe%f!2Ux!BHEh=1_7_=0zeuXxg##JioT ze6_QPuW^>}wN8|O&uQgnIi37$r;DHGtmWrBXYh-i^Z6ytMf?iqO8$N48h(wlkzea< z;v1YT{CejO{zK;;zR9_d|H#?KH#<-8+nne5?ar_GUCt}~r_O8q9_LNI)p>_M;C#Rz zbUxybIy?9_=S%*i+mHXk4e@8)0{)ykivP;phrj6V$A9M*@t52g{8e`jf6YCb|Jgm3 z|HZB0Z@G*4+wO_{J-3Db&0WqvaJ%_-w}*f1p2a_L*YVHY%lQuXO8ynN_SfzvDF0go zhJd{L|K#8QYWde=$v^ex$v?aq@=w2M`KRBs{L^n*{^8A#fBNlzko;S1$v^$3<saS* z`KRBs{L^n*{^_?}k$)8Qzf}I|y#05}Kh-Qe`G+^CTAuvVG%f#BBk|;)rfK=7!)f`a zX<Gj2a9aN9H!c74o0fn2P0K(1)~oyz!<Y~SkR+q|cu1N3#h#ELWBGKk4?j$dhtxQL zSBMF`5>ls5Oyvv2G=7qp4v8=el3+G(7l-kc;&8rN9L3KRNAq(ai7pZ4{Blvr*Nb`l zdQrn~g;cst)bp*Pf!{BV=TC~o{AuwW{#$Vpe;HEh4bjBk7A^ck(aJv-ZTxFUtZ&3A zB3~rLAhA-66syE;;#4tCoF?`ar;91#3{fb~5wpcQaj3XJ6pIT*nYdI`iOWQ-xKb<< zSBWL!I<Zu&7g2G8Xcrqrr?^S<h?^11t>P^4V}!gzTq5oimy4f?4dQP2xL0fu_rdic zm=B8w#be?r@wj*v=1byf@q6*ScuTw>-W9(V+r@9hKg7%83-OBhO8mi@B>w136|Xys z#2d~M@s1M}?>epG?@p(9-{}$`I=IEoIYa!@IbVG0TqM45t`z_2TqFMFY!v@?HaWuC z;yBJ7PM&j*6LRiz!p=5lkn@By%z54!?)=Ib<-FpIc3yM#aNczGbl!2sIUhLtI3GFt zJ3E{MoG+cpZa-&=8*+-=0%w{#%9-iz<IHmRa}ITjoWtB1&XMjM=P37Rr_?>xDRXO_ zx$a`8(mm0sc3YepcezvNc02WMkF&@<%Q@a%=bY$X?tI6+(uuemou%$3XPLXj>45xO z^MCU1f3^Jk|8e~HT}%GyH!c70X2?JNrsbc0)ACQh?TY-Pp#P=vPv`BwTmGSO0ZdQ+ zsix-1KTZ1|I{tH3G2yJ{<DBpE@ffM>@0`gCowN9K=Ujf6a~_|A5le-0F|Twk=XK5% ze1UT{KMA9ki1P!!+}Xg}og4W|=Z6^m+``Xve#FngXyy{<Hh#JD6TaTL3nQDK^II{p zxy`vBqn8Kx{mvu&N#{}iG)6eTb)MueJJ0YpoM-vl&M*0g80~!Q{FZ<1{EmO){9fcc zuZls=pTtP#&tf;{O)<`SOYH0XRZMZ-6NS!yh}q5u;!x)wqS*OZlsTV?D(7=i>wGB| zIbVq-&NpJI%S6<5MZ4Qibh-mXkDD(}bq9;H+#zC}TOclRM~KVa-NXiWcd^kOE4H|M zi96i!;y!m@@t`|FJmpRl&$?5^OYVW<_wID@mODed>&_P2-GjwH+{48e?h)cENR~-% zu`|^zhXko`mbmkrC?rj*TkCYX^PMiY!CC7raL$0#Ip1C4T;!hQT<JDC*SJm2Mz`77 z<hD9n+?aER+wR=sb~yLB31^$z<vii8a-N4&`jvZ{^NRaj=QZ~X=S}xa=N(9>58QK| zkK7BL9qvWWm+ob5KlgGs<X+_#xL3QQ-1Y80?hoAk+>LILd!swUz1f}P-r^qZ{@6X% z-Qw1`ce;z+pSUNwce^d_&)wzjeQvjVzuV(J?4IR5;;wTaM{G~HSGrFlhG*PO?h6R@ j667D|2QgECLnR{v_t7V_f8@_UVlWT;*qZb)fyDm<DGCU6 literal 0 HcmV?d00001 diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorridaNovoLayout.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorridaNovoLayout.jrxml new file mode 100644 index 000000000..7a153352d --- /dev/null +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEmpresaCorridaNovoLayout.jrxml @@ -0,0 +1,458 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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="RelatorioEmpresaCorrida" pageWidth="595" pageHeight="842" whenNoDataType="NoDataSection" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="RelatorioEmpresaCorrida" whenResourceMissingType="Empty" uuid="94834362-0ecc-46da-b0a2-5cdee355da3e"> + <property name="net.sf.jasperreports.export.xls.exclude.origin.band.1" value="title"/> + <property name="net.sf.jasperreports.export.pdf.exclude.origin.band.2" value="columnHeader"/> + <property name="net.sf.jasperreports.export.xls.exclude.origin.keep.first.band.1" value="columnHeader"/> + <property name="net.sf.jasperreports.export.xls.exclude.origin.band.3" value="groupHeader"/> + <property name="net.sf.jasperreports.export.xls.exclude.origin.group.3" value="empresa"/> + <property name="net.sf.jasperreports.export.xls.exclude.origin.band.4" value="groupFooter"/> + <property name="net.sf.jasperreports.export.xls.exclude.origin.group.4" value="empresa"/> + <property name="ireport.zoom" value="1.8150000000000004"/> + <property name="ireport.x" value="85"/> + <property name="ireport.y" value="0"/> + <property name="net.sf.jasperreports.export.xls.remove.emtpy.space.between.columns" value="true"/> + <property name="net.sf.jasperreports.export.xls.remove.emtpy.space.between.rows" value="true"/> + <parameter name="fecInicio" class="java.lang.String"> + <defaultValueExpression><![CDATA[]]></defaultValueExpression> + </parameter> + <parameter name="NOMBEMPRESA" class="java.lang.String"/> + <parameter name="fecFinal" class="java.lang.String"/> + <parameter name="USUARIO_ID" class="java.lang.String"/> + <parameter name="LINHA_FILTRO" class="java.lang.String"/> + <parameter name="SERVICO_FILTRO" class="java.lang.String"/> + <parameter name="TITULO" class="java.lang.String"/> + <queryString> + <![CDATA[]]> + </queryString> + <field name="linea" class="java.lang.String"/> + <field name="boletos" class="java.math.BigDecimal"/> + <field name="abonos" class="java.math.BigDecimal"/> + <field name="kmOnibusProprio" class="java.lang.Integer"/> + <field name="kmOnibusArrendados" class="java.lang.Integer"/> + <field name="kmTotal" class="java.lang.Integer"/> + <field name="pasajerosTransportados" class="java.lang.Integer"/> + <field name="empresa" class="java.lang.String"/> + <field name="origem" class="java.lang.String"/> + <field name="destino" class="java.lang.String"/> + <field name="dataCorrida" class="java.lang.String"/> + <field name="turnoOrigem" class="java.lang.String"/> + <variable name="sum.boletos" class="java.math.BigDecimal" resetType="Group" resetGroup="empresa" calculation="Sum"> + <variableExpression><![CDATA[$F{boletos}]]></variableExpression> + </variable> + <variable name="sum.abonos" class="java.math.BigDecimal" resetType="Group" resetGroup="empresa" calculation="Sum"> + <variableExpression><![CDATA[$F{abonos}]]></variableExpression> + </variable> + <variable name="sum.kmOnibusProprio" class="java.lang.Integer" resetType="Group" resetGroup="empresa" calculation="Sum"> + <variableExpression><![CDATA[$F{kmOnibusProprio}]]></variableExpression> + </variable> + <variable name="sum.kmOnibusArrendados" class="java.lang.Integer" resetType="Group" resetGroup="empresa" calculation="Sum"> + <variableExpression><![CDATA[$F{kmOnibusArrendados}]]></variableExpression> + </variable> + <variable name="sum.kmTotal" class="java.lang.Integer" resetType="Group" resetGroup="empresa" calculation="Sum"> + <variableExpression><![CDATA[$F{kmTotal}]]></variableExpression> + </variable> + <variable name="sum.pasajerosTransportados" class="java.lang.Integer" resetType="Group" resetGroup="empresa" calculation="Sum"> + <variableExpression><![CDATA[$F{pasajerosTransportados}]]></variableExpression> + </variable> + <group name="empresa"> + <groupExpression><![CDATA[$F{empresa}]]></groupExpression> + <groupHeader> + <band height="42"> + <textField> + <reportElement uuid="09306494-79f1-44dd-9eed-c39684384bbf" x="0" y="0" width="326" height="20"/> + <textElement> + <font size="12" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="e8355048-a037-4837-866b-e6cf7a3e90ed" stretchType="RelativeToTallestObject" x="319" y="20" width="46" height="22"/> + <textElement markup="none"> + <font size="9"/> + <paragraph firstLineIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.abonos}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="d88253ec-b6d4-4e99-b677-3c1a0b273a81" stretchType="RelativeToTallestObject" x="273" y="20" width="46" height="22"/> + <textElement markup="none"> + <font size="9"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.boletos}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement uuid="569add1e-cb73-4278-b800-fa44631527f6" stretchType="RelativeToTallestObject" x="463" y="20" width="45" height="22"/> + <textElement markup="none"> + <font size="9"/> + <paragraph firstLineIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.kmOnibusArrendados}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement uuid="31387dbf-1cdc-4c27-992f-2e439abea576" stretchType="RelativeToTallestObject" x="423" y="20" width="40" height="22"/> + <textElement markup="none"> + <font size="9"/> + <paragraph leftIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.kmOnibusProprio}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="12ef050d-3938-4dd6-8e82-bfeca7adaa2a" stretchType="RelativeToTallestObject" x="49" y="20" width="51" height="22"/> + <textElement markup="none"> + <font size="9"/> + <paragraph leftIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.linea}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="fb4fcf1b-de90-426b-bfaa-732a08711977" x="326" y="0" width="229" height="20"/> + <textElement verticalAlignment="Bottom"> + <font isBold="true"/> + <paragraph leftIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[$R{header.km.grupo}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement uuid="73c02335-4bbe-44ba-9c73-1201ed6b3967" stretchType="RelativeToTallestObject" x="365" y="20" width="58" height="22"/> + <textElement markup="none"> + <font size="9"/> + <paragraph firstLineIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.pasajerosTransportados}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement uuid="edd89ef1-92d6-4b5f-b249-851532fad9df" stretchType="RelativeToTallestObject" x="508" y="20" width="47" height="22"/> + <textElement markup="none"> + <font size="9"/> + <paragraph firstLineIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.kmTotal}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement uuid="edc6a77e-c068-4251-bb3e-1f08004eb5bf" stretchType="RelativeToTallestObject" x="100" y="20" width="51" height="22"/> + <textElement markup="none"> + <font size="9"/> + <paragraph leftIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.dataCorrida}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement uuid="15a278aa-451b-4c74-8b9c-15262c6f88f6" stretchType="RelativeToTallestObject" x="151" y="20" width="41" height="22"/> + <textElement markup="none"> + <font size="9"/> + <paragraph leftIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.turnoOrigem}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement uuid="1f69061d-585c-4aee-aeba-17c3cf06734e" stretchType="RelativeToTallestObject" x="192" y="20" width="40" height="22"/> + <textElement markup="none"> + <font size="9"/> + <paragraph leftIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.origem}]]></textFieldExpression> + </textField> + <textField isStretchWithOverflow="true"> + <reportElement uuid="ff19c95a-f2a3-4e55-b02e-07cc660acc14" stretchType="RelativeToTallestObject" x="232" y="20" width="41" height="22"/> + <textElement markup="none"> + <font size="9"/> + <paragraph leftIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[$R{detail.destino}]]></textFieldExpression> + </textField> + </band> + </groupHeader> + <groupFooter> + <band height="23"> + <textField pattern="#,##0.00" isBlankWhenNull="true"> + <reportElement uuid="96095298-1c13-4089-8a8b-fd324b377e45" x="273" y="3" width="46" height="16"/> + <textElement textAlignment="Center"> + <font size="10"/> + </textElement> + <textFieldExpression><![CDATA[$V{sum.boletos}]]></textFieldExpression> + </textField> + <line> + <reportElement uuid="6cef9de7-7dee-488b-aea7-3d02a8e3634a" x="0" y="0" width="555" height="1"/> + </line> + <textField pattern="#,##0.00"> + <reportElement uuid="354a3daa-dbb6-45c0-93c3-b9c4f485cbb5" x="319" y="3" width="46" height="16"/> + <textElement textAlignment="Center"/> + <textFieldExpression><![CDATA[$V{sum.abonos}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="2f518abc-f4b9-411b-bb4f-5e58c0a2b301" x="423" y="3" width="40" height="16"/> + <textElement textAlignment="Center"/> + <textFieldExpression><![CDATA[$V{sum.kmOnibusProprio}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="6ce0a6db-3435-4ef2-be61-273af168410f" x="463" y="3" width="45" height="16"/> + <textElement textAlignment="Center"/> + <textFieldExpression><![CDATA[$V{sum.kmOnibusArrendados}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="3abc13c1-b7df-49e7-977a-c49638f639c2" x="508" y="3" width="47" height="16"/> + <textElement textAlignment="Center"/> + <textFieldExpression><![CDATA[$V{sum.kmTotal}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="9a3560b6-4371-4d7c-9336-f7578ccadda8" x="365" y="3" width="58" height="16"/> + <textElement textAlignment="Center"/> + <textFieldExpression><![CDATA[$V{sum.pasajerosTransportados}]]></textFieldExpression> + </textField> + </band> + </groupFooter> + </group> + <background> + <band splitType="Stretch"/> + </background> + <title> + <band height="39"> + <textField> + <reportElement uuid="e5d4714c-07cc-42ff-a7a8-76d6f6d3e716" x="0" y="19" width="49" height="20"/> + <textElement/> + <textFieldExpression><![CDATA[$R{header.periodo}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="66b2d0f6-2bf1-4bc7-9ec0-a34444e04d60" x="399" y="0" width="58" height="19"/> + <textElement/> + <textFieldExpression><![CDATA[$R{header.data.hora}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="be1692e9-f130-4d08-9173-6ca3e4699030" x="444" y="19" width="82" height="20"/> + <textElement textAlignment="Right"> + <paragraph rightIndent="2"/> + </textElement> + <textFieldExpression><![CDATA[$R{header.pagina}+" "+$V{PAGE_NUMBER}+" de"]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="4914d9e7-6ce8-4512-b1f8-13f3b572ac50" x="49" y="19" width="395" height="20"/> + <textElement/> + <textFieldExpression><![CDATA[$P{fecInicio} + " à " + $P{fecFinal}]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="652312bd-292a-424d-a234-5f157e3699c6" x="0" y="0" width="399" height="19"/> + <textElement> + <font size="12" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{TITULO}]]></textFieldExpression> + </textField> + <textField pattern="dd/MM/yyyy HH:mm"> + <reportElement uuid="6f671365-868e-41a6-81ee-a308d1d91e1d" x="457" y="0" width="98" height="19"/> + <textElement textAlignment="Left"/> + <textFieldExpression><![CDATA[new java.util.Date()]]></textFieldExpression> + </textField> + <textField evaluationTime="Report"> + <reportElement uuid="0228244f-d8b1-47c5-9020-513456ec745c" x="526" y="19" width="29" height="20"/> + <textElement/> + <textFieldExpression><![CDATA[$V{PAGE_NUMBER}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEmpresaCorridaBean.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEmpresaCorridaBean.java index 483d5f11e..0d99503f0 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEmpresaCorridaBean.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/RelatorioEmpresaCorridaBean.java @@ -13,6 +13,34 @@ public class RelatorioEmpresaCorridaBean { private Integer kmOnibusArrendados; private Integer kmTotal; private Integer pasajerosTransportados; + private String origem; + private String destino; + private String dataCorrida; + private String turnoOrigem; + + public String getOrigem() { + return origem; + } + + public void setOrigem(String origem) { + this.origem = origem; + } + + public String getDestino() { + return destino; + } + + public void setDestino(String destino) { + this.destino = destino; + } + + public String getDataCorrida() { + return dataCorrida; + } + + public void setDataCorrida(String dataCorrida) { + this.dataCorrida = dataCorrida; + } public Integer getRutaId() { return rutaId; @@ -111,4 +139,12 @@ public class RelatorioEmpresaCorridaBean { return true; } + public String getTurnoOrigem() { + return turnoOrigem; + } + + public void setTurnoOrigem(String turnoOrigem) { + this.turnoOrigem = turnoOrigem; + } + } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEmpresaCorridaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEmpresaCorridaController.java index c1342201a..ccf780179 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEmpresaCorridaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEmpresaCorridaController.java @@ -7,7 +7,6 @@ import java.util.Map; import javax.sql.DataSource; -import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -15,9 +14,11 @@ import org.zkoss.util.resource.Labels; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Datebox; +import org.zkoss.zul.api.Radio; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioEmpresaCorrida; +import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioEmpresaCorridaNovoLayout; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; @@ -27,7 +28,6 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; @Scope("prototype") public class RelatorioEmpresaCorridaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioEmpresaCorridaController.class); @Autowired private DataSource dataSourceRead; @@ -37,11 +37,25 @@ public class RelatorioEmpresaCorridaController extends MyGenericForwardComposer private Datebox datInicial; private Datebox datFinal; private MyComboboxEstandar cmbEmpresa; + private Radio radioAntigoLayout; private List lsEmpresas; private void executarRelatorio() throws Exception { + Map parametros = obtemParametros(); + + Relatorio relatorio = getRelatorio(parametros); + + Map args = new HashMap(); + args.put("relatorio", relatorio); + + openWindow("/component/reportView.zul", + Labels.getLabel("relatorioEmpresaCorridaController.window.title"), args, MODAL); + + } + + private Map obtemParametros() { Map parametros = new HashMap(); Empresa empresa = cmbEmpresa.getSelectedItem() != null ? (Empresa)cmbEmpresa.getSelectedItem().getValue() : null; @@ -53,15 +67,14 @@ public class RelatorioEmpresaCorridaController extends MyGenericForwardComposer parametros.put("empresa", empresa.getEmpresaId()); } parametros.put("TITULO", Labels.getLabel("relatorioEmpresaCorridaController.window.title")); - - Relatorio relatorio = new RelatorioEmpresaCorrida(parametros, dataSourceRead.getConnection()); - - Map args = new HashMap(); - args.put("relatorio", relatorio); - - openWindow("/component/reportView.zul", - Labels.getLabel("relatorioEmpresaCorridaController.window.title"), args, MODAL); + return parametros; + } + private Relatorio getRelatorio(Map parametros) throws Exception { + if (radioAntigoLayout.isChecked()) { + return new RelatorioEmpresaCorrida(parametros, dataSourceRead.getConnection()); + } + return new RelatorioEmpresaCorridaNovoLayout(parametros, dataSourceRead.getConnection()); } public void onClick$btnExecutarRelatorio(Event ev) throws Exception { diff --git a/web/gui/relatorios/filtroRelatorioEmpresaCorrida.zul b/web/gui/relatorios/filtroRelatorioEmpresaCorrida.zul index c7060e450..1b9faf066 100644 --- a/web/gui/relatorios/filtroRelatorioEmpresaCorrida.zul +++ b/web/gui/relatorios/filtroRelatorioEmpresaCorrida.zul @@ -29,7 +29,7 @@ format="dd/MM/yyyy" constraint="no empty" maxlength="10" /> - + + +