From a5e5b01c3caee7f21bd6b8990f4699a05989ecb4 Mon Sep 17 00:00:00 2001 From: frederico Date: Wed, 24 Feb 2016 20:21:23 +0000 Subject: [PATCH] =?UTF-8?q?fixed=20bug=20#7112=20-=20corre=C3=A7=C3=B5es?= =?UTF-8?q?=20relat=C3=B3rio=20tabela=20de=20pre=C3=A7o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@53250 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioTabelaPreco.java | 8 ++- .../templates/RelatorioTabelaPreco.jasper | Bin 43669 -> 44516 bytes .../templates/RelatorioTabelaPreco.jrxml | 56 +++++++++++------- 3 files changed, 40 insertions(+), 24 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java index 437bf8420..f790717f8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java @@ -35,7 +35,8 @@ public class RelatorioTabelaPreco extends Relatorio { dataResult.put("tipoClasse", rset.getString("tipoClasse")); dataResult.put("linha", rset.getString("linha")); dataResult.put("empresa", rset.getString("empresa")); - dataResult.put("dataVigencia", rset.getString("dataVigencia")); + dataResult.put("dataVigenciaInicial", rset.getDate("dataVigenciaInicial")); + dataResult.put("dataVigenciaFinal", rset.getDate("dataVigenciaFinal")); dataResult.put("idLinha", rset.getInt("idLinha")); dataResult.put("idVigencia", rset.getInt("idVigencia")); @@ -64,7 +65,8 @@ public class RelatorioTabelaPreco extends Relatorio { sql.append(" cs.DESCCLASE as tipoClasse, "); sql.append(" r.DESCRUTA as linha, "); sql.append(" e.NOMBEMPRESA as empresa, "); - sql.append(" vt.FECINICIOVIGENCIA || ' à ' || vt.FECFINVIGENCIA as dataVigencia, "); + sql.append(" vt.FECINICIOVIGENCIA as dataVigenciaInicial, "); + sql.append(" vt.FECFINVIGENCIA as dataVigenciaFinal, "); sql.append(" vt.VIGENCIATARIFA_ID as idVigencia, "); sql.append(" vt.FECINICIOVIGENCIA as dataVigenciaInicial, "); sql.append(" r.RUTA_ID as idLinha "); @@ -76,7 +78,7 @@ public class RelatorioTabelaPreco extends Relatorio { sql.append("INNER JOIN MARCA m ON m.MARCA_ID = t.MARCA_ID "); sql.append("INNER JOIN EMPRESA e ON e.EMPRESA_ID = m.EMPRESA_ID "); sql.append("INNER JOIN VIGENCIA_TARIFA vt ON vt.VIGENCIATARIFA_ID = t.VIGENCIATARIFA_ID "); - sql.append("WHERE (1 = 1) AND ROWNUM < 101 "); + sql.append("WHERE (1 = 1) "); if(parametros.get("VIGENCIA_ID") != null){ sql.append(" AND vt.VIGENCIATARIFA_ID = " + parametros.get("VIGENCIA_ID")); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPreco.jasper index 9252c709f1f0b8e4f16e9269e62923c8b0b4ab6b..ad62726116c0d27e659587f84e2b7e903b7d17f0 100644 GIT binary patch literal 44516 zcmeHw34B!5z5hA)-XxPSgg^jUTmmApCafYNN)i$h$Yv5yKn+7ONd}TkoJ=5C7ZA6) zpyFEVR;%^7R;|U|r_~mh`l_u-g9OylcDYB{onh48o1}4 z`}>{s_xqjS`JHuc`+#Nj#n_adaJ;y$y?8^YuQwcvg?pp1cwce2rz6r6E?zExjRMHT z-@(7Mm|eq$v_`voBVFO8p?E0HM%QczZ3>k{q9sk?SR~XHIWe@pE4-+N4OhYHLfzq} z{`U6BK%9+`fxALI9VJciSfr-|0f(x9vGT4^U*8Gr6lM*?*vxcgTOaB}0UOKkN-p5E zYBsi^sbb~Q`j)1O#_H0VmQ@vvP1W^vEi0>+RcX25JiLY#xuByX@lJwOg+p!OSZPmNB36E+uQ?L$3adEPEUzov9+w3z zV?&~`NVo?CN4`MyiWDLpohWrKeTXua0Rf`M>tje7#g9>dL{)R+(cVOA`I|e#J#|sy zVDpyVa1F~_A8Os$5d#_8;%rh4XkXITUSh~aiIj^HB7098_%=*ZYiT4FZlz+y+1#`d z;NRO&)oDEhi zk19?NTBS-kyGICus%n8IXsbe9{h-;Lw6zs%t@or;aaD+@QC20iB=#z=VV<Qni{tc&&~$8lKi4;dL2ECh4>b#hQub4`qBYWde|ILlP=sBjR%SF@9q$*?*)OqBj*Uj0TVNzIY z7*t_XZ&xH<+SL`^9B!*&g+fq>Mim3Sv2b6XP&d=kl685b7Zz+9+8c|alZ!{feYGLf zWac1|8}#6apW8|ebHz{9Vtc0?iib!Ayq57!rkZ$ zmO)=bM(B^IYe8wWc1F6|V!$QJC^Skr{ zozySaZwklSA#ycrWT>aLGa4h?#gigx)-1eF^?Di-RxubWn5 zxIGM!Y)#IuhK+N>G)JRd@knn{iE5ZvV6*WjSP|(fgR0snv}b=;SDY2-= zo+kqolUj;^py28|r#BQwb$it3aP^r~An3pTa!@LJ@IfyIEEwx z?XcrW>J=TtcM}>leIE=7Mx%(Fh%lk9(k|G;q=r;+$M~R>gddVt(+FKyWu~h{JRAIt zcC}FslTf%wUo|q0w5so+k-mnu_KNQH;kLGLBG53=q9Yr_&7Dw>9i1v{kiak#+DOeP z*pNuy${x@gq9E#rEQHN%5Of$>;i=>tLSRKqN)EKip>)ck80HLSht_oq#65rDOJcjg|lPscE^hypdY92ukJc z1;Kk-qa;HrWdc>2QX>Z*1{n*)SR|E>K>;@j8Hh#YKu1wzXyRLuqa|+!s-v#JxBo9!tD8tbs#3QY#(mpx`p$a!|@WQRq(-b9yUMbE{ucYXd@#%C*HFJ%s zeb8FSbgu5Hj6kg)-3jGL=9%aO1qP;V7*=qbs7c=%HcrJL?YdM9hY}qmkmxxZ!`;zM zVUj!wArx^L3-(6)A~YN%!v^ElKH0s}S2fGpOhf5v#s~0hfl)=n&Q?-z#A;}%k@{#2 zCfKG3+Gm`lCn|<}+88epixi}8@K6r>B1;U&!g`kW#_$#;%1(E*O=to%!(8$!o=zW} zr?m*Jgl!1g7Sy6pHlJ?)jgyk8n@EkuNtD(IbfT5j$Fww7 z)RZu&gb+gXQNWYK4BqB#KQrvfirT|c_q*qOIoy5EpXUO(3YImqJAqgu~P zr^Q6AeL8xdnrD|+)HPQ$%2L8bK{Hj5q>s=G%S35hG$h&hA?BgK&Q%r>jh524a2n9k zyjOIfAx!2Z46lK5GJ=p5w9{Y%Da3O_Qy=PQI*>IH7S?A)N@s2Nx)}fNl19y5?9^T? zoBB1C#(*GZrXx)hy-ZA)BDzOWnkUF~epV9Ai_1MjiTE%TNli;9G}>f>QHJbv-5!`r zR+Qei3xKPWq2Ti=ga9aYl);FdWJ^R*%19(Cre5Q0xHj?-lfon@y>ssNjoW|Q5ejsk&@^!Oe(wT zgwk*mUe+u64qrs(!zAR`sKhs;EC*4nW?h8!@&pAj#JMG{hBBDHk9Th%noviBX3Cl%yn^vKTq*Lcm{L-$gKYB0Pi)Rm z7^{pN6Us?9(LOyj zS=J(z9t>$jqd)M0KTDpB_;A(ebH04&tMKMuT|e>Iv$rpwpQw6*4^*HoH`~FFR?!4*AWK!b%a0pRS1+(l+GppH{4Py&!FU=;zRzSvKjP-+pv-xHIfwB75UQt zJfc6EryK=f8n9ScH~hwZwijG5x8Gt}l`OkG)YaP=N?7eR%xZ=H87~bJnmH8XUO9hA zlSSc0So~^_b*vYPCC;q1mC#%5;)|+wzR)b}Yy6>@1SueAKT*tcsX$-j5jB8zpPEi_ z2o;xZ@HdP3$U^zX}p0F#S84Wpw{VF?qvS1|_3_fHxRo5-6sSqSM zM{qXIvdepC&zV0b!RNG=zu>bz`{t8}Q&(SCL8%e((rT}%KFvqO`F2DWh8!!Cwz1YI4H_CDb5y&!6z&zhxh}zv0 zOE|ath?>Ouh?qW_L7xXtJgs|TuIC;`?cbX4(m2zyuT70C( zRgRPt*h{b5_QYT^7V=5jM6d!1t7d!1o2*TKFk{%-jY~RaoE7~}Ys+VKAGypEv6TuD zwIgS6MesOfBAmy3xFfMX+|dyRcXWh5cT|W(>D*50F}KvpLnTYghv`0i7$G~UcxWJm z1(s0kg#NIR?jBkhF+tc(88PACzk0T?A}jx>&DVc?_T?um(KWO$Eql47?lZqOQ0C@3cpG?wDk+@Te8?}cKIGRC2KjY_KlxP%lu?w$Ch=us62y z$5c__eCWdhiS=QDjxboDBm7yQLZqCHj&m#k+>`wQO#Q2|Pp3_bb z3#-J~ZbKZRKg|TqQB&#k*F$&~(bC_%+1567 z+P!}n+ps+UZ`a*5V#!WVG-deonxPj(;JL1olPZl0n<|Y4LYGDZk&s3$BdUp^2Y3#F zj6X#bViyF5=;V!+OOgf9hGjF@Y=uc)L1K|?0o6SXdC&ZS|LF;&r ze8<@*>qBWBVNhB} z7?f6s6iP4ND@xDxp>%dMdEPQZLYsrbbcFulIpc1-;af9z-FE4Yy8CWl{?Ok+=vpGQ za8~#bT4H?&ts@LV>j;C;3XwwS6?;YKc|L^3YLD;WFGF&h!@zXpe(0#*Z`gX>z0bwY zIJ0%raaHAi2f5c0xrMXZhujkDLv9^mkXuI>Q%g;_74)XV4pNA`%NH z?n7dU^&zp2Fi5N;3=%6u3W?);MdAf6iG#v==^(3FnjP|+V{b%pTeKg?0$0&yqA630 zrsugq6CLM2JFKC-GD%#uzl?&)F31g9oYZ==z`1y>ZC>Slf<2Z#NP8rTY$}?TqI-TFw8jJMej91({zK5c^P*ir%qBbRx zz=~U5ANKPLI%X6z5g6qYdmpK8^RRBW2@4=})E0?M9gI?|R9K|3?;eCeG|f0WV(_i5 zwAt53io}*EDdU`BMnj5Hni&l#O4i}8?XH{lhu*}LMn2|VW~5t5)aG793SK+N!tNG~ zCk3go0htH|_IdKP2PxUx%@%00YE}S6O?wayTX6JKWL`;eirS%iC^^kn`)qMGjgC|i zbbNAQ%`>7n!iEiE_`^2Z^ES*vzs}#(w5GXq~$jDGiOXu;HpRlv&suY+Hef$S`za z8xA3_!d{o2)<~$jCjz%i%SYSJ3ym%pas}6h>+vda*4&FleEgZmfRsKiGot22+7iXm z%A+lotBt^3Mmdo-EFBwU@(E7!n1i-@srHwAx8=l|zYV;XX!X`!w0e<(*Om&>^?o=M z*e*`xCpL4hVPomwg4hZ#PnXyCRD@c^k^D7mIN@+^oKDBdUC#0}Kg^jp&gEmr1+E8> z=TjAkLat%Kjp1-_a}-AmJL%y4KHZU?Dsh&zIohNJM4N7t_*!C{4RFGEGsRG#I#DLap+XZXb0ec8y>?*8bqa!^y$rI`l&i%ziab&`z%rnNpIPsx}$y zt`<#?2%u`Rw;eNMn?J-HG0SKxOcJw{K^RB>zYYJvh_d*+;NWDNr!RGn4a+F zBCr2ddUML`spxA_ioy50rZCW_9BR9aTaet$3o;7@iL<;|e>~J8YC|2!+ZnBv8O-o0 zRo1e``jrhB+ND%qbQ^+X!Q_%+Xej&J4EOA&Dk`6nWY^U<)|S@D-U_?XM4!eeYi=XB z?6AoPL1fzSv32?R zMM8A_jTKDrP9Xi{mR40P;S@_c7;-DI5@E=#jxgj_M;LOe5Gar+iz~OqvWS1D+z!i_ zV+l%-PHk%|sjV&9g1@~vU;}Fqt%}Z|OMZzB1L#Y=jq=1Wp+^wFRZG+@NhW8+;A{Tt zs>t1M)@{i8#kWS->*|7@T2gDvnenxhf(hqHAHGVg4_|eJ!B-t&@KqsF_Bs_5Vsbd88*t&u5?QYm7ueQ9k44%s%f)Rs2r z2@e$}oj7QWc_t(B(B-8~4HbW1c;3WFwT$F|EGOV{H}JT8WFCx?xchpOV%)R&iHLp~`y#dtZJCHPYl#Yk1o z9VMzcTE%OukacV+TUoc%Okj-1V3_&ZjJHvM1aX_IYb#pT(3X9z3?sZG=qjT%iK7UK zQY56Tl5F$lmdeud=K4mtHmhopc7vU$99ph-b)HeQLRH7|n$o7GmYVv~r8q0Dm2Q+b zC=qk^HBq{C&PZaMN@8VWO-ofNQK-?clyY=OqJe;PVn5Vfh0T3k?%3K$bfikOvbv@M zZKSEb2A5Cj1xtH&LRK0#YZ6mnf13q%*-=s3fC~pIn)Gz#ysJn6lT=+kO=UBf*(zp`(aIZ3P zC`#rz6s)RVR#8`8ja=%g@lr!|xgep*pF0hns7$^au@cP9INA_5T1K@3VM)LlZJ^B( z!>k;fRmH8QbUkPBiP2~`PM9S=VYs_~tSm0^?=%KP)PXKsraREu)!!Bthh8H+#WYV` zERKg4(;ngCIsbSPvj<=$NvRO+zbe$%iEcY9=at7EAHD8*n^~1OdJY9BCj)U`Y`ilT z?!)yzZ3DeWE+J!yWp56^r6-FFy`RS!pF^JKaAoi8;<<r83-I2}6P`TEXnY zFMfI4Gbere+=NGWesspg^U4l_r7D+E(^#sBIp{^}f4lvpD`wogG-0Ub2o32@RnSRe z{vMVIn^re9SJaAegfaUdW~cO1x#?#w;%o@?TSZIV%Gxq0PLceVNM80fl$o4>;BEj$Ywxn7L54vlJM;K*k|vn23uxw6j9K0v zyp&Gnxrm9~9L8|!R@T%|;zx_-ntu9rT;hm>JrPGbzfH*zVZ~`> zdyG3cPMHXMpfCJ-|MYXWM+=_{{bxhnQg8e(GNp;IAtE6SM#BFurl5<)q@<}lOv%9$( z<0h0oNq&Zl9)7HV7Ad+Mn2;a-R3b5fmq*;qQ^IzMhC*mTAEM|UP6>bikesa_KOZhD z+|bbed}%qRh}HIZ{n)xllEf|O-csSzR8%$#v7^K<^BlpxJ)KS`q`lB}X8VYt#QKP# zjxfYfM;KzL5Gi6vg%t;c?b(7n=&H0M)+b|s&bsQ(G!u?glf+$?N$ z5Q7B?3y4Z;<3GhtUfa2R`-5Meeev*}H@|SgU-sXx_DYv=6x*65(#ULr+^(Xmgj4Cm z5Q+6+h>kEAq9Y83C`3Z)6BFcirJ|DeN~aM+ z(Vje#qjc6YL~^as{A2Cu?r%K$yYE+7HxDh!X}IOzYff?5qPHiPL-qpl2I1^o6FP=C zCLB3pV}>S|SRan*2!mrf!r+)fq-jD;g35ny6DmyRB`m&??y9vIFwn4T3awa+KS3%o zmkYcVj-sln!@9d=eT$Uj40D?m76mPwMPcLqX*|BJcix>heR9X!54`)xPtGe_fkk~E zok@(j;C#3Xz7#?Sk}wFONsMJkAmKhC-wfjjekr8se6# z7I$zcSW4^Cqg)|T+gFl!FI&Gf4*fe)ufn`gL>b~%cf4PdC*kM>$BeqILCJlJdA5RFNEQsaj)<<4U&?knQaE2&LmiIs!$ z_-mIhwoovk0AbTvQ9G7gdd_1+;mbN0JmUih~w-q1o=Ar`Uia8(sX|&{=Sy>BJo%_ zzwqI)#QN}9M;JWT5eAPHB8A7lkUaheTH4rts(u(U;k7h%tBAYve{b6v{p1pSv_)v4EVLP-x3dm^R^EUB-V!qI>O+Ajxczj5Q(z5 z+79!`Nq_0u**KTps#l_JMlCV9@;}P2k$LS!t}p4C4$?x7%czCiWA%Tucs_e!rn9|Z z{~s?K{?BM3pA&b4^O+BKB-V#JI>O+Njxe~R5Fm=6h0C4KB$@t!7Bb%DnAbwo^`6#_*PWl6MBXJ4<7 z%9oCZ2e@SPc$mBv?j@MYK}(FEz%P%3w1E`+8wYKPMQ+yrWDahNH2mbmmp>W(@L$Kx zxMp+d1v&>w=mx)gz&V__D4aPyT$ETJF6sz_i#o#KqC%u_QC@-SQC{c}tBP3dL-K1t z?o5>5gnyLe%3w`Ves}$5_;o+-{qgSc4>Ub|^0w;nI?26C?6J|*61jy_?n7>g^&z*8 zFvzVV400<(3c1U@LMk6-uY^f1%3P$HkSF9Aa#?p~AmkHWimUcTBV*j1+$SfuNE}uF zaod+)eijYPW2gOYWy7C;SM#1nLJA~}>hzK;ikcX@I&^)AbXNM%RAPN-sv``V>WBnQ zWsXN~6_=N*9EpAc?rNl!$;71!>0?%`Y!S#CvmTgCHOx1dV^$+cgGb(V8VMfl!FCq0 z$RwDQoZB9Gbj4{M2mW~2@;7e%yz=u$)>VDq_GGD zn6V-%&T4)7s|UygD(07RHq~#hd&}&3^ADLjZ`QoIha56{R?ET#bLTIZn?v(vwEJm~ zzo(6hG`jHPLh9!!qOlxibGDCr5k`x#kwm>d^Crw`Ip>~)j_Pul5 zt+^bxJPlYz71 zw5Ra3HYKkt;rLZ|k(ho#8fvJ3?(I^X4V55uPlg-ByMMtAqApnAESN}|uD5s5>Y7Y& zTcY)9h$|x8i1HRO_fy_f#MuxTPfU5asj8`FFR=J!7Bt;W>b@A-R-M>($XWUyXV=K& z?vvzfw40Q%lMvG9B3xm?o;}VAUAVVPP7kf`OVdMpXPiMKH;u&cBzZc7v+Tp^O#2a> z*;A&j;>;<>&o&0xVQf(zbJ*e_%VOEN%wk6dS&sCT2C*$xz{-OxSNbY~EKmBD1=$ek zs}8cD^sNZ8q0(0yWckupA7sO%@2DUvkiMoM8!mk-gBYlZJdO^sLg`x_WFw_-ZIF$U zzT<*ywDh$E**?-23bHZM*BWGFr4Kb4Cw(13HeUK7LAI~-Z49#gq^~=OJpkAe$h4{XsTS`ZfpIfou{{XiE^M6ou~_K{i?XP7bnzrSH@rn<9PNf^4ev zZ4a_((sxFXO_#p2f^3HLeKW{rO5eFbRxEwz2U&^qT@Ylmr0=32n=O482iY7pm&$T! zkj<06%Y$sb^nEMH4w1fZ2iXGYyE@1YmA-3(Y@zghhqGb0+C<&HkfItt6EK zqTeFHw{ra6F_KsniUD}L1m1zBYuEz;b|*k|+NC5>wj6dh#2Z(Ua5h<4TYYMOzmVptbB>^|r<)rMWGBETMi8c|TgoCvUoI7=*u z1lS{J+bWo8Km^#MAdF`@1lW&|kJ}-slLP_w1lZ+j5OGE>zqO|u#dqky*opT zqnnZf><^h4&LoYZ?c}ge(Ua+Ya)A8_GUQ$N7+_zZRH`=)us>7FbFV@Qu)hMS`r!ck z3U!vZ7zQ}DIwh{s3UCWF(#tEl-vDwG(Y*%vXw=#3SOa_vLg-y; zfR956uQLtseIY$&HyYskLpg;v;W9^T9fLefsrJz-NTy<-HH>q&(H^Kkah9`0Xd?P$ z_RXYebNGQErqEsjp$;_V@Pp7ekSLVoVf^4cKABHJhEQqZj4s;Z6rcQpd>Wsg$3EjT zAlhD>7$) z3wiVE-WCq@Yybgd7Kzs1IJ$hF-|Y$TO>X3b zh8lnf%2H_Bk)P<&BThfK5#T3*Awr7j4!{!c4!|6K3W92Px(b7OX^?N_+w%CS{4}Ep zE){pb=J3-=NSEr=kr+XoGxPWv{46L9@905*e-pVR^h|vh$UOu~03M+Sg8V$$;Lj(C zJRdAd1g*f2N1?=FL>P_;?x%`&5uzc+PGlxebVHAZVeI0!J2AmC2X71m;In8DAl?`P zh&KiR;tlg(ykY!{H%x!=hT$*XF#E+DM!$H&19%d+~;0FWxZg#T!Pwc*CR@?+NM+b6$MIm=|xD^5P9c zUc6z(i#LpT@rDU6-Z0?B8|J%s!*~~OnC{{Y!(F^#wu?86cJYSEF5WQM#T(|jc*9s1 zZd0vzr;(gya#oRZ3^{AaIhLH`$yrCvdUD#xX(y+XoDJl3k<&v?FF7%C;^b^1 zXMmg&$vKIfQ^?s$&S~VFPR^O+oK4O-SjR1XXEP-jNul6 zAxkiVtH9W8Ik5E@uQg+&wi;u!<1spGMd(h9$ht8W!ySEWGsa&hA@(*jk2ArPbCKtT z7;9aM)UL$%>RODfZoru8W-#gwr2Yf2>OQuZJodpf5NWWy|&HvL|9^RyZFvfHN3yqA67 zqX5;Nu~lfcM`L7u494245eMTdnSymW!zoy_=ONRkkGSi8cCW=AW%uJh$6hX$0h11JVr0&kV>a zK%O@s#{lvR1F{B?7Y)d93K)L|=odM|qO3&{HhBnHR_1|$y1M+RgQAfFhJ0Z({N6bHXU5W4kf6s-{G zHV9*wt-<1L7wfGkq-@b>UkWK-DTS10p|F2c zh5hVN_8IAu=_5WjASVIxr2#nwkiQs^t$_T^fSd-%*9PSDY10ciH$Z0+$TmP{6DZ37 zokO4;19TpNat+W90u3=h7ZPZw0oqBRVFu_Dk3C1AH8bd(5$r6m=WMX&n_$m5V9&W= z#Chygc0Sw5c0gNP0F84Ydxl-aegnuS>|*Y)OF&}GohVK6fFv+cNmocy7gWKc3xqUc~b{p7)_aC*whHW3}Kp z8P8*QUc(^|WM%J^Og3?c;3YG0iG{V8ANvQ+bqsl zJTMcS5rUrjWgFmgoAJO13wQCEkMfe*o9wN|R}5b#3fyeq+KjJN z_&UeMRpD#hE0E z;N2p<@5B2I>3tpElco1XWOzv;L$(`VXS-kb{fhjb-%90*ADmV0(_n1 zer?0odG1#qzD^NeXc{bxFO}vlz8xPbNqn@Xe5oWAP9>?nROa+`A3qx@4?(5Sln$+( zaVIpAFpu$@z}w-!RdfWOvb&%X@8%3s-MQ>u9%K(fH9o}0V6u4vdkjkT$54?!;j=Ik zypTP^4`)Avs(g-DVY>Dx_9Aa)zkob%n7L3|ohgfH?O{!2cDzmBQEw=m=PJ|E6M zs0aUoE7{AXBEHES

D+W0L_2fxFK@$WnR{0Gifevh-A-{Fmb)N&b}cBHl0Yr=7R(ew#nze1i8M_)nd$`R*)- zKbw`qpU)b`e}%5|+<$eX{}(#a9Y#m0zEnqwFRde0U#cTjU;lVVdO-#qDTVo0NBY0I zBbAc#KiHAV3=IP`(C>r@}ABh|jp zk!oM)NVP9?q=~OVI#T{7#vpHFrR~4aoxO|s^$&P1x~(Ap10Tizh~=cu`2_w2pTz&l zXY#+HYvO#NW%0wUY+hmI@G5HvKgtU7W~+c7XAS4;tWi8-jpkj}INooK=L6OOe4ACo zPq!xV3#^0qPIQG=ThsV;Rx!WTD&conbNT(~8XvL_<-4tg{Ap`3f6+RE|I#YsuUqB( zEo&Kn->TvtS~b>WtJa!o9c9h48m$G^Dyzjh+FEa|wNAE&kPORNj+JFJWByR1v?UDjpx{nnNCW7fCrC#-Ajr>yJjpISHA zFIzX-uUI$RZ(6t5?^t)(A6VbFKem2ge_`EY|HZn`v90@^Z0lhs-+IIuZvDs^Yd!Al zYwdO>Sx-6#TR(M5tY@7$*7MF`*3X^A)=N&6^|G_V`n9vldevENz3#MGZ#W&+J5J2{ ztw<=BC&VRivJ(hL99k^W!kNdKRYNH5NyBc(9^>PY`r zccfB|{s%i!nPH+MRbT&~j7aUV%(BO`PwfNP-|Ql+pHAYr_CY*oPvxWRX?%=b%qQ3- ze3Ctv&$Q?9S@xlPp}i2}xy2aA9l@*YGJcd@jZ`t^@4f|C7p}pOjY@cpTwa>QZ+26Dl*ymd<_6}>ky%SyF#nx8)a_fBi3hQF~ zTh^oSKW1NPJz-yCy=Gr)y=i~f`pCY)`r7`k&FmX(+rHV}-@e73VBcXcvcGR1VgJCc zw(qfP?ECC?`+hrOKWxYCN9@h^kL-)=$L&k(-3a-leV6@HdzbwzLOgFjX8+uN!hXqq z%6=KpU&DRXe#L&>e$#%#eh2?PuzzcRY`&L}f9Z_1 z|Lp8*f8|WFzjh8rZ&ur{oiZZNQQ&*)qD2WP|MxF_uQsU`Zp-jC^n! z2sfAjVPnn^ARK{g0!uIfk`NL@fFUj0utM^`2SM}WWCd*4E*tGs=syx|MesUx^5KSba1Mx&ESsv~0j`c^&SBbc%7U_+h64}rjT~g0Rs%(vs zzG&-US66Inij9()dn5hb6|Jd6tiKx>hpUW<>fT5)xrv>@tgQ()I~#5rB1s_FQiWSO zf-~ya_~zD{)ytdOTWebCD(lqLH8r-cu3KKm!W-hLRJ^Ytl0YZxs4u;Pef`z( z!TwYoVM0%>1Cb7(=0T5-b*6gOv65JKe>@Rwj-X^D6^r+;W2LcVZErl1sutyH+gMEFG#J0xh7G#gEV`W~_@v&47rLBxcI-`lo{!X`4aV*&uOZ7%onL1Y38|_L- zM5|a)JQ0ibgWzZvpaD@sth)zT52FWxV-)}(YN{!Ls)2rjGPqqGmWmI!wH0saiS{?f ziGyw12BP(>a6_bHV|M~%=uEMx^`L!4va7<7iwY?h6-4&_PVjAnq}K9SBHBS{rP%ze z1yg9LqGhn(D^Sxv*oS(;vK~nXV!z|1Ng|1~^(@p0bd%9kGR3B?&)U+e7U~(YQth45 zuE=0-sx`H(H=1IH3{g;IL$UnMXetuxRp<WU}&BB|O)M=GA! z=1Vw89_th1tu>lTu@Q1$45nhe7)OM6hz7|ZI4cH3JuAlGNRi+ebSmnL#QIfdQ*0=- ze5yG87?rB#{C*(_s;ecMpsk7Y4uWR$vi4T6waJ%G#Z@7q2ChnIN$gcyBYbI9P0by; zsb){YMN8{hev()VsW@~fsc@NFkd(typs}6}OGWzzdLt>SqhhE!q`qlWCBUe>6pdQd zqf&EVsa`D{x>v^=15)&C>i}avXoKb*jf+baY)_GQnP{~#X0M_Y$}*Y_oRMI2v*}IZ zReAalbZZ>N81!y2sq=CYzH-7s2M(m5{@YpxU^!-HYemz}q$*?;WIPJ8>*oBPC@HLU z463kopf{GP?Cp(jiFVerQXwcrqnfP)iD)t@)Xj{nWL?$b=LMUF4rVh^l%J|}DaV$g^_QjL<`2{u1Rs@C*I`(O-K zKwm>f=#QvtL1}dK#CkgufVnsdjZz;=3RM`@%B9$>tQdlPTJ9xViR-08HmJ(-%0wcv zjq2Tc*0YnYek^jm&3GMilCe{wB)4qX76)M=3eCx}Q*F_$soGeySCf|mvdhcx4e|I! znAwf>(aq7`Dpnlb42303WLvB+TE#~6fVhd?SpUX0*!yUziVgQu09wZmfTX1o(Nsqd z+2y9q(L@(SuAYsK^mp{c6Xd)2Qbc2X4D6oYjNrh~MnzG?bWjhUY@piyf+maNW-X}`3ReX-(^KCSp`+KQE1P>-rf`|)rTf3jYj%`Orb9W zRFX!DNCD#NxnLlYLU;Ss<4E${~74Hi3rIu^~>L8{sexeztsq zZwa^D9nX<1sS1&TUMXL;N-s20`nNJoWTe^-h5nO(=16BJd|Q)Hb^WPmcQk=2LtXIW zNa__G#B(bKH9a2&3C5s^oq{}(-pXG1!=#23y5j;sO2QA%s%eBSTxr&;L_8n-jrVp^ z3sZqyELn$!V;$;wcr4l6*;UiGA==p)bu*0+BRaM*+SUX0*xjS@hAA0tLMN#il~xo> zuI>lDAqt{@XhQhh20=%V7oJJZB1%@or0PJM0;;Dfj%m(NeptQC2znP$88zRaYQXjq zElJTY2M3I*RQ0&DBh5HCK(#{NA>V@W3Rlb-5|QpiWS}R-rf22Osumj6A}irL0D|{- z#7Tx!&6HGYN{yU&7-TFFbCFCshDEwb$WS6KCpwBE!`){^j*6@Z3vp^uH7Hup+{Zwt z*h|pINFh>9R7S!gq+%VJ(mo~wppaWIG;(Y7It7N%E9E)rl?vAz2at$Pau$(Q?zWC-SNgm}8 zinxk}2ja;XO$W)b!Mrso%_}|CvAiubm9AraE3R#Ds%YBTK?;so4J|cVpRK_K+Z@CA zOtI`l#dJ@b5F#?O@LuIjN*!?Gl%AB19B^2 zE5g`FzO=7z=+u`OMpVGnk7%pj>CI6nIgh34-cj4r)y~XCytUgU;X}WXLs#!o6LM zl^r;!YPK|raWz@`k~F-G2_;xUotiWt{&JcprBm0fjpj*I*C-g#+PV|kTWabn+v?WT zw6`_kznL09{aM{!(oyAUeG90*un~(`Z7nrz)hpph%bA(*zNyC#U2T83v+vvrIR2|x z7>-Ud)f(%rilvgPSW#cxd)hki`GR+s^*?g&H|L+Z{J#9jbUwrvu3*;b=zmR&pAe$Bwy$&$+ z0X@&Ju4!zmX^~hW1fsbrNYY2J!m?7D7Zs&DKg2xP>tV_xqS;dR5l$0YTK9@?ZH|&V z3CC+|H90|O3fgI?i4@9txygnGxenw_M1}WRlVPmw0S^*vE@{^6m(H|e`DE8r9a{x4 zbDe1d^(wJoisC*+X`LX~^;tM9pJ}&JCt2DfdR}2W- z5eUeAnuHcxl=$Y<`R*v`+e0b&~G|syG}7uIG|Tn<*l{hxyF7Qg;*fyA_t3P zr4G{zIYENH5pxS8CEfdC#Iyj`A?w^(SceSP zSQ3^o&FI=NvdY#IlnZm4RiTNhGuKdp>TYa0em};G?-$9s$lN$}%!+klS-PWVuzw@` zr8z^bpZK*@QxPz!SXf>0wm_SVkMdJnqLE$?BFyh0gAiNM(!Ss5X)B_#rM|U4c`0`6 z&8uA-&e8Y7bJWIZSo;L9s+dC*ug6VIwymuLc_}z4kqyz_a?JF*v3#!o3E?U89XQ3A zO2(`&P&~tdBMDnXHBe-+D8BTf3p(3wzvT79&%J)-6^qWOE_F4Q%(QIa49Z)XVtFlf zD^@B82sMbp%jIpQDnmJ&DG(M}1SiWJ$GNro&;UIsi%9@h@TI$zUSf^b*a;fY#c8eE zzmqAV|54@>skEXKlU+PXbY%k)4;`c|QN*}N>(;10m`cQxdTkQTGF2bkXH_ex&!3`r zPSn3{%taqR^w;Q?pWig)vlpDRYN6X}m->WIuh(o=qMu56MX)V^=n@)0bRA$2T?b?k zT>*iaz{w-}HV;=78ItIS1rU9>6#0Q@C*B&zjVeWR!BoG5sE(m1J$@|tl?zXXe|79R zC6~<~v{+s(%kPTx4)jD^551mQ9ndusr4vG{gkp{>*9vK2D7pkMy1EkG8-x-`F>8G- zbX1pkqOM&ivlu$59pm{za^fz3h2hilxvndIoZruqnm83sSffu#4R5rFY zSGK^%mrbP)<-30$S@hA5unEJ-N(jQYk!CY0k+GS}eDn;0dckHo#PZ3g8U@F~i-4|QQ z2`DBR6WK~AuUf^SXu9V3k69zuZ(P-_jvI@;fFeA{E0D6Q0m=p6+@Quby0AEf$4 z@a+JeNN500bb!GV9gx8j1$1%p%+R+zTvddS%1Zqi0n{HQ%}^?`HGH*aNaM{|Ab8x%Lb0+$?7XRYNflto()w%h1t@v3* zJl6JWE)-yR1{^s8gZoKo>bq}0y(oe%bIi@Kui10c3yRT3OMDTI|;UzSH z@H)UCybj19yaHwr{^k89{Okb27b(Ky^_$;$s@YqfAC37strTZn&J{j}u|0TV~BN)fQQ=`t=!q zy5xy-7y9#SV)X$+{>u5w~q-A5quaRh!Pqgh&sR!L>=G?qSg@g#2oz}Qj+nfh(hdw;1GWP zEVn#e0Bv|IL#-~DPI^#PiiHlIb@0J+%ID0HtpyW0ZJ{QMAa5VJeASK%j(y^y zwiBnE|G8QeGzB>aLQf__i{PLDLQ7}>p>=>kXdPe>S^+W$eUMIL5zj{GxdDVO$Xt@i zjne50l36JI<@*ngob~f%^W&Q@pI!WR^>u#-r7MWiBA6XOX$cLWv<@&Rtpf~7D?kRN zXYUuK=LJwYKc2qgm?NRnCVg25{jG~8+;z*svV8@e|^LNbaT5*k2g9bgbz2N;A_fDA$(zh8u27(nPk zYz!W98t1zm0n@lFB)($rggKGswwn@DrvGH()|%_nNt}Z)CaRUc?G-KTjZEIv@2tO=AP>O73L23qq*nEY@1lt zF>HTsz#gM2Hg*d(Shhry@xeq#v>}G`Fa6zZc*RO@aOlVc=B`5?eiCOZ@NT)JE7ptm z{Qm1(>dzR|)J?}pa;eEZ&fp&+TTdqv{SyN-hMGsyz6o)>0Qi^(a|oHSI8=od%EY#z zPgWd9+31Bi4nhdxRN(}pJdK4-&&A1(L~H=3vr_)SJD}>NqO(Jy+Uiz;_h*Gk?8Fyz z%&DZC8Tg4^i`2ITcnh}~FE;3qEGn5k6s6Xvyr|`TGSQji*3hlx;N zpD$ngkdpn~CV?@l)(3!U)+21#Jfolg@-fBvXNUTsT=Fy^R96aqQuZndqk9NfRuplRD z6VH<=Pqea%tT`MMsP-FFG|l8$v4_VBa&?HDIQcNj zOC{`7i`fsH(CdkcI=xe>&52%J(S&~F-`lEJ&kov07Gpe-o_wYyg)3LD9zW~# z+TVSD;=?V|>kjd!>ViE-qq1U!(B<@!QTz!|(9434hR&u!3L6NDdzA~%4U~M!Cc-e;EIRer2n3FlprA{xg@|;g7$*?J5I4bk<#$K zT#kEs_?f7fWUyrE_dqe@?+KpP~*=@o-)hPNj~ zkH0B-wdWs`Z(c>Lqd!l+t%;J>Kr2JOZ^`R_b<$I--~Q}1uZ$W0^h#~DPtcX*dzeJe zdrc|;0n%-ip#d38l3mfITR|m2mu>@~OSb{grP~FdR{|GTx-EZ;7N`BB>Q9rP42d2w zG;7>yNUwHwRx~tJY{Ors%!XWPNU_l^QMe&^DI9O3&F7J3I{XP=S5LzoG}%%I-6p|v+Mfd=VxdEbfmrhyCVbf1cmgxbz5(op>(2CuVE@%Y*kJoV#ALa+ zA8QLZ>JD?Rc^-iaE&FTdIrs*Z)l$>k)Y68*hEsYcvuw)*Rc}tct0TALqg3YQm2H*ntxc<2 zs%!l0n51NL(dBopTE)UwAO@|~Ep^Rp^)&`fvU>fiS}HdrQwe;o%3Js{Y96l8t#7KX z#3o`I^v3#x;7@%VKD^wx>~?dED%VmY``BK!x^cN#!8o76aDcScJOcrjxNUU}HSOzY zo3Vz&D8CB&z{)yz`?QOND`mCh#I&{7R#vw)wXD@^$hwV4bPgle|DczFTB+(|b$w-P zYkPfD<#L>0)v!Cj_g2MvWPO~zg=JJRK~=H3rM`V-B~hp)2utbrl4u|!og4;_B?=3rx@BI-|;Ha1gd+exbXvQ(yp^qgJdB#1g4N`ru(2Nk-STw%4tIpIp=4T)CpI5r@M~1)?qQsG|xlRybb)<=WT; z(H5u5n_B9c^nM1fhC#YT!GhJTt1I`f1d+0($sm39HVVOKh)`vFopd|I;5W3IL`7xW z59C``Ljh*5)uB9omE_~>Fi2Ojrfx+|V|5)WYOKRe&Qp|v(qsxE;i)G{bFW}67^W4Y zHg+0q6nR;Lkwt4HnT+=L<%#J}0enn+B$2-MSAI%7-iJdh?jt@H$cXEq#@X)28LLg|U3zKVHS$t#EIogo=T?GLr0pz0E85#rJtAX4T>(D>Ro}-@xZ5Q$2}j5?>SP+&XZ~GU4asZwcW}S02&tW}G%U{0NGD1z(Vx zTfUH@UjDV#Lm1`yVnMtR5=h8zqG{(aXAbqQMU-`q zV4B}w#ELyohs`G!RIqpHl|P&CpMM=eYiKQoT zGF9SB;R^_?Lad4{4OV^fTg0^BTAt`PJ;+&$O!6r32l zma6lo?61pdC+fyO?<+l^=wci2lJg})7ZQMzd0uyJ8uvb$V< zSJtgU+`X3&lf?2;POHUD=C@@7cs;Bhu5xR2Wi!qkqROlj93e{Lb64Uk$+X-ZP-6%l za$6myIKVnhentwLK3=4jDY_i&$`60stxUj!4k6lN<&2p}YKfxzIE46(!wa_Wc_vy_ zdUA8uGnLg?9#i{u^|P>|HCiDGd&k_J`kLA{A$C-`b}Uh_52x;A#{yQ5>_U`~ft4wS z3YsZ~20#}>1E7nc3&;>d!dRR{v@IbvFjd+KRf66~=@iL&7Oo^+G_6ecS~MW*3OlN`&;W+$0D~bqz+i|1phrTY+~qubtmvg4WYY*E)5#8vFscLVZ&()S ziI;cc?K(aKg+(0g&lpcW$$_2qB$51|HlFS|_2EB!W2JS+@UnvDuYIrn4391Pc=9-8 zhXjWZ?B5WYP8<`#)Bui2XaL7_fWa{xU~o(UvJ9cAg35pI5E_-vOL&^2y;pByia@ie zY4qAn{0UN#yIkTg(Uz@Txwx-S_P0z)&IoT<;YEjq&GBr)KaIyX4lMZQZSVa1?;m*m zyN_N{bu8XY2Ix#6YK+4D=J8VEu?Q9g@K{0vc&q~q9_s*u#|n^z$3pi2{`aZLQjf=Z zf(7)s5WI$W$1A2}_{9SW0r&G}PAQu*Q$9N8%px!kDhvCSb$Vwpm7vfq?eMoR8l&-n z^Wpzg(Kx4V=|PFgJI$JYLNuh~w%?+$hD1XI#|4Onga(L)4lqPR2N1OB4z|2D#}k1A8_txs zh)1`yG3|ervkMHMzas?`N{E_Syr><^uDa;^#~oPMX>Iw^hF>*e!NfhTMvbVi z3Lu)@ixT*Y6E4&oiMR|-3mBae8o)svU~o_e7#vgp5Jw>3xl^Y}auM48+fh6j-YjNF zl;rbkjK?oa@&o)*-__8zH;Om^`FPDgW$_euOp3cGQ%3Xy@%>F098biO+}QDNzwEnk z+i@2>_t5iaj{D-T8s_`#(AyGC1 z03*I`r{JqzaB~2MB{YD;I>6wt4lp>Z02v&px?p+G$hw#4E`oak=q{lFbk_j}-F1LL zcLm6x`#nCADwb_zjrZv7kE{aq3doc9p@&sQk)g(vc!lIOz`a?EKzWGqbYf29>0WE_ z?V}d5=Vv?TlpMHw#mIkfJUvN#6~W^He3j4uzUlyjuR6fss{&;3^>N9~{TxpdJpTIQ zNqvQgrvLh;_x&7J>XsdMGIO28udNGgtM})mP5?D?Lv(hLug0I$g>L z`tN>d@|FkxG_9dAzINFUPffmk-m#l~4lBX;g(+yH(id245xf|{Q3(y;s17hVssjv; zDnJHDU)0eQ@oXdYGaeb0-w(@_`JUCU(%hSsKBT}G`Xe5G6W35Yoa8nBPv+rQK7a5% zOTJq45y9ahZ zHt~Vh@0@;C-9(+_eosUf1C*#kUj~suz>2tn29R48lK_Le0%VXob4460W5V;_ zhswi?3M&_tH`$}O8mqMAhL61_{NEH zP`{mJUa&ZTBN7_G5glL%xDIeRqBTS`GP$wXBbyshN(7Y1JdZFnoi=nHL9I%-<;C55 z1ALnM26*UCx6_+{|JQ2w@yd1tek?_9qLo{Av1uslr_6EQ7(ZZ!UlDdUC3`<=OdXWQ z3#WZcJMg*eBtCLq?f>dASi`Tz$uaU|andRiGDiDZRuhV!J`!}cZarq1XeKQ7N|jK2 zD={DtfW1Z5`l`F$9s5y!sO@E}fe{twob|+CANVfHmGdufHa%#gd;8o43lE<+f5F_t z7cM+4(+Gf=TH3N3jw|Oy%Y7t{CJ{(*_@5_PWZPQ+pYN!zYnV_ z!}iNwe@{JU6a4Dbo*QpRFJ}j40FAw?oZOmF)OK4VO>L;DwLc`pI$5%CnwI)&`UO2m^YdYVkgj!`X0|qz?Ie&+2%XSHwSi&RN*S zg}%A%l~7;%^H9~N?p_)B9VG8jeqn{PB3YwYJ@YD57QxRfehUI)ceDD=1#Ovj_bGCg z{pX-HVt5-XIUD0uWo$i!aCrbv7O=^Wvr;eJ-&UvR);F^0x&4!!ka({S_vn#4`N3KK zQaZ_dG-vj->1#N1s_{c{VRj^2T*w@@G|ci?{xD{-qr9gKFqGljGYl? z(`0OWm`#_lv%_qLjD0@LX3E%kVKz&~E(o*PGImjzmCM*AVOAkyJHl*^jC~=@=CXN& z!4+XPU&g)|W(#EO-@@L4-fU{`5QRv!^ z!DK4lhZ6*ybr2HH=1h~n-$2_cD(Fig*&j)u3Q4@0Ne?G6Ow-Fx2Y+v7w-f^Vud2MY zq;!&DcAHGTo#S^^QN@}_0*POfiFaba8b&_EzK$e1zf$4iR=~aip~hzyI6G7|OTQXk z(X`=Y9Q0T+UHdsKl@w-ovwMoL?(-k$X%7B};W8AkZ$WXXk?Xk%A+`(3L!}x%LWq5v zdv8!e>_PNic?$3fLhL&j;i{PF4ushE(2i$ilphdc-v_%qy&+D$h1d_E4%{@&@`u=N z*d+xBF!>?&7+9s?nynA9$I+P}BOhW<`knWzdx$;dr+Q{R#D0Q~D|;Sd&p_wULx??x z9+(z9#9n}&_WKID{0wYXm`R%*Vn6qh)r@tB{Ssw0D;;9LMgv}D!aRrAZ+r|ryBuP_ zh0Syc=NaS>`yJG!w8SCys?Q+P1c%rk&_88+L+o`tD5D!n-0 z_I7S=Fo~fUGzIJ(NRj_Fx)6I8jVmh~V(;TYnb;8fkVc#LZI=-H7+sSeSqrgGkWpFI z5c?Ep>1H*={)Vj5riM62TpH96hYv0fY=?LrYEY&$#0w~ou%jV93_Q^+Xoweau^o0O zSD*R_4In;CRltWs2n^#H;v;~j$1#}A5Fd#i`UW$^OOZo2l_7ora`;9v#K%HDO!FAx zud!7lvB zc>$k^+TAnv>9x!9OTv6MFDFbYz(neKw5e-o73vk9%jXsH8GJqwOH;85E<3ugkk8_W zLp$TZe~2Fe`M_SwXn!ZxYX} zMgyq2idVxbam*IPxh!c`mSZPj0k19OE7(%d-rtKNx1fc19cLU}I<}A(6D~$~0t}Bt zKQ~(v4e{f^Qa?rC_!8o+7!2~O_TGqF4J;Oi`0*H!V#P1S*J9ksOv2v{ z@%12-OfUvFKhY3V^(Lx-x09HzliZ6G@{{-mV1xvXaw;!KHM~@W!6hMe?!DtYJ zhQ3Kw;eV5?fNw)q?Q4?|q-oQahxw`ev_gIgKiwFD%f(kI3;3BN{mXUgNQfZLS%rK% zKO0KJKZ6kBpGPaMo@wgENGO65Kt$+)Fh5@o_zOs`E&z+%tTp(#8ekknfsrWSJ*r}t zpcqPAipJzAZ0OM_oLKw{Al7B(;tuy7F^imgaffR!?r`kI9d5n2!>Jc{xb)%n`qa+{GPkyST$?7k9Yq z;tq#h+~KZ^JDhcKhpR5`lhqw=x_E|@F79yA#T^d1xWhdccR1(b4%b}V;h2j%+;VY; zQ!egs$;BNGxwyj}7k4=0;tp3_+~J6eJKS(_hZ8RDaKXhL4!F3({l-0ny~dbwA;eFK z@n3)+v{mLWGj_3~X7F#ZV<@Pkpqhdj3RX~1N5QcaG*Hk)!EqF{Qm~qW<0)86!Fmc# zq@bOG2n8J!L@DT|AV$GP3i>FBQ?QAGBn5*MY@uKq1*cMQIt6D^a25sUP;f2<=TmSY z1s79rDFv5Na5)86Qg9UoU!ve@3a+K#dJ4XLH+s+6jR=2?DGj}fb1;<~hDls8rf;Q~ zxQ)YpM)M+Sv7I<+U+PfH&r!QdIbQNm522-UkW0G_W_;Uw1^zW$sKiE=s zKRb$jhaJrx!Ef3=hSvU*RkCMT75gcxX1`?1*~@7CRaVR1U@O?$Y$bb-)v=GoE5)y{ znNn~b@y5C5tM9Kq3N;Og*GE!=g@?9fk1yUY1QtFWMh>>zE zQhsQpG$7?sBc%x`KQdB|L&_6IN-I+S(@0s3lph-@$0OxwBV{d8o;6a|BjtG`@=&8oerVI^j!)mKS~NIdk4twQON%JVfJTIBQr<6XQZ5pln;!Q z(~|C(oJh0+?u;K!+;zF?EA`tvyu;LPSIlB}j+rf6R%h(fO%&(EM zhg|_uV$nlsj0Y4c&!g7DvNc}(FfS&Jilh=F=_*PZWh8xxl13XzS5wj$Bk5X78fPS3 zPe~JuBuz_C5r^rofo8rII`=y0%IjG@woJ4`cP606&t+f1OPz`QGw`S1ab1iH zzpucb!1W@o*KoaqYcI4U>a=Qb;oX$A1J|>-_TT`=0$eS);n7i;O3pKgEPr`vC6=`U&N&uZz9&bXId zdLN(mFrU$In|=R-eAZf|oGDT!-^b_N&ll|Ci%R*C_wl3rta!MOAB_U%Bkg>z_%`Ed zBc9st~r`*_2{95^(Wa*dcO9%Tj2ZOnm0 zbu`?@p9kPr0a$^jN3&(U16gBU)@!q6J;MY(W;7YG@8?};Y%OGfsE%l(N~%Q@m$?GO zk3fbVnPE1fC(Gy*M0;g)ETa7~8b)+LMmeGh5oI4Bnv&5!BDz^dUq*DRjJ|*dFLxVc zkKyTD@9EokI!8R6(r_EQ6HljmPuJt=V(;lPJZmtmcFI{P7?#eM|U`ZzxV%eIy5$FTX&Ld8DEo3ZG+ zmc7V7%YFq_`)l|BzlFMe1)ED=gUbB_-;QO?i`k#}4z>rX_Z|K{tTaBsKEU@F{{j{K z3I8Ql3}3^F#OvJQ?_g>0J*)!m<%Rrjyx3aAM_7w_sa3;ATPyiEYk-fpl6;c2gCA&J z&Zk&6@Tt}<{7~x|#GmDdSugOJ)*e2~dY8|!8J}n8^9A;N#24^|_9A|y-NF~!tNGD( zoF8K+c(r{xUv6*bEA4A|oqauTuy2RJ-N{?*-MrQQ5kKC3g`Z%*%0Fwr!B4c`lAB!8w!P)=d4>GRys@~C<4@%sg8QNTCwcR6KY~AgW@;Z;w{@Twi&Il;PE$V0g7B7+&oOhSz->!tnA}G0*t} z%;6vLUhPk8FW&>R_YM#7_wiQh13sGng-_z2@G_Xd=~(KUWjTDImB){;hVe?PkT182 zd4n~AH(RBAtu>l|)*8p7)_C4yP2!uZ19{4t!cVsj=G(2q_{G*VzQdZuAF^ii?^$#C z6V^Qblyx|N5vKK*))M}jwUobZE#vQ4mHa)J*}YaR|C_bST4Wt-Ew-Ah8mrk_X|-7c z)@mzht+jSo>#WPI&sjHECt0^x8?0v#f7a@-Ua-2YJywtPuGNbrr+z!%8nEXhzQEdK zFR}*h7HhM;+B(IKTc_Fy>rDG}YrDPO`n-LOb*_EAb)kK`b&-9iwZqv^Z&dcoOb z{oFat`h|0*^^$Xu^&96>>vzsh>-WyJ)_*y-TCY2ISZ_M_T5mbKtUo)CSnoQ!tq+~2 zt&g1Nti8@l)~C*IZSK5f+s-Gr@3r&thS@x?&@RXui~BfxSl%JHA8Hrn&By%+JDj(~ zF3GF5$HDMk{4c}%zuoZu@0{`O$ieVZo_`tM|LcZV%HRK>;gt=#hF3lPe=_5>@oLjP znC-C-V;|eo*j{@U&$DOqkUf`=wCC~B_ThXI=80wY5$MR;oiLbSrF)wW6QOqZM?6rK8y^g2s&+*gkcD~*2;1}DSe23k`AF^Zodv+gx z!tUo!Vb1xYo#el?xA52Ot^9TSH2x0epzqmd@xAuh{BQPo)*}0SYq5Q?RbyXbt+c-Y zGkUp|w6B6`{5R`zn9CdN>#SSs8?0v#f7br8^@4q~wa322de^?)X7<}P zuiK04yX_YH9(%QYpB=Y%*$MkW`*iyud%OLxeU1Hn`+9pfaz1L`X+MG3llG77pV+V1 zPus8B&)aXr39*PZe9o6cnWEoZ9z zXJ?lEu2W%u=q$27au(ZrohtiNr^ew~uLLPQNqK+2kDH zoaT&i&U7X?7daE1OPzz9olco^tuxiR)j7nu!&$R=IpxkHPKC4EneRO9EO4H4 zj&NRbj&y$O9Ob;_9OHa~`(CFqZ - + - + @@ -27,7 +27,8 @@ - + + @@ -36,31 +37,45 @@ - + - + - + - - - + + + - + + + + + + + + + + + + + + + - <band height="124"> + <band height="119"> <textField pattern="" isBlankWhenNull="false"> <reportElement uuid="136a5066-d141-4362-af36-0780f0d16542" mode="Transparent" x="0" y="0" width="457" height="35" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Left" verticalAlignment="Top" rotation="None" markup="none"> @@ -119,11 +134,11 @@ <textFieldExpression><![CDATA[$R{label.empresa} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="bcd47f18-94dc-4d33-96db-6d89795188d3" x="102" y="57" width="513" height="18"/> + <reportElement uuid="bcd47f18-94dc-4d33-96db-6d89795188d3" x="102" y="57" width="699" height="18"/> <textElement/> <textFieldExpression><![CDATA[$P{EMPRESA_ID} == null ? "Todas" : -($P{EMPRESA_ID}.toString() + " - " + $P{EMPRESA}) ]]></textFieldExpression> +($P{EMPRESA_ID}.toString() + " - " + $P{EMPRESA})]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> <reportElement uuid="049832ef-f634-42f9-95b1-ac2e1fe23b10" x="0" y="75" width="102" height="18" isPrintWhenDetailOverflows="true"/> @@ -136,11 +151,10 @@ <textFieldExpression><![CDATA[$R{label.linha} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="df6b8946-988c-479c-8eeb-c8d40c94734b" x="102" y="75" width="511" height="18"/> + <reportElement uuid="df6b8946-988c-479c-8eeb-c8d40c94734b" x="102" y="75" width="586" height="18"/> <textElement/> <textFieldExpression><![CDATA[$P{RUTA_ID} == null ? -"Todas" : -($P{RUTA_ID}.toString() + " - " + $P{RUTA})]]></textFieldExpression> +"Todas" : $P{RUTA}]]></textFieldExpression> </textField> <textField isStretchWithOverflow="true"> <reportElement uuid="2d048310-1ec5-4711-b402-75ef3d3500d4" x="0" y="93" width="102" height="18" isPrintWhenDetailOverflows="true"/> @@ -153,28 +167,28 @@ <textFieldExpression><![CDATA[$R{label.dataVigencia} + ":"]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy"> - <reportElement uuid="40c47b73-ef86-4b76-a4bb-ec284d4e6f59" x="102" y="93" width="56" height="18"> + <reportElement uuid="40c47b73-ef86-4b76-a4bb-ec284d4e6f59" x="102" y="93" width="70" height="18"> <printWhenExpression><![CDATA[new Boolean($P{VIGENCIA_ID} != null)]]></printWhenExpression> </reportElement> - <textElement/> + <textElement textAlignment="Right"/> <textFieldExpression><![CDATA[$P{VIGENCIA_INICIAL}]]></textFieldExpression> </textField> <textField pattern="dd/MM/yyyy"> - <reportElement uuid="12564f32-d986-46a6-a184-23b23ba50bcb" x="176" y="93" width="56" height="18"> + <reportElement uuid="12564f32-d986-46a6-a184-23b23ba50bcb" x="190" y="93" width="70" height="18"> <printWhenExpression><![CDATA[new Boolean($P{VIGENCIA_ID} != null)]]></printWhenExpression> </reportElement> <textElement/> <textFieldExpression><![CDATA[$P{VIGENCIA_FINAL}]]></textFieldExpression> </textField> <staticText> - <reportElement uuid="bdfc1a2c-9e77-418f-8169-50c67ad7f116" x="158" y="93" width="18" height="18"> + <reportElement uuid="bdfc1a2c-9e77-418f-8169-50c67ad7f116" x="172" y="93" width="18" height="18"> <printWhenExpression><![CDATA[new Boolean($P{VIGENCIA_ID} != null)]]></printWhenExpression> </reportElement> <textElement textAlignment="Center"/> <text><![CDATA[à]]></text> </staticText> <staticText> - <reportElement uuid="1bba53bd-7d81-491b-b1de-11a0c570c5c7" x="102" y="93" width="130" height="18"> + <reportElement uuid="1bba53bd-7d81-491b-b1de-11a0c570c5c7" x="102" y="93" width="158" height="18"> <printWhenExpression><![CDATA[new Boolean($P{VIGENCIA_ID} == null)]]></printWhenExpression> </reportElement> <textElement/>