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

fixes bug #7503 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@56338 d1611594-4594-4d17-8e1d-87c2c4800839
master
thiago.penido 2016-05-24 19:47:49 +00:00
parent b81ab24d75
commit 1cffb30ae6
3 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,9 +119,9 @@ public class RelatorioCarteirinha extends Relatorio {
if(clientes.get(i).getLsClienteDescuento() != null && clientes.get(i).getLsClienteDescuento().size() > 0){ if(clientes.get(i).getLsClienteDescuento() != null && clientes.get(i).getLsClienteDescuento().size() > 0){
StringBuilder trechosDescuento = new StringBuilder(); StringBuilder trechosDescuento = new StringBuilder();
for(ClienteDescuento clienteDescuento : clientes.get(i).getLsClienteDescuento()){ for(ClienteDescuento clienteDescuento : clientes.get(i).getLsClienteDescuento()){
trechosDescuento.append(clienteDescuento.getOrigem().getCveparada()); trechosDescuento.append(clienteDescuento.getOrigem().getCveparada() + ":" + clienteDescuento.getOrigem().getDescparada());
trechosDescuento.append(" -> "); trechosDescuento.append(" >> ");
trechosDescuento.append(clienteDescuento.getDestino().getCveparada()); trechosDescuento.append(clienteDescuento.getDestino().getCveparada() + ":" + clienteDescuento.getDestino().getDescparada());
trechosDescuento.append(","); trechosDescuento.append(",");
} }
trechosDescuento.deleteCharAt(trechosDescuento.length()-1); trechosDescuento.deleteCharAt(trechosDescuento.length()-1);
@ -131,7 +131,6 @@ public class RelatorioCarteirinha extends Relatorio {
} }
preecherDataAtual(dataResult); preecherDataAtual(dataResult);
} }
private void preecherDataAtual(Map<String, Object> dataResult) { private void preecherDataAtual(Map<String, Object> dataResult) {

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

Binary file not shown.

56
src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCarteirinha.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="RelatorioCarteirinha" columnCount="2" printOrder="Horizontal" pageWidth="555" pageHeight="802" columnWidth="277" columnSpacing="1" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="45e60734-3047-4ed1-864d-5c96cbf2a87c"> <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="RelatorioCarteirinha" columnCount="2" printOrder="Horizontal" pageWidth="555" pageHeight="802" columnWidth="277" columnSpacing="1" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="45e60734-3047-4ed1-864d-5c96cbf2a87c">
<property name="ireport.zoom" value="2.0"/> <property name="ireport.zoom" value="2.0"/>
<property name="ireport.x" value="40"/> <property name="ireport.x" value="0"/>
<property name="ireport.y" value="29"/> <property name="ireport.y" value="0"/>
<style name="style1"/> <style name="style1"/>
<field name="nomeEmpresa" class="java.lang.String"/> <field name="nomeEmpresa" class="java.lang.String"/>
<field name="enderecoEmpresa" class="java.lang.String"/> <field name="enderecoEmpresa" class="java.lang.String"/>
@ -33,7 +33,7 @@
<detail> <detail>
<band height="188" splitType="Stretch"> <band height="188" splitType="Stretch">
<rectangle> <rectangle>
<reportElement uuid="bc55347b-529d-42a3-be9a-ff3ffcff7c5e" x="10" y="32" width="250" height="148"/> <reportElement uuid="bc55347b-529d-42a3-be9a-ff3ffcff7c5e" x="4" y="32" width="260" height="148"/>
</rectangle> </rectangle>
<textField> <textField>
<reportElement uuid="394f5c12-2c2c-4163-8bc3-acd6f3bc5d28" x="139" y="56" width="108" height="7"/> <reportElement uuid="394f5c12-2c2c-4163-8bc3-acd6f3bc5d28" x="139" y="56" width="108" height="7"/>
@ -43,17 +43,17 @@
<textFieldExpression><![CDATA[$F{cepTelefoneEmpresa}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{cepTelefoneEmpresa}]]></textFieldExpression>
</textField> </textField>
<rectangle> <rectangle>
<reportElement uuid="83734f3b-766a-4763-be16-45b5069c07a4" x="17" y="89" width="61" height="45"/> <reportElement uuid="83734f3b-766a-4763-be16-45b5069c07a4" x="15" y="88" width="70" height="70"/>
</rectangle> </rectangle>
<textField> <textField>
<reportElement uuid="9cb7ec2e-f157-4aea-ab7b-949d4407876e" x="91" y="89" width="23" height="8"/> <reportElement uuid="9cb7ec2e-f157-4aea-ab7b-949d4407876e" positionType="Float" x="91" y="89" width="48" height="8"/>
<textElement markup="none"> <textElement markup="none">
<font size="5"/> <font size="5"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.numero}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.numero}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="db03a582-9ac3-4bd4-8601-b03e61d2d574" x="91" y="97" width="26" height="7"/> <reportElement uuid="db03a582-9ac3-4bd4-8601-b03e61d2d574" positionType="Float" x="91" y="97" width="48" height="7"/>
<textElement markup="none"> <textElement markup="none">
<font size="5"/> <font size="5"/>
</textElement> </textElement>
@ -64,66 +64,66 @@
<imageExpression><![CDATA[$F{logomarca}]]></imageExpression> <imageExpression><![CDATA[$F{logomarca}]]></imageExpression>
</image> </image>
<textField> <textField>
<reportElement uuid="03905d16-be95-4402-a96c-94285b306567" x="139" y="148" width="58" height="11"/> <reportElement uuid="03905d16-be95-4402-a96c-94285b306567" positionType="Float" x="139" y="148" width="58" height="11"/>
<textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> <textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
<font size="5"/> <font size="5"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.assinatura}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.assinatura}]]></textFieldExpression>
</textField> </textField>
<line> <line>
<reportElement uuid="a6e3aac5-6397-4ff0-981b-3e1b0d434947" x="91" y="147" width="156" height="1"/> <reportElement uuid="a6e3aac5-6397-4ff0-981b-3e1b0d434947" positionType="Float" x="91" y="147" width="156" height="1"/>
</line> </line>
<textField> <textField>
<reportElement uuid="9d29c54f-cd25-4a3d-bf57-376894802d22" x="37" y="160" width="118" height="16"/> <reportElement uuid="9d29c54f-cd25-4a3d-bf57-376894802d22" positionType="Float" x="37" y="160" width="118" height="16"/>
<textElement textAlignment="Right" verticalAlignment="Bottom"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="5"/> <font size="5"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{local}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{local}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="3748a0d2-52f4-4d70-a615-94aabc419f3f" x="167" y="160" width="15" height="16"/> <reportElement uuid="3748a0d2-52f4-4d70-a615-94aabc419f3f" positionType="Float" x="167" y="160" width="15" height="16"/>
<textElement textAlignment="Center" verticalAlignment="Bottom" markup="none"> <textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
<font size="5"/> <font size="5"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.de}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.de}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="6c415b9e-2080-4767-a59d-197438e3b97c" x="199" y="160" width="15" height="16"/> <reportElement uuid="6c415b9e-2080-4767-a59d-197438e3b97c" positionType="Float" x="199" y="160" width="15" height="16"/>
<textElement verticalAlignment="Bottom" markup="none"> <textElement verticalAlignment="Middle" markup="none">
<font size="5"/> <font size="5"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.de}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.de}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="5039e861-4bf5-430f-abf0-98cfa54698f8" x="118" y="89" width="40" height="8"/> <reportElement uuid="5039e861-4bf5-430f-abf0-98cfa54698f8" positionType="Float" x="118" y="89" width="146" height="8"/>
<textElement> <textElement>
<font size="5"/> <font size="5"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{numeroCliente}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{numeroCliente}]]></textFieldExpression>
</textField> </textField>
<textField isStretchWithOverflow="true"> <textField isStretchWithOverflow="true" isBlankWhenNull="true">
<reportElement uuid="e420ff44-ca6a-4aac-b83d-a5150c5fd324" x="118" y="104" width="129" height="7" isPrintWhenDetailOverflows="true"/> <reportElement uuid="e420ff44-ca6a-4aac-b83d-a5150c5fd324" positionType="Float" x="118" y="104" width="146" height="7" isPrintWhenDetailOverflows="true"/>
<textElement> <textElement>
<font size="5"/> <font size="5"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{enderecoCliente}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{enderecoCliente}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="f51b30e5-1cd8-4172-9430-e6a1e294ed16" x="118" y="97" width="115" height="7"/> <reportElement uuid="f51b30e5-1cd8-4172-9430-e6a1e294ed16" positionType="Float" x="118" y="97" width="146" height="7"/>
<textElement> <textElement>
<font size="5"/> <font size="5"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{nomeCliente}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{nomeCliente}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="54cf868a-7657-48b4-a8d7-4d288037eb62" positionType="Float" x="118" y="111" width="115" height="7"/> <reportElement uuid="54cf868a-7657-48b4-a8d7-4d288037eb62" positionType="Float" x="118" y="111" width="146" height="7"/>
<textElement> <textElement>
<font size="5"/> <font size="5"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{escola}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{escola}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="6c7dee6a-2ca8-4b8b-8e6e-143ac88d6870" positionType="Float" x="118" y="119" width="115" height="7"/> <reportElement uuid="6c7dee6a-2ca8-4b8b-8e6e-143ac88d6870" positionType="Float" x="118" y="119" width="146" height="7"/>
<textElement> <textElement>
<font size="5"/> <font size="5"/>
</textElement> </textElement>
@ -158,14 +158,14 @@
<textFieldExpression><![CDATA[$R{label.escola}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.escola}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="8301812f-003b-4eb8-96e8-3a24614bb2b3" x="91" y="104" width="26" height="7"/> <reportElement uuid="8301812f-003b-4eb8-96e8-3a24614bb2b3" positionType="Float" x="91" y="104" width="48" height="7"/>
<textElement markup="none"> <textElement markup="none">
<font size="5"/> <font size="5"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$R{label.endereco}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.endereco}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="7cbd4d0f-3dae-42f9-a4fa-9f9f9491e6f7" positionType="Float" x="91" y="119" width="26" height="7"/> <reportElement uuid="7cbd4d0f-3dae-42f9-a4fa-9f9f9491e6f7" positionType="Float" x="91" y="119" width="48" height="7"/>
<textElement markup="none"> <textElement markup="none">
<font size="5"/> <font size="5"/>
</textElement> </textElement>
@ -179,22 +179,22 @@
<textFieldExpression><![CDATA[$R{label.titulo}]]></textFieldExpression> <textFieldExpression><![CDATA[$R{label.titulo}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="d81de290-edf0-4e39-af32-7ab6a4cc944c" x="154" y="160" width="13" height="16"/> <reportElement uuid="d81de290-edf0-4e39-af32-7ab6a4cc944c" positionType="Float" x="154" y="160" width="13" height="16"/>
<textElement textAlignment="Right" verticalAlignment="Bottom"> <textElement textAlignment="Right" verticalAlignment="Middle">
<font size="5"/> <font size="5"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{dia}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{dia}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="8c8e7468-0133-4b72-a5c2-0374b3a77229" x="182" y="160" width="17" height="16"/> <reportElement uuid="8c8e7468-0133-4b72-a5c2-0374b3a77229" positionType="Float" x="182" y="160" width="17" height="16"/>
<textElement verticalAlignment="Bottom"> <textElement verticalAlignment="Middle">
<font size="5"/> <font size="5"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{mes}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{mes}]]></textFieldExpression>
</textField> </textField>
<textField> <textField>
<reportElement uuid="6bab4624-e5ad-4ac0-98a9-8c686673ba08" x="214" y="160" width="17" height="16"/> <reportElement uuid="6bab4624-e5ad-4ac0-98a9-8c686673ba08" positionType="Float" x="214" y="160" width="17" height="16"/>
<textElement verticalAlignment="Bottom"> <textElement verticalAlignment="Middle">
<font size="5"/> <font size="5"/>
</textElement> </textElement>
<textFieldExpression><![CDATA[$F{ano}]]></textFieldExpression> <textFieldExpression><![CDATA[$F{ano}]]></textFieldExpression>