From ab5d345f67fc3d0d4f3580d8e3c87a8343cd9de4 Mon Sep 17 00:00:00 2001 From: "gleison.cruz" Date: Fri, 8 Mar 2024 14:20:23 -0300 Subject: [PATCH] fixes bug#AL-3817 --- pom.xml | 2 +- ...LinhasAnaliticoSimplificadoSumarizado.java | 6 +- ...atorioResumoLinhasAnaliticoSumarizado.java | 6 +- .../templates/RelatorioResumoLinhas.jasper | Bin 50159 -> 49870 bytes .../templates/RelatorioResumoLinhas.jrxml | 85 ++--- .../RelatorioResumoLinhasAnalitico.jasper | Bin 120470 -> 120501 bytes .../RelatorioResumoLinhasAnalitico.jrxml | 299 +++++++++--------- .../RelatorioResumoLinhasController.java | 14 + web/WEB-INF/i3-label_en.label | 4 + web/WEB-INF/i3-label_es_MX.label | 4 + web/WEB-INF/i3-label_pt_BR.label | 6 +- .../filtroRelatorioResumoLinhas.zul | 23 +- 12 files changed, 255 insertions(+), 194 deletions(-) diff --git a/pom.xml b/pom.xml index bfc11efb8..493e194f5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.55.6 + 1.55.7 war diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSimplificadoSumarizado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSimplificadoSumarizado.java index 514d14cfa..a93882845 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSimplificadoSumarizado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSimplificadoSumarizado.java @@ -295,7 +295,11 @@ public class RelatorioResumoLinhasAnaliticoSimplificadoSumarizado extends Relato sql.append(" nvl(gr.descgrupo, 'Não Definido') grupo_linha, "); sql.append(" ( "); sql.append(" SELECT "); - sql.append(" SUM(nvl(TR.CANTKMREAL, 0)) "); + if (parametros.get("SOMAR_KM_RODADOS_POR").equals("SEQUENCIA")) { + sql.append(" SUM(nvl(rs.kmoriginal, 0)) "); + }else { + sql.append(" SUM(nvl(TR.CANTKMREAL, 0)) "); + } sql.append(" FROM "); sql.append(" ruta_secuencia rs, "); sql.append(" tramo tr "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java index 350794439..16d57f32e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioResumoLinhasAnaliticoSumarizado.java @@ -215,7 +215,11 @@ public class RelatorioResumoLinhasAnaliticoSumarizado extends Relatorio { sqlSb.append(" ELSE 'N' "); sqlSb.append(" END INTERESTADUAL, "); sqlSb.append(" NVL(GR.DESCGRUPO, 'Não Definido') GRUPO_LINHA, "); - sqlSb.append(" (SELECT SUM(NVL(TR.CANTKMREAL, 0)) "); + if (parametros.get("SOMAR_KM_RODADOS_POR").equals("SEQUENCIA")) { + sqlSb.append(" (SELECT SUM(NVL(RS.KMORIGINAL,0)) "); + }else { + sqlSb.append(" (SELECT SUM(NVL(TR.CANTKMREAL, 0)) "); + } sqlSb.append(" FROM RUTA_SECUENCIA RS, "); sqlSb.append(" TRAMO TR "); sqlSb.append(" WHERE RS.RUTA_ID = RT.RUTA_ID "); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhas.jasper index 5877644e15f608ba2d5df81aa5a553d7a9505e89..3663e6d3a67c49f1df329084b6568a678594900d 100644 GIT binary patch delta 13822 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 xm%7H!g+k}Pb2d#6kfk3qgU_Z_iC;* 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 + - + - + - + - + - + - + - + - + @@ -189,7 +190,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]> - + @@ -197,49 +198,49 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]> - + - + - + - + - + - + - + @@ -250,34 +251,34 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]> - + - + - + - + - + @@ -285,7 +286,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]> - + @@ -300,7 +301,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]> - + @@ -308,7 +309,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]> - + @@ -316,7 +317,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]> - + @@ -324,7 +325,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]> - + @@ -332,7 +333,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]> - + @@ -340,7 +341,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]> - + @@ -348,7 +349,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]> - + @@ -356,14 +357,14 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]> - + - + @@ -371,7 +372,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]> - + @@ -379,14 +380,14 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]> - + - + @@ -394,7 +395,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]> - + @@ -406,21 +407,21 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]> - + - + - + @@ -428,14 +429,14 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]> - + - + @@ -446,7 +447,7 @@ WHERE NVL(TAB.EXTENSAO_KM,0) != 0]]> - + diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jasper index 585c4c72abe4adc9733a78e856bca4e054bd4ccb..ba96bb07db1d0456fc5010f13da3f6a929c92a44 100644 GIT binary patch delta 25376 zcmeHvXM7b^xBgzc%*>fH(n7DHLqH((4j}|cBncz|DQXBkNE3n}A_qb2C>V9HAw|GK zl@bLJupo#P1q1{e7DPosP!#dM_UwHoXCUvrU+#zZ!~eebxAuCTwfF2bd-jy|oZ#bY z%`I!q4Rue`T2l+}EL&^QuJESJ(}h-H*K=0sQrZ3c=3bYco0Zu!sb^+(;jVM*62=t} z*0N2DTgYr{Yym0Ts##*I_N`mCZ`H1CyOxP965Gi@egT0NGYY$oZBqE=?~9>AVN!)A zo9;QkHe7WYEg*JsR%%j4a#C(;&&g9|_i0eTYP(PtJO28w;U<&=yJ#xFCE7s8anKd1 z_ydg_ZQI>Qp|YD{K)9%tfUZWIoW;xC526Ncs*Rl?~>xM_UG zfWCd3#wRw7*T?p{3K<+FbF1zSaUipzcLFKt{jyTBV~$?5(}6}@1+O|g_n$Jbh)$!0 zcm7tsi9A^%;*&CZM(2?$(lZHj?UkC5)Ym^Tv$?yd6jUzyzATs_c+Ndj6)M$#Q7+e7 zZ_%D3Oivl zbzNv9k5VUi{Fsgv-DPzl$))X8$GToVmFq$O*nDF8S8?+iLV34EeQ4}{UJu&DgsS?X zn{dvD>qC0%F_5wvz+`N0Q_YVJAnA$@*EfV&F$av72khcjYvkqDztL3(e76zI!UOhh z92i#5?cW%>n5`zuD-m4PE(uT&GeHA4u?e(^u2RD$ka9&ri<`g>-BRRXm`b!er>%?^`UAq+Ckrh5HnqOZ@T6k;707epaaar#_9;y#db$3(hlRCq=fvfR4*`9gMyXi<@c}Gpg|MLT@RiM{@3S?d#aG?vt)l$cvJh_1I ziIXOdQisWo9{ah%Wi76ChjoGDu(fbmw>YLnzhqAH1~FO$%|mxS_F64iAQ?(RPLAo$q5 zCN*Z~xOu7gFxlxYONI9JTFZGo)4YUvRaDIz_2sXbAFCQY_i#hr@3HR_GCtdpD z!!xiikM@Pe`qb?Ka(2%Y_WwN2RPF#ZpNgp~t$pugm9I{=U+l?>4E&n-*qz)L;@#C5 zP%Sv^Zy7MAo_vgiJu|L^vsFTCY6cg^q0#t*Emg||$t>YmMpMzEyt_&b%|*?qxw%M1j| zP05M9I7vyB+=V&VP2UcyWOkleRzh|vsii=%wCILq|nxJw4$M})UKD$6YD z26xBsfw(Crx$&8JKW>u=cxFop38<(_AnMBmwC^RLe3ihKXacuf5Bm|sQJ{83-duYGTR<*WJMDc&7%ZpL6Jhl`Lm_{vSXe{k{qN9FvU zIatE{Dyrs>`f`5ld-E$_&42Lf`SD>K^Ai2|(@O5mLyNEf4|00Xd{e^oDypWB`f_^h zd($glP5;f+)6185Ww+>t*lQp+p?za<5*K6=p82hWBve!-5%pyf+V_%BzDnY^5|Ze8 z6MRwM5jc-B{OWmh)Xf_P^|R&>;`bG*Z|uuh_f>)ZF&}_BFck-r-myG)U(JPT)ZuPo z9#nD9r8zZX z63rTpi8hsqdM2TSL{(I+p7KjbG&T@OR0Xb1G{H~Qy>jFHf&^c3se%iCVZV!0V(KoSZ+`msXg+{AV*I&?tOu4TJ+iMefCv~S(2l}W(8 zb0#z>qNBj3RVq);o02zSRKchzxk0t1$Q}c~*pa)*JvQOwK8FZmga{=MIK))m0*6@2 zd)Of%`xd zkT~V7bVzySt#(KS<-OpLipqP*A(fQ3)*+RZx85ODl(*3#Rh75NA=Q+(#Ua&|SLBcy z%6ruzHPMUU8E7q?_{oc1U;S{o{}%<^AiB9-ar_kYwdChxAmQa7YU26(SJ| zri0HjbSZ=!(non=homa+8i%AQue3w1Q(jpIi)n8}oI}!;SHU3}%B$p%OyyN^NI&IO zb4Y*X)o@6b@@hFGn?$_B)OJXYBI`P2fb!})WT5gII^=rgHFn4#+V4jHYy-VPa~yi|vbRo-WRsE$@IgI%JCSavd^Nd3g?Mgei54w<98+Z}SJ^6qfR zT;)X^GEaGTI^-_p&2z|n<;@4;p1c)i47nd3urZGZf!O&I^9y?Aj~YL6ssj%x`e7iJ zqzC3rL2{8I9|3YrT2gkul&svWlzy36ITk#M)VRD`^O{d9$RFQ4J#VrJkGor^L!z}9 zo(O{rPr7HOLz_xZ11Y1%6laiI4o1WCqf>l6D=}>ZJMo!8gOz3$WUM&4u@S?kM22`eNpm6ff<+%mx zpm6q?>JbYz04blEotxS_BQq-{w_j3kl!|jwGczoBxj5JKq(QmKnFBKLz?+NN9L%q8 zQcg;?1zRz7t%_Ul3g(lMiD#FUg5k`p)JzMuAs2iJS@0UvBTnzE0l0)pP`BW9Tt|H> zeKV7j`r_j3av!=4Dvf&sNH`nU8nx_{zCCfuw~7hvf!wE7bo)1@xr;g$3g{M>=SqrczIGXvXe6L z*AEN6M513(c6L(llvM9HUjqsGKZ{s!66eSmkS^E9g70uM_DsQ(_0SJM$|Vm>$xZH? zl%0~Bosu;W^Td_@(OZ|~lvLFHQ__1RW%VC`tN0U;2Bou76x}bSCthdl`wK32D()Ek z$ss4H=Ky(@zq*rehw`1zdV5NBADD{iVY0vDlJvu!kl8CG3%ld^3qbsX_DJfjy8Y?y z!Xw=97sg^vEjPU%p28)Z&^ug4b}lYN7E+gS$>dRSIVg#lH9MvEfUHc5Qg2JBOmZ@F zFh|PW7PFvw#E9vw7oA$TV0r?J+CXSZe~UUXv+6^X!iyPQ4moofTwA;jDH%CC&{Aafv{A(*JwrWg7r?x%@|;(_rT3VD+6g>c#Ej+E}aQschb#ZrJ1xU z&X}CpcR+duc2xbU@d0Pe@NpkgnJHjUX7YGHE|E!ymAwxvZ| zT+Oz!XiF&Uzb;PTsMgYxhi{9AuLI?ANPF+D3v4cV{Ej8i*t;{h{p&$oWs7!=*+1Te zk)yi18)ifK2|ccgVHQ2{_K5Bu?Aj{^;(`0bKXO*nBgWypnQ{l zF)=@#tgA>IkmF9q0TTw|Zt(9`dGtX60y_=~5SY{rxHDpJ3mkOQ6%-B|b_In4hr7Q; zpeBrzO*M{vMk^0PW8I87P_g+qT<+LI;~kfa{l=F-&`LS20rH zZB=zS@$|6Etw9F6&ImGiz?ndJN`KjVmh!OIY~^8ePRy?IE{b>DxmU9-tq8sAY8nr5 zH{PS_Ng*e>w;16>_ZK7V`5-x-1F%P;XY@(Yb z+JbB19cX;s#4*jY3#Q~x9AnZVAdqd*S8e(V_MbQps`A%>R4kmduVPJ$zK%DK zPs=M9mFUo2^eOz-p}TE(2B+FJ4}Y(I%RM{~58dB_*OL7Pw_WiRBS%^ETX*(+sAqjoe~|H0?u+xGTIJKY=Zm|I&L3YeWztlO{#&f`SUrOO;Y5?Aj}wR#ubzwU*E zu9vVccKZicC)zD#Y5`u^f>E;bzg}lXaH8x<)256V)hmDeD6A_f7Tko)c8A{w=OYHX zR2Gq5izTGjVgc#3SU!3!7LQ(wrK8t2)h$+y9>$u{Yq4VVTC5kn7OO?C#ahv8u~PI} ztP{Pq4HlrDgGHj(Vu|RrSRi^WR)=1TwV~HyW$3k77kVvLgJ$*J35;wO9vwZ3N3e&%qkdYq0|KTCD%P7OOw6#oEtnvGVg;toytct3I#An$K&o z;`3Up_q-OXJ+IByEf#tn#xhT~5n1JV1lD+7ixr;NVtwbeSlxLo)^=Wtm7UjOUFWq} z)p;$}bY6=Eo!4SH=e1bOc`cT5UWuf^)kYq56o zTCCi>7RxrT#iGq?v1IdFEZDpj%QdgXV$Ex@RP$Oa)VvnUG@KtdA697|fi;@fVuj|l zSf6<<7H3|IrJ2`aVdk}1mU%4}WnPOVnb%@L=CxRkc`X)WUW=ue*J2^&wOEGX{3s&< zK^Y3|y@c?GF(JSUb9+J&xjzB6kO!rCNScMxJR;4b(mXEBVria~=4ok`NV8O$<dwKOLq(tan+57PW7%}>(&BF(SToR#KxX)Z|f zr!;>_b4i-ZXiyMDgP(d^fJOHf zhBPy!nUzoiM%TT*_ zUM8VQ5iCe(S_BIdt}TK>e>C=&5BudPudYDp^f?qmSEAH_ii0`={hBa52B8@VP2%9O zSK%p2cEL0F|8nOe^=vT}LGB^REi2}bS}3U%0qPM+tqf3)N@{h0dR$U31gOQ5dMQ9X zDXF!Riujp5ExGl9Zc8M!F+eSq)TRKnTvA&C)N_(53Q(&g^=g269;pay4{$HaZaV_h z8cFR8Q0pYMJ3wua)SCh7Wl6mqpf*eDofs-29}&pyi{a!01F8K1YMZ3q4^Xd3>car_ zx}-i1P`f1cNq~AoQU^UM65SYYN$zl<+a5_B2~c~BH{o2=wFy~^0{c3A@2*G9cLPeO z8&QXR8MVAkD2Qz)i^&%964^>#Cq?9A@(MXgUL}8!ZD5n_P=mY%El6YsB$L-+AlV7| zxD{rR-S9AZ1D2CF@j3Js>?Lo*F|r4KA@5+lzL%CK`)EV*F6~J6({%D4?s^o|O4{|u zblS&v!EyOa#WVRLK)olauU?I)n?rT`Kyu#%x_u<6Zv)f;NqrxnK9$s|0Ch-Grvuby zlKMG79gRrtOo01bQojYL6OxKw|&kvIO zJIZ;~kCOT)K>Z}Ce*@GnNKpt-ze2nXf{`dp4<4x*)kwpxd943J0ja zBy~-Ix+JO60qU}(%EnUoLPIJpK+%K(An@KZm;>6=SvQ#S!(a=euRv zRaDxv+Adm6zO9j}5uj{I)rz6;UF}G&b_^$9>`2uOP-P@lKR}g}RKoyOUQ&$%R7FWO z2~d?Kb*)E5FjFtts*-CS=vG})i2jG4JNu>vEisCdNNQ4mirgT%TLRoolA0QzhDmB# zfEq5T=>ck_q;3mPqa}5FfEp{QJ2VwhyMLVIf@?8eQg;SMPL$NV05w@s^8?frN!=5m z3M6%3fVx#u59s%w-UKrww;<4MrlcMYP_rbpC_v4YRAGRcBdNy%)Lcoq0qQRK{-aL> zxZ=-bFh~-9WBiRz+e`Sg{Rf}6m+@))FUiGfZVCXI50oqhMqUDr9}$9lj3Z8hN&Wx} zYzRROv@IYE$>6|1xCZi}6#gB2X?PgQ;16MC@tZtS4)#JE9E0-sqeTS@P!ToxO0*&V zrqvOu&~&JZnrSsU6{@35Sc5(RHSxEuT68DG(*sbOehYQzpHP>Dp&qLV^%?%V1lAK8 zvg@G{8wZWq9gx5lLKC(EnzF5ME!zjp*yqrkoq-md;*U5LIzmg{2wL$@(3)pJ8=ePk zc>%QJ_dt98By`|wp(Eb~oe0n;=~GxYJdNwY5iKG27Jc^&Y=X$r!MupBNM9{ZZ>PTh zMU4N6^qK1OP7J?2hF>4UuZZE@82*76KH~F{)naN)U`)bh^5<5%dKY~GQyLsV*9A}) zL}&e;%>$@*0L39X>h~0}i2o4@z*C4mk9Ot90_gn!+KK3QzvspPS`k2xA^OYjc~1b{ zmJo>z-i*Ot{H`|!P-XxnA-e4MY!yKD1E>pHM+0PjKDB6{M5kMaY z(3^-Z_&v7-(CPqs0?|)?&j$kN4n&dS;3R}U`d#w^C_8{sUZ!gkHbbwibRBM#t@Pz5 zNiD?96fTYkb1U7tni$wUeKjksM)e7difo1!{xBU145LTXu(ZIi&Ct>xr6a*nat~aJ zo(z?Hpcu(L5Ji#I^frVi{jPEk6eGC@ijmv{zxqAp9wtXdlTHnBpT`0T}NiTmhKjBfJY>wvX^GfV+Go?}C!o zD&j2`kt@KXOH1Sm6eGC;75ziW6{zkbxdL^3Bv+u3kK_vITLMo~u0U%)7D}jAMBhkn zx&g&br75wNSPv5{EGYittflzxua-j^tb`2wlZ;H*h<|mx4RT-y48lKU7!3RHpCcWB zo8TY}$3Gqz0bjuw{DFTg{0!sq$M*?v5pKaB$fr;Nx6)EDotA~$@wew$vOV};aYOQ^+`QHQOe*Rb`pEZauQu^qG`+e<64 z{j?f8M60tSG@hNLwb}QyK08Yru*i9uzzJ=_8Ewu>(H6WcZOyCGHoO+?z!PXkel6|F z+tY5m6HVs5XiuI>`|uo^%CD#C{C=9j7tk!ei)QmT>Gk{q9mFrv8w95}3X|rEa&)+; zKu3#sI!4r`H;ZO;yhx;zMQ3`8=tifBGS?|i|O<} zF_+#i=F^A7Li(^Mq=jM$eN-%?i^UrHgji3X5!>hzv4bubd+7?XpRN{%==0(TT_Y~g zwc;Y(XmI+nVbZNeIa*{?pxcdj`kGOf?lPLu-9{pP+vrRqdyH=MT_cU|H`3{c#vuBU zF_eC4jHU;Te0szvphu1A^n@{&eqqd~-xv$&Nu!YdU@W1hjAis^V-5YqSWnLy+vquC z2mQm?OaCY0OBeRC*lY>s9LW{#bk@q8%UYZBS$lIK>tGhLF6I*~ z2|ugw7tAX@u8uzsy&=*udc*P3c>8tt5g_UnMeH1+zCQXEQI?MmBO2tReTZ)I(RM^5 zeI(zA<9zfiqR9~-E<$*#kLDqo<)dkc=K5$1BLCUL2IGV4#jW(sT@)Yr?7DEeuzHsQ4d6CebgG! zQ6Dux^tnV4`4vkmBlN#%sg3BbXjiy|2$NRdyYLI5%Rc%N(eFMwfarja-a>?{r^jtY zbiqf@BT`>g-pln#gg^Sh2XQTkk7i@+q>m;ey5ytbi2M%<{OKe1OQ09VKJ$9YFM;-m z@T%x!60j##2w$%F1I}is8r@x}3~h#Z9}z?iq6mLf+6+y7bP`cZA00x}-bZ^8b@kCU zL_K}922q+uk=6L?+h*wJ2Nxn5=%cxaZtzh7qTxOojcBZo1|cf&Q5vF&KI)8UrjME- zniEA45|8liC?w_L=&$%H4&zS6y|WKrztOiZ9YP)_gryP6`a*lw50Y7b=*0#=e>MFY>xgK-jwa(SWxps_9<`44)eC` zYu=81%R8}Od1rQxcW0M*5(l2b9o~zV=4retzmC`7nYp27e0KRs0VA0>6`Q=5u)w zznj0o@8NIr2lz+)LH-F}$WQP^{44$#|A{}&&+sStUpVR?{;aV0QW56QiHdxssKQ?m z_4tdTAzvq2^7Wz(-z2*8%_5n4uZlFjLuB!{vF1N_)l2HXSOK^YPyjT#4j(l5 zB-N-3BD{?>Y92tf11Js=KAv??5sQ2UKn3|J4C1p}qhkT|egN%6gpX(4b7KHu?GqD| z)gM0cbx&FS6{DyEpo6md!}ozkvid7V_~jpi@XKGmD|Ao%@{d9IaQ4K?IT|~I)=4R48qzc2Fcn7Uq`y<0|9ggBB=oA;3S0j zs?sPgfU*OqSONIs3I#x7eCYPtN~ISl%3~COm{Cdr(8I8PylPmC0uVFIdpqe-_`bP% zl-vXOHdQARRRA=SdmtJsRseKR?g4x$Yb5tTF_L=#U&=Zr_dqd{d!QJ}J%BG|-Ba#? zVkGx~k9-9{b&V6_5&mj^PSO1wbRb3#0;|5#9w-0nkX^1tqUlPyxVY$EA%b02;{^sOTR` zu0VAk$rY&MBe?>Nd?Z((nUCZOwDysw0Q_~e0>D2Ylz#+E`KPd)AB2_s2(05rVIw~Q z+xQo-gMR~i_(|Bue}Du06ddF~!wLQie8tbgkNh0`%>RH3{7<;ZFHy?>p+W#HB`7T` z3|bY7(i$R68wiIs7G-ElQI@t5kqWfCs7RAVRhl8H(f*JaVlwL{3Rs$$ z#?r-YY>=4AhKkv2w1}{LF^?69yV!JbFPkgwWAnuVwop983dJLAi6~^tgv-{5#caKJ znr#!$upMF<+bfo{{bCh6Bv!K{;w5%ctYP1a4eYGghzfw%!im_*nb^iliS4|s*vYGl zUA&ffizkS;`L$vnZ!g~Eox}&cm-vvUicffs_>^BSKI8X`BYc54&Uc9u{7vySzaYNh z7sdC2iywq3eiG%x&!U3(O~i|{qOQ0gnu$L|qWD{M7MDafgNQT(PysN67-Se?s9}rI zMp)zfVPHAWl5jC^CHQDBTRrlU947-!5kCK?NkNk*YD)mVa&WyTC+ zjd7c?-nhfqX3RErV6VN#JY&Cck8#Mj*EnK4Xq+?_7~dO`H2#*1c}@sgQttTzW48_c1`W^=T$#mqNeH4BVw=5*tA zbFQ(|oNv5oE;QaU3yr=nHkqY8kEv2QV!<;M;q z8swvWh;H(cRsi%ktpI5BEcTQNfQE|@-s+=yh-Ud{8lt&A8iR;OAM*bV3ILwL(*F|$ zKpqGS@)8vQ^{9<102*lp08xwrppjMpG|~!yMp^;55L5tkP%8imMHK*zv;v@!Rsb~8 z3V=ph0nkV*02*lp08y+0po3Zg&`2u)8fgVUBdq{vq!j>-v;u%AMgh<-v;v@!Rsa<86#yOl-xL7jAfd)#Xm1>YWaD$_Wqb+!jjtfb_!e@F?_jv`BTO(( z!(`(O+;02|vyI>3KI1$*Xj}x>_zRviF2hRWUwGbRu*u}80GJl+#{Zh$Tjn+Jp;-zJ znC0NO83$jQmEg2l8GbRV!$q?OTrz7@)2u^nvjHt_)T9?sS0Jlip~i&|zjOU2LY&r_2nx!px+r%xt>O%s~af97JC; z2h*MAjr3jfCi=cPoPK7GpvTNH^gDAbJ!Oukznc^2ALcELnp2oCZ$)`_I*T)JXEn`P zthPCaH8t-<^>se$Xx@#A>;0^c`2f4le3%VH6?U-sC>v=$#>Su$JH>pGO*5CUIp(u$ zp1FcOWIl%qfcZRo+I)dMYp!K4n(NqF^JVsmxruEzi`X9X6}HcOjeTnFV291!>}&H4 z_N}>x{c66$&YAn!W%E4_=11HyKjx*)gS@JFh}STW@7`y9n6!wr}-`K zZJy#;=8t@U`3oOrp5Y_Rb9|y1`JLZl{>f*V7kR||hu?2r<_qv23NE%7f66lXD$C+8 zSPtK8UBip4viuFJ9Dm!Y$Um|w@lUL3{Df7Ve`UqcVQO{~48d@DhORJ-3V|5kXt!^UON=601>M7E!J|fHNhYG;oSG}bEixmJR zC;tDx0Vvjoxvc(B4^S(^W%YO2N3!}WMzZ=VMzZ?DnqQBT)t`@i1waL(3V=ph0nkV* z02;~a4;287v;v?J);=*YtpMnlRsb}LDgYWz!hyb6&GG^$JAjH6fXn!viTxV@iSZK# zzpkYBpA>+YQAz>O!?1q5YFLZ{5HrkE0Q4wS0InXj0u#n6U!7W10niBRUq4o?0O+7r z05sAHfJSl;V3n_t+yli(?tx+?_W)M;x~JR&#YpY}ANdM^>Kau5G|~!yMp^+t6r%u0 z^gk&8a%qYc0F7`3qym5_RsqmKtpI4G6#$K7{fi2KMz{h}0nkX+zxoQ|gtGoc1whAS z{fi2KMz{h}0gxz00Z_rH0-%vr05sAHfJRyY&`2u)8sS|a6#$L20#L$Q1r-3bv{3~> zBdq}FL&+6D1wbRY0;m9JBv$|x0FC4dpaP(gTme)7G?EGcgR2z)YcQeKP*`f^!g6aE zth7eLI%^bcwDMt_H4b)I6Jd`v3HDi2;eb^D2dx=!!nzHe^WdU& z52e<=fXT942g*5kB+<rg`^)#j&}e z@@#&nGFup`!U{t**pg69wk%YKtqIj->q8CMwooIsBh-}b4PDFjhZ5PLP)l|s)RvtL zwPW9hI_@P!4Y&8o)b+2J>E_ zAv`s76VD0d^6Nt*`2C@gd_ia|-xbQ|Z-yrD3!#bpVrYusp{c?QO&8@tGem{ZED;~N zL(~o3DVl}mip0>}qI2jT(Jl0VNDDoP3P5O~7!+D0hK3#!qeG92{Lqu4AoP@&9(q>H z4J{S(L(hqYp_QUA^nzFtdQmJ3trKfP>&5!eCb2EFS?mbCBKC$}75hUw#G%mZ;z;NX zaUt}kxEOlJ;Gw;S8G6qs7kb~Q5c=4N4;?V-h7K9cLWhmS&@rQPDDt_{E%c?47W&Fa z4}EJ43Vmk`4gF}04xKjgLuZVF(67ey(C^0F(0OBi=%TSO^p{Z>x@;^7{c9|^S3yUCB6US2n)4s~czS8pe6Mwn^+dCbJuu@pePA zuH6I`0K2J~Xtyvs+lgj3yN#J8u4j^-e{lR4DxW{$SIoB4K6v%pRW{Z{J#NEH(XQ!&@dbq z0nlh4B2)l0(h7h^S^>}~ssL!H6#$L20-%vr05lqdQ=kH%o<08!3IOKyf1?1%1N|oj zK%H(>0nkV*0El7~0FAT)ppjMpG|~#d|Nk3+7zIG>uBZZ_kyZc{iYfpaX$3$dtpI4G z6#$L20-%vr06bKz0O+7r05sAHfJRyY&`2u)8fgVUBdq{vq!j>-v;v@zuK?)a|E2)g z!w9v9LwkEPB;$V%ua|u@^tZ=Djy)N2?OR~DJq;$9n*g|ORx6yCBI!-w`0aKL^Bj@wJ%OM5w-wpZYPaBnqS zw4aAd_8My1YpHE-q~+|FX$5;Ljkk+vU3)uiX1_)g?On8ky_YpfdZYaj9cF(@7uyH%zb|lvuCR~NRrU$G&i(=w0Q(#InthV)w11%Q+NbFI_RsV) z`xko5K1;u|&(Tx%AM|(oPx^;_iBbC>Cc?nVgei*)8?0v7WVOR#)->#}=HW7|W4J8q z60X4dge$V^!d2P8a5XkKT#Jni$FnivdTdI#KARS9%;tm>*t~Ev_E5MvDgfbD?CEf8 z_H4L4dokRBtqpf!uY|j@?cpA5PdJ(F3-@N9hWoI?;lAwaa60=o+@Jj#&SK}n1KH*9 z^&G-Oxf8yDmktl(Rl|9_MtBr&6dui+gvar=;hTAf@Fd9P7s4*z9A3HyqbR%eu@7SUc=9XH}Jp08~H!sEy48)*D+$Sj#porjUEAF@>aTt7b{9+P7}m zzE!)n?OGX~`KW$+>AgCQp;Ira+-n zqp0k^<(~mCi&p>`tmxc7Ws9Etx4NC3nldmoBPA`l=&gTi)2y7Lul}uHCq6l&M|@Ux zv*eVVv_YBiUE-4(#itI*NzKSk&dlwb-o$Z28w4a2pXYF+5hwR)W(~}V*?{_w2b6_kyx3{LvviH zR{T;~;5IxPT3Zz=)mtG0xylRYvxMx*A<<)&7G(~dt_nZF`r?DtfCFp}B~^zyq07}_ zPUvuT4A*ltpgjam$c>N!LP)7lUM*-IDqRbD!HLk|T9A!vlAA$d%$zcEPW8~$S}-Jr zEgNAILQCVJO^m5r)MU1rEPeah+a~TIvo_3)nOVN5?6kPhx!RB)LskfrE%fT^JgO*X z6kWI@E@ae&YN1*QzTH>yTc7t^E5}-EUw^b!yuDAZ3%Tg-Cw1X&9MbDS`t>ubhmz|< zQV8lp8=TXwK1{~prTUP3{nT3CPW#U)8`{wTs)U9&@HreGYt6uolx`T=AEE~v!rd|9 zNzk+H(7J|DJJhd{Z(DVJR$l;dQ&$>6Ar6xhp)h8P4dj~8V~J45H$P@ZLvO|}jiG*M zQDg6LKW+?n;Ffwffi!)%h_*F>`8Z@W^@eYnLSEE1z8TC$+plVv*c=8#ZD*Q$w(%|0 zlonxI{o?#2Xa(?R@uHTHfMaM|EBG_I?s#h$8{=hr&&$7BL;2A3HlCNSwt;rh>80Aj zJ?O$?YH-^@X4LjTJD3==sT)HJ+TnH4yuB~DT@|~uJs8oIpR|X&aI1Ygz+EvL=4EZY9K8Tz0j^gw&*PS6217bQPmIh5B4o`c0jQ>Il7Rp|`< zgUj$*ay;>@cdH=%$;eC{cOa_@uC zh8_?PyNU)hsUAvA#?!hl6ikLrerHc7U+e4%>8vNdD#2N0Ey3AXgU{JmgU?xIP|ki8 z>ulu|yt;iM-JWu-mw!qxJ#nrCFO{_fFJlcpFJlcpFO@-gc`nw=vpwK;zn4X+F<$1S zLEC_dUMfLDwKE~Ey&|r6OwUw?SjV&>lzbD!8ESPXxi?e?8tcouJ)t9>-r0kpQmA|{ zs2lMsG@uvsfj2{*H&vxKo+z)pQA7#e#2S3wD1-7QtV?go$9l7*H@@xc3+?ZHZL+mV zgGNvsIzJrR2bxG{JkdZoqlglmi8c6~Q3mBqSeMQ;h;?RUAGqIMr*Bf~0u_Csrd90S zw#ef}Nl(VRfiBV;Pjpn?D53;!VhuiTl)>|+ik^gf_1<-|^{p$=v1oaVrlBi+VPfPA zdAE#({i1oZ_n;1=nNCq^k>6j6dNu?C+n%AkA+>(ZA|vA%qh2{&TKoF9Ps+ou1ut~}WP+Ux2r z>6a&_E58&`f?u%)pI^$L{0i&Ruj#RV6%X)ko9I`kYjUV>7W580BHi%B1Ii6Wl;B3J z!RLlDsI1YGuFIMSysYV-jjzY+yvOlt+0YQ4DLVds<|#wX!t-F8p$a1$$uNF6skQ48nSVd zCl_rF@Jz5)k4*L#<*6QAP&7<$CE=1GjSnzD3n8IY7M>i*7(rSs51wpGoCo0oKZvx&cqsg z&M1R&CagwJ~b+b4&Q{YxRGb>r=L{{H5wMpo^Pc`o;apFQbY+J#TtAbDTDGT ztV@rMmEaM+rc@41A0FdTXv1*m8qVdj(i=~lR^BM01aD#uK5vvkc@x&9H>XSR=IRLe z#tr-}cj}3&-cAigJd+EJlub9`}z*YHlz?WT7m^W&C_-$8G za*tO-C-R_5(Z@w1^iLj?3+>K@c6A-JxSp`oK4ag+mBB&B>V@Wy0@F~lLjy)aTqmWg zMX|3rdeL>xxt4as*%(?j5~_lAjXyt+M1Lwte>_p41b>t@>W{*nKZBHBfTrq3sxGSbECp5B}Nm4mLuX(SLv>7Jc$_g=)D;?OL>G*S2Nb zmhD=%PRebW)V_85Rwe-;O+vMA!zRj(G2qbRAI8EjPH-N%-yxhl=n_E;n^5wwOH8Fb z>Jm$7kGsTH+I*KdN_)~J0i`|V5?5)@xa0<XNcb3qJ3X za!Os{k~pQk;F9u6d(kBol=hNKDk|+2msC>P8kba7+B%n1QQB)Rsj9TsT~bYHn_N;| zX`5YALuqfiq$X-XJmM`bsinxbT@tUfcU)3iX**m}M``c6BtdDrT~e3SlhNAalKM*9 z>yida`@kg)mG+@a8Y%4~mn16f6PGkr+Ci5z2`cq7mo!z{VV5*h+7~WquCy;*(n4up zxg<$xU%RBG(!O;`E2VwslGaK)>5?`|`_UzBmG+ZM+9~a4m$X;fFF}`dQ0iHibX3}J zF6pGS-(AvKX@9z;i_$K-7_`^CB2pAxFk(!u1oqTt&~gpDy@u5`YElPOVX8A-X$4ItLTzUrB!xG zf2CD*$pEEQcS)AgYPuww1U+x!U6P~7IxZQgw7M=Cq_p}j8LYI1E*YYyjBtyTv7U zDD764+(}Y{G8x9ZCf@V_Jm{bw4*_usCKeR-EXW@} zW||9+DEd(#mZS&eO-1r?MLq%KhCa#J{Zq4Yvr_wKX60D00I6H^ZqI8zy|7?>^YpyQ zCKQDh&48r9)9_3Ho`MjN7V-|p_+F#Bp6|kad;Sc}9+>QT^BxeRXIj4;x$*bW^@w2~6dgZXsig(` zag7(kw2UgDlRYa{vHeqf;OWGToyN$g zVXELap`7F%7-b92$a$IlGBKa=bPvkJ4__Ai>ZO)iJSYuaOSj-0#-)Gqklf6ksad!f zw|3s!MNm!ap4>~#`vcjS1IkVBkKSCkj>Mz6gx+{t&&bZjm}DV!8N(=d(ieAlCB}*D z)LsL#aF>63siXFolbItAfc^_bdCyk~S`=ay=yO3ChEMOqq5=p_9bi#2X2)tP)W&lh z4j1m61~AfiR#G!^@Fde4@FaOToZBxgqj$1JO9NqP$^9)_);oQ@QgdBAN!>B4XdIB{ z@>*}6Zqf?4qm;~k1Jg5d!{$mD#z>|P%*e5572GvmZmGE`nI5i&GxQ?O)BsXB^!9B~ zImx26@NAEpI%)c3yp!FM7hY4_yMAE;YPq&?Juvwz6m|@4{0%)@dd;*ro&;x7e-( z8aL9xOQe{yDmT&TIubX~C6)}z1jxnpUGb6$Clanqj)Ax)B?jW;RNO>(vX^yoXT7c? zabenZBrfk8C4;$M^2qh+QC5?@|77V;ehD-#8&?92dngDk zpAB&w*WD(yiZH<=WNJ+EGF_cjJYt+O#n0eYr}-INH5~{~9Uy1VP#VspE7*fCNLCbMUz}2QOuHPmx=_H;Qn|yePu0KY%xo*jt>O|IoD@u6pEJ4%a>g zMBp7kE_p($ICBB!o=4-1qR=mMpm(E%7)bABVSL`iam~{v7Uqx3pK8*@c#I9x8sQ7r zJo>Cdm(b@zBj!TgI?L$u4tznE{#B z+Vlmw+MyNc^3cJ#kYK$+Uv-dL6Z(5D+?cwKu9xUFj8$~^*@aUJCXO@d>p&peqMIDL zk*>j~m3MQQ7B9V#B!9+BEgtva_WPaw@(6Sj= zPOrNUZ0i&HsXWMoq3!oU)zb6mXAV6;KgYw5x9E}3PxnE`z)||8B#+6*_!IX*y@c-5 z$BxaP+R3Fy>2YcK8nZUKzcKk1{Wdgx9@MqIqu)#W$8OoMkzckby^{&M`6C4{Fj=11$UG^Y5LUB`8^B9=abr4#B%H( z%nA*C2rdNcp-N>*>y22@dLx#z-iXDlH)1L4jabNfV-r1M4eMd7V7(FRS8v4X)f=&P z^+v2*y%FnHZ^WwA8{1$x>?v5XdLtIB-iYO@H)5^ojaaFABi50vB75W)#dLvew-iWoPH)5sf zjaX-TBUYK-h&84+Vuk6ASYCP~7MI?LrKLAwVd;%nR(c~Al{f~etSLPLD@t#~deR%Q zn)F7jCA|?VNpHkD(i^de^hPWpy%7sYZ^ZJ^8?kuwMl2n@5er9e#In&Fv1r8oWAb6m z=n+^kdL!10-iXzrH)5&ijaVppBbJHYh()3|Vu|RDSRi^MmWSSm#i2K1Y3Pku7Hq_`}_6)FCf;$IX1QZOlm6s8om6agu2kfO8{Wu=IdqJk8aq^J^o56qUUI%#rH78!#&Y?nChp2^RnK1Xe=9a>&dBout_8Q}^yNiH(cl z;lw7z@K|EgVwfLUiLF(6Z(okR-4)okU5TC87qHKP?GBaZbU$IZ4MIC5HjaZQ--3md z?107if0^(|J?o<$3rcROk9$H=&-a$9`UUX|3_ zK5DI`-tkfECAGsxZIINvK5C<+cKfI|5`)O?@o~j++Fl>^mZU!LQClVTp^w@osgHcr zc1eBWqjpN_V1x?F#MmXd&mx?p-iv13J=jYpWDU0R*Wzo$I_xg5$7bzo*zw$eUBlP$ z9=nk&B%8>q%Ca^FTcNqsD-?|js!k~-<54oT`qAN9GUe)3UAB=xh8 zIx4AOkiy3^I`8>^Omg8YRn&1wo%OB!MpD1|s1uU<-A8>dsXu+x50bj*qfR9@4#vTM zeB5a{?Jpm7Mp9RO)UT5I$48w*isC8vE-2;xc}YFyp_)j6Z=H{~c!h_n7e~G2?&0jQUqzjXtWWq`LX2=922}qmm@m!$-A}RL{49-u0r-WgE%$_DyRisXjicgQWWT zs7{i~@KIeP)!#>Tl~k6GN)Adc$H%2eYLJggmDCU))k{)0`KUBW4fj!fC3UlpN|)5g zFctKYI8$d>YNn(f_ffMXHQz^h3H79pnj>dD<)b36 z!a)KCNyfYFWxU(|g?HO4c(=WZciX@5Zu<}3ZT}_M$|DN_$g4o{?SYX`f#W?@kW2WJ zcLz+U0T#3X8&VJrf&dhNi+>_<13UqxUEDd>Zz5giRr<;Q&JfDdg)bUre3gAc9rp{EgDip+e#hwe-a z#u{%!8 z;i-T*5Q8uWVvx*%W8Tb->8nBJfJSljjm>oPB4WqUH!<9CbPL)s0#HE(2@ysBszne+ z0BUVIy|2Ho@o!k`b5`K^Orjh#-srOphSE3Sedg;Z*>0B1m2ZCC4i0 z1&hcCKsdBSMj(o01mYr_k`bs9K{5ihB1lG{UIfVq=t}|*Qbr&tVzU#g71M3$OQBxA6y@!8SprM>U@$8$4?x&5Tdu@3+x1Vmfiu+;YYmX_yApjpVnTa zPr+&$f>-GZSVLFAYxsF;1KkL3(04FoJ7Ej`5Vq2fVLSa2cF^On8$X`BN6)}MdJ#UL zm*FGE;bUgPAyy7PV->JUXYp{9CBSjk48F!E@OP{;e9yYVDb@#mV(IV;8v?(wVQ`*} zh2L2LTx5lCiOqm3Y%W}7^C)5SDX=0c*ive+<A%KFMvPO88^1GQTwu0Im}4?l%8X~F%>))_HXFpsn@Oy)*_l-_ zyRsT)A6C;$XLZaWEWsSc8kl2QL$iQ2F$-B!a|TN?=dzaOJl58n&)S(qtdqHjb;Z{z z{G55s%hlDF@Dd8P3tw=&G+usPA_x$rgc17#QCbB3fG9J9jvyKsLHiI5i=eHD@*-$0 zqHz(l4AF#O1TH{0ErRYvbY}!jM--ho4pHRZ!-nFG>*dY#ogEZ!`K)hZ9Nn>*?nbp6 z8n%0eJ&0N&S`31_E2@o}tBbA1)y{X}`BEdSNR)FccxartE%` z9xA4XZ?)A$>L7g3C^+t*l2CUnbBw`U38B7w!~G zKy;fv6WtJ^2hms@_K4nv=+p3xmySntD1vTA^uCAiAw~NmLWk9>DeaEvTm-d7bR>f6 zBRVQkP`<^|$_Ot+j1HnpVFXtZor$2ch^|D?w}{S1&_P5PAhmngjp#rGZASD*1mUZZ ze&zBWu8R?3i1flo5&a!O_aMS}YTIN)mm_EtqR0ycW)rcU1C?Slj&`CtiBj_-qHW9QJQKtynf+#tH)*$Mo zQE)X`iZDH5oR26wg61L`8bO7KawBLgqWlONf@n$v^+9x71a(FQ)4fE1PqJy|vkz`wJ~!6#5I8w#V? z2$;ZbhRJLc%w(hC9ySghVz?vxpr}5FXh?ZlE@o}}3#^nFVoI!E$zkD(LU^Tn#DHKfmjxfU~kfq>}|RbA9YLEPP&r4OJ8Jr=sNa34Q{~a z-rMX$x}AMOKVYBI1MGA91wIFlu`lV5>=-@GzM+4zZ|Nm=l2P^p6YMlA!+vIQ>@2Iv z&av9;57vbJ$(pnOu#W69>%#tKz1cskFQ;q}XKW}p*%)rIaolB7`3-D3FUw~0a_nAS zkv+~U1=#{#jXle&vt>M8N4yi;%#|0@4yG6bqMdpha)qB59E1# zBp<~`^Rav)502wg_-*`dKAs2pWd1Os$M|%~@A7&4 zJ^m2?1ZN)NkMpnj6Z`}(;=k~x_&Hql7hlBx=FbU>FBJj4LR91{MHRkU)a5UU27HZZ z$=8ZDe1qu5Ul%ESv*=Zm7mGf8tH|QJu;xE|-9zesa0lSLuLGb_U%a*8om8VPi0~Gy zQF9-v?L%>h@b;`{idYos04O6rjYhn8Yjn(q4*1Y^M0k7FGdK7U);=*dS^eQHU(b}) zUlfHq0NN<4KYSi&B&)wD!Z-gIgm3=xS)pg*n|}<#H~$zUt3P~l=$W$mi=apcKpDdw z0FAKrkq;S-Wc3$CSo_FFj<#X#6N9k!i9xdV!RNA``G^nALL@r?+BgXzKB_dz^Py}X zigo~gzor8qG2V1jHdCqjit?BaK+G!D0np1*OIQ}u0f<@VJ)QI_eBMaSw=*hp0H3Dn zV8R^$jbsjlZP5;ZHp(2phq6X82ck&k06sdjP3Axp$sC9xnFIJx)-z=eM3Kya2#Rz7 z)YNbXKqFcIvhZd==D;xz#dH90=EnbB2SA1fUj*ZMgYQrCNctXkxj`6 zREZ!Nfm#tHBTz4bWCR*Vkc>c51bH2R3)go5_=kk@kKlQJ5LWO*u!DHU9-p@ZaEPeja}17vLhl2$%U^l=3T7@PBD3L11k z{YmtvXG9LYC8ikI0*@d`U7*0JBkdh7s*jhu*0oQXGiDe)FBE4K0K z;vHT~yvq~CF5XnU&)bW=yp#Bl_Y?Bqnu!Y{Nn944#b2VU_(${+|6&KgU}A{D#W2GX zV+~sr7&nMQqm-ColoNA}I5E$tB<35HMUhcmEH!F~#;7CK8}-E&qk-6FG!}b} zCSt$QLL4@d#8IP-xM;K$myM1FH#!-n(bXttbTcX#J&brG)krYXjAlk3Bgx1xIvc@E zG-o5sG1848_}@@tm@&c_Yus!U7^93rW3(~D7-!5iZZYN=o1f$59Vk|YL8q1B_ zjWuXpZ_G5d7IsV~(*OXC5~0H;x()8z+rNj8n!F#_zcDg7Fmox$4saHi}4Xt)63vJ>(iEVU+O` zOfXKvWaC$uX`F?7jNjoQ;}3Y$xC9~NKd{)i3agC2;UyDbqe-y?U>dN~G-0_#T2fMF9*4(_8bu{l|UCakrZ}TD6*L;i(G9PC{%_rFy?8J^ULu{(KkWDwAWwXua z*uCa*_PDtMI{@a3>{)X)TV}q>UNP4&{P#cEo8|_#)qI2PF*mb)<`(vuxs@F;x3lle z9qb2lH~Y^9j`uLX z=e^8RJj?uv4>W(_Bh6p=X!AUuXa;}hQ_PF}Zu1fknpgP4=2iZfMfgGs_!3L-7cGOo zY&m?B72w5IY5uNNhQDW(=bu;=_#vwb|Jtg`PgphiFIFvn&Pw2aS#|l}RzqP~jYPm| zDk@sdL=~&0sB5(n4Xk#erPW@vu{w)xRu_?CC1VG`>Mr_NJw=w4fgOO0*FB{E2X_Ee zQ}X}+1|ZrW=Cb<3et?P$m(|~u2$I!b6v^r@ie&YNHNRe`I{*qrIsh8t*UxBU`TvdI z09?lBOzdv}B*s@5e7lmGuPBe{0K}|P9RR%y>&NSs#dH8-mU$fjy$U-3*RRqY02SGA z2S6j;0q{_?1E7t%1E7)a0BEE;02;|0z?xqp-2u=@<^Wdt8p#}pBHaN{wnzs+!Egsa zBi#YeNOu4b#dH89x~8i2{RTjWCfWheNOu4b#dZL+QFj0|(j5SebO%5qS^r`OKqK7& z&`8$5*a6T;*1y;R&`5UxB#P+(C}X$-ppotXXrwy;8tD#zM!Ex_k?sI!q&om5#LC|R zP@xTX05sAa0KF;Q0nkWB06PF0=?;KKG6L8E&`3rAI{+Ga9e}IXcL1!xgjz%4d20l$ zux^G`)+ktKjfM@@IM`y{0^6+du*aGJ`|uxlK4?va&#l|xYikCaux7%~*4^-{H5)Ek zbKtTyk5cP?Dy)ZTDeDnh)_Q_gwdT_r)>E{;^)zi{Eut;0#k7qTTuQrH%V>(Vl4e*h z&;iyrMKQ^)`LV+D1dxPP)Q+m#(t*(ATW@ z=|*cmeaHHc?!-UX{LuQ8er$bCzqAh1#ADC&KX63A( zu>)Y8W%1TImSFwCnpuCcB>IDZG^3gO{~?^XhgQuVtt6L_32wwX=A8JDYd12lJlx z5T0fa=Q;KWKG@FV58I>oWA<3S!yd?yRIu+7@%BuS zU%{ z_6jlIUMY&~)ncjrl2~r95o_$VV!gdVY_VS#+w9F^uU#zm+grt9`)zU5-XSj9JH=)D zJ%ihO4AcI=C};0CD%c+z@%AT1g8iA%%>LX+vX2^_?ckS2SNm(DkNu62ZhvnKu}>Pq z?4OLW_GzQQ{?#b7&l)rA-;KHUAI3cUk}==@k5Ob_HI~|c8_OLq);QEy?-<4w$27J% z0b{S@8vC6x#$l(danz|`oOCK0r<|(B?@l%2f>X;RPQ1ySx@Npn&rEO{VF$oTG?ScW zW@o3l+0|)f_HkO9=}vodh||Fw=5#T~IyagHPIt4=Nikis=Ao zq&ol_=?;KKx&!e4e*+NH0Z`c$?f__{I{*rWI{+H#4uD3w1E7)a0BEE;02=8IfQO4TjzN=<1B}>&MLU$2Iyz>T4aNeTLoGmoTd53mzw$skeF51i4P5U@|X_m8(4s;IC5za?+q;rri zbPmxa&JnuO`GUUad_~te$FT$8oWOtQ;XAtB`H_C$oT3MuGxQ7R7kbS3jsEDIr>C6@ z^iSs^z2yAGsB?u0=U-MPKv-OWvzh_HY6ooAB;c^-fl{nvpfu|eh-1A2_2X5w7 z1G&6LU^H(S7{eO}ZsBbM1-wIG0`C!+$a@8*@~pr#J}@wYj||+wM+ffa69d6nd`e&r zzdJCO2Lt!>hXW7r#{!S=g@H%;lE8faVqgJ(Iq)>!6nKUg2Nv^p155aOfo1%Y!1Mf2 z;06A5U==?Rc$xnac!i$}tmA(L*7Lsu8-*3vBm#jqMa95dqDo+!s2g}kGzh#aS_XEB xHi7p=x4>SJ68KQ`Y8*Hq`UE}|S%IV20r(q#aDsoVUPvmG^bbFVf`_5){{qFds|o-B diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml index a29e9a596..d89380596 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioResumoLinhasAnalitico.jrxml @@ -37,6 +37,7 @@ + CD.ESTADO_ID THEN 'S' ELSE 'N' END INTERESTADUAL, NVL(GR.DESCGRUPO, 'Não Definido') GRUPO_LINHA, - (SELECT SUM(NVL(TR.CANTKMREAL,0)) FROM RUTA_SECUENCIA RS, TRAMO TR WHERE RS.RUTA_ID = RT.RUTA_ID AND RS.TRAMO_ID = TR.TRAMO_ID AND RS.ACTIVO = 1) EXTENSAO_KM, + $P{SQL_KM_RODADOS} SUM(NVL(BL.NUMKMVIAJE,0)) KM_REAL, @@ -392,13 +393,14 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + - + + @@ -406,112 +408,113 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -525,11 +528,12 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + + - + @@ -539,112 +543,113 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -659,7 +664,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -667,7 +672,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -675,7 +680,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -683,7 +688,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -691,7 +696,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -699,7 +704,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -707,7 +712,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -715,14 +720,14 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + - + @@ -730,7 +735,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -738,7 +743,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -746,17 +751,17 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + - + - + @@ -764,7 +769,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -772,28 +777,28 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + - + - + - + @@ -804,14 +809,14 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + - + @@ -819,7 +824,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -827,7 +832,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -835,7 +840,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -843,7 +848,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -851,7 +856,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -859,7 +864,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -867,7 +872,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -875,7 +880,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -883,7 +888,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -891,7 +896,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -899,7 +904,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -907,7 +912,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -915,7 +920,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -923,7 +928,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -931,7 +936,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -939,7 +944,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -947,7 +952,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -955,7 +960,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -963,7 +968,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -971,7 +976,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -979,7 +984,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -987,7 +992,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + @@ -996,46 +1001,46 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + - + - + - + - + - + - + - + - + @@ -1047,137 +1052,137 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1186,107 +1191,108 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1295,7 +1301,8 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + + @@ -1303,7 +1310,7 @@ ORDER BY SUB.DESCRUTA, SUB.INDSENTIDOIDA, SUB.ASSENTOS, SUB.TARIFA]]> - + diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioResumoLinhasController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioResumoLinhasController.java index 39536019a..21343541e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioResumoLinhasController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioResumoLinhasController.java @@ -70,6 +70,7 @@ public class RelatorioResumoLinhasController extends MyGenericForwardComposer { private MyComboboxEstandar cmbEmpresa; private MyComboboxEstandar cmbGrupoRuta; private Radio rdAnalitico; + private Radio rdSequencia; private Checkbox chcSumarizar; private Checkbox chcSimplificadoSumarizado; private static String CONSTANTE_GRATUIDADE_CRIANCA; @@ -131,6 +132,9 @@ public class RelatorioResumoLinhasController extends MyGenericForwardComposer { SimpleDateFormat df = new SimpleDateFormat("dd/MM/yyyy"); filtro.append(" DATA: " + df.format(new Date())); parametros.put("DATA", new Date()); + parametros.put("SOMAR_KM_RODADOS_POR", rdSequencia.isChecked() ? "SEQUENCIA" : "COMBINACAO"); + + parametros.put("FILTROS", filtro.toString()); String tituloRelatorio = "relatorioResumoLinhasController.window.title"; @@ -142,9 +146,19 @@ public class RelatorioResumoLinhasController extends MyGenericForwardComposer { relatorio = new RelatorioResumoLinhasAnaliticoSimplificadoSumarizado(parametros, dataSourceRead.getConnection()); tituloRelatorio = "relatorioResumoLinhasAnaliticoSumarizadoSimplificadoController.window.title"; }else { + if (rdSequencia.isChecked()){ + parametros.put("SQL_KM_RODADOS", " (SELECT SUM(NVL(RS.KMORIGINAL,0)) FROM RUTA_SECUENCIA RS, TRAMO TR WHERE RS.RUTA_ID = RT.RUTA_ID AND RS.TRAMO_ID = TR.TRAMO_ID AND RS.ACTIVO = 1) EXTENSAO_KM, "); + }else { + parametros.put("SQL_KM_RODADOS", " TR.CANTKMREAL AS EXTENSAO_KM, "); + } relatorio = new RelatorioResumoLinhasAnalitico(parametros, dataSourceRead.getConnection()); } }else { + if (rdSequencia.isChecked()){ + parametros.put("SQL_KM_RODADOS", " RS.KMORIGINAL "); + }else { + parametros.put("SQL_KM_RODADOS", " TR.CANTKMREAL "); + } relatorio = new RelatorioResumoLinhas(parametros, dataSourceRead.getConnection()); } Map args = new HashMap(); diff --git a/web/WEB-INF/i3-label_en.label b/web/WEB-INF/i3-label_en.label index 59bfe75c3..6494c4b34 100644 --- a/web/WEB-INF/i3-label_en.label +++ b/web/WEB-INF/i3-label_en.label @@ -592,6 +592,10 @@ relatorioResumoLinhasController.lbAte.value = até relatorioResumoLinhasController.lbGrupoRuta.label = Grupo de Linhas relatorioResumoLinhasController.lblSumarizar.value = Sumarizar por linhas (Completo) relatorioResumoLinhasController.lblSimplificadoSumarizado.value = Sumarizar por linhas (Simplificado) +relatorioResumoLinhasController.lbKMConsiderarExtensao.label=Considerar para extensão total +relatorioResumoLinhasController.lbKMConsiderarExtensao.ajuda=Selecione Sequência caso queira o total da KM rodado considerando o cadastro da sequencia, se não será considerado a KM da Combinação. +relatorioResumoLinhasController.lbKMConsiderarExtensaoSequencia.label=Sequência +relatorioResumoLinhasController.lbKMConsiderarExtensaoCobinacao.label=Combinação #Km Programada relatorioKmProgramadaController.window.title = Relatório Resumo de Linhas relatorioKmProgramadaController.lbRuta.value = Linha diff --git a/web/WEB-INF/i3-label_es_MX.label b/web/WEB-INF/i3-label_es_MX.label index a4ba6b581..c59f08607 100644 --- a/web/WEB-INF/i3-label_es_MX.label +++ b/web/WEB-INF/i3-label_es_MX.label @@ -534,6 +534,10 @@ relatorioResumoLinhasController.lbLote.value = Lote relatorioResumoLinhasController.lbAte.value = Hasta relatorioResumoLinhasController.lblSumarizar.value = Sumarizar por linhas (Completo) relatorioResumoLinhasController.lblSimplificadoSumarizado.value = Sumarizar por linhas (Simplificado) +relatorioResumoLinhasController.lbKMConsiderarExtensao.label=Considerar para extensão total +relatorioResumoLinhasController.lbKMConsiderarExtensao.ajuda=Selecione Sequência caso queira o total da KM rodado considerando o cadastro da sequencia, se não será considerado a KM da Combinação. +relatorioResumoLinhasController.lbKMConsiderarExtensaoSequencia.label=Sequência +relatorioResumoLinhasController.lbKMConsiderarExtensaoCobinacao.label=Combinação #DesempenhoPorLinha diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label index 5cdd3f498..c976c598f 100644 --- a/web/WEB-INF/i3-label_pt_BR.label +++ b/web/WEB-INF/i3-label_pt_BR.label @@ -351,7 +351,7 @@ indexController.mniRelatorioMovimentacaoBilhete.label = Movimentações de Bilhe indexController.mniRelatorioEncerramentoCheckin.label = Encerramento do Checkin indexController.mniRelatorioGratuidade.label = Relatório Tipo Passagem indexController.mniRelatorioGratuidadeANTT.label = Relatório Gratuidades ANTT -indexController.mniRelatorioGratuidadeAGR.label = Relatório Gratuidades AGR +indexController.mnirELRelatorioGratuidadeAGR.label = Relatório Gratuidades AGR indexController.mniRelatorioPassagensAGR.label = Relatório Passagens AGR indexController.mnSubMenuAGR.label=Relatório AGR indexController.mniRelatorioComissao.label = Relatório Comissão @@ -593,6 +593,10 @@ relatorioResumoLinhasController.lbAte.value = até relatorioResumoLinhasController.lbGrupoRuta.label = Grupo de Linhas relatorioResumoLinhasController.lblSumarizar.value = Sumarizar por linhas (Completo) relatorioResumoLinhasController.lblSimplificadoSumarizado.value = Sumarizar por linhas (Simplificado) +relatorioResumoLinhasController.lbKMConsiderarExtensao.label=Considerar para extensão total +relatorioResumoLinhasController.lbKMConsiderarExtensao.ajuda=Selecione Sequência caso queira o total da KM rodado considerando o cadastro da sequencia, se não será considerado a KM da Combinação. +relatorioResumoLinhasController.lbKMConsiderarExtensaoSequencia.label=Sequência +relatorioResumoLinhasController.lbKMConsiderarExtensaoCobinacao.label=Combinação #Km Programada relatorioKmProgramadaController.window.title = Relatório Resumo de Linhas relatorioKmProgramadaController.lbRuta.value = Linha diff --git a/web/gui/relatorios/filtroRelatorioResumoLinhas.zul b/web/gui/relatorios/filtroRelatorioResumoLinhas.zul index 413e3cfa5..ec0e10179 100644 --- a/web/gui/relatorios/filtroRelatorioResumoLinhas.zul +++ b/web/gui/relatorios/filtroRelatorioResumoLinhas.zul @@ -12,8 +12,8 @@ - - + + @@ -88,6 +88,25 @@ + + + + + + + + +