From 1cffb30ae6baf37ddb53ed41d24341f7b207a672 Mon Sep 17 00:00:00 2001 From: "thiago.penido" Date: Tue, 24 May 2016 19:47:49 +0000 Subject: [PATCH] fixes bug #7503 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@56338 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioCarteirinha.java | 9 ++- .../templates/RelatorioCarteirinha.jasper | Bin 32818 -> 32810 bytes .../templates/RelatorioCarteirinha.jrxml | 56 +++++++++--------- 3 files changed, 32 insertions(+), 33 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCarteirinha.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCarteirinha.java index ee33eac84..82ac82e0b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCarteirinha.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCarteirinha.java @@ -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()); - trechosDescuento.append(" -> "); - trechosDescuento.append(clienteDescuento.getDestino().getCveparada()); + trechosDescuento.append(clienteDescuento.getOrigem().getCveparada() + ":" + clienteDescuento.getOrigem().getDescparada()); + trechosDescuento.append(" >> "); + trechosDescuento.append(clienteDescuento.getDestino().getCveparada() + ":" + clienteDescuento.getDestino().getDescparada()); trechosDescuento.append(","); } trechosDescuento.deleteCharAt(trechosDescuento.length()-1); @@ -130,8 +130,7 @@ public class RelatorioCarteirinha extends Relatorio { dataResult.put("trajeto", ""); } - preecherDataAtual(dataResult); - + preecherDataAtual(dataResult); } private void preecherDataAtual(Map dataResult) { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCarteirinha.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCarteirinha.jasper index 5e29e0b00f3be4edb3ad7eba4b62248f1999025d..ed516ef61b5268ed154e663b76d1b5bb0d1a33e7 100644 GIT binary patch delta 3001 zcmZveZA?>F7{~9aP+*+`R$k<-z)BQ>Qa}(=P-`s&SNd{w3OI)aZV;igmOEdz1uXDPv%o#Ibg8j{DWf6ZVQ_{5qIELYK* z!UeJxZ3AnOAnTN@w`R$5?jBsj&#xVW`DWDawS0!A6mF8KXd9S{1evBJ%vVaB?@gZH z-jpm~m(Reuv2H`w*D+j4h0pG+;d6Dv(EFlpr{xg>DLf#cXd3`Uf`BPmZ(S|RVS8w^ zCQ=*q0O>rt;dQ`h4K3_8cUM;PI}PXO)|GSJF$CR@9nY}wQ=^;B@hT_mSaOrIhvm${ z(Kra#J~%K1(0RG3fo0+>ukfI&6l$M0W9{-5FUzD_9&;6&lv)1PdevS5g^WU(n9=B> z<0BFkJha(r7KQxxjq~zY+q`tO9tF;w)-tsHu2r?yp)G}416z?LTPe|2O0ZomB(BYp zRbsVxrug@5x9sf*pwMOj5Lp69i2x}PAY?kA4YuK_-HYZFJO<_>OXgCdxs+%wWV*SB z_V`-IUAu|^3PA&a$Pz$G1W1VhA=3dt0#vy6<2IahsrDh{P}pO@5n19$i5w|`lagK4 zMJBd~mi~07cm8!G&l`WysoEn5qA+0q5?KOCi6AKvBqf0+2=rH1PbR(h_?NA8Scf;N z_P3Ej;fMi6WQigrQlvzRltei~l<`d;ns0+CJSs6~Weq!t0177z03u5ODG?wg0;D9s z2?G4Gc?6!^Zud_6S+u5b#=u%+$y!RZmJ+O23z@#m;_>yx!$uGCHG^xlB-RP zYH@8O>W#$W+H@FS2J9if*IUN!^B;Rlg*M%fai^<@H*U)m9eFr5b22&-o?IBQ3OjQq zqhrxXI6jiHI=!u=5EGWEXhic&j%!o8wlD@M+lqy0K9-ra>5=GUYB0=WCH7|N@$i04 zk1iP)eYH>wT!AIaM#mS85?v8(dSQg<3QsMV6eUZ2Q3f8lYBm3)&&sm-y}s(whp=k8 zvV4E|VA%1dK0fK_3yZg;DVzV(SCS?2Yk5;v8F%?t!YIGL0$d_~8|e4_<)E)Z%;w+t zZA+>x0j#bFU`1!Z)sf8@p;T`$pzav*1w3w_mv);8NZ!IEe7M*eC1DOo0zPEZj#QW+wRK$IVxC_~T|gG~nQOcNJF0btNO{?(t&b{|C=t=NNyn%gZLX ztKV{K9dHGN_#5|OT tX~hQlso_BW`X;Bdt);o8t$nDyqrJ7GHTit_@3K{C-MZ3Dr?YIf@IR}ytRMgY delta 3607 zcmai%ZERCj7{~7^v}H8Il@7Kw?YhCLGS|mgU^wUSaPV$|=8UF@+*{4?2 zkkLMFrV4Lq2nSCbk`^Qgi`hKQXC&$KSeAUA3McT{EiM}?#AlmbK9;ibIg|3+eKq*^ zh5~ZqS-+RCtMGgNaPSOm2w~ZT#8e=aQbJ;>3CXA-B#X4H#{< ziN%yroDF!ey=6bR%C`j39lWdEkMFizM2|qrx5h#Hsr5%==JD2k)QB5GuoLvrP&cYL zLAK!$@_pUdoK?EMtsdc?4v#fYC4A6dN4x00_AXQbQ)D`W|Ms=wH#)+O24V_9@L<&D zin1}gl__pRvYG}a%>I|aZ(-vK+}XM4D{+s)PoauFh-UU^DBg=7b*hdQnnGxzPG;EH z#0f75PIy6ZVhDsNED>tL@jwgyy6Z#7OB4>F8{lkg0_Oz*&I z+f_$`dVmn89-?e);(-?g54<3FU;@6~SBv7X+NXPEa+*HuWvA&syN0O(Wr)~xS9p@<%!a2%ZWMdO1F9=Lt z5SWHgw%g8;8R0{pz$1EsNfJI1*ocP)Cc&RR5O!Rn{vcche{5{xj~4`gydd~91Y$)z zgsuwa$lzIjH^R)H>*cV6E+2wW1b=L7;*S>uf4m_0GlVjK#sBfASIFm9yYFWU(sNpR zM$2i_899~BY54@bPxJu)Htg|IdHuAOjcN1RYnilGR)Owg=dhPmSJ7(gd}cZ^ztW|(tmV@gp1~GK7y0W~XRiO=Q6|bE&*$S9(rOs1w z#H_?elyLuuT(Z2Zc*tcpmFJ0%FO{IrD6TS!V?(2Id{P;ETJMb1llo93Ujx&IR&)^;1ZPD?1Z(xM7KZcN7Hv zFcJj*Ffs)C(~;zrm(5iRmLmT3fEN|9Gf|^&N~}TXE8IF&N8;|OO=v$(Pt}rma!RRb wYwzyp?(7NmgyNlD9bFwEyM&O`j1O5odd2h)p6arKg4702;7OtadzUKz1yA35{r~^~ diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCarteirinha.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCarteirinha.jrxml index cacf7b9a3..1968ecb59 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCarteirinha.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioCarteirinha.jrxml @@ -1,8 +1,8 @@ - - + +