From 27eef07fafdaffe2c988576a3189aecc6f43c29c Mon Sep 17 00:00:00 2001 From: frederico Date: Thu, 3 May 2018 17:55:39 +0000 Subject: [PATCH] bug#11018 dev:veloso qua:wallysson git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@81552 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../impl/RelatorioHistoricoClientes.java | 3 + ...toricoClientesSemAgrupamento_es.properties | 1 + ...icoClientesSemAgrupamento_pt_BR.properties | 1 + .../RelatorioHistoricoClientes_es.properties | 1 + ...elatorioHistoricoClientes_pt_BR.properties | 1 + .../RelatorioHistoricoClientes.jasper | Bin 47795 -> 48948 bytes .../RelatorioHistoricoClientes.jrxml | 32 +++++++--- ...orioHistoricoClientesSemAgrupamento.jasper | Bin 43935 -> 45034 bytes ...torioHistoricoClientesSemAgrupamento.jrxml | 58 +++++++++++------- .../relatorios/RelatorioSisdapController.java | 1 - web/WEB-INF/i3-label_es_MX.label | 5 +- web/WEB-INF/i3-label_pt_BR.label | 5 +- 12 files changed, 74 insertions(+), 34 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoClientes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoClientes.java index 92e6baca9..15a42fd6b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoClientes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioHistoricoClientes.java @@ -42,6 +42,7 @@ public class RelatorioHistoricoClientes extends Relatorio { dataResult.put("sigla", rset.getString("sigla")); dataResult.put("bilhete", rset.getString("bilhete")); + dataResult.put("agencia", rset.getString("agencia")); dataResult.put("linha", rset.getString("linha")); dataResult.put("origem", rset.getString("origem")); dataResult.put("destino", rset.getString("destino")); @@ -95,6 +96,7 @@ public class RelatorioHistoricoClientes extends Relatorio { sql.append("OR (caja.TIPOVENTA_ID NOT IN (12,18,49,5))) "); sql.append("THEN 'NO' ELSE 'IP' END as sigla,"); sql.append("caja.NUMFOLIOSISTEMA AS bilhete, "); + sql.append("puntoVenta.NOMBPUNTOVENTA AS agencia, "); sql.append("ruta.DESCRUTA AS linha, "); sql.append("origem.DESCPARADA AS origem, "); sql.append("destino.DESCPARADA AS destino, "); @@ -125,6 +127,7 @@ public class RelatorioHistoricoClientes extends Relatorio { sql.append("INNER JOIN PARADA destino ON destino.PARADA_ID = caja.DESTINO_ID "); sql.append("INNER JOIN CLASE_SERVICIO classe ON classe.CLASESERVICIO_ID = caja.CLASESERVICIO_ID "); sql.append("INNER JOIN CLIENTE cliente ON caja.CLIENTE_ID = cliente.CLIENTE_ID "); + sql.append("INNER JOIN PUNTO_VENTA puntoVenta ON puntoVenta.PUNTOVENTA_ID = caja.PUNTOVENTA_ID "); sql.append("WHERE caja.MOTIVOCANCELACION_ID IS NULL "); sql.append("AND (caja.INDSTATUSBOLETO in( 'V','T') and INDREIMPRESION = 0 and not exists(select * from caja c1 where c1.indstatusboleto = 'E' and caja.transacao_id = C1.TRANSACAOORIGINAL_ID ) or caja.INDSTATUSBOLETO = 'E' ) "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_es.properties index e7b873e63..537f25b1a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_es.properties @@ -17,6 +17,7 @@ label.emailCliente=Email label.telCliente=Tel label.sigla=Tipo label.bilhete=Bilhete +label.agencia=Agência label.linha=Linha label.origem=Origem label.destino=Destino diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_pt_BR.properties index e7b873e63..537f25b1a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientesSemAgrupamento_pt_BR.properties @@ -17,6 +17,7 @@ label.emailCliente=Email label.telCliente=Tel label.sigla=Tipo label.bilhete=Bilhete +label.agencia=Agência label.linha=Linha label.origem=Origem label.destino=Destino diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientes_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientes_es.properties index b541353de..898185897 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientes_es.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientes_es.properties @@ -17,6 +17,7 @@ label.emailCliente=Email: label.telCliente=Tel: label.sigla=Tipo label.bilhete=Bilhete +label.agencia=Agência label.linha=Linha label.origem=Origem label.destino=Destino diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientes_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientes_pt_BR.properties index b541353de..898185897 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientes_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioHistoricoClientes_pt_BR.properties @@ -17,6 +17,7 @@ label.emailCliente=Email: label.telCliente=Tel: label.sigla=Tipo label.bilhete=Bilhete +label.agencia=Agência label.linha=Linha label.origem=Origem label.destino=Destino diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientes.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientes.jasper index 438685c9a8d67df8442facf891d2a9bedda7e707..d636dfd3abe5286a4a715c00d2a687df90372c13 100644 GIT binary patch literal 48948 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 J>S#mce*l-s*~0(; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientes.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientes.jrxml index bcefd2ca7..8a9575554 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientes.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientes.jrxml @@ -1,8 +1,8 @@ - + - + @@ -29,6 +29,7 @@ + @@ -122,14 +123,14 @@ $F{cpfCliente}.substring(0,3) - + - + @@ -164,7 +165,7 @@ $F{cpfCliente}.substring(0,3) - + @@ -205,6 +206,14 @@ $F{cpfCliente}.substring(0,3) + + + + + + + + @@ -322,21 +331,21 @@ $F{cpfCliente}.substring(0,3) - + - + - + @@ -405,6 +414,13 @@ $F{cpfCliente}.substring(0,3) + + + + + + + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jasper index 0cfed350a314ad16ec833d95c756c3473c3678ee..b24e0a00b5e40a5a057db9106d50fa8034625d22 100644 GIT binary patch delta 13246 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 delta 12729 zcmcgy34B$>)jwzEkv#HlAS95Og;fF}!9d8u9tc?^ke59O2*#J>B|LapNFIv_T!IKF zlx@_itt?hcaj9rDajT-#eW}*9S_@RAMJp7ob*adA=FZK_yOMlA+w}Vab8^oAoSAd( z%-lI=E_`x~?R$qEuCm+1SJ?m{x<$AmhVDM%XuH8)8q#MH0D6The$WFEi~AbV9VCru z+ZI<5+^3L~LkzLs$QSJRs=?wVCCK0}2EQ(O6AL}C9M(f_i=;UqPBbUAO-|XsMD?1C zwlk^spuxPJ{%gfNG;tt`Ra0IJHlq<)2~h(LKNK4@$w9)1V5?}Esyntw)*#o2rzS?! zD7ne-H5cG$c@zEkZMG;yc~6RY-6*KPG1~mjk**P0GcFM`rwkAeOiM{HrsoHdNlU{k zOf(tXBplP7jvHho2H7K{6=Bn=agQ&N?ba zO}G=X9Kv zVHxC%5tfp>2`f-x2`f-x3CmPm5Y`!Exi{qv6#Zwzs&a)BK0-nZt0uEPtRlJtwyZ_p|3ZMbez3VtzsT$X9>Ndvbq)Q`|WBsCdem5)Xg* zF+HLRo#Oj~qhfSXPj8l9GzyzUO2r6KQ}~Fuws=bq!45Am?Hr|Y#tc$y%$Sn9nK7j> zX3S*ejG5*a%viB8V^L)mo@M{;VsQDR-ARm$#j!;`EVR`Tayn$s+(%F zy&iXi&n@3+wqLX^j*F5S&0X*EcrVbYUOxAQnlRa`Pm8C{>*^XRT!O(>9`6!&pa*5^ z^)xIAupJ<6gBqJXb?*8fj!@%n@p&2=e+aj@n^$_O17I~qHHFX;@IVoAWP4Mi*Vo+G z5a3alc;6bA&o$58P-7}+(tXfxscWSxd4jmX$<_z3NKT&GJN@9a}VITN9CvdW5cODjur zi;GIjRh;|9K38h6X(0w|kH|G~W3UKgu$JZCZr~jI(w95m*y9j7vy&KF#L_9T|GpctcsLVLQKst5~kJ+lfvSf(Ii}3la$!$e4rU_ zUVcF?O+#5x!Mxnkzz4oWzEQ(|u8#n&E&ARp4pyne!o9-4SFx zz%@d2xWi?Sm)!E%B@kL`0K;pC4^=}9Fy__kYN$(|)!68DyEXpRpC zOh`^iOHH3NX;R8~`IC}D+m1WwNbq@lUbhqq=~St1^scCHnC*7exSJ(5*9Uy!gz=Is z@Bz!1Ah}{6*nG_^j7~*uQJ&BEV0PY!lrIKYb(%_HkapEZ>Bnou@cQBr_0*|2>(X3O zTwuIjT2~2CpNqBP5A}sH4c%EuqpL(#!*nvz8wz4p_H6XAVRUh0QGaq9lwDL%;Vd+) zMQh_C#{MdfHO|D_#PYZpF{P=%al0JaAp6AbridUVih!Y!z4Zu{fdrU-I(egON2SsLjvbeRm#qorU#31cPBubW% zOj2w&kpwC%k(ixJR>WbuXjm~$e4p4)yxr1l`dj5&=6GHDGssJZKP4Of6x)rzK!wGh z*;)E~iTt&je#%xZ)%Z#2$RNiJM@lvvDYhF&feMQwv$J$`-2Y%(R^4hkEM7e(_%(S6 z;E#(96Vo;Ro#YMjmEl~;hI7Ss<2+Ddac*{&&cE_I*RR@aI!{|O2453bteNKMPhM>X z2@y}Njwn&Gaus+ZQ#SoCjKQJ^jKNfhtc+M@3-Je0ef7N*#DKMvD1bR@$2vyI01Prx z22i8qZUP8Y1a5NGd6ep53Bc?@2fR#Q{_SlW*}1*j;@6#$8(Y3&WAudJj3#-b1ffre z7spd`sXt&hYWD1dNThqSnT z*^Tv09B)eKpBQFt0HYW5>di=%jAAN$rWZZ~w ziP&Em6J42-K4JXi^puI?Cr(UDsm#boOA7`>DjApei4#SegWC$PSgZ_$h zY81ZVqez1RiqlIp2v=;G1`&#@&|skAF4JI;;udHSskqBEh*I2Q4K7k#r3TT8b7>Hx zxM~ez73bC}86*R)b3vw?%_w#a*YtIK^$# zU_7MAsDGlt1jX&tAXRa@HAqvO&>&rLH;VDsuUU92{49hz{Tw00)8O&tdEDL_dWgLW z-iKh9@H|&Dfd>?LJ3^>gA{7*6XBFhy;SPdiwK7gt(Br7242E9{+qM+Pui%ga4#Hgs zz^(g-G*AB0Wzi%J3@HOgT)?Rk_J;h?J;_UDy8JKmO9o|NW zG~XK-OZ%Nm6A+y7Gv?UrE>)qzH)eheiAdAAv z!V2fC+|nRBQt3FZbL*ATKK8h(yzXFRwEa{WXPVm4MpNV84RlMfV-UGBMl)_LcBIiX zvy+L0h(SANV}EhQ&dBfq2)2a$G4nLYz=#kG$AMz=&XE^KVpIs+ix<&GFkTT^(2pzg zHG3NBf-xopIbI}Q*%^z2#i^aKAwv;(i?11BlsLRA-Z53f;W&ccP`p@V?n-yWFo$WC>_miY^H8A z$%=5eM+R-@QZ>zR1F7(ITxruR+`1PL1Iakp1 zDNg~r7_X%HQE1?I6+2e>tpoNr)`Y+Zv<-%f=%hMwT;{GH*14t8L;K(BZm9Dup{Vwp@X#&1e3 z#&1e2#&1e1^xIDF8`TR$<>&h+$sP&)G_eDwB;rFbO_EGWW=b+kk{n6$B$+MA97zf! zDU_sGl2S?Za!Kb&GGCH~k}Q(s3Q4Y%q)L(+NoploBFR!oypl9X(j-Z3(`(gr5?9nzG)@H$AC` zlYBGWq9%nhv6|Je#H0?mEpcoI>`%O;1AfufFWi{*QYyE~sFW(F;;4f9P^wlVun6EJ z1MW*q3cvFaxSPQdxR?IQ`ArJH&w^woCh6h#TcDX_)Mi0u5%Q1)$swe}g5(kMhy|HV z$YT~{4k5p>AO(czPghe16~fCkKgMw|yt zxCEBt8feDt(1Lq`zNg5-O>Gjq)7&JviF#7_`({`l9Dxty8<7-#%z}6cIblH>2>H;0 zG!gQ#1!*SaFBZf{$SDi5QtrP`EzoK*`pkl?A>@n&Sxd-S3$mV&FD%FgLcX*h8wvT! zf@~s0|HcAsCg@)lWGf-(EXehQoVOs`yI#*ix`Y6%rIlPqE4iLlQm2*NKr7iwE4h)7 zYiK1m(Mn!RE4dl;XJHF1u4#jr={FROSzqv@+Y*EJ80Rcv^GzN?P}TRI7^B^ zR3RWgf?S?91og2%yCf8Bf%ZtKZy==8!9D4M7)?w( zwG?X8snO>OTtICTwVl*nr1loI52?w|ecw=~q0GbjQ;VTSec5Y*GU7coWxU=jZ@MXg~){d=P5dG5QF`IuEihNZQek zaYrzmq>mrNAqx^Ca9BHzd>9itkXG@Mc1$6og{lh)?U+uck3NPI7j)nxV(&A1P3i2V zcXczzZpZ27ND(-L%>2Xn$XgZxG>nJ5)cOOvoD|tgQA}*EVsnYTRIyWt%~$L=V&^J$ zB(Y9i@zKN=DYhT6C5q+5mKiL5O>Bi?KO^=s#r~Pt1&V!#*vl3BGO>#l`xLR2ift#> zrP#ZPtyZkQpLn<8Z=|Q%*p9WvbmJD1w)&;3NLuNamXWl^FD)i%sb4B0smU*8k>oX` ziOz$VO49XyDV`+VXNXHk8Aak+ztoqc)rLfC5C0;m*)M%Y(t5vijHC^I>2;E}E9p7t z8-Ys?LTDF6Lmeh*lQL+>20hHN55l^jgWxf?h~I_>wPUl|U}4GaxT4E6C`_tod;9Y_U&3e_OK|r`EjG75wg%;v}L1*Hf za2yWNQF0gj4Sr3>$$juOw9%3BAll$zI#wQ`!{|43vOIxt@HCw+M==4OqZ8(NOrvY} zba(}4!s~R>{9eaGx;-y|cW@EBPe;xlaSPpgcftwW10U1Ta}r;n8|+)~DZUG5=m`2d zo}^ppY4{S)!Z&mjeT(10_jDYcXTiu>f3&f1w6hrO%LZd8i^qN}0mIpNj9{r4#irs# zEED5c9u8*tIGmNBK7y6wD7FYkvr0^2bvTwS#qq2eQ`ibjXX`M7ZNMpPD^6wGa0U}N zlih?lY%k`r1DMYa;T(1k7P1a3Vvk}Odj`wd^EjWqfeYB%xR{;5E7(U^#m-Y?;^rI^ybHCy`#{5PAOhI*Ifmhv@%}B=T?PkgNSUME`Fj z5laq{WB>RZqIYJu-Xsy@_-6l64$%){?~}-dIb^LRhnSL?Lrh8K5FJg?Od_UaCJ|FI zlL$!xNyL<75}_PIQa}zdB{PSR6p%wq$;=_TDVj;dl*}X|r5_{_)4)t3QlcahkV7P5 z$srQxK8Hw6klsxak&14Uh@t2viBJxaDoSo<4l$)3a|j-xvh`^?=%3Z$6h23vC10Ww z{bl-|_!=U#{~QcQ}AQ@UUmwn<0te*>om^AGxUw= z3tWKzz(x2qZo+SH3!cNB_&x4n3}0j%U!m;q7PI5KOv4XZD4t{k@HAzLvrLb~Z&(z5 z$LJr|SR4yx!&rYdoQ1P^7Q;rd!7P!uB$mL&vGMdLm8G$%ES+Vt$t;geVfnkzV8wop;_u{_P~P!JkBWkwbL< zO~jH!@P+ZPe`0Wfw9jfU82pfm^^-gqPxEnjmZ#!3JPp62L)XS9vtT}* z_2-!^oX=u0bO;aTm$G<1n6`&K&0 zucHI}C+rzI-Jj=s*c)81xA{-m34SyCi2t0O;kU8R`2lv0-_C*mlIsqBkoV(v^Jsn# zkK>2=XnsFWC&-3?e5&TVCB!9ye#oxEZ@ME@ke%zM8KeDCrkH^?D i_$gZ^KTBz#l`fa`ZxTL;=;nVw_(bc3A>z&ZBL4?ZNZU;S diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jrxml index 82d8cb52c..ae1a9d13d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioHistoricoClientesSemAgrupamento.jrxml @@ -1,8 +1,8 @@ - - - + + + @@ -29,6 +29,7 @@ + <band height="79" splitType="Stretch"> <textField pattern="" isBlankWhenNull="false"> @@ -96,14 +97,14 @@ <columnHeader> <band height="15"> <textField> - <reportElement uuid="18583c5b-9665-4604-8bb8-69d73c58567a" x="364" y="0" width="56" height="15"/> + <reportElement uuid="18583c5b-9665-4604-8bb8-69d73c58567a" x="388" y="0" width="44" height="15"/> <textElement textAlignment="Center"> <font size="7" isBold="true" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.origem}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="8ddc037e-7fbe-466e-8e61-dae087bc1cf7" x="420" y="0" width="56" height="15"/> + <reportElement uuid="8ddc037e-7fbe-466e-8e61-dae087bc1cf7" x="432" y="0" width="44" height="15"/> <textElement textAlignment="Center"> <font size="7" isBold="true" pdfFontName="Helvetica-Bold"/> </textElement> @@ -138,7 +139,7 @@ <textFieldExpression><![CDATA[$R{label.tarifa}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="eed395cd-47a8-45f5-b51c-8089c932d448" x="286" y="0" width="78" height="15"/> + <reportElement uuid="eed395cd-47a8-45f5-b51c-8089c932d448" x="331" y="0" width="57" height="15"/> <textElement textAlignment="Center"> <font size="7" isBold="true" pdfFontName="Helvetica-Bold"/> </textElement> @@ -180,14 +181,14 @@ <textFieldExpression><![CDATA[$R{label.formapago}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="2d8bc8b7-05a7-493a-ac4f-52f7f39cfa8b" x="206" y="0" width="25" height="15"/> + <reportElement uuid="2d8bc8b7-05a7-493a-ac4f-52f7f39cfa8b" x="251" y="0" width="25" height="15"/> <textElement textAlignment="Center"> <font size="7" isBold="true" pdfFontName="Helvetica-Bold"/> </textElement> <textFieldExpression><![CDATA[$R{label.sigla}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="aae9977c-b656-4daf-8b9f-8fd3248542e3" x="231" y="0" width="55" height="15"/> + <reportElement uuid="aae9977c-b656-4daf-8b9f-8fd3248542e3" x="276" y="0" width="55" height="15"/> <textElement textAlignment="Center"> <font size="7" isBold="true" pdfFontName="Helvetica-Bold"/> </textElement> @@ -195,7 +196,7 @@ </textField> <textField pattern="" isBlankWhenNull="false"> <reportElement uuid="f47b6889-caff-40c0-a384-f2bbc9665741" mode="Transparent" x="0" y="0" width="77" height="15" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> + <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> @@ -203,7 +204,7 @@ </textField> <textField pattern="" isBlankWhenNull="false"> <reportElement uuid="3fbb713b-dc9d-4dc6-91fb-1fb40b491280" mode="Transparent" x="77" y="0" width="56" height="15" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> + <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> @@ -211,7 +212,7 @@ </textField> <textField pattern="" isBlankWhenNull="false"> <reportElement uuid="431ed3cb-4ca3-48f8-b2cc-135161f41839" mode="Transparent" x="133" y="0" width="37" height="15" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> + <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> @@ -219,32 +220,40 @@ </textField> <textField pattern="" isBlankWhenNull="false"> <reportElement uuid="3d7297de-acef-46a7-8fb7-c3a41f3e8ab4" mode="Transparent" x="170" y="0" width="36" height="15" forecolor="#000000" backcolor="#FFFFFF"/> - <textElement textAlignment="Right" verticalAlignment="Top" rotation="None" markup="none"> + <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> <font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> </textElement> <textFieldExpression><![CDATA[$R{label.telCliente}]]></textFieldExpression> </textField> + <textField pattern="" isBlankWhenNull="false"> + <reportElement uuid="42d89714-ee76-4ef4-b140-7a188d57bee6" mode="Transparent" x="206" y="0" width="45" height="15" forecolor="#000000" backcolor="#FFFFFF"/> + <textElement textAlignment="Center" verticalAlignment="Top" rotation="None" markup="none"> + <font fontName="SansSerif" size="7" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfFontName="Helvetica-Bold" pdfEncoding="Cp1252" isPdfEmbedded="false"/> + <paragraph lineSpacing="Single"/> + </textElement> + <textFieldExpression><![CDATA[$R{label.agencia}]]></textFieldExpression> + </textField> </band> </columnHeader> <detail> <band height="15" splitType="Stretch"> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="7d36d275-67bb-4ec8-a119-fbedc14cbe04" stretchType="RelativeToTallestObject" x="286" y="0" width="78" height="15"/> + <reportElement uuid="7d36d275-67bb-4ec8-a119-fbedc14cbe04" stretchType="RelativeToTallestObject" x="331" y="0" width="57" height="15"/> <textElement textAlignment="Center"> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{linha}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="027df7b5-ebc5-4e17-8f47-9b585bd3dc7e" stretchType="RelativeToTallestObject" x="364" y="0" width="56" height="15"/> + <reportElement uuid="027df7b5-ebc5-4e17-8f47-9b585bd3dc7e" stretchType="RelativeToTallestObject" x="388" y="0" width="44" height="15"/> <textElement textAlignment="Center"> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="63b723f6-7508-4472-b7fb-d5c0cdd85e7a" stretchType="RelativeToTallestObject" x="420" y="0" width="56" height="15"/> + <reportElement uuid="63b723f6-7508-4472-b7fb-d5c0cdd85e7a" stretchType="RelativeToTallestObject" x="432" y="0" width="44" height="15"/> <textElement textAlignment="Center"> <font size="7"/> </textElement> @@ -314,14 +323,14 @@ <textFieldExpression><![CDATA[$F{parcelas}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="c84cf1a5-c9cb-41fc-a177-66e10fdd184e" stretchType="RelativeToTallestObject" x="206" y="0" width="25" height="15"/> + <reportElement uuid="c84cf1a5-c9cb-41fc-a177-66e10fdd184e" stretchType="RelativeToTallestObject" x="251" y="0" width="25" height="15"/> <textElement textAlignment="Center"> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{sigla}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> - <reportElement uuid="61a29051-32aa-45af-a209-161218f1e3eb" stretchType="RelativeToTallestObject" x="231" y="0" width="55" height="15"/> + <reportElement uuid="61a29051-32aa-45af-a209-161218f1e3eb" stretchType="RelativeToTallestObject" x="276" y="0" width="55" height="15"/> <textElement textAlignment="Center"> <font size="7"/> </textElement> @@ -329,14 +338,14 @@ </textField> <textField isStretchWithOverflow="true"> <reportElement uuid="47ce5fd4-21f6-4555-9c9b-5c3122af6a08" stretchType="RelativeToTallestObject" x="0" y="0" width="77" height="15"/> - <textElement> + <textElement textAlignment="Center"> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{nomeCliente} == null ? "Sem Cliente" : $F{nomeCliente}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement uuid="a0e4121e-c83e-4043-a5de-9866b54d52df" stretchType="RelativeToTallestObject" x="77" y="0" width="56" height="15"/> - <textElement> + <textElement textAlignment="Center"> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{cpfCliente}.length() != 11 ? $F{cpfCliente} : @@ -350,18 +359,25 @@ $F{cpfCliente}.substring(0,3) </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement uuid="4c493d99-5a45-4390-8909-b6403b31598c" stretchType="RelativeToTallestObject" x="133" y="0" width="37" height="15"/> - <textElement> + <textElement textAlignment="Center"> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{emailCliente}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true" isBlankWhenNull="true"> <reportElement uuid="7d687ab8-abb2-41f9-9b23-442da1a0cc75" stretchType="RelativeToTallestObject" x="170" y="0" width="36" height="15"/> - <textElement> + <textElement textAlignment="Center"> <font size="7"/> </textElement> <textFieldExpression><![CDATA[$F{telCliente}]]></textFieldExpression> </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement uuid="0df8da8f-cf33-49e5-a560-ad3057762fed" stretchType="RelativeToTallestObject" x="206" y="0" width="45" height="15"/> + <textElement textAlignment="Center"> + <font size="7"/> + </textElement> + <textFieldExpression><![CDATA[$F{agencia}]]></textFieldExpression> + </textField> </band> </detail> <noData> diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSisdapController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSisdapController.java index 1de08f881..43101f0ed 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSisdapController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSisdapController.java @@ -292,7 +292,6 @@ public class RelatorioSisdapController extends MyGenericForwardComposer { return; } processarRelatorioSisdap(datInicio.getValue(), datFinal.getValue(), pesquisaGratuidade, pesquisaDescontoIdoso, pesquisaGratuidadeIdoso, pesquisaDescontoJovem, pesquisaGratuidadeJovem); - closeWindow(); } private void zipFiles(String[] filesToZip, String fileOutputName) { diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index f4cafb6d1..56bbd5c96 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -6405,9 +6405,10 @@ movimentacionBilhetesController.window.title=Movimentación de estoque movimentacionBilhetesController.MSG.suscribirOK=Movimentación se guardó exitosamente! winMovimentacionBilhetes.fecmovimentacion.label=Fecha mov. -winMovimentacionBilhetes.origem.label=Origen -winMovimentacionBilhetes.destino.label=Destino +winMovimentacionBilhetes.origem.label=Agencia Origen +winMovimentacionBilhetes.destino.label=Agencia Destino winMovimentacionBilhetes.aidf.label=AIDF +winMovimentacionBilhetes.empresa.label=Empresa winMovimentacionBilhetes.estado.label=Estado winMovimentacionBilhetes.serie.label=Série winMovimentacionBilhetes.subserie.label=Subserie diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 1485a517a..62edce78d 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -6672,9 +6672,10 @@ movimentacionBilhetesController.window.title=Movimentação de Estoque movimentacionBilhetesController.MSG.suscribirOK=Movimentação gravada com sucesso! winMovimentacionBilhetes.fecmovimentacion.label=Data Mov. -winMovimentacionBilhetes.origem.label=Origem -winMovimentacionBilhetes.destino.label=Destino +winMovimentacionBilhetes.origem.label=Agência Origem +winMovimentacionBilhetes.destino.label=Agência Destino winMovimentacionBilhetes.aidf.label=AIDF +winMovimentacionBilhetes.empresa.label=Empresa winMovimentacionBilhetes.estado.label=Estado winMovimentacionBilhetes.serie.label=Série winMovimentacionBilhetes.subserie.label=Subserie