Conforme conversado com Ricardo por telefone, o layout da carteirinha foi alterado.
fixes bug #7503 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@56714 d1611594-4594-4d17-8e1d-87c2c4800839master
thiago.penido
parent
6bcb640fd7
commit
e58e69d836
|
|
@ -119,9 +119,9 @@ public class RelatorioCarteirinha extends Relatorio {
|
|||
if(clientes.get(i).getLsClienteDescuento() != null && clientes.get(i).getLsClienteDescuento().size() > 0){
|
||||
StringBuilder trechosDescuento = new StringBuilder();
|
||||
for(ClienteDescuento clienteDescuento : clientes.get(i).getLsClienteDescuento()){
|
||||
trechosDescuento.append(clienteDescuento.getOrigem().getCveparada() + ":" + clienteDescuento.getOrigem().getDescparada());
|
||||
trechosDescuento.append(clienteDescuento.getOrigem().getDescparada());
|
||||
trechosDescuento.append(" >> ");
|
||||
trechosDescuento.append(clienteDescuento.getDestino().getCveparada() + ":" + clienteDescuento.getDestino().getDescparada());
|
||||
trechosDescuento.append(clienteDescuento.getDestino().getDescparada());
|
||||
trechosDescuento.append(",");
|
||||
}
|
||||
trechosDescuento.deleteCharAt(trechosDescuento.length()-1);
|
||||
|
|
@ -147,11 +147,11 @@ public class RelatorioCarteirinha extends Relatorio {
|
|||
|
||||
private String construirStringEnderecoCompletoCliente(ClienteDireccion clienteDireccion) {
|
||||
StringBuilder enderecoCompletoCliente = new StringBuilder();
|
||||
enderecoCompletoCliente.append(clienteDireccion.getDesccallecomp() != null ? clienteDireccion.getDesccallecomp(): " ");
|
||||
enderecoCompletoCliente.append(" ");
|
||||
enderecoCompletoCliente.append(clienteDireccion.getDesccallecomp() != null ? clienteDireccion.getDesccallecomp(): "");
|
||||
enderecoCompletoCliente.append("");
|
||||
enderecoCompletoCliente.append(clienteDireccion.getDesccalle() != null ? clienteDireccion.getDesccalle(): " " );
|
||||
enderecoCompletoCliente.append(" ");
|
||||
enderecoCompletoCliente.append("Nº ");
|
||||
enderecoCompletoCliente.append("");
|
||||
enderecoCompletoCliente.append(", Nº ");
|
||||
enderecoCompletoCliente.append(clienteDireccion.getNumexterior() != null ? clienteDireccion.getNumexterior(): " ");
|
||||
enderecoCompletoCliente.append(", BAIRRO ");
|
||||
enderecoCompletoCliente.append(clienteDireccion.getDesccolonia() != null ? clienteDireccion.getDesccolonia(): " " );
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -33,167 +33,167 @@
|
|||
<detail>
|
||||
<band height="188" splitType="Stretch">
|
||||
<rectangle>
|
||||
<reportElement uuid="bc55347b-529d-42a3-be9a-ff3ffcff7c5e" x="4" y="32" width="260" height="148"/>
|
||||
<reportElement uuid="bc55347b-529d-42a3-be9a-ff3ffcff7c5e" x="3" y="29" width="270" height="156"/>
|
||||
</rectangle>
|
||||
<textField>
|
||||
<reportElement uuid="394f5c12-2c2c-4163-8bc3-acd6f3bc5d28" x="139" y="56" width="108" height="7"/>
|
||||
<reportElement uuid="394f5c12-2c2c-4163-8bc3-acd6f3bc5d28" x="142" y="50" width="108" height="7"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{cepTelefoneEmpresa}]]></textFieldExpression>
|
||||
</textField>
|
||||
<rectangle>
|
||||
<reportElement uuid="83734f3b-766a-4763-be16-45b5069c07a4" x="15" y="88" width="70" height="70"/>
|
||||
<reportElement uuid="83734f3b-766a-4763-be16-45b5069c07a4" x="7" y="85" width="81" height="88"/>
|
||||
</rectangle>
|
||||
<textField>
|
||||
<reportElement uuid="9cb7ec2e-f157-4aea-ab7b-949d4407876e" positionType="Float" x="91" y="89" width="48" height="8"/>
|
||||
<reportElement uuid="9cb7ec2e-f157-4aea-ab7b-949d4407876e" positionType="Float" x="94" y="83" width="48" height="8"/>
|
||||
<textElement markup="none">
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.numero}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="db03a582-9ac3-4bd4-8601-b03e61d2d574" positionType="Float" x="91" y="97" width="48" height="7"/>
|
||||
<reportElement uuid="db03a582-9ac3-4bd4-8601-b03e61d2d574" positionType="Float" x="94" y="95" width="48" height="7"/>
|
||||
<textElement markup="none">
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.nome}]]></textFieldExpression>
|
||||
</textField>
|
||||
<image isUsingCache="true" evaluationTime="Auto">
|
||||
<reportElement uuid="26b05150-ef3c-4858-b212-0bfac5b8acf8" x="17" y="39" width="97" height="32"/>
|
||||
<reportElement uuid="26b05150-ef3c-4858-b212-0bfac5b8acf8" x="20" y="33" width="97" height="32"/>
|
||||
<imageExpression><![CDATA[$F{logomarca}]]></imageExpression>
|
||||
</image>
|
||||
<textField>
|
||||
<reportElement uuid="03905d16-be95-4402-a96c-94285b306567" positionType="Float" x="139" y="148" width="58" height="11"/>
|
||||
<reportElement uuid="03905d16-be95-4402-a96c-94285b306567" positionType="Float" x="142" y="146" width="58" height="11"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.assinatura}]]></textFieldExpression>
|
||||
</textField>
|
||||
<line>
|
||||
<reportElement uuid="a6e3aac5-6397-4ff0-981b-3e1b0d434947" positionType="Float" x="91" y="147" width="156" height="1"/>
|
||||
<reportElement uuid="a6e3aac5-6397-4ff0-981b-3e1b0d434947" positionType="Float" x="94" y="145" width="156" height="1"/>
|
||||
</line>
|
||||
<textField>
|
||||
<reportElement uuid="9d29c54f-cd25-4a3d-bf57-376894802d22" positionType="Float" x="37" y="160" width="118" height="16"/>
|
||||
<reportElement uuid="9d29c54f-cd25-4a3d-bf57-376894802d22" x="88" y="172" width="104" height="10"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{local}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="3748a0d2-52f4-4d70-a615-94aabc419f3f" positionType="Float" x="167" y="160" width="15" height="16"/>
|
||||
<reportElement uuid="3748a0d2-52f4-4d70-a615-94aabc419f3f" x="204" y="172" width="15" height="10"/>
|
||||
<textElement textAlignment="Center" verticalAlignment="Middle" markup="none">
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.de}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="6c415b9e-2080-4767-a59d-197438e3b97c" positionType="Float" x="199" y="160" width="15" height="16"/>
|
||||
<reportElement uuid="6c415b9e-2080-4767-a59d-197438e3b97c" x="236" y="172" width="15" height="10"/>
|
||||
<textElement verticalAlignment="Middle" markup="none">
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.de}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="5039e861-4bf5-430f-abf0-98cfa54698f8" positionType="Float" x="118" y="89" width="146" height="8"/>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement uuid="5039e861-4bf5-430f-abf0-98cfa54698f8" positionType="Float" x="121" y="83" width="146" height="8" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement>
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{numeroCliente}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement uuid="e420ff44-ca6a-4aac-b83d-a5150c5fd324" positionType="Float" x="118" y="104" width="146" height="7" isPrintWhenDetailOverflows="true"/>
|
||||
<reportElement uuid="e420ff44-ca6a-4aac-b83d-a5150c5fd324" positionType="Float" x="121" y="106" width="146" height="7" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement>
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{enderecoCliente}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="f51b30e5-1cd8-4172-9430-e6a1e294ed16" positionType="Float" x="118" y="97" width="146" height="7"/>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement uuid="f51b30e5-1cd8-4172-9430-e6a1e294ed16" positionType="Float" x="121" y="95" width="146" height="7" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement>
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{nomeCliente}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="54cf868a-7657-48b4-a8d7-4d288037eb62" positionType="Float" x="118" y="111" width="146" height="7"/>
|
||||
<textField isStretchWithOverflow="true" isBlankWhenNull="true">
|
||||
<reportElement uuid="54cf868a-7657-48b4-a8d7-4d288037eb62" positionType="Float" x="121" y="116" width="146" height="7" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement>
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{escola}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="6c7dee6a-2ca8-4b8b-8e6e-143ac88d6870" positionType="Float" x="118" y="119" width="146" height="7"/>
|
||||
<textField isStretchWithOverflow="true">
|
||||
<reportElement uuid="6c7dee6a-2ca8-4b8b-8e6e-143ac88d6870" positionType="Float" x="121" y="126" width="146" height="7" isPrintWhenDetailOverflows="true"/>
|
||||
<textElement>
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{trajeto}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="df8ed424-684c-48a4-8aa3-5ecd916e17b9" x="139" y="39" width="108" height="7"/>
|
||||
<reportElement uuid="df8ed424-684c-48a4-8aa3-5ecd916e17b9" x="142" y="33" width="108" height="7"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{nomeEmpresa}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="e8992c9f-8d48-44cc-90fa-811f36c50c11" x="139" y="48" width="108" height="7"/>
|
||||
<reportElement uuid="e8992c9f-8d48-44cc-90fa-811f36c50c11" x="142" y="42" width="108" height="7"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{enderecoEmpresa}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="79715320-72a3-4dc0-aa97-db4093ff03a4" x="139" y="64" width="108" height="7"/>
|
||||
<reportElement uuid="79715320-72a3-4dc0-aa97-db4093ff03a4" x="142" y="58" width="108" height="7"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{cnpjIEstadualEmpresa}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="4b3cd63f-ddbd-435b-8706-f5a644bc952f" positionType="Float" x="91" y="111" width="48" height="7"/>
|
||||
<reportElement uuid="4b3cd63f-ddbd-435b-8706-f5a644bc952f" positionType="Float" x="94" y="116" width="48" height="7"/>
|
||||
<textElement markup="none">
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.escola}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="8301812f-003b-4eb8-96e8-3a24614bb2b3" positionType="Float" x="91" y="104" width="48" height="7"/>
|
||||
<reportElement uuid="8301812f-003b-4eb8-96e8-3a24614bb2b3" positionType="Float" x="94" y="106" width="48" height="7"/>
|
||||
<textElement markup="none">
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.endereco}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="7cbd4d0f-3dae-42f9-a4fa-9f9f9491e6f7" positionType="Float" x="91" y="119" width="48" height="7"/>
|
||||
<reportElement uuid="7cbd4d0f-3dae-42f9-a4fa-9f9f9491e6f7" positionType="Float" x="94" y="126" width="48" height="7"/>
|
||||
<textElement markup="none">
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.trajeto}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="1b9eb694-5e65-461d-89dd-76725bfe36c7" x="34" y="73" width="211" height="14"/>
|
||||
<reportElement uuid="1b9eb694-5e65-461d-89dd-76725bfe36c7" x="37" y="67" width="211" height="14"/>
|
||||
<textElement textAlignment="Center" markup="none">
|
||||
<font size="8" isBold="true"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{label.titulo}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="d81de290-edf0-4e39-af32-7ab6a4cc944c" positionType="Float" x="154" y="160" width="13" height="16"/>
|
||||
<reportElement uuid="d81de290-edf0-4e39-af32-7ab6a4cc944c" x="191" y="172" width="13" height="10"/>
|
||||
<textElement textAlignment="Right" verticalAlignment="Middle">
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{dia}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="8c8e7468-0133-4b72-a5c2-0374b3a77229" positionType="Float" x="182" y="160" width="17" height="16"/>
|
||||
<reportElement uuid="8c8e7468-0133-4b72-a5c2-0374b3a77229" x="219" y="172" width="17" height="10"/>
|
||||
<textElement verticalAlignment="Middle">
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
<textFieldExpression><![CDATA[$F{mes}]]></textFieldExpression>
|
||||
</textField>
|
||||
<textField>
|
||||
<reportElement uuid="6bab4624-e5ad-4ac0-98a9-8c686673ba08" positionType="Float" x="214" y="160" width="17" height="16"/>
|
||||
<reportElement uuid="6bab4624-e5ad-4ac0-98a9-8c686673ba08" x="251" y="172" width="17" height="10"/>
|
||||
<textElement verticalAlignment="Middle">
|
||||
<font size="5"/>
|
||||
</textElement>
|
||||
|
|
|
|||
Loading…
Reference in New Issue