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

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@30814 d1611594-4594-4d17-8e1d-87c2c4800839

master
rodrigo 2013-09-10 19:27:27 +00:00
parent 800faa4bf1
commit c6b9d43531
7 changed files with 58 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

84
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioOrigemDestino.jrxml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?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="RelatorioOrigemDestino" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="84b9dfcf-8ec5-4f51-80cc-7339e3b158b4"> <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="RelatorioOrigemDestino" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="84b9dfcf-8ec5-4f51-80cc-7339e3b158b4">
<property name="ireport.zoom" value="1.3310000000000028"/> <property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="153"/> <property name="ireport.y" value="0"/>
<subDataset name="peso_operacional" uuid="6107709b-669e-4e25-b14f-19ae373fd33c"> <subDataset name="peso_operacional" uuid="6107709b-669e-4e25-b14f-19ae373fd33c">
<parameter name="corrida_id_relatorio" class="java.math.BigDecimal"/> <parameter name="corrida_id_relatorio" class="java.math.BigDecimal"/>
<queryString> <queryString>
@ -176,32 +176,32 @@
<text><![CDATA[%Equi]]></text> <text><![CDATA[%Equi]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="36aaad04-9c5f-40f3-a75a-b1702c09094f" x="130" y="0" width="61" height="20"/> <reportElement uuid="36aaad04-9c5f-40f3-a75a-b1702c09094f" x="130" y="0" width="61" height="19"/>
<textElement> <textElement>
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Serviço]]></text> <text><![CDATA[Serviço]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="c0095aaf-98df-4c84-a162-73e7f5fd2fa2" x="191" y="0" width="212" height="20"/> <reportElement uuid="c0095aaf-98df-4c84-a162-73e7f5fd2fa2" x="191" y="0" width="212" height="19"/>
<textElement> <textElement>
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Linha]]></text> <text><![CDATA[Linha]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="c2ca7785-7d17-4ed3-aba1-6dc0324c27ab" x="453" y="0" width="48" height="20"/> <reportElement uuid="c2ca7785-7d17-4ed3-aba1-6dc0324c27ab" x="453" y="0" width="48" height="19"/>
<textElement> <textElement>
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Horário]]></text> <text><![CDATA[Horário]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="b73636f9-9b1b-4538-9364-6abf618779da" x="501" y="0" width="54" height="20"/> <reportElement uuid="b73636f9-9b1b-4538-9364-6abf618779da" x="501" y="0" width="54" height="19"/>
<textElement> <textElement>
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Tar. Max.]]></text> <text><![CDATA[Tar.Max.]]></text>
</staticText> </staticText>
<textField> <textField>
<reportElement uuid="523ac3ad-3918-41f8-9a59-a89ae6bbc9ca" x="130" y="20" width="61" height="20"/> <reportElement uuid="523ac3ad-3918-41f8-9a59-a89ae6bbc9ca" x="130" y="20" width="61" height="20"/>
@ -214,7 +214,7 @@
<textFieldExpression><![CDATA[$F{DESCRUTA}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{DESCRUTA}]]></textFieldExpression>
</textField> </textField>
<textField pattern="HH:mm"> <textField pattern="HH:mm">
<reportElement uuid="933f2533-0f1e-4359-a70b-71f39018068d" x="453" y="19" width="48" height="20"/> <reportElement uuid="933f2533-0f1e-4359-a70b-71f39018068d" x="453" y="20" width="48" height="19"/>
<textElement/> <textElement/>
<textFieldExpression><![CDATA[$F{FECHORSALIDA}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{FECHORSALIDA}]]></textFieldExpression>
</textField> </textField>
@ -225,10 +225,10 @@
<reportElement uuid="e43ff8fc-e645-4e03-a46c-b9259e03eead" x="0" y="43" width="555" height="1"/> <reportElement uuid="e43ff8fc-e645-4e03-a46c-b9259e03eead" x="0" y="43" width="555" height="1"/>
</line> </line>
<line> <line>
<reportElement uuid="aa242ed1-f522-4932-ab75-b459a8e1aa9a" x="0" y="63" width="555" height="1"/> <reportElement uuid="aa242ed1-f522-4932-ab75-b459a8e1aa9a" x="0" y="65" width="555" height="1"/>
</line> </line>
<staticText> <staticText>
<reportElement uuid="21260120-2ec7-4efe-bb44-fbfcd1c0e38c" x="0" y="1" width="130" height="20"/> <reportElement uuid="21260120-2ec7-4efe-bb44-fbfcd1c0e38c" x="0" y="0" width="130" height="19"/>
<textElement> <textElement>
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
@ -239,15 +239,8 @@
<textElement/> <textElement/>
<textFieldExpression><![CDATA[$F{NOMBEMPRESA}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{NOMBEMPRESA}]]></textFieldExpression>
</textField> </textField>
<staticText>
<reportElement uuid="7e4b01fa-7ae7-4e9d-b67e-e215a7cd847f" x="403" y="1" width="50" height="20"/>
<textElement>
<font isBold="true"/>
</textElement>
<text><![CDATA[Sentido]]></text>
</staticText>
<textField isBlankWhenNull="true"> <textField isBlankWhenNull="true">
<reportElement uuid="a24cf606-d6da-4c49-bbc6-1f4df6d625c9" x="403" y="19" width="50" height="20"/> <reportElement uuid="a24cf606-d6da-4c49-bbc6-1f4df6d625c9" x="403" y="20" width="50" height="19"/>
<textElement/> <textElement/>
<textFieldExpression><![CDATA[$F{INDSENTIDOIDA}==1?"Ida":$F{INDSENTIDOIDA}==0?"Volta":""]]></textFieldExpression> <textFieldExpression><![CDATA[$F{INDSENTIDOIDA}==1?"Ida":$F{INDSENTIDOIDA}==0?"Volta":""]]></textFieldExpression>
</textField> </textField>
@ -256,6 +249,13 @@
<textElement/> <textElement/>
<textFieldExpression><![CDATA[$V{PRECIOBASE_1}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{PRECIOBASE_1}]]></textFieldExpression>
</textField> </textField>
<staticText>
<reportElement uuid="7e4b01fa-7ae7-4e9d-b67e-e215a7cd847f" x="403" y="0" width="50" height="19"/>
<textElement>
<font isBold="true"/>
</textElement>
<text><![CDATA[Sentido]]></text>
</staticText>
</band> </band>
</groupHeader> </groupHeader>
<groupFooter> <groupFooter>
@ -320,28 +320,28 @@
<text><![CDATA[Resumo]]></text> <text><![CDATA[Resumo]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="ba8b9a18-6d78-4b14-8266-99736c209dd5" x="0" y="61" width="74" height="20"/> <reportElement uuid="ba8b9a18-6d78-4b14-8266-99736c209dd5" x="0" y="61" width="94" height="20"/>
<textElement> <textElement>
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Extensão:]]></text> <text><![CDATA[Extensão:]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="bbf0782f-ce0f-4d29-9d8e-dc9862a01e21" x="0" y="81" width="74" height="20"/> <reportElement uuid="bbf0782f-ce0f-4d29-9d8e-dc9862a01e21" x="0" y="81" width="94" height="20"/>
<textElement> <textElement>
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Viagens:]]></text> <text><![CDATA[Viagens:]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="f83de431-6542-43c7-84b7-c6fd27dad121" x="0" y="101" width="74" height="20"/> <reportElement uuid="f83de431-6542-43c7-84b7-c6fd27dad121" x="0" y="101" width="94" height="20"/>
<textElement> <textElement>
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<text><![CDATA[KM Rodados:]]></text> <text><![CDATA[KM Rodados:]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="9a6d0493-c402-4a16-ba87-731a610f2338" x="0" y="121" width="74" height="20"/> <reportElement uuid="9a6d0493-c402-4a16-ba87-731a610f2338" x="0" y="121" width="94" height="20"/>
<textElement> <textElement>
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
@ -386,7 +386,7 @@
<textFieldExpression><![CDATA[$V{RECEITA_3}.divide(new BigDecimal($F{VIAGENS}.toString()),2,2 )]]></textFieldExpression> <textFieldExpression><![CDATA[$V{RECEITA_3}.divide(new BigDecimal($F{VIAGENS}.toString()),2,2 )]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00"> <textField pattern="#,##0.00">
<reportElement uuid="1b9f5961-347c-4afe-94a8-8a221be656cb" x="74" y="121" width="100" height="20"/> <reportElement uuid="1b9f5961-347c-4afe-94a8-8a221be656cb" x="94" y="121" width="100" height="20"/>
<textElement textAlignment="Left"> <textElement textAlignment="Left">
<font isBold="false"/> <font isBold="false"/>
</textElement> </textElement>
@ -410,35 +410,35 @@
<text><![CDATA[Localidade]]></text> <text><![CDATA[Localidade]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="4e986dd5-a716-4d02-a723-3e9fbed1d4fd" x="140" y="191" width="74" height="20"/> <reportElement uuid="4e986dd5-a716-4d02-a723-3e9fbed1d4fd" x="140" y="191" width="94" height="20"/>
<textElement> <textElement>
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Rec. Saida]]></text> <text><![CDATA[Rec. Saida]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="07c2b3bb-13ef-4862-95d6-da697714905e" x="214" y="191" width="74" height="20"/> <reportElement uuid="07c2b3bb-13ef-4862-95d6-da697714905e" x="234" y="191" width="94" height="20"/>
<textElement> <textElement>
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Rec. Chegada]]></text> <text><![CDATA[Rec. Chegada]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="8930f2c6-9cbe-419a-9678-8d72dc141eed" x="288" y="191" width="74" height="20"/> <reportElement uuid="8930f2c6-9cbe-419a-9678-8d72dc141eed" x="328" y="191" width="74" height="20"/>
<textElement> <textElement>
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Soma]]></text> <text><![CDATA[Soma]]></text>
</staticText> </staticText>
<staticText> <staticText>
<reportElement uuid="64d4208c-4752-4389-aa26-4ca6e97db6ac" x="362" y="191" width="74" height="20"/> <reportElement uuid="64d4208c-4752-4389-aa26-4ca6e97db6ac" x="402" y="191" width="74" height="20"/>
<textElement> <textElement>
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Peso]]></text> <text><![CDATA[Peso]]></text>
</staticText> </staticText>
<componentElement> <componentElement>
<reportElement uuid="fc473644-667d-480e-adf3-0b7abdc99aa5" x="0" y="211" width="436" height="20" isRemoveLineWhenBlank="true"/> <reportElement uuid="fc473644-667d-480e-adf3-0b7abdc99aa5" x="0" y="211" width="507" height="20" isRemoveLineWhenBlank="true"/>
<jr:list xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd" printOrder="Vertical"> <jr:list xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd" printOrder="Vertical">
<datasetRun subDataset="peso_operacional" uuid="522d9fc1-f32a-42a0-aac6-d2149d3ef7c8"> <datasetRun subDataset="peso_operacional" uuid="522d9fc1-f32a-42a0-aac6-d2149d3ef7c8">
<datasetParameter name="corrida_id_relatorio"> <datasetParameter name="corrida_id_relatorio">
@ -446,7 +446,7 @@
</datasetParameter> </datasetParameter>
<dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($P{lsPesoOperacionalRelatorio})]]></dataSourceExpression> <dataSourceExpression><![CDATA[new net.sf.jasperreports.engine.data.JRBeanCollectionDataSource($P{lsPesoOperacionalRelatorio})]]></dataSourceExpression>
</datasetRun> </datasetRun>
<jr:listContents height="20" width="436"> <jr:listContents height="20" width="507">
<textField> <textField>
<reportElement uuid="4ef0b54c-34d5-4bf6-b86c-b807b23e7026" x="0" y="0" width="140" height="20" isRemoveLineWhenBlank="true"> <reportElement uuid="4ef0b54c-34d5-4bf6-b86c-b807b23e7026" x="0" y="0" width="140" height="20" isRemoveLineWhenBlank="true">
<printWhenExpression><![CDATA[$P{corrida_id_relatorio}.equals(new BigDecimal($F{corridaId}.toString()))]]></printWhenExpression> <printWhenExpression><![CDATA[$P{corrida_id_relatorio}.equals(new BigDecimal($F{corridaId}.toString()))]]></printWhenExpression>
@ -455,28 +455,28 @@
<textFieldExpression><![CDATA[$F{localidade}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{localidade}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00"> <textField pattern="#,##0.00">
<reportElement uuid="06fc754c-d01f-4a92-bd76-7e900d93a69a" x="140" y="0" width="74" height="20" isRemoveLineWhenBlank="true"> <reportElement uuid="06fc754c-d01f-4a92-bd76-7e900d93a69a" x="140" y="0" width="94" height="20" isRemoveLineWhenBlank="true">
<printWhenExpression><![CDATA[$P{corrida_id_relatorio}.equals(new BigDecimal($F{corridaId}.toString()))]]></printWhenExpression> <printWhenExpression><![CDATA[$P{corrida_id_relatorio}.equals(new BigDecimal($F{corridaId}.toString()))]]></printWhenExpression>
</reportElement> </reportElement>
<textElement/> <textElement/>
<textFieldExpression><![CDATA[$F{receitaSaida}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{receitaSaida}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00"> <textField pattern="#,##0.00">
<reportElement uuid="ceb27078-6808-4d71-882d-c22332c3e5a3" x="214" y="0" width="74" height="20" isRemoveLineWhenBlank="true"> <reportElement uuid="ceb27078-6808-4d71-882d-c22332c3e5a3" x="234" y="0" width="94" height="20" isRemoveLineWhenBlank="true">
<printWhenExpression><![CDATA[$P{corrida_id_relatorio}.equals(new BigDecimal($F{corridaId}.toString()))]]></printWhenExpression> <printWhenExpression><![CDATA[$P{corrida_id_relatorio}.equals(new BigDecimal($F{corridaId}.toString()))]]></printWhenExpression>
</reportElement> </reportElement>
<textElement/> <textElement/>
<textFieldExpression><![CDATA[$F{receitaChegada}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{receitaChegada}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00"> <textField pattern="#,##0.00">
<reportElement uuid="d75fc1b6-95f3-453a-8d09-40e9bc7959b8" x="288" y="0" width="74" height="20" isRemoveLineWhenBlank="true"> <reportElement uuid="d75fc1b6-95f3-453a-8d09-40e9bc7959b8" x="328" y="0" width="74" height="20" isRemoveLineWhenBlank="true">
<printWhenExpression><![CDATA[$P{corrida_id_relatorio}.equals(new BigDecimal($F{corridaId}.toString()))]]></printWhenExpression> <printWhenExpression><![CDATA[$P{corrida_id_relatorio}.equals(new BigDecimal($F{corridaId}.toString()))]]></printWhenExpression>
</reportElement> </reportElement>
<textElement/> <textElement/>
<textFieldExpression><![CDATA[$F{soma}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{soma}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00"> <textField pattern="#,##0.00">
<reportElement uuid="fd0a475e-2147-498c-8363-04a4af4031c4" x="362" y="0" width="74" height="20" isRemoveLineWhenBlank="true"> <reportElement uuid="fd0a475e-2147-498c-8363-04a4af4031c4" x="402" y="0" width="74" height="20" isRemoveLineWhenBlank="true">
<printWhenExpression><![CDATA[$P{corrida_id_relatorio}.equals(new BigDecimal($F{corridaId}.toString()))]]></printWhenExpression> <printWhenExpression><![CDATA[$P{corrida_id_relatorio}.equals(new BigDecimal($F{corridaId}.toString()))]]></printWhenExpression>
</reportElement> </reportElement>
<textElement/> <textElement/>
@ -493,24 +493,24 @@
<text><![CDATA[Peso Operacional]]></text> <text><![CDATA[Peso Operacional]]></text>
</staticText> </staticText>
<textField pattern="#,##0.00"> <textField pattern="#,##0.00">
<reportElement uuid="2e9a3a57-4989-4418-83d5-6a389f91f1b7" x="74" y="61" width="100" height="20"/> <reportElement uuid="2e9a3a57-4989-4418-83d5-6a389f91f1b7" x="94" y="61" width="100" height="20"/>
<textElement/> <textElement/>
<textFieldExpression><![CDATA[$F{KM_CORRIDA}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{KM_CORRIDA}]]></textFieldExpression>
</textField> </textField>
<textField pattern="#,##0.00"> <textField pattern="#,##0.00">
<reportElement uuid="9d44eaed-c896-4000-a73d-2443760ede53" x="74" y="101" width="100" height="20"/> <reportElement uuid="9d44eaed-c896-4000-a73d-2443760ede53" x="94" y="101" width="100" height="20"/>
<textElement/> <textElement/>
<textFieldExpression><![CDATA[$V{KM_CORRIDA_1}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{KM_CORRIDA_1}]]></textFieldExpression>
</textField> </textField>
<staticText> <staticText>
<reportElement uuid="214d1ffb-e86e-4d8c-a7a2-3138ac92f161" x="0" y="141" width="74" height="20"/> <reportElement uuid="214d1ffb-e86e-4d8c-a7a2-3138ac92f161" x="0" y="141" width="94" height="20"/>
<textElement> <textElement>
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Pax Ofertado:]]></text> <text><![CDATA[Pax Ofertado:]]></text>
</staticText> </staticText>
<textField pattern="#,##0.00"> <textField pattern="#,##0.00">
<reportElement uuid="5c8faa69-f13d-41c0-9ba4-46007cae9716" x="74" y="141" width="100" height="20"/> <reportElement uuid="5c8faa69-f13d-41c0-9ba4-46007cae9716" x="94" y="141" width="100" height="20"/>
<textElement/> <textElement/>
<textFieldExpression><![CDATA[$V{PAX_OFERTADO}]]></textFieldExpression> <textFieldExpression><![CDATA[$V{PAX_OFERTADO}]]></textFieldExpression>
</textField> </textField>
@ -520,7 +520,7 @@
<textFieldExpression><![CDATA[$V{sum_pax_km}.divide( $V{PAX_OFERTADO}, 4, 2 ).multiply(new BigDecimal("100"))]]></textFieldExpression> <textFieldExpression><![CDATA[$V{sum_pax_km}.divide( $V{PAX_OFERTADO}, 4, 2 ).multiply(new BigDecimal("100"))]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="530855a6-9450-465a-8f7c-cdd67a2a311a" x="74" y="81" width="100" height="20"/> <reportElement uuid="530855a6-9450-465a-8f7c-cdd67a2a311a" x="94" y="81" width="100" height="20"/>
<textElement/> <textElement/>
<textFieldExpression><![CDATA[$F{VIAGENS}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{VIAGENS}]]></textFieldExpression>
</textField> </textField>
@ -559,7 +559,7 @@
<textFieldExpression><![CDATA["Período: " + $P{DATA_DE} + " a " + $P{DATA_ATE}]]></textFieldExpression> <textFieldExpression><![CDATA["Período: " + $P{DATA_DE} + " a " + $P{DATA_ATE}]]></textFieldExpression>
</textField> </textField>
<staticText> <staticText>
<reportElement uuid="bb8d0dec-2060-456e-bca1-c69d7c272fa3" x="0" y="63" width="61" height="20"/> <reportElement uuid="bb8d0dec-2060-456e-bca1-c69d7c272fa3" x="0" y="63" width="74" height="19"/>
<textElement> <textElement>
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
@ -569,19 +569,19 @@
<reportElement uuid="3f36efc2-5272-4015-95bb-b8efdc893b89" x="0" y="82" width="555" height="1"/> <reportElement uuid="3f36efc2-5272-4015-95bb-b8efdc893b89" x="0" y="82" width="555" height="1"/>
</line> </line>
<staticText> <staticText>
<reportElement uuid="3857502f-b69a-4362-97fe-6f7a7f6ee32b" x="0" y="43" width="61" height="20"/> <reportElement uuid="3857502f-b69a-4362-97fe-6f7a7f6ee32b" x="0" y="43" width="74" height="20"/>
<textElement> <textElement>
<font isBold="true"/> <font isBold="true"/>
</textElement> </textElement>
<text><![CDATA[Empresa(s):]]></text> <text><![CDATA[Empresa(s):]]></text>
</staticText> </staticText>
<textField> <textField>
<reportElement uuid="7f31cdf0-886d-4eef-b64c-28bc94c05b77" x="61" y="43" width="494" height="20" isPrintWhenDetailOverflows="true"/> <reportElement uuid="7f31cdf0-886d-4eef-b64c-28bc94c05b77" x="74" y="43" width="471" height="20" isPrintWhenDetailOverflows="true"/>
<textElement/> <textElement/>
<textFieldExpression><![CDATA[$P{EMPRESAS}]]></textFieldExpression> <textFieldExpression><![CDATA[$P{EMPRESAS}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="44b1c344-61df-4dd0-b661-cae5f2f8e699" x="61" y="62" width="494" height="20" isPrintWhenDetailOverflows="true"/> <reportElement uuid="44b1c344-61df-4dd0-b661-cae5f2f8e699" x="74" y="63" width="471" height="19" isPrintWhenDetailOverflows="true"/>
<textElement/> <textElement/>
<textFieldExpression><![CDATA[$P{CORRIDAS_SELECIONADAS}]]></textFieldExpression> <textFieldExpression><![CDATA[$P{CORRIDAS_SELECIONADAS}]]></textFieldExpression>
</textField> </textField>

36
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOrigemDestinoController.java
View File

@ -24,7 +24,6 @@ import org.zkoss.zul.Comboitem;
import org.zkoss.zul.ComboitemRenderer; import org.zkoss.zul.ComboitemRenderer;
import org.zkoss.zul.Datebox; import org.zkoss.zul.Datebox;
import org.zkoss.zul.Intbox; import org.zkoss.zul.Intbox;
import org.zkoss.zul.Paging;
import com.rjconsultores.ventaboletos.entidad.Corrida; import com.rjconsultores.ventaboletos.entidad.Corrida;
import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Empresa;
@ -32,6 +31,7 @@ import com.rjconsultores.ventaboletos.entidad.Parada;
import com.rjconsultores.ventaboletos.entidad.Ruta; import com.rjconsultores.ventaboletos.entidad.Ruta;
import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioOrigemDestino; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioOrigemDestino;
import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
import com.rjconsultores.ventaboletos.service.CorridaService;
import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.EmpresaService;
import com.rjconsultores.ventaboletos.service.RutaService; import com.rjconsultores.ventaboletos.service.RutaService;
import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.utilerias.DateUtil;
@ -39,11 +39,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada;
import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParadaCve; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParadaCve;
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.paginacion.HibernateSearchObject;
import com.rjconsultores.ventaboletos.web.utilerias.paginacion.PagedListWrapper;
import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioOrigemDestinoCorrida; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioOrigemDestinoCorrida;
import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioOrigemDestinoCorridaSelecionadas; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioOrigemDestinoCorridaSelecionadas;
import com.trg.search.Filter;
@Controller("relatorioOrigemDestinoController") @Controller("relatorioOrigemDestinoController")
@Scope("prototype") @Scope("prototype")
@ -53,17 +50,16 @@ public class RelatorioOrigemDestinoController extends MyGenericForwardComposer {
@Autowired @Autowired
private DataSource dataSource; private DataSource dataSource;
@Autowired @Autowired
private transient PagedListWrapper<Corrida> plwCorrida;
@Autowired
private EmpresaService empresaService; private EmpresaService empresaService;
@Autowired @Autowired
private RutaService rutaService; private RutaService rutaService;
@Autowired
private CorridaService corridaService;
private List<Empresa> lsEmpresa; private List<Empresa> lsEmpresa;
private Datebox datInicial; private Datebox datInicial;
private Datebox datFinal; private Datebox datFinal;
private Intbox txtCorridaId; private Intbox txtCorridaId;
private Intbox txtCodLinha; private Intbox txtCodLinha;
private Paging pagingCorrida;
private MyListbox corridaList; private MyListbox corridaList;
private MyListbox corridaSelList; private MyListbox corridaSelList;
private Combobox cmbEmpresa; private Combobox cmbEmpresa;
@ -124,43 +120,35 @@ public class RelatorioOrigemDestinoController extends MyGenericForwardComposer {
} }
private void executarPesquisa() { private void executarPesquisa() {
HibernateSearchObject<Corrida> rutaBusqueda =
new HibernateSearchObject<Corrida>(Corrida.class, pagingCorrida.getPageSize());
Comboitem cbiOrigem = cmbParadaOrigem.getSelectedItem(); Comboitem cbiOrigem = cmbParadaOrigem.getSelectedItem();
Integer iorigem = null;
if (cbiOrigem != null) { if (cbiOrigem != null) {
Parada origem = (Parada) cbiOrigem.getValue(); Parada origem = (Parada) cbiOrigem.getValue();
rutaBusqueda.addFilterEqual("origem", origem); iorigem = origem.getParadaId();
} }
Comboitem cbiDestino = cmbParadaDestino.getSelectedItem(); Comboitem cbiDestino = cmbParadaDestino.getSelectedItem();
Integer idestino = null;
if (cbiDestino != null) { if (cbiDestino != null) {
Parada destino = (Parada) cbiDestino.getValue(); Parada destino = (Parada) cbiDestino.getValue();
rutaBusqueda.addFilterEqual("destino", destino); idestino = destino.getParadaId();
} }
Comboitem cbiRuta = cmbRuta.getSelectedItem(); Comboitem cbiRuta = cmbRuta.getSelectedItem();
Integer iruta = null;
if (cbiRuta != null) { if (cbiRuta != null) {
Ruta ruta = (Ruta) cbiRuta.getValue(); Ruta ruta = (Ruta) cbiRuta.getValue();
rutaBusqueda.addFilterEqual("ruta", ruta); iruta = ruta.getRutaId();
} }
Integer codLinha = txtCodLinha.getValue(); Integer codLinha = txtCodLinha.getValue();
if (codLinha != null) {
rutaBusqueda.addFilterEqual("ruta.numRuta", codLinha);
}
Date dataDe = DateUtil.normalizar(datInicial.getValue()); Date dataDe = DateUtil.normalizar(datInicial.getValue());
Date dataAte = DateUtil.normalizar(datFinal.getValue()); Date dataAte = DateUtil.normalizar(datFinal.getValue());
rutaBusqueda.addFilterEqual("id.corridaId", txtCorridaId.getValue()); Integer corridaId = txtCorridaId.getValue();
rutaBusqueda.addFilterAnd(Filter.greaterOrEqual("id.feccorrida", dataDe), Filter.lessOrEqual("id.feccorrida", dataAte)); List<Corrida> ls = corridaService.buscarGroupCorrridaId(corridaId, iorigem, idestino, iruta, codLinha, dataDe, dataAte);
corridaList.setData(ls);
rutaBusqueda.addSortAsc("id.corridaId");
rutaBusqueda.addFilterEqual("activo", Boolean.TRUE);
plwCorrida.init(rutaBusqueda, corridaList, pagingCorrida);
if (corridaList.getData().length == 0) { if (corridaList.getData().length == 0) {
try { try {

11
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioOrigemDestinoCorrida.java
View File

@ -1,7 +1,5 @@
package com.rjconsultores.ventaboletos.web.utilerias.render; package com.rjconsultores.ventaboletos.web.utilerias.render;
import java.text.SimpleDateFormat;
import org.zkoss.zul.Listcell; import org.zkoss.zul.Listcell;
import org.zkoss.zul.Listitem; import org.zkoss.zul.Listitem;
import org.zkoss.zul.ListitemRenderer; import org.zkoss.zul.ListitemRenderer;
@ -10,21 +8,12 @@ import com.rjconsultores.ventaboletos.entidad.Corrida;
public class RenderRelatorioOrigemDestinoCorrida implements ListitemRenderer { public class RenderRelatorioOrigemDestinoCorrida implements ListitemRenderer {
private SimpleDateFormat sdfHora = new SimpleDateFormat("HH:mm");
private SimpleDateFormat sdfDia = new SimpleDateFormat("dd/MM/yyyy");
public void render(Listitem lstm, Object o) throws Exception { public void render(Listitem lstm, Object o) throws Exception {
Corrida corrida = (Corrida) o; Corrida corrida = (Corrida) o;
Listcell lc = new Listcell(corrida.getId().getCorridaId().toString()); Listcell lc = new Listcell(corrida.getId().getCorridaId().toString());
lc.setParent(lstm); lc.setParent(lstm);
lc = new Listcell(sdfDia.format(corrida.getId().getFeccorrida()));
lc.setParent(lstm);
lc = new Listcell(sdfHora.format(corrida.getFechorsalida()));
lc.setParent(lstm);
lc = new Listcell(corrida.getOrigem().getDescparada()); lc = new Listcell(corrida.getOrigem().getDescparada());
lc.setParent(lstm); lc.setParent(lstm);

7
src/java/com/rjconsultores/ventaboletos/web/utilerias/render/RenderRelatorioOrigemDestinoCorridaSelecionadas.java
View File

@ -1,7 +1,5 @@
package com.rjconsultores.ventaboletos.web.utilerias.render; package com.rjconsultores.ventaboletos.web.utilerias.render;
import java.text.SimpleDateFormat;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zul.Button; import org.zkoss.zul.Button;
@ -14,17 +12,12 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
public class RenderRelatorioOrigemDestinoCorridaSelecionadas implements ListitemRenderer { public class RenderRelatorioOrigemDestinoCorridaSelecionadas implements ListitemRenderer {
private SimpleDateFormat sdfDia = new SimpleDateFormat("dd/MM/yyyy");
public void render(Listitem lstm, Object o) throws Exception { public void render(Listitem lstm, Object o) throws Exception {
Corrida corrida = (Corrida) o; Corrida corrida = (Corrida) o;
Listcell lc = new Listcell(corrida.getId().getCorridaId().toString()); Listcell lc = new Listcell(corrida.getId().getCorridaId().toString());
lc.setParent(lstm); lc.setParent(lstm);
lc = new Listcell(sdfDia.format(corrida.getId().getFeccorrida()));
lc.setParent(lstm);
lc = new Listcell(corrida.getOrigem().getDescparada()); lc = new Listcell(corrida.getOrigem().getDescparada());
lc.setParent(lstm); lc.setParent(lstm);

2
src/java/versionADM.info
View File

@ -1 +1 @@
ADM_20130910_1RC231 ADM_20130910_1RC232

15
web/gui/relatorios/filtroRelatorioOrigemDestino.zul
View File

@ -126,12 +126,6 @@
<listheader <listheader
label="${c:l('relatorioOrigemDestinoController.lbServico.value')}" label="${c:l('relatorioOrigemDestinoController.lbServico.value')}"
width="10%" /> width="10%" />
<listheader
label="${c:l('relatorioOrigemDestinoController.lbFecServico.value')}"
width="10%" />
<listheader
label="${c:l('relatorioOrigemDestinoController.horaSaida.label')}"
width="5%" />
<listheader <listheader
label="${c:l('relatorioOrigemDestinoController.origem.label')}" /> label="${c:l('relatorioOrigemDestinoController.origem.label')}" />
<listheader <listheader
@ -154,16 +148,13 @@
<listheader <listheader
label="${c:l('relatorioOrigemDestinoController.lbServico.value')}" label="${c:l('relatorioOrigemDestinoController.lbServico.value')}"
width="10%" /> width="10%" />
<listheader
label="${c:l('relatorioOrigemDestinoController.lbFecServico.value')}"
width="15%" />
<listheader <listheader
label="${c:l('relatorioOrigemDestinoController.origem.label')}" label="${c:l('relatorioOrigemDestinoController.origem.label')}"
width="33%" /> width="40%" />
<listheader <listheader
label="${c:l('relatorioOrigemDestinoController.destino.label')}" label="${c:l('relatorioOrigemDestinoController.destino.label')}"
width="33%" /> width="40%" />
<listheader width="9%" /> <listheader width="10%" />
</listhead> </listhead>
</listbox> </listbox>
<paging id="pagingSelCorrida" pageSize="10" /> <paging id="pagingSelCorrida" pageSize="10" />