From 3b9436c154a841dcd959f9257b410dfc88d880e1 Mon Sep 17 00:00:00 2001 From: edgar Date: Thu, 22 Dec 2016 19:01:27 +0000 Subject: [PATCH] fixes bug #8301 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@63999 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../relatorios/impl/RelatorioTabelaPreco.java | 29 ++-- ...elatorioTabelaPrecoArtesp_pt_BR.properties | 4 +- .../RelatorioTabelaPrecoArtesp.jasper | Bin 33912 -> 34135 bytes .../RelatorioTabelaPrecoArtesp.jrxml | 130 +++++++++--------- 4 files changed, 89 insertions(+), 74 deletions(-) diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java index 2b6d73514..7a936e47e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioTabelaPreco.java @@ -37,16 +37,19 @@ public class RelatorioTabelaPreco extends Relatorio { dataResult.put("tarifa", rset.getBigDecimal("tarifa")); dataResult.put("pedagio", rset.getBigDecimal("pedagio")); dataResult.put("taxaEmbarque", rset.getBigDecimal("taxaEmbarque")); - dataResult.put("seguro", rset.getBigDecimal("seguro")); + dataResult.put("seguroOpcional", rset.getBigDecimal("valorSegOpcional")); dataResult.put("outros", rset.getBigDecimal("outros")); dataResult.put("tipoClasse", rset.getString("tipoClasse")); - dataResult.put("linha", rset.getString("linha")); dataResult.put("empresa", rset.getString("empresa")); - dataResult.put("dataVigenciaInicial", rset.getDate("dataVigenciaInicial")); - dataResult.put("dataVigenciaFinal", rset.getDate("dataVigenciaFinal")); - dataResult.put("idLinha", rset.getInt("idLinha")); - dataResult.put("idVigencia", rset.getInt("idVigencia")); + if (!isLayoutArtesp) { + dataResult.put("seguro", rset.getBigDecimal("seguro")); + dataResult.put("linha", rset.getString("linha")); + dataResult.put("dataVigenciaInicial", rset.getDate("dataVigenciaInicial")); + dataResult.put("dataVigenciaFinal", rset.getDate("dataVigenciaFinal")); + dataResult.put("idLinha", rset.getInt("idLinha")); + dataResult.put("idVigencia", rset.getInt("idVigencia")); + } this.dados.add(dataResult); } @@ -62,12 +65,16 @@ public class RelatorioTabelaPreco extends Relatorio { private String getSql() { StringBuilder sql = new StringBuilder(); - sql.append("SELECT pOrigem.DESCPARADA as origem, "); + if (isLayoutArtesp) { + sql.append("SELECT DISTINCT origem,destino,tarifa,pedagio,taxaEmbarque,valorSegOpcional,outros,tipoClasse,empresa FROM ("); + } + sql.append(" SELECT pOrigem.DESCPARADA as origem, "); sql.append(" pDestino.DESCPARADA as destino, "); sql.append(" COALESCE(t.precio,0) as tarifa, "); sql.append(" COALESCE(t.IMPORTEPEDAGIO, 0) as pedagio, "); sql.append(" COALESCE(t.IMPORTETAXAEMBARQUE, 0) as taxaEmbarque, "); sql.append(" COALESCE(t.IMPORTESEGURO, 0) as seguro, "); + sql.append(" COALESCE(segop.VALOR, 0) as valorSegOpcional, "); sql.append(" COALESCE(t.IMPORTEOUTROS, 0) as outros, "); sql.append(" cs.DESCCLASE as tipoClasse, "); sql.append(" r.DESCRUTA as linha, "); @@ -88,6 +95,8 @@ public class RelatorioTabelaPreco extends Relatorio { sql.append("INNER JOIN RUTA_COMBINACION rc ON rc.RUTA_ID = r.RUTA_ID "); sql.append("INNER JOIN TRAMO tr ON tr.TRAMO_ID = rc.TRAMO_ID "); sql.append("INNER JOIN ORGAO_CONCEDENTE o ON o.ORGAOCONCEDENTE_ID = r.ORGAOCONCEDENTE_ID "); + sql.append("INNER JOIN SEGURADORA_EMPRESA se on se.EMPRESA_ID=e.EMPRESA_ID "); + sql.append("LEFT JOIN SEGVKM segOp on segOp.KM=tr.CANTKMREAL and segOp.SERIE=se.SERIESEGURADORA "); sql.append("WHERE rc.INDVENTA = 1 "); sql.append("AND rc.ACTIVO = 1 "); sql.append("AND tr.ACTIVO = 1 "); @@ -113,7 +122,11 @@ public class RelatorioTabelaPreco extends Relatorio { sql.append(" AND tr.DESTINO_ID= " + parametros.get("destinoId")); } - sql.append(" ORDER BY r.RUTA_ID, vt.FECINICIOVIGENCIA "); + sql.append(" ORDER BY r.RUTA_ID, vt.FECINICIOVIGENCIA"); + + if (isLayoutArtesp) { + sql.append(") ORDER BY destino"); + } return sql.toString(); } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPrecoArtesp_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPrecoArtesp_pt_BR.properties index a66115839..ce4609ed3 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPrecoArtesp_pt_BR.properties +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioTabelaPrecoArtesp_pt_BR.properties @@ -6,7 +6,7 @@ label.origem=Origem label.destino=Destino label.tarifa=Tarifa label.pedagio=Pedágio -label.taxaEmbarque=Taxa +label.taxaEmbarque=Taxa de Embarque label.seguro=Seguro label.outros=Outros label.tipoClasse=Classe @@ -17,6 +17,6 @@ label.total=Total label.orgacaoConcedente=Orgão Concedente label.totalSemSeguro=Total Sem Seguro Facultativo -label.totalComSeguro=Total Com Seguro Facultativo +label.totalComSeguro=Total Com Seguro Facultativo (Opcional) label.valorSeguro=Valor do Seguro Facultativo label.msgAviso=A CONTRATAÇÃO DO SEGURO DE ACIDENTES PESSOAIS É FACULTATIVA \ No newline at end of file diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioTabelaPrecoArtesp.jasper index 7730cd8ce596af46ffc7e78d288f942bee8bdfbc..d366cadae9d05faab79bc0386886e2591a31c317 100644 GIT binary patch literal 34135 zcmeHwd0^aCwg0)_q{%dyrfHJy1xj0Jo0g=sl&uAum8P96OwvL((n<17GITOC%uL#} zB2uV`tjZGgnvzV=vZ$GANDen#7)r*?M8b^65~*Z^8662n&4x`97?ePg z|CT;yP)UF)2V-OLaKvm4r9vs16}T|8H`Ex8HTIf`a3~T!5E_V>>jE@GC+iB0nZ4t~ z!{Lb()u_agP;{iRHbQDis^+3?Q*Aie9*KogEizwwES548oG{rtJ~kFg z?C&!7A-TDo7TTcm!l_Y)Z8SqeW}+!NWaX*~C;P&wh^g~*P({QXPANp2sWO%bn^6!P z^&%=RO9+pQ0_&;#A#rR*1c;jIPM~O@pWp;mQ>Uh4ajUedeWPZyE5<$8w?A$MsA3>A zxMw5*G7P0?NdUBOOb$1C_@YtqMI)0vI)r|kuBg=-PMCv?R*Kf-%$Pz=jluD#ouMr{ zK8AAqsvJcJ?*396ridhAJIFT#bdzQ(nWAMoa@Mpd$Sp%sE`7)x4vj}ry{Y{XGesxl z$taT{TiKAA3WXyYooVW;*J|j}e5I&_D5qvPmKY1A+Czh>SYp4!;UIZ7pL#?iAvc7l%T zjYq<%rbr~V&m0O+t?WTYzHK6&Fq28C2kLXScT> z+{uxDYLYQxHI|}k*Z9)BKgGjPl^v}+V^z-bB{$19a*3)R611j3svqjEEck3Qm{e#f^lgm%#h(cq$yX;0xeeM zs={SB^qCW>_OKaoiNVa=VlZtW7TbeieNVvLYet%>%G?VDDTm~~@R-?5(?>z4L?j&D z(+B&)Of}Oq2ZE^WG!p`pN|>p^QMLoR_nL`eNK%06Leas|Sb}XOM>x2-H5g}|Y9wRj zAH-xb@P4h6lMyUj8?|{FCZzxa78pp2xW;U*-MS`;eg^8Z?F2k>rA6&3f^c@xhJG^p{)z-vV!KY2}v7FuP;FJ>@t%qc|4RtbEEomhW<=L2%@#R2zJ(rL5U1& zo)dC0G>n{q7+Z>rLmljT^#xlN(*R3Nh4!TyB?PU~wsW&P(+p)#E0|2krLBNkR}np- zp&{7PUP5(5Q|5@7K#{&-*p1Bfnhx^27rKhSSAv5f6yXC%6N)rNV1KiA)#%R25~Vr( z)SL=bs`!oGay5&Wp?_nMA+BLLkP9a}P;q!re@_c1dxnPF#sDT-$T&pZ1rc7vy#D@m|PraQ_kfy$1ttR zXZHnELeRUC^XT~v7lUrEc7Zhg3NZM%NL`LaJJyWjaV{174*r%MuW`j3B@r4)gyN$q zP!=qmV|u|-Et4|7aS%K@7-JsNB{Qhq%Qb4E;~`_UocmP| zPQR=H5|J1=gXUOlugRRpDWoE9CVxDZ4DfEzKSeARkkk1t5CMu?vt~sTZixs5Xj^i5Uph`>tO?Q1@i)t4m=oS{B z*0gcP+@l*n66|h0J6mAQ%|w%BtHKIZ7BNQ81}X63uGyDYU%zJD zpegNCHXMq?M?+xGy*$AVkTHm6&R3QM54e(D)UeAs)?9}<>TqIYKqgO-v7;Tc-eLL0 zlsiiq_HVxV<}hq|hE#K~SkihOBlRYJh?0i>@>~W5E3*cRx2)!{jn4(b^e*e}X*zdH zn=B~5EuYRWSqiLe?>N6d*cNE&>)6`X-`9=*do-ds4S9)ZT5n}3zM>1ufNJ((cZ!@Q zaUVW%bIEHT9eZCRW@wwp57RA~>J5)Hhf~Q-R5=#2zb4{W`h2we_uqbI#gk|4x-PZ( zYVLZ*5|f)LO}y%f!e=;hAZ_2&{OVJ8zIO2aryD#2Q+*A^TkWLl8iy^BxZ>U$kE#6d zFRwO0W}cx{@O12yyuFmgg2_UFvX-{4zP6wjzh-5qerI9g(q}*R`YXV1yMaFqaiSi%@r#VI5} zYvcmfVwksN7OjtEp>nl5MKfHJFS!oSj1o7acGu@;6g1FIt#!IfZ9e_<)0Qkucf?j! z_2ZYHy!|KZ|MU`sr`-}BZg=O|mlE;Id3JE7EHQu%5#WQIYSTq}^kP7cosVG1fD@H4Q~z6!k2DPWuFwUw^SjNcWE>hHCZ@wjy0}M zvF9dE%@qNfKFk&_b7}|XcWQnC9!=F_3H4S44g8LiDPSdbvlMPl4^ru1tz0hP*-ZadoVUhu7L$~1{ zN1Z9(TmeS0oIE6l@Qk^MBCJ|FlkT5MM}jcxnx&%>MV*kYL*tdmYHa5zZA+980^Or=cm03Le5!s zWGzNRJC&(=E-bnpm=pz!9jYESZ?%TxrX?*hAF`-rJvnwC7i>wF>W%}F78e6JZJd+5 z7jHts4uUiMiZfE7M0hx4l_Z}sNp{Bg2-hIv)x1Ux&|G*SjB)K%$NuJ~3Ex%c9dqK- z4-R%$Gs?0?E?_eU?|)l(;x;Zy2A|-!Vt7JjErutY%8KC$cRhvigw8PuPkh4DgZSWv z=j4g1EIgsLMcf>MlSRSW;^nu*6nDS4>-m!|{Ym%4XW!%h>;*0Nzf(-{6{d&`juguj zDr+%J;Z#-(Q@HCXj45=ENtohD(M&Nt3sclsiee&!wf9isqH)tx?&RviXn9MVap#SH z`@t*EKk%zfxBld!4_~nHpWi9Y_&)Q448B(^XQ-^jaE4P^F`VJ9r!daYIVRzZ?|FI< zAKdVq>Y_ReXVhuVz~XzP*Bt9LN5c?iccE3}+@e(&c27f4)H&oVQc*Ciz7~XK#Qy6dP9Fy?IAKV?t?|FG+Mjqa1i50;c z=YcnFeoMS@#Up>3>RZwH`A=Qi^u*$yw@rD6ctcD9VN_rg$s0Or5xn74rp=jxOixce z1@VTJBRg*hqiEi!$-)~ml-|J9DwfEiH0-7QV|X!?Nqa1wm?jmv9;*EWnTeDKkk~;} z2C(;qnc)ffW`@$caw3kYol2TxYA2K4__Ir1y5`&OTkFi{7~@RO7=~J!ur71YLbkIS ziNr!hV@{twv---8)yF@)Zm{=`3#WhPU87BVyqqnSEzhj{ifU=IDmz*k@C8k;#0iX% z3>Gm$N-q^Oz0z5W;c>gNqIlfSB~Fx0ER4@pE+)0ilvEF<9(bG^y-0O~D`aXjNAW*J zVP}R_YqNQ&Ebm|m{I2w@TLA-WWVt>3n#M{@ zA4TlKxTu{o$e@KwD~5|y)?&EGuB<37vU3&1MH)MYi}1#68N z=Z4Z0Ri>1kon~Yg!4g>7Q&X~nSmGm>9XbE->^%$ae*9;(M~`m0Btt>GjV!U3DI^2w ztW^w4sI0}Xgk4!tEMey=iX}9587#rgERH2+Wnqaak|mT>%dj|R5OU?l#SDy;)C>}q zp(DQa+*L1s_x*ni-G9aMdk4a&Yj&*?ynk@G{Oge3Mt7tq2Zjv+rfuAokI}y`IZTI zuV0>+06yL$RE$h5&ZS|UJh4CjVUcq=8Sg*iY=2k7f3o5l+#KK{G=l$x9tpgL+-_{A)hlwA2l@W9de*lCl05PjuD)Ic}}pOvfVA$^!S|WeJWP zOo68d=KGS=5J)Bzy3gUSNw}m~uLG>hmEq{bh&cvSa~?K?JBs_Ho`Wflke9McjpoxT z?evTDe|&6>p|jJG^&XJLF+sR$;U5%@8hDhvH|5a<6`fU*=1#r@B0E(uwP2 z(Kx$1+Rz*xX*CDKW6*Lkfh=B+Xocq}Qwp>23~3s+@Qh`#@l+xv&(asxn6!nU{N$Pf zucgtD3!_{efwQvEEd{2o9m3J=tzfX|U^vtf4I_-W>QR2x(uEg80erW(!?-_YxbwB+ zgnmJ}Joc)qnmnCf5gxKobY;r)0CvzT4-dgV%tNv)$(g0=f+o%)L&jo#>^c+b;o}2P zDN4=eP$|xcu!#KE)_;BX@s?VtgRBowM_{MQgTL*u1O$344nLle?Zn5P_9t<0 z8b=}E_lBduv-D94sY}y_#=N?zDhgGO!%`TKZ5O9>C1B|b$0N#>baFo_0fQq&Rl&BN z?qFYkOE=u1&sQEkn$4HzQn>24H~Z7Utx0yLahxh~rY^CkDcIE61|RF*{?4Wz)#FOt zOp_W!@+wr8C-byTO}#yBL3qA1R_;s%-^t-AZ-&#nuC|swTzBCvQymXZUKD9SL!#<# z0#Ej8oxQW^d{Aghmj|OPe9BC3(V<4?ZEfmn>hJB|5^QO6*PXjP@}h=bX?A2qsJA89 z(bE@b^B~litHU-0n+9<71NSZ1W{0QbX&T)?cS}>igQ-$svbzE?9Klk`#cJj(oiEs? z+SuQ`r3+4p?xxOh`r9%Qlr7~!z@l|uM`v6A_UuK%C1s|>P9F1?)?gsU zmpOQfn5T=_5)AZjY+?!pvthYVmc;#tgnW!6G`11@V-Yi8S*x^nv;|r{ zIbGuvTQ#04%g_$!3wK31b&#I(w983{rzA`Ewsr*jwloDgwii+Arr_3aA~nu8_N0-d zuA{fVWboIGf|uCoYYkkCIqe5$oE@Py%;p#QP($k(j%Ylh_Eqlxc`h z@t4R`{8(%D<5C&E9i`zwEH;*+sn#bByV~#jCorrjRAdir3?)aQXQ!0^__43g+Wkxk z8SQYv28$||!bLf$QP?3khd4A5f7b>%zLo6r;mJ25l(3ZHCKj=ZUvR{vW>v!(t6cw` zy!teb!Hh$!QeMxj1*zkv*S@*Ez5brj3x4{^16Q1~u^&UVnv&!gs_iMsz;7?V_@gV2 zv|1x|IhvGHy}5kRtwLl&3NkmYG7r#twI*be;3< zvTXH|?q+@5BuP9z*RXNIQJggmMY7vC?#Wh#q@BA(Jik`d)U7Gt@JrCjqFYkzYz?=4 zyux?Kz!g8I{l}zhNb4-cR$fQ^-fg{oZJpBjKEG>!MptAhv9yZ^K&1fKQJB&fny@21 zCu;6f0GI@oqv^GTm%rSz354+@%>iLgfe3py_@pmSXOu)S#c~c zJin%-<^YAI>|ZcInSy5GOJuP?c~^Je#*Qv^(t(-4XIEV&NzRTRuEh*upN{H=q1ZT9 z%cSC2w!Fge0I}BPRo0wIGp5S2=qhi~PXECU(7S`&oa;PGHLVgGk8sH|bH>9q*G#pW z<@^89tjQ^sWl<(CAv`4fF#D1*!NMp{Rv7<=o>iTj;kt3S84d zhfAD%(?!=|yue7y;CE_pkS<@|SQR0UHfD>kT}bSrUQjvYW=UEOaBG&6F2?UTnde`w zU6KVh&pM}ED#nr{4eEkDPdWB}$b8-p;gKu<0Nw4qWG_p9PYqzo)!Wk4)0WoX%CN2| zVjU=m$qp`Th?uGx-fF=);<7|&C_F9;Ux{PHYjg3d%TzswZ+;06X51w*CD-N+mWi>? z5@Ckn`!V=kTTZ!;j!Qcblck6@n&dq>IOm(9#W~mav0yEanp*S>eYjlqvYfHx> zP59}O4B5^h8GliI&8Vk4F&tSOJn`i7ray7zk{fQ^+rIHZwk@E>xpnntrdZ4C9Nz+r;<`dcPHc~?8_yy^Rmb+uG-`?i;&!= zz2Riqfr7#}XgbDl=b7pvmYx;4cpZ1ozV*xHu-6#~9oUbFUM$*{NW>C-Fza*QEjRfM zU`#oj;eQKvesKvnSe$-+9fL8!%XT*%M=i~E(cJ&bHDFxWNdbB%?x^FUm;E1IIfskH zw(wqcOK5OZZkfGJw}x>W8Vb3ouG+;+TK^U>^Y3;z&{D(R8^PYVP4 zi0KYQqglXZvb}aG8q5E)o4Xk6)jYx&f7SZQzDS7fwG_K!f8`iaF8lIBFYK6i%e~)N z^@G=^^)=s+WkiwMc_uEGaa=sGQYZg09*!IN{B(6_q%G$;sugci`KqOP@(ctEP-=+` zW@Z@(RBV=kz#ZWk2;32#fj~zTXg_&*QWIHTVaim%O#@S!VL)wmwb3@y8rV$ZRL9Cj zXIj#QU+mG#m(30Gy@1Z(0Mp8KaGvX_*PUe_)v&E{vbmz<1cfT6PaoPpHudz2%Q}AZ z?$sBx-1^ezH$KJ1$<&-Uk3+TU8c&bbBU_0KmSyQt6`Q3;-4UK1bw_x5R7U_+@6f(X zHPsbjt5offE*vr!Vwd#mcgKZ(FoBU}I(58dr@8J0W7;c&(R)`{$y$`jk(1bIH(oyK`|YlVZ|%DLxqHNCH^2gQ zccvs1PqFG`89iK3-YHheI_^;!oR+0WRcw|Xbw_x5)E(jJQ5|7X%{JCDjwdkQIgPc7 zbnV1z9m*TU#TRMzvfU2`979!KI0D3U$3Lz)U4ZT=zx>Hx?0g}*a)-F>+@G9t)g&~p zQn~ZfyMyU1gZ3=+R+O5M? zPCRZ4-x9a*<-e$fmo=QfM=+TH;xad0+v~+NHs_5c@Poo#vG@ZK*6zLi_bMEX3ooSF zL3WbCbv8I3YW+bAkU~6S$(5Ss)o&*l-*fAT4(uU>u1s?$zhz4p{o z`&XZ_X6>n`m6H(Cfo#(2Re2VTd)4&CII%=Il?a+`dmd_s1nm9t?zqTv^}jBR=h}|* ziKjS^n}eVQ85Oy9E(OiYh_*M$1+J5{JRbX9`->j9YcE#d%%+__+xBs`+H7wFLC0m} z_WF4UnxByZz9riELdY99m4Bv1Qtf#n=$OomuKo6GL~^-S2wIYnJoE%8DyiG?J|-r5}QS8Q(e$Pr#jsoX`U2<<_@zXZok`+OFMuGOjWSdl#i>K z5tU=5z#ra_g}Kiopv@X+AA1y3r$An3WwSUdUI-`b1IF3Ir&6XdsQw|QQc>y+CPBGpLM}13_LSEN znq?Q|*{y=W*%9vTAVIY@+}VI}r*?072)^!0x$ySOGemCGUFXaMm96JJ*RutcEL*-+ zP-zP;zV*{;T2p~-`?Y?WLS<9Qpws+RuHMe@lTW>^^V3xIc9x$i)Z4rKRH@#Y{Nz_} zEq;`Dw9wi}`7Zdb`Mvm3~=A(oZL&KM36Ljv}^(5&+()fHy(JG+V1N&_^Eyh~1SME!@iK7O*4!zJs6>b+x=R-Pk>F zAr{ToEqC2YsX>1F7=65wZlzD4r3ET7*)sl<2<7xCVBi@^eRMmTtnqXWp+343s!7A` zvC~JNh8l4Vnm)P*0M}^gqt8MBbv}=mm5=UqO0>sEAAJsztl}J0^wF1~H7uBG4D``qr+Kcy&qohol+hWojCwx$3Yw8^xbx8?P$g=d^U+rwW`h`X*ZDR`uX=_GI?aw+b`R?4hijz6~w!9>#q1 zG#J`By6>ZZ25G$mn2)|Ea0kD-N6Sb5f)71(`RE5M4z~ZYkA4WssDs`Q?`oj((Juulw{Rc*3dQIl%16K9G;)0M(Qm1Ep}H39!Eh<&W-%ISYVM5#Sw zgmzvjr@vt+L!nSotLe=OdP88fzz3BgmoCA?%d*tx7ltUQpr=GB638<7bV8$ZI-y*Y zp&hQhemQEk`h`zStq|p+0&MKyqITiSg&&>8Ej7D`xuvb{npK*0eo-Z+SBPn%+Eao$ za#1d7&>w2g#Nr)MhpOR*o2DUE29Ji+AitO;WLgl2;>us&_OB>h+y3Z;}c6D+zzc2md*GxhS102#I$B* zQT%qZs>HGiQ7e`+Xg1$1TP~&=lFSWR#-NLMN>f zCv!=w!A#42;uLUHDyAw*=O`P!Q^jeV<@5@Ak=ZJ3>&qwBRnTo5;o8UciL=3FmT+`O zfM+E*7cY`|{h~>6X)~AE4C-1*+i(XcIMzgl8OUIN>TK(Jo$u$C!etI)gPf#>&1g~ItOQRu%3gnIoQBKGY734v~#eLgH0R+IOyV_ zhl3yoeH?7%;Cv3YbFh3&YKY14P&_vX7V-|$QOW^gGfCJ!*~oPG1i)~in)p| zM(%?k@D(8O)gbW)X)WD|(r%&C=#z9h-AQNAXXs4&97_Kpt*3|REP9mArpM`B^aN^q znwsbtYNj6oS3%d%wW^~~k`jpO`V~j$L-i|<(1+_!Izk_DTF7l9>Vmj*W7^Y$iOjjk z17lc~Af6%kMuQyT`V}=df0;gM&{4V#|8t+OsJX)fITMh(JdpK(-0gv!4ajFakPU$R zqX*Iq$bBA2DGl@?{UC2atz7kRTwBdLVs( ze9Z&d3dmy~$oYVL-2>SU$Uk`?I{|sZ1G&KInyr`_64<7Owu7a1fE{+yM%sn13n)VU zSccvWMhVgFG(cYhTYZy;=s7a!1sbNm(uk;{QL&K1Vl`bTT4|5iN)a&%wljEAqq}!d zckgr{@}x%OsiX81i`$Bt?|2{sfPB{j83N=P4`djS?|UGlfIRDgTnNaIJdg+=|LTE6 z0r`ms5(ngG9!LU^Uw9xXK%VzN_5$*24`c$6fAc^N0P;Hz<>-V%AUGzBS|Y!w2u|-s zrGLgWTmvC=4B7$Qb7Lbfm{a2s~*T9K>pnWxdM>?^gylzz)+bt9Uzoj!yH-hgKP15p2O`U{%zI#QP6>#sZtl-z*#5)84!qI3Rd@eCoB z|1H4pAb!{4$Co4Cg&!02QT(37?^*nwhf0}&AMU~wyYSnC-(LKXPh5i^E@2S2<98o^ z58?L`eyH65uEs3&Bf6Dd#HGVHqX};)!-|d3m z>VjYIf?r<$C5j#vQ;v%A!=e%&qxQ!jz6PAHhr|rv&|7eNBpgo9Jrlr-C9oD{mE-Gx z^+kWFuN5;7i@BY5(<^wLuU>zR*JIS{b9g;Yy?zI;$E(-J@w!;O9>MDg>h<1-#nNpk zKCX&?NYoz@C)J9^!(t7fLkfzITCo=4VQ~g(oj{Bx1->rC*HwqbnMcJmeC@>7mG)N` zzBFYJw*g<8YWP}>FWqi@EdfgF6-sjvvEi^d>!?86sS*+I;)s>^gKOlVEap)=-q{BE zIE3pq@Y(I)*H44j?#9x|KZ4)xrF-ap@Z19s$p^uAhcRe<1-$n#2FkC2|BgaLzX2Zn zC;APbuhO^a4Lsk(Y{^egf-j#Ib(j+$PtS-3JR313UXSNl^nI}j&u+|$gP8s9qJI^; z>1W{GpNlA_v3u#)Vn6*3Jp6lc2$Rff=w)#|y$W9bv$zG5#M|jLaTn%z_t9Sk);+{S zLWqaO6!8*fVt>SZ>vd5n{wAgyK2dE{iaKMKm}$%vbB!fpp0QLMYpfQ>8EeI2V}n>? zw1{QKX0hDp5+@nkM1!$YtTu+knb^|V@OMdN_H1!Ws{YWDYJGVmwSe@BW4*bxqyp%Y zRQ2_aNh%kgDX9$2E~$tqhbU=DZS_d1{?d}FQ))@oUs_W2SMic6S};>@qeJ++R@Xv) zJ}A2AX2{UTL@(VX`mnlqK0P3|VR>&CJt{81qS^pta1b&$LeIipc}_&=c`=5Sp^G3( z39NoxL~n{DRw6DEGeioD2NU9Wu^&_63DGDHi1m1$CEhJI;n^)N7C~{T*d-2%-Qs;> zkGMia#Z_XjxEeXG2lRvDkod5;M%;+6o5e@OE%@&f;&$;#ahJG5+$ZjYq}~Hb{R|}a zK1k~4AgNz~q<#^SdIXaC5G3^xNa~}I)W;yHk3&+w2}ykdlKK=R^=U}z_aLdyKvJKD zr2Y_+`eR7yuOO*yf0tBiAo=^4nq^Gg=#f)F`8)Mg=`-RMOMNbb8jPrss@0dfu2xzcJ?0tHwNf1J5^& z`N9v`m|-lyh_+B1Zyb-&YN2Q}7K!zEo@Fc+oAB(0>;#QvVwbU8>^4pkdyEDVg&gfQ z)`r_8VQs vdyH+yCB{zUGUT`llG*`#!yue^nwiy;0)K2N*VzW!!(lhlq>o!Ot5-R75;hmxW#6_jy(Iy}CPnEV6$& z(BE%;UtO)vL;Vzo$v5BrT4a>BiJh<0au#!b~R3L_C>JHJY*ENX%^9B!M9b zB>A`KIfKfAR6P(MO+=z*TR0s~(~RIH;l1IeNW7`nOh&@d$fe<3QFCpOYIU-%@Tl24 zHZ&9&Pg9*r91X{Yn|jm9NNgAhr|5*q)@V4D+Cx{6F`lGT^5M2CoC1QO7Q8YMTpFO+ zJ-zLl+q(OE+e3loVE>l(P;a2StABH#EkOQV@pL*q+8IuwkpXT?bZj)%8Xt?L1B?lO z^(MjtK+TTb8W~KFY^Q0F;aEIr_Jol$oQ}j}+o?X1>WId}=~kJqBOXtiNluvR9UC1D zCnvhheMoL@r};K$Ya~6wu#IMT&`dVR2CZB*kyKwK9W`~H098fJp|nD@g{tGph#3RH zQ7@trvV_R+2(X^a9}>qFM1ZL2?j(u^`bkb;HFa`2p0G-***9Xwy5ih}eG>^YNL9PS z1G|TlAj4pq76w84rqocAhcB8GUox1TPz)vU@T(&^H70~DmPSQY7>C1{#n=HesDAwwg`ITnHh{>8{J3&YF zCZdsab2J*?XATCbUiKg(-#(s5nyHl3155L^cT>no3;In-B;y!;(h)P&8BV0>lmeN1 z+{uxDa*8oxHI}AnuJNU1BF)24jUBB!V@2NbB{$19a*3)Rl5}d3RBex%qtMbDph(eq z{KwQaAk70Kk?3F&aTbnJ)Ps?f)KR7@Uz(QZ#Sr9krCvLpK(E*H7~IH3HZ~`d;R!Bx z{J?kS-ST+&<7FfQRGx}lYBEC+?JLKl%4RMSiA3UxBsJ!1B2%T&LlrKG|LTY^Sl7t< zSz|Ra$yAhzM2}YX_J!K}S~sGWl?7|b93b3fv5?J6!v^UKC8VKHE1z?arcyNvv{;d^ z3YX!~XO5>kB4*Sj2GjG4!IWL`_-+jAyMyLlGulEm=3XdBIVAT*M$HzQIs!T+qmkI| zKG+v#x`n1V5JYXK=@6iF(o7GGupQ97*GvvUl7iF_jtz{&lWZ$F!okh0!#L|yBN?mk zASRQ6_v@XUj9~HFsNK^rDFqm?z(88WHD&MOA!!4d^#y5;ou)4ykESDu42**0Anes?R#!w)E#UIq zQd^HjqiL#lYaA46hGRgc%HaXd$qGP1fVlpyOoY>DZcKmH>dy>>AX=+RU}voul*q8= zc~?G$hLN)?&XywM&;Yw$eZiK+G{90*;eF{Q2|=s0?cCzdRIBW11(ON6v}I81DxxPm zI0#$XOQ=9BZ4R4B6zLm+-N;<8=^(#*p{w|NIXD~Get8r@krqBMuE z$*Vx6ir?rhSF?Bp`ZpdOfy2~6KG_6Ear9?+|n|&kD z`okkSt)Ia#O9olZXjpY5wK)cQgB4`^P=&PdJp`S~R)01*s~N0`$;E*-m0V6s9Mh^o zc3)5>1ih;{kDlLfG3fSbE|8{Q5e6R@smrlw$C`00!KH%V!QZmuHLjSWB*VkWaAG74 z%7UfyOfOifWm3jB0fNT{;><(3WCnG3xkgQNJY<|E=RVnV^h>yxkiKMGO{_FUrdZ#a z98GxB%aj;GujC!? zUBhISPMMoerv%8h6=ywx~y=Yb|STAwra>0)S^^3TySNOX1PGDUF{)JS6u5Rny$2n$$O8B)VlIq z69BFRcFS~oZXoTE))AP8rZm`2&b0bDM?LHTJr$U6hQVU&0X-vdwp!qLP?80@*1C)hzU2GGp8%97v#SF(#5c3H=oYcWS1N)GRm$tD&wzT*6b>sgYjc8s&ULu;&TRDoa>cTRhntj-vBBx2* zhhMs-?A4ErzOM;0v`yrP>6S|OMuuA=>C`5w9*x^yfs&PrXzpL*q_!(shl&h)7;_-;MLCKl<|z8lW#v z%_j3a?6iX2lf!h$(ejGc_O8D6kQcueWubm+escf!Zh!q1;J4kvFTwLb`G+jU4i2n~ zVS%XX+2E|sH2j!vV5>~l)*w%S^J_OAdU%a7KHg)pDGj4@yp;_=R0YjkXl{&rc51dC za+ytRNtx2}?#nV%$`W==Zc~95LY&;$BX|Xm>AH+@$sffo9sunvcC)!@dWHihM&pI+ra-sphyAjH(h~k4G5XYB+@iXjNRqA`J7E z%%T;sEL1LYr>WL8>yiub%qR&nW_NvIMnMDZ)LNOl^ySk}KW)jvR7Y%ORX_awlXv{+ z>_5H?;pwo1hua-IXFm}Kw%CueWQpgYLj;5>ufBAV9=#Y;Eb8>6Qot9m-pPd}*Vyl^ zUoDW7l7kBg1J7b-oWL`rrQz)%TKt*~s_c{E^|mU+l2myt9y3{a=N)8RonlW)oSLhG zGng$O{3es{nN;KpWbYl8?2Mo6geDZVC@jVXrXeZcn~kW(qW7zCZ%agG`!1%B0mS*Q_|Njf>^T4KhpM)7O1|ZS9)5H>J<~ z(8GTk>4ep5nQ5G;Qzq@^V93Hp=Id1$Z7oW>Ud8$4;~hFWGzK8JC&(=A|=;@ zwfG{23{_9UQH7PYK5$L{5VEum7qFd=Di8Guv9ILQ?V2?^T|hVUzfNQaY= zp|Dkwe9I)c`QamW5o#Wz#$_(N7=F0!n&V%%Y20_s)_EsC{qR8dG)7s~%q9G7_~8>= zlziOIp;GukWi5ptoXSe!2X{Ti@q^BB41T!X(|h>fhUevnnjHL~6-2@ughNHq3gUTY zIms~p8-}?1cRQayW&e-5$M1c&|K5vQ?|&y4;s{eiJ{~TWAyn2<7{aNn6ozouQyfF+ z9LHdYhf8LNsW}*;&QcKLVXU!-lY7QYPr1id6UNH7#T9qn_{Mi%dH#W4Y`X17dp>&6 z#%JCMu6UMtK|Y=-l`B-%Qn8C(ye+;sGW)h*(`$W?_8j@~s;|y$>wYKr;w9z=`S^9Ie4(%=FY#6kk|5a`S~yE7UILD99IeIrySh z=?l!B;>jG!!d|wY&Fh_9!|`}yCRFT_r}hD422$QVVh2syg?%kd{@zt+@+Unf#}k;n zsib*kZ!+nPKe^)NYoB`GYG=yE7-xIEFw`=j8?yH!WILxJk>JMSkJD#Pp1!za)rpU+ z9q9e^B~w3h?nv`)hpVN6q zol7i~O)QSbHFhAf%#>6wrk)|GC+5o@a6g#R%uW2KDD2Fn>TMP;m*wp*gFls?R4ahM zI?1vH^A|5zW+$kEYfD@%D5(9m{YX>3Y{8NR?phUMSzIHh;Vlvs?wCSc^QGjMpNReT zcXQu-J@$cDzS`2|a1D3xg2WYENLQLBg#sHk_VGss_i!>r-{KgjjWfu{dM>RL#!*>I zVH~@%k{HL%RTAT9>>S2Hh}+7|6stWwhmU+b(_r(AuvwxaYu=4L&67?#X+`6T6>Cq? zfjlf>JXX4qKDu3*orGd-+wZ-F?dNPOK^KyxbNO3CtSz{$;WmstrSjBSxeyr zyRwov!Om3@Cur=lIDwm48YfK8{5MQeZ7 zxnTJ{wGRd+-YIrqFDoG*a%H;|c2HSMVF$ailGwq{RT4XB?6TN_n^_t=%*bR13?>z+ z%o$aQoFM1kMRCH-?>&6Mp_#jnyZdWDsXuyj6P5>E%W)VhxIKRh#c(YbBp=rxRFYy) zSxeyryRwov!Om3@Cur=lIDwm48Yj%m&Nm4POaO51pA`Te)w z|A+AXS1q}3*M=SM6eHZpbdircN@WC9MD=Uc+>|7-=g2oOVB?owGrCx9|OJjst znT!CHfX%<0OK>If!wp4S3|Ak%WA&@I)h%i{_0fr?*PS=_o#KZtF?r2~|%32CP z*p-#U4|cAS_(5Zr#Sh%f()eL^4t}W2UZc;&3ii~x!8NtU#Do1ON||BnQ)&IS%)y3qjo#^+@^ERVQHb&0^Ze^ha!NF_mmVPQ;(x(SRzkO z6h04fJ}2XyW*py;#A(4fPjzMuuG%%Jfn+3sGi+(+cp^}>p=fMDRC}!=;Hp@a!ubJ7 z$D(ptiGiQ=wdA&)35UnM*eK+q#3*D*Axdr0X;H>;$6x~Ocyvx-*IITi&cQ{}4N391 zAgtghR?4%2qgcr}`)7}LE&X%CTEeNpTGR3(cim+PjvP#aPY0&{lGJc`W$Po^<+W+t-UGq5-b z2&XLkLD4w=SMc|QNJ}LweugObLWuZ9q11W`%p;~w+#rj_@!XNdmdJ3MIS?6zXRb^j zi`ROu_#E1pE+IpFES-$YQ}4y$l(Do^xYd*3W;7xvLxs~;;#4bCM3JfM2XV-H3-}~9 z5D5oj5j>-=mMafv>1+#)4reQ-JCn86ov#CD>5IzcF-lz36zIdM$e@LyD^s@1u7h4> zWDpKr9+Krq&Yam0GI44cq7v_8UzczXJNiR2C~cWXGdPNU0r{_6`q;%MTH2ujB3Ft_ znj9V+xtlDH=yt@Dkjv2o9B+oV6CY5TNa2Vx4lTe@4TpAT=tB=uC1#9p1yxK<3>q27 znlP@~K1rFfY>B<&!sJSNY{w=6yCF?Aq4u8cP+xy*H~g0`=u;h|gnLOoy{QgnvjZIb zkYp}no+@#=F0rRM)ZEz)r|91P&gLF>!BeCnkh}`b~3uidN5T(g6ytf9EYWpa>=p}VQGoc^{(dSw!M5U^<77wBy7 z-`?HjDWc9Pg3s1&m;R(KVp~kt(H-h+?(6SpZtd$1ZF3`$cgIOK4ub659pOQ(UbnF| z*xcLOAM9>!Ygb32wUVDMv6Ba~rBN4*^R)|}BIf8KHiv@!8=ILzpWZdcSy>N_nwg*NCyI|9LWh)i#H5Vxn2_`(sjG|^s8G;se2FX;sO;+Q+ZgClM-!L{ ze0J3plH}~l;aZa*_R^TvI2a$pqL)-Wiqax(_LvJ<}Azch} zMMy8Jj0kY3KCs8suy(tQUvV&IJJmuJ18FP6n zgGZ~vgL1d`3Oox9*WvleK}@rHTbp~@Gx}N?(^Vy`{e&>V!F38zQ&q!9uW{J7A{icx zjLE{61&6h@l>dCUwEZwaifThi z-eQBpxM?~m@6tThn&o+L>wtE{I9GkD?(ySo$ylHXKUI=pEq}e`JvC&!s`{GqXF5S1 zJ}Gqa%B@o$zk1;fH}37&_%PcO+J4xkd0dv;&*h>3;|(2a`O(d@5HaAGmo zD6S&|`S8c0vn(H@<679afA1UiD1+fkCor>%$J&$0c(M<6eEw_Sj(s^7Qx2!>-^O)Z zTmp{%X5K8vV9e-pT^q+yi*nro_rJNJiwip?Nbkh;aa{D`|D)UBaL3nX-eYbJ4~)pI zuD{WRUfhPpVlI)J=3*wTe2bXscRL(t>0s|=U2pR`E$kd)Nmhy&w*;fZR0pEbEaINm zUb_^H<^S2GT8#B79$t*s_3(0>rPZZIXSFfaF}(5&C-42jk(YMNx%IxUulVlkQ~Fxq z5tB8XNbTI<@#n?Tocv=v98d7Mnd;EUSikeASE+p62b(z-1(waV9}PJM0u`HMAaF-` z1_F14XCTlKMH)|Do@5I1pUZff)B@}2JXafS8?BLTG^W+@veDTlbn#bj^zuD$1AJwl zs$bhxuA}W-&r;15_DKupR$iMc$`&eAIeq51e*5GzF0Tl@aM`MhT5o&#a~r?ujO(f$ z-F7RF*^5iK7v*D7j$Tx;IeO6@;ps(pgr^sE1TgXr=ZkC{tpN5z)i&t-L32K~LLa+3 zo|+$8Xm^w26$EoS@5-s1M#&rEI8BZI`XF`phP$AIEo#Tx8WEya__7pUv2gw| zfMbapZc^jrx?apu^WGW)4<%gGihrHK+K{*Zu?Qt~tW)71R6oFeFSt?$hc~T%O#-A4 zzr>CLJBVNfK09WH>$-byEUtKz6gN_OzsN85i*V%wE?46|$QgkhAY(_%eg84@zbbrv zKi6A3C;Fdy^NU|bzDCh5Xh|+7kN%aXow0KDnw4u-tUi6k>HTX~tX#A5)JhUUx^^A& zZd0Bl<8Cv3IZZrSNo9g&+CG8W#{k>8yx}bh+`F#}^Zj2Jp(7=*0)MQRL5QHPvw6ns9NQd z&T@9C+8xeGEWIKHHCVo>QX}fkAwl^kH7~w2)B+FYBk3w5keQ?x*=_5>-ql zgVy+|Qiaa&lTU@t^3!A$I@?cGDs+yYs#R#cpZqG+;-@Jp)aIue73%QQR2ACjr)es* z$xpQ^6!c>PAnWb&Q@slH_^CmKLVlXALVbRkp+Z~yG*g8x@Y5_6+U}>>Ds-VAt_yRy z9T)lOI2F3sPxDl0m!FPTp+P^Lph81_ny*45emYTwF7eX>6^i=lBo&JJX`u=w{8+7* zbtL_CvI?dBv`B^a`f0HWjr(Z{EoEFT_0uvHy4+98Rp<&oouWef{nV&J@AXrY3SH@^ z6)JRtd&fN=eO6Gm1EG&ThhEn?^hoEU2cRn~m}`jh(SuI&Tw|M$9>yS|GvpZ5 zd~_Ji$Tgbz=nGIFY8dm;BM$Q3@ykb#I<2(_E+2ixf!ZUMkG=}ksFBGSs(kbqTIN>p z;Bxjo_R+rTxeDow3+BrV&qi+h_Wv}k2^3k{Op$8`)eVbX|_Ad6( zv!H@HW$mMXM?yU&`RIG-G&jC-K=RQKkY0^OKKg$MtD(q8KN6&zwte&y6r%?rAN`Ee z$Pvg#&x6OL{#X7KKKiAQbLwISX~?8JSW!v80`Gf<9UuJ~1hKe=eFuE>TQt)dYJBuN zq;L;1KKeZnmZOP}{s6pO1B;LT1Vv!(mH$i%RMYgufgBQy3fjj9O!zCuV^BBJ2ewH{ zJ^z~u`&g@0(tm=8Qd7tX?OIYv|AoN{g+d{%q}QwHHTrK<2=yV?8NslNbJXXjH|WhO zdV=0U0$C;>0cdiL08|QrcDQ!p<+#}97iFTnN*H1iSk}Qs?U7fCN^};t)a)MOmbSTT zR%zDy#bi-cC48dVQ-V6zP${OMKhy??#XDjus)mznhBj0gJlar${GwLWK{1PZbd$b1 z3H?13_KE3s=@vhWnNS5*BIn4TPs|2kG~9FVl26R_#@ILS_{2PPkjeuhSa+}Z#0d~& zhgJ&97W{L7(7ocsjArFf@^-T(i<7EEjabN}bqxX*C71!k$yH*3SR}}pzt|_1KwQEJ zTnao0t&l5ARw)WCbkZ`hoJ%@IkXYgqP2i|>Tve3GQ8s!j#VXEnY8Ac6Y?ZN3p)#AX*;ge1jm}lP>T%qr_R>Q z*}Ez8`hY7!xocoSYq-GJ50V|g~>N; zF!_cBCf~5X-cdlKbrZ` z%8zz_Y~V+LALsF-lONsuIG-QA{MgKot^C-=j~)Ej$&Y@1g!wVR50f9m{D|;lH$O)C z5$DGqex&#@#*cmcnBd1{{CGD%-ouXr{5Z&u_wnQX51>_ouEz6UV5#yNY&k6I$*`qs zK)-re(z9Sg&x7^60Cw{tSj@}8Z7cD$2KMn68xx-jj7ZF@O#9{^>q0%bo)r_qOLHQk8PZl%-d6LbdMNoUe$=q%u~mL8Al`pD8#4%0`S)^WRt zIw2ihn8$QuX3~Q^uya)j;#q>DGDs0wx~%S|FVO7<9i@N7|J>Ef>OSd#oC(Ms9>`ii z?({&`0rF2C$hm;r`Lf0eRX3835!N55xrI-#n0EK)&OF zFe`o61KAD8_dSqNK%VnJ;(+|n1K9(}k3EnSAV2j$#sK-b2eJ>4Uw9xB4$02}{}aKv zp2k4(y&(BMkbE2@p8(-51<5Z1$u9@V-wl#q0g}H5B;OB`9{|bU3({iNr)BR!P1^UM z!WVRfFCL{AS@kTd`;7@VeUhzN<0`f->ft*U)un+=tM(>(RImqd6Y|>i>LuEbMM7Fj9C6V z4!;BVU5DQ-_}zsc6Z290p2Y8a_&pEhQHvigk`z1f+l?P~S_JZmYw^1ozdP{zEPhAu zdl^6MKpVi-n1SCy{8r(&9zX0T7~3A9*S3`(rvK@@Tl~Nk{-!JZ6%LoFG!MGqce~)X zx!~8k;0KpJM7s|OIx37qq5>bL{V{;Au=909_<=)j{`7mC^tp0R2XI0rsXcZFi z?6~##(sV-HDtu`g;%gyLI$fbO8xiLo5@#G0XggIS;w+9>jth#xc^G=d9O^*$7VzV3 zbR`DC>*$l<(>npVi*CnYco*GE_h3MLfIbItd=Py15Qe8C;Jq(kID8cR_hpFZ*T931 z(F+(P|Agt!n|Qy439ld1;97c0G|)5RL`-WN@ou7jgZ=r8SchrtCcL}pJ0e8i2jBic zT#PB|Zu+r^(a*uZ&x;96BoDyiypmo5AOB8Vk7?k|^ha?k{RRB|S8*4;2A+Oh+)r^0dC>MXgMCf(Qh~5xW44{< zRBkP)0JE;JJns{YcsGf0aW>xT#Dv&{cel7ygv1qMr+AOJ zSR53)#g!r^u13rUkm5RVKzs<08^pEZAH?C8pGD|?@lWE2 zxEqrC&ydvnAgT95QXhb%J`71c1WEm(F+)58N&N~W^(Z9u>yXrcg`_?SNqq{E`V1uX z+mO_MhopWNlKLDZ_2-b(^?#RCYasdin3`iuZS_bhn;wv2EvY*0Z#$-n-$GJ<2TA<{ zB=wJw)W1Md{|ZTc4U+mgB=t>5>Ra@XQAUp%<#ZI**ptR&dfJ#m-!p3HIirrAH|psH zVZ*}Bze6L%Qx;w~c~K5J|e_d~{x z7~PP?Uh%TgC;nhuAYO;ey - - + + @@ -9,6 +9,7 @@ + @@ -26,25 +27,25 @@ ++$F{taxaEmbarque}.doubleValue() ++$F{seguroOpcional}.doubleValue()]]> - <band height="30" splitType="Stretch"> + <band height="36" splitType="Stretch"> <textField> - <reportElement uuid="5d83d8a8-01aa-4022-9583-6808e65d2ec8" mode="Opaque" x="0" y="0" width="264" height="29" backcolor="#FFFF66"/> + <reportElement uuid="5d83d8a8-01aa-4022-9583-6808e65d2ec8" mode="Opaque" x="0" y="0" width="321" height="33" backcolor="#FFFF66"/> <textElement textAlignment="Center" verticalAlignment="Middle"> - <font size="14" isBold="true"/> + <font fontName="Arial" size="20" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$F{origem}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="2c5b01a1-51db-478a-a307-83c9df5cea6e" x="264" y="0" width="538" height="29"/> + <reportElement uuid="2c5b01a1-51db-478a-a307-83c9df5cea6e" x="321" y="0" width="539" height="33"/> <textElement verticalAlignment="Middle"> - <font size="14" isBold="true"/> + <font fontName="Arial" size="14" isBold="true"/> <paragraph leftIndent="4"/> </textElement> <textFieldExpression><![CDATA[$F{empresa}]]></textFieldExpression> @@ -54,16 +55,18 @@ <pageHeader> <band height="20" splitType="Stretch"> <staticText> - <reportElement uuid="325e439b-ecaf-48cb-9c09-387c0649e47b" x="0" y="0" width="802" height="20"/> - <textElement textAlignment="Center"/> + <reportElement uuid="325e439b-ecaf-48cb-9c09-387c0649e47b" x="0" y="0" width="860" height="20"/> + <textElement textAlignment="Center"> + <font fontName="Arial" size="12" isBold="true"/> + </textElement> <text><![CDATA[Tabela de Preços R$]]></text> </staticText> </band> </pageHeader> <columnHeader> - <band height="25" splitType="Stretch"> + <band height="29" splitType="Stretch"> <textField> - <reportElement uuid="2bc93d5d-8e74-4b8b-8808-080060e8cad1" mode="Opaque" x="0" y="0" width="321" height="24" forecolor="#000000" backcolor="#FFFF66"/> + <reportElement uuid="2bc93d5d-8e74-4b8b-8808-080060e8cad1" mode="Opaque" x="0" y="0" width="321" height="28" forecolor="#000000" backcolor="#FFFF66"/> <box leftPadding="1" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -72,12 +75,12 @@ <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> - <font size="9" isBold="true"/> + <font fontName="Arial" size="10" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.destino}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="74398eb5-f168-4dff-a38d-b23b11361b96" mode="Opaque" x="321" y="0" width="80" height="24" backcolor="#CCCCCC"/> + <reportElement uuid="74398eb5-f168-4dff-a38d-b23b11361b96" mode="Opaque" x="321" y="0" width="86" height="28" backcolor="#CCCCCC"/> <box leftPadding="1" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -86,12 +89,12 @@ <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> - <font size="9" isBold="true"/> + <font fontName="Arial" size="8" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.tarifa}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="571d26cc-b563-4f10-8d8a-1ee49678088a" mode="Opaque" x="401" y="1" width="80" height="24" backcolor="#CCCCCC"/> + <reportElement uuid="571d26cc-b563-4f10-8d8a-1ee49678088a" mode="Opaque" x="407" y="0" width="86" height="28" backcolor="#CCCCCC"/> <box leftPadding="1" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -100,12 +103,12 @@ <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> - <font size="9" isBold="true"/> + <font fontName="Arial" size="8" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.pedagio}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="78aa7d0c-aa5e-43b0-a7eb-5de12d80db4f" mode="Opaque" x="481" y="0" width="80" height="24" backcolor="#CCCCCC"/> + <reportElement uuid="78aa7d0c-aa5e-43b0-a7eb-5de12d80db4f" mode="Opaque" x="493" y="0" width="86" height="28" backcolor="#CCCCCC"/> <box leftPadding="1" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -114,12 +117,12 @@ <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> - <font size="9" isBold="true"/> + <font fontName="Arial" size="8" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.taxaEmbarque}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="4a9bdb71-945e-48ce-a495-fdd4eee1b1e2" mode="Opaque" x="561" y="0" width="80" height="24" backcolor="#CCCCCC"/> + <reportElement uuid="4a9bdb71-945e-48ce-a495-fdd4eee1b1e2" mode="Opaque" x="579" y="0" width="86" height="28" backcolor="#CCCCCC"/> <box leftPadding="1" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -128,12 +131,12 @@ <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> - <font size="9" isBold="true"/> + <font fontName="Arial" size="8" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.totalSemSeguro}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="50b8dc32-c117-444f-b819-9b4c2ff954bd" mode="Opaque" x="722" y="0" width="80" height="24" backcolor="#CCCCCC"/> + <reportElement uuid="50b8dc32-c117-444f-b819-9b4c2ff954bd" mode="Opaque" x="752" y="0" width="108" height="28" backcolor="#CCCCCC"/> <box leftPadding="1" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -142,12 +145,12 @@ <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> - <font size="9" isBold="true"/> + <font fontName="Arial" size="8" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.totalComSeguro}]]></textFieldExpression> </textField> <textField> - <reportElement uuid="a08041c7-23de-4505-86bc-f009082b2faf" mode="Opaque" x="641" y="0" width="80" height="24" backcolor="#CCCCCC"/> + <reportElement uuid="a08041c7-23de-4505-86bc-f009082b2faf" mode="Opaque" x="665" y="0" width="87" height="28" backcolor="#CCCCCC"/> <box leftPadding="1" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -156,15 +159,15 @@ <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> <textElement textAlignment="Center" verticalAlignment="Middle" markup="none"> - <font size="9" isBold="true"/> + <font fontName="Arial" size="8" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.valorSeguro}]]></textFieldExpression> </textField> </band> </columnHeader> <detail> - <band height="20" splitType="Stretch"> - <textField> + <band height="22" splitType="Stretch"> + <textField pattern=""> <reportElement uuid="a36a0fa9-3f68-416b-ba5b-3221bb3b6353" x="0" y="0" width="321" height="20"/> <box topPadding="0" leftPadding="1" bottomPadding="0" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -174,13 +177,13 @@ <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> <textElement> - <font size="10" isBold="true"/> + <font fontName="Arial" size="12" isBold="true"/> <paragraph leftIndent="2"/> </textElement> <textFieldExpression><![CDATA[$F{destino}+" ("+$F{tipoClasse}+")"]]></textFieldExpression> </textField> <textField pattern="###0.00;-###0.00"> - <reportElement uuid="fefa6e89-eec1-424e-bc72-bec86ee9eb1b" x="322" y="0" width="80" height="20"/> + <reportElement uuid="fefa6e89-eec1-424e-bc72-bec86ee9eb1b" x="321" y="0" width="86" height="20" forecolor="#333333"/> <box topPadding="0" leftPadding="1" bottomPadding="0" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -188,14 +191,14 @@ <bottomPen lineWidth="0.25" lineColor="#CCCCCC"/> <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> - <textElement textAlignment="Right"> - <font size="10" isBold="true"/> + <textElement textAlignment="Center"> + <font fontName="Arial" size="10" isBold="true"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[$F{tarifa}]]></textFieldExpression> </textField> <textField pattern="###0.00;-###0.00"> - <reportElement uuid="8452d6c9-7348-4c6a-965f-e127b5fd9830" x="721" y="0" width="80" height="20"/> + <reportElement uuid="8452d6c9-7348-4c6a-965f-e127b5fd9830" x="752" y="0" width="108" height="20"/> <box topPadding="0" leftPadding="1" bottomPadding="0" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -203,14 +206,14 @@ <bottomPen lineWidth="0.25" lineColor="#CCCCCC"/> <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> - <textElement textAlignment="Right"> - <font size="10" isBold="true"/> + <textElement textAlignment="Center"> + <font fontName="Arial" size="12" isBold="true"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[$V{totalSeguro}]]></textFieldExpression> </textField> <textField pattern="###0.00;-###0.00"> - <reportElement uuid="4d222ca8-11b3-4979-8928-71b2995e3bdf" x="641" y="0" width="80" height="20"/> + <reportElement uuid="a7c2dd13-c0c0-4a7e-9782-b758b6176b1c" x="579" y="0" width="86" height="20"/> <box topPadding="0" leftPadding="1" bottomPadding="0" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -218,29 +221,14 @@ <bottomPen lineWidth="0.25" lineColor="#CCCCCC"/> <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> - <textElement textAlignment="Right"> - <font size="10" isBold="true"/> - <paragraph rightIndent="2"/> - </textElement> - <textFieldExpression><![CDATA[$F{seguro}]]></textFieldExpression> - </textField> - <textField pattern="###0.00;-###0.00"> - <reportElement uuid="a7c2dd13-c0c0-4a7e-9782-b758b6176b1c" x="561" y="0" width="80" height="20"/> - <box topPadding="0" leftPadding="1" bottomPadding="0" rightPadding="1"> - <pen lineWidth="0.25" lineColor="#CCCCCC"/> - <topPen lineWidth="0.25" lineColor="#CCCCCC"/> - <leftPen lineWidth="0.25" lineColor="#CCCCCC"/> - <bottomPen lineWidth="0.25" lineColor="#CCCCCC"/> - <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> - </box> - <textElement textAlignment="Right"> - <font size="10" isBold="true"/> + <textElement textAlignment="Center"> + <font fontName="Arial" size="12" isBold="true"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[$V{total}]]></textFieldExpression> </textField> <textField pattern="###0.00;-###0.00"> - <reportElement uuid="61b08629-ac62-475b-96c8-d88aedcf87ef" x="481" y="0" width="80" height="20"/> + <reportElement uuid="61b08629-ac62-475b-96c8-d88aedcf87ef" x="493" y="0" width="86" height="20" forecolor="#333333"/> <box topPadding="0" leftPadding="1" bottomPadding="0" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -248,14 +236,14 @@ <bottomPen lineWidth="0.25" lineColor="#CCCCCC"/> <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> - <textElement textAlignment="Right"> - <font size="10" isBold="true"/> + <textElement textAlignment="Center"> + <font fontName="Arial" size="10" isBold="true"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[$F{taxaEmbarque}]]></textFieldExpression> </textField> <textField pattern="###0.00;-###0.00"> - <reportElement uuid="4233bd79-2a8d-4b1b-88b7-a235f79b1227" x="402" y="0" width="80" height="20"/> + <reportElement uuid="4233bd79-2a8d-4b1b-88b7-a235f79b1227" x="407" y="0" width="86" height="20" forecolor="#333333"/> <box topPadding="0" leftPadding="1" bottomPadding="0" rightPadding="1"> <pen lineWidth="0.25" lineColor="#CCCCCC"/> <topPen lineWidth="0.25" lineColor="#CCCCCC"/> @@ -263,12 +251,26 @@ <bottomPen lineWidth="0.25" lineColor="#CCCCCC"/> <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> </box> - <textElement textAlignment="Right"> - <font size="10" isBold="true"/> + <textElement textAlignment="Center"> + <font fontName="Arial" size="10" isBold="true"/> <paragraph rightIndent="2"/> </textElement> <textFieldExpression><![CDATA[$F{pedagio}]]></textFieldExpression> </textField> + <textField pattern="###0.00;-###0.00"> + <reportElement uuid="9a062a18-ecb7-4297-9c1b-b6397f1844a1" x="665" y="0" width="87" height="20" forecolor="#333333"/> + <box leftPadding="1" rightPadding="1"> + <pen lineWidth="0.25" lineColor="#CCCCCC"/> + <topPen lineWidth="0.25" lineColor="#CCCCCC"/> + <leftPen lineWidth="0.25" lineColor="#CCCCCC"/> + <bottomPen lineWidth="0.25" lineColor="#CCCCCC"/> + <rightPen lineWidth="0.25" lineColor="#CCCCCC"/> + </box> + <textElement textAlignment="Center"> + <font fontName="Arial" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$F{seguroOpcional}]]></textFieldExpression> + </textField> </band> </detail> <pageFooter> @@ -280,9 +282,9 @@ </graphicElement> </rectangle> <textField> - <reportElement uuid="b7957c63-89ec-4009-b196-373a274b59e1" mode="Opaque" x="172" y="15" width="630" height="29" backcolor="#CCCCCC"/> - <textElement verticalAlignment="Middle"> - <font size="14" isBold="true"/> + <reportElement uuid="b7957c63-89ec-4009-b196-373a274b59e1" mode="Opaque" x="0" y="15" width="860" height="29" backcolor="#CCCCCC"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font fontName="Arial" size="10" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{label.msgAviso}]]></textFieldExpression> </textField> @@ -295,9 +297,9 @@ <noData> <band height="27"> <textField> - <reportElement uuid="5954ac3d-3873-40e1-b643-cd910fa11ef2" x="0" y="1" width="801" height="26"/> + <reportElement uuid="5954ac3d-3873-40e1-b643-cd910fa11ef2" x="0" y="1" width="860" height="26"/> <textElement textAlignment="Center" markup="none"> - <font size="11" isBold="true"/> + <font fontName="Arial" size="11" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{msg.noData}]]></textFieldExpression> </textField>