From 7aa3b8efe4877844159d520ba684d95cf17f0eec Mon Sep 17 00:00:00 2001 From: "mula.liu" Date: Fri, 9 Oct 2026 17:59:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B7=A8=E6=9C=88=E5=91=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 6148 -> 8196 bytes README.md | 28 ++++++++- app/routers/weekly.py | 3 +- data/board.db | Bin 434176 -> 450560 bytes tests/test_periods_projects.py | 41 +++++++++++++ web/app.js | 101 ++++++++++++++++++++++++++++----- web/styles.css | 20 ++++++- 7 files changed, 176 insertions(+), 17 deletions(-) diff --git a/.DS_Store b/.DS_Store index 6096b826db28fcee49a538ee57ccde9660f66f10..607424f15f3ed071a44972cf132ae1d3237aa530 100644 GIT binary patch delta 486 zcmZXRO-lk%6o%i+Ow**&hnVO>oDiagPMS$Vn?4~|Ny`XCosq=RtIZUNNI~vwBeRV* z(K=*S(VuDEA7~TQ8N)!kaPK(>&hy*@r)R)V zno)1?zWpvngZCsBp`i#1#foN@OPm|bo|hsw8gw*afTIl+CeCvPFP98na%TaAeTwS$ z=uiguNyAY_jkpUWDC4M;ffK8fp-q)Bw&zl # 指定别的文件;首次运行 . - 台账没有的,取《周工作情况总结》「定制开发」块中该项目首次出现的周 - 再没有,依次退回 custom_updates 最早记录周期 → 项目所属周期 → 记录创建日期 -周期换算规则:以**该月第一个周一**所在周为第 1 周,第 N 周顺延 `7×(N-1)` 天。 -例如 `2026年8月第4周` → `2026-08-24`(2026-08-01 是周六,第一个周一是 08-03)。 +周期换算规则:第 1 周 = **第一个周四落在本月的那一周**(见上「周期口径」),第 N 周顺延 `7×(N-1)` 天,取该周周一。 +例如 `2026年8月第4周` → `2026-08-24`(8 月第 1 周是 08/03–08/09);`2026年9月第1周` → `2026-08-31`(周一在上个月,照样算 9 月第 1 周)。 字段可在明细表中直接改,也可在抽屉里改;重新计算用: diff --git a/app/routers/weekly.py b/app/routers/weekly.py index 4f481cb..188e9f8 100644 --- a/app/routers/weekly.py +++ b/app/routers/weekly.py @@ -49,7 +49,8 @@ def weekly( periods = db.query(Period).filter(Period.id.in_(period_ids)).order_by(Period.sort_key).all() scope_sort = max(p.sort_key for p in periods) # 本周期(月视图 = 该月所有周)的日期范围,用来判断「本周期新入库」, - # 口径与「入库时间」一致:该月第一个周一算第 1 周 + # 口径与「入库时间」一致:第 1 周 = 第一个周四落在本月的那一周(constants.month_week1), + # 所以月范围不等于自然月,跨月周整周算进周四那个月 scope_start = min(constants.period_first_day(p.year, p.month, p.week) for p in periods) scope_end = max(constants.period_last_day(p.year, p.month, p.week) for p in periods) # 全部周次(算「连续几周没更新」用) diff --git a/data/board.db b/data/board.db index 999b95fabc530308c13ba7f7b31272b4d84f4d03..74949d4f41cfbc0ca8cd829766b4006838aee025 100644 GIT binary patch delta 49264 zcmeFa2YgjU_Bej$w)gIRwOoRV5|L!SmXU~FPJFNbz0Kc*NcO>Qk{YU*f<)~6<*{`I_ zPnl=Plf*v@3&dym9$W<)hgfF2{(Vgr%(zDQm9J4N6pO$98r_3paK~>@OVkJt`38CU z#VFc@m3Alz#T;iJWZB_Sc-=QB14ZML-ynD6Vy|vWNJv17^5=|wV9JC!V`opEO@pWt z3;7I$)W9C0Inn~Z6@C^pF`-`zJTo072Fk_8yj~Km1XxpZq@Kt$O+jfTkIJTmrcKe( zt~9F|v!*{hVceYAHPCY6gn2#+?9ej;YvfMI67Va@fsh=-E5#Nm@T1%e$$=D06*2|P zN-{DBS|}qR^eY`W>3$J^`VDGC1_|5}^G(PyAh%qoj}YBl;EnrhfHA zbhqt#bQISDg_bO?D%oFod0pkYy+Yv4j&W_nTh3LMT&#R%acIv{PUTWjR(2Zv5L&U7 z)wvc@=y7 zhwP!!{c|Twm~8q)W|6DaiW83vU1>7OP%)1dgH2X;8j69`+f=ie;}O9KHolh)qvK<~ z)%XDdmv!QYX{P8X((y?Dk@V*f051j7qk<=1T9_=LQ76h5C&+^#Vh|fKJerW z+uE49fm~Xg+var6P1cwZH8G?~*``_s2!#1`ViKbEN#tQ+RC`u601f2?Q_JYj@cm zkBz7gX=w7nHi6N&Q(#wEh;mzfV;gBq$J(;XaDQ61+h@0qj)^2*^yXX=)6@lR9334I z19=X}8(4ATe8u^lILimc@7rt??{av2k4N27{JJA;)^F(qS(!B3WF5M+w(R^ZL*Zv3 z%4)Sv)*>S=&|mvzRUP#d**YcWKbG|yxyvKAe;r3PNumJyh; zEk0oV2}ZTcZJlerWfaZaml=3|TPK1L?X@`_6HG86Y6or9_Ckn(dOAD{M2(qLTjbpB zlWCrApVK~9xGm4PfW9M_=IM6Yt@ra9lUbYRj2+oD#_4nVCUOyzEb#h{K{Uo;wK>MK zFm-Fwcy<=h7`x48pN2FhyS5_Rcivx=)EPc5i7DipRcK;Z6C*R0XVg;JXSz>nWy&-y zHotB@DJ?Y5lvw$SI^VKPousujr<%N`S<)^&S<2HlsRJ$7^IROU;g z%tdmxd7OEjVwc|2_nRhac^ac$k-jin6r_Kkd*ofpcWQIx^-jtf(?NNR=?!zC>6+=h zl49CoQZ1L2i|RGCkupmDL0fF;Yp#@+Yj0{d^@pX?(sVi5_=68?tk^G=>p?%{`{Fqp z3bo}%Ao$K#J+mX6#`QwwXHJIk>8gXPDv$W9cAu@-TGl?a_DE>iuBt721}j`sk}_-J zglTgICUG8wzs%+0iUyI@qkpfV<>yMnyH{0hf4U%<>w+fbO_(re(zJZX>QO$=z6O zjNkf^62o|J=**dlvU_${tXq;pSFp0DLd#AY)y^i#!kem>CnH(k8l(#g4WvGS{s$6T z5zN}US3SL`V%LUVt$(0aa>02+d{os1^kCv2S)5~%GF7-;fb8c(KX;PRFxz&+mcT-!j4vSxt?pYsNy z_V){H*_Rf`+LshKvMmO9ywbx>csn-<1s>nt0f`XNETM64pA9%ad@O^D`emF7vFZTwm zQm|_CiO`wi5X{N4<)LE>LtA0KZRg%x7g>q$+I6AjtIN;rDL=nCw0do2Ss7F%yzLM) zx|$~27KT%f72928IPWyCt0>^J6eU4P8v z`PeB2scb%fTq6rJ;+7H@AA;tE7oM-$yc5c;db-qDE<&p|MHW4E%s*Rn;Oe@BZqPF} zuV0O^FkPT$^64;GO&S_Lwlh@b4{zL3S$rHmxD^*m;g`ylYng4`ZXIlm@UEu3S-iDn z(W|)F`0AE<{4vo6Eol+>@g-bJEc9dO+>(12-d%oytj}W;shfNsGz52Vl0O-(vEfnPpA+;PsI->4^F?RlUczqBkpEaL{1gb%k;}w zwRCN0*^=;%b(KdJm0vhoe&#SOi1qq#mLMcfC*?T&$r_;v$2|6r=R@`2cMiC{m!VK& zMi>J-v|>m3xs{^qi zq<8OT6j43m)-4OIgO(nz8{2e+GNxhG=F{P_Q+0&J$j8M`CM~x4+bPg(DAm-$LyD`| z^jx@PanGX$3<27lqDk1g-)mW_8o(N6n~4`0S?8 zYHT{*aNcClSn*Y8TO;!1^C!yip@z9@jPN#p723r`j_m6EgU9hTFP~UT9&2ECX?z^X z!RxdV6{?$xR)=2}{+Fksl}^R(gaURy$6J^l(Ajh% zl%H8zweYFxxmC6t_*Y;YKp=rdCbVvOcn401Z+I3^hQ+ppi!Cx{nAPU@aWISo$aypw z#4v*(XOekv2dwm=Gs`Mhm4sHEtJ-?7{9GA)Ei3k~G!|0hIlTNpsH~b#H&&eaOyuBe zcu+jOCHB;33g^;e*&z*2)w=ZWf z)!jZi)nUDK`@H@psCvC569qo*l^34{9tGCOdMv@QW94VIncCirtbSbqjp{E)x6B?l zMjkGKY|>>VK5b1~e~nL(^_K`+Y9qUK`j`3*J*0oAzoY*_e@%Z$fBrhBj1lY8|wAElT^fc1b&<9oG(N&uY80r?d@P zCvAJY(5r*=TvpGRrdAGTxGJ>1)Zdbh0=s?JO-UQ5MO<7Rf)#-^icIVfjP(Px4jy z75P{41$m#mOWq={msiS*O%E#b&h(!Iz%0y=BPc@dsVO6PHm~Csg2cGRa4Et_y1M-TKQB7DSuSnRDP?xpqy7u zDn*BtXO*4GW~HCfQ|Y3(m2{=C(nwJh!Sb`^FP58@_bhK&UbFm0ou)pd+LaHKQrJ=L zsI;6?GEq7!9haU{#wf#-LRppeNZX}NmNk~8mW7s)mLZlDOM>*V zbVYJX?WLCHpUnHsi_HtndFI~j%qG+OrvEXmGx6fz#P7rn;%f1Jaj@852ninuJ%z^n zTl{PCDY;BqD=otvy0Zzkx#k(>N#?F*ui0i=E({acw z6S@d)p`*}BNXIeb*ycr|U2H2h7n_RlqAr?6B>YwQTKM$;x4&`!i$(Frj6c}&$wqBN z4zYvLQ8NAqqay&c!Ke&?X)roW;_}cT13ZT(^<{g&p2Tk4yDyuWn1{BC;}{K4tN#(S z0(2O^+=nfe^Uz`=*&_TzAGV-qAeu+s2co$Kc+`k}!~k;)Fk9Tpv?)NR0Av)PlK_$n z&1?V^ctpFVZU@AaIjRaE+Fd0_Y5rybs@>YPJhqt@}bOk`~0(2Qb*McH+381$C zT?Ak&Ko2W5aj?c6{2iXZUO3RRHl!qoavg6dIM;ak9q;f$VWW^B{vH63z7qgQ?*jnIy#OG&$G~)( z2N6sc0Kjwt089q}z_bGZOdG*0Kvog|p)VVqnuppON!yuM5#+W20J#kSKyHn%^<|UV z=b;t`QgewT8D{_h+-3j(Hyr@rrWq)y_}jiPxbjdV=^j#-7yytY8UQ4T0su*L0FXp8 zlBfny3}BI7V)F8l44`*Dk^lfD%>cal$OOQak3;}KR{;Q&zyp91H~>%r3qZ?nhY&z0 zf+3mqXZ~)0p9#oi{$_xm4DcgfnZqU(_B;0D$CS z09wApgaAVNa=a#&eNgVtyiGFd&%A|i=CY&BdCYHU74VIzY}@$Dhiz>xHIUZf`Tf`&E{9o+f7OpIU~}f-s9d&#)^~=$A(S(nhSPATTsC<~ z-$~>x`ym=mq~U`!oIt|9<7qgKh7ZtiED8IJq2Xu}b{$2+ZX-$9`+gGk8i8NWW8;gu z-bZ7G(3rtAW)KM-18G=D!kz^r>;cM1$SI%x-k*kfB=qKzuzNoeX62BuTQ&*1_9daC z4+-z>O~Nj{NZ7e2{k;bble$xoMZ$Z!k+4%&68i4NmIPMSwV{a9G1j9)_?>$pi>HmyCq4Q^|c0x=MyX=qt&C@ZORv z2;C)42%ROZAhebwLfF1Ugs@dHDX~rQ1O`O#*2M+zl3d&c!j$6H5Vj~L%9Q4QQgAar z$=dGk3Sp+d1%zGwW(d6#A?P>&g6@Q`OK8GEi1cqEWZDLm0qjvOIBO8Qghli4S3_V8 zniA}KADaN(g$E3US1;Z^l+A5RzfI|=9T|4%sI39$`k0Pd8*i-)kcmGY%HG>Hg}kMq zrUpnhKobKrHb9aA5^Fe!j87-8 zDa_Xq4NKF%#acHup=go5Uw>NPrf;JBYBjeC-0K*9xIRelulLov>z#E``$qd*tE^^N zDXXfxb*tV+Z?324iP|fAjIQX6_E+sAU}x88f7bp7lthHBB`hytXlD?X)?n`}mnp+a z88&A%zgows0{2F^)p{)IDT5uAd&&389@&a3v)JS!;E#s_hn!2f=~loYe-9inu&b0$ z?nF6d;IS!>d=0qex762xS3X$F#;&SmWC^$VKs{#GZm_e!f!49Fl=C!rPRhR)wW`m) zYBDh8F964UzuFjh-7dh+Rz+~bHLP!`;s$1Rnjmin*DWA+zaiEL}00#5lT5cvck(Nn*DN%|B zzIiv{d`(}OZkWnVJ4_fD=K@oX$wJxZqVL3a#XpF@6PJiZ;yi=l1qPRJ(mRFCLaDGq zC=vPrS4~;tT2}cW{|rBipUijS9eg|PNA4T$GwuR+O8Q>5%C`(`eIBQ<5o0+zQ+}FyGPuDO>6;-6J`R2zM`~n%^=1-u$Zh*XE1n)8-?TTYtbj z!aRuZ`=%dEdx6FGiC>77;&t(;ctCvGVE8Fd{(^8`I4MjMCJJMO#)PLAUlcEiL2;(| zusF`(-Gx62ZwkK^o)jJ-ygmOO2ngHwjr@3iBwy5mPvOGchm^HHEIca=6AGzN@EZRc z{xZLYU&;^R^Z5imihG6o6@Lb}=7s!Yd|y6`mw1-@6L*z-VCb5khu$JHG!OlOfPv`u z2DnPVAoQjI-XNd=y>5Wl#3GvFcjPq>y=s702pEKZYk-#t7>Hgn09}#`(2L})0R5VP zJoGCAykLOm2^fT~7=W(Z0})-f2O_#|1LsTPfb$i(LX!TRk?^dM;*0_4l0ML2eFp+N zPE(vTzzG8KfE}mc7y*L}c6<;zf{%@7o0y+7Fc0FP6WO%(g=jB%FGPC?7=WHJz|#iU zO+W$KWq_S{&O|m7l2C@A5K)F;0Kx|DCIf6Va5oqrfH5SI3(;!wUWiuV4<@ilc>Dx5 zu6vyjLgMmJiGfmV06zf(&_V+g5m0~@7+}5up2TlVWRs%v4dJD~A-wcQk7D#7n>3&R z%`(tt8ej$id1$%;rWs%=0r_YO0sYZr15in20GdSJ2B3!wFcI&Bnn&lMapXM@Jz#*b zxGfZhV;*9Y<^E_G`LRD5ilZm7N!|OQLFBz38fbt*BT0b)1`yC6C0rCjQMY#s( zhwptDT9SwQkoP>)+W@@?03m{a{-}omx)YF#vJBA809^^_XUGu!P#5E^GtPSmm|PGT z$a{Z7VCawBMiQ3+oCa_Z&=1)SU^9S~fIQUE038U(H)Mx=V|@nM!T6D`&mcP(Z*+am zN15cUKZ{!8QIpuT0sT-q`5~`XYA}%L@||xi-}#6x-}#6x-}#6x-}#6x-}xw!=7$mt z5RV^+T#NdlXd~As1Ly=)iy8UG8lP{h@%hFY4`POaLf3c@GmJONEB8ktdFzh^0&)>= z0L}m`0sRmnAkUC8@>u5YSe;6F_nYMR{>&HnIT#a({g@jRkNLy^RR*ZU)2Fg7{Od_< z9M_L|A0L4pO3h{7A+i0KKN(1WG{FBD;BCAMk^s_c29oiqVqP_3UopUM@ztqp4>^~i zUz>i+CHy($jF;xI3ApVvwozg(L%$sT7~{*q7+((N816KUZA0mt%N#TcI6y!Sv!4Ro zp&#pu-$|ZxnH>hgb^~D>UObuYjJb!|IQ;sQG(ASED-b@mDT9VL>Kbr=$%9_shVPoR(qUmgFd}2D= z%iPqU?rYBu;G((_<~&}z!RS5p$Mol6V|I~_v>V!YdMkZ9@Rw`#_jO%=POsD_>rM4H z^wauCJzvikWPT8Lg-d1o!5$RsYWfS38!-qqDdy;k$}mY}>wLOx)`UkVOnYQPfdg!f z!n>A!ap5VO+uFfuO_OBMzQK-nts(M4GmRz#YQL!^m3skr#@a-JZb8T>9giUDpg#atd34L zPX~t+EEB=fu}M&iuD>Z(Rq^ZY^$9bT{3-e3($jKd$@nA9+-$WKH?@{iIzJ9GA= ziPI*G53O5Nt4yt@`=PX{+`S)&9a_JN*tUR15)1>jodY9butEUk=r2{u=5@I1RjR0l zq7I1i_#H{KR{m_GPDZ7AwlpeLYujL`I_y9aqu&U@7VigA-KnZzV+F=wp|hu<&h=|s zwCdx9eyDW#@ZMjlx7F!txVs$?@;0%I25Rqbn0YpPyd*P`321T}KH zZQcedOJnTT>G3gS=z`%6{YQyyORpZdR2xr>-kr^J#%Q$a~t*UXOT<0nj+ z^yq|H6UO7{96oMXgN>@m-{!X6p-ncoeM+O-v+r#xz1`!u1IZx9J3fYztStj( z{_u}>Qv0;XPO7}THFWM-o3({}$5P1Xv^(r~Xa&UBr$^Ib>WzhV4fo95c8ksH1ao0J zQ;Mi6z4qH~hbY(hsM{OXu7QTxT`iLC*f3}p!g&T`hz^--)tD6WrJhf z1~KEc+uK!?&_Kf+))pzh*f2Z%yHhdtSt>22-c)K^uaw%!8@lx1UC$+Gf%T4s+NLO^ z(E3xUP1-*(mB1GK4l@-FA~>d4ZqL5;E!qFlRI>S8Fy9*@8I74G-%hgDsgYADf@F81 zSW&fINbO)IS=V2SYnEaXCshFc0Tt|{i*37PrN5Yls} zNo9i==Pc9hZOZ&-+tfdzQAV2}>xREjq)_`5@%A>gOuhTDXM@uX4f7r}W{Plo_AUOY z>|M98WVOS<4JT2i@V95*{Fdy0acIL?nT9_)z|Q-ev$^UXiC85vBENEtIbZeRgYd51 zV29H_wDK~T+g5Dcl0c6KT-X&pHR3=#c@A%16F#yyj+okq&IQApmR4=w6iePJF5=Lc zvM@f^h@e$%Sr$HZAcjPQpZ15&EUrAgIGVm)+#KGvy=wi6D1rt?wUx^+>G;Mdlw3rj ztJd#?Jj*YyP-wwRj)b=#wa~|PrC_ivS7%Xqd0SQBv_#*I?E$tlym^V4pjECv9=eQ8 z+zCg>^vaDjw^3Z`GPtYpXfO*hUaKbJ=6%jL=%Q&=mDJyYF zQfS%cs)Kt^U*k|zzS5LQVSi*m1JFi$UK>|?n625rewgjV5m9qwWTDip>ATMEq`EJ+-4)SBTzv&)vEE6x}nv}y9O`WT) zmQToorMIOyQmpwX98USt6fn8OxAa|lUnO72wY)5Rpe2hFv?_88MZiP*bL(+o9#>Li zDPm?%9UR5<0##LSmXk zONbs4j665lmZcsM-3;uN}zet#>*_h)n%~|A! zIuVJOGJ~KpZ}z_+SKyf|_)HG?8C+%$TF)FqoibyZ

4r&~!IOHeEkJgtTv1$WUq1k+PvTp0aE=Vmn9e7(g9jJrG|@nk6)>N1wXI^ltIn!+ zO~$9E^KE&z!{a43h;i+$NP^UwI>G$#0-Y1dP`IK#?enVKVT% ziEIWWt5GJJa?soVK$$3~dki1R*TE!;3L3wdT33%xwwh_^CN`6wrzpLeh zTr%pkobU#uY*@=FeM!C$3~f@imh*uaxd|j^YBZhj7Ke|3DwAkC<*_ge8`5^#2FdfG z80H#n5c8n{J|F-zpzErxl|0Pn(&raGml940w8pcJ)b$lnme8pWt(2tjN} zG1|0FF=}~+AYC*{qGlL**q_HXy;V&LteuwkUo|P{Apf6LlL~pgRj~~djox9@=haTi zN=39_3nxDXHc~BxQ$jnwfZNA;*(>aQfU@?^e;{yXC(bNx9c_p!kut`&>3Gj{z6%Fi zC{!M43J)$Pl=?pe7i63WdE}dPqA9T9g%`kcjujWIK2!;|ZY;+ELInr{@`^$33t-%9g=cnC$pHh+XP^<`S5G(~p!ar$F?CTsUlDW<*4 z?s2*x>Dt?q-mI6D?4egDwd3op`Pfa5@_akkUiLuhX1AyQqF!pUQB6~GHkXIWUMbLK zm&dL7&?%A_HlZU3^?8~>RF~CDjzT9UTfKH0pk@)&`ZTRdqckP80g~FzbBRq|R*;%C zUqd}`qYk^4nt%_~1pEfb|Cxc0k3PZktj|ME|I%k3&XKx)vh62OKQy>xpMZloGb zaQNIf>wPXh#R^ZJT0ymbdq1f~wqkN%87~~m^T|G|jcA-cyglI`OrATzpgV zecxGYobjNkY4?oy%2Q9;z-6j)&4g84YfnygoY+5c(%;A8u_#3;AJ?s5TAcLvR*NZNZs zVscit;ky7x8{YAB=;lFm;>N?v*`o+yWI*L@8JFvCL-%B79Zh zm}7jj)ddxG02)l9u@r6UO12Hld}?$y_$TsU|0OP7AWvTGzR2~lFbvn5LHQK>=rT5) zWj--_7?f1_YE#~r%27VM#|w_|%Auwz#l3lw>&7xw6qj{)@wL`)Se(rIj$V%)WgMp;U_F6dw)W%+J_Ibs zpdK{+D)0?=vettIIFGA1f3mutDypmMcHpb=LcG)JaKlFmzGwTYn?%fWHXCLdN2>z< zkl_Sl?dq_9o#AkR30Ifzs_8rjJdv+lF9waEE&aTN&19KSbx}?qCcY+UQ*~kn0bh#u z88nWf{`4N#mW9JGWQwp3C%!U`ERaAH-D!0aOxSBPrpA$zLP{*mO7L1kd_rtETeWZ( z%uD9u>gqUL4&q>dCg$PA9-M!XD}jTXmJgX5(p*OWLH`QQu9kyg)c=4%)XQKrbxuE_ zAJX^gJ9G>i_{;TT{Rud!F%?YsN9#lN0zF6X0S5doy@Q^qr|C&xsBh7E?Qhz5+81EZ ze_eZ5`-Ap7?L|0=8q|(z2ehZPt#A%?wYEen(&lM1!EAq=*7kmFu-0Ge0|!ujnq6zF zHP@QL0ajfzYe@a8`ZXBYhtv<$KdNu4zs0}l##%M$DJdYWk`_pFmGR0*{9QM;6&{|& zb}16&zsujtU&^1zAIpE1- zM9w?G!Nw2(IM`SY01h^OOnGqhkpZp~FbMgLH!3CMAu1*0q4$lrRRjz~R7x0#-Zg%t zrjvsZHJvO#R7xm7)O3=VeB)QgvEA|f@oXMe$Fs?a1*n`PD=-QlWSA=tLdC(K$FtoL zIh&kZnw3avJqZ2PDB%Yq#rFpI3jqVscLw;DfI;XR1AI+D0s6`SUlK47QE6!)`oci@ z+yI{ukcU1szzqThqE8G^B{qTAL8y|v4nh?K6rivHLb%(5?D`-#k$s2Nh~3{;QkcW&aPKu~{xWEA~=N@k}DOj)D0XukF$7>J_!W^06{ciMNcFKai(N-$>c! ztL9;*WkN4;51b)>-INM^$~y2s`FGTWXsF=dzTrc70b54$%ejaAgK%j!aLMnC;O$6) zNQp9$c=!l@QgFjaehM2L*^O7k(=#|es#`4gAtNpnw(zI84|NQubrRGq%I}r?EN@yy z$)C!8IbM2N(#)Mre=xP-{=z-Unb?hB`Ff1$$-D-C433$|uQbi0f`SLj5Ax0NYY+0R z@RSGnB-QD5`9PC*!>B-@Ix>rQ+MU+m)`@%vHV75(#|2}j@}IK783XuFgx)Gtxe4oK z)SIebc^RAm70CZ1kCncV=1UfHF&xd9Ay(*;wn$$iJ|c3$N+Ax;OtgTrAUW(sNVdxO z0|};g;zPxO({N9+V11MnMQTFWEwIfuthxm>{kPwwF73-}lm95sgD&IRXA;CGmU)5h}>!at7V zXAM?GI}^)1!@$@4LA{akr1V$mv~WY%A@t&pg1C2<8_8C(3)mLuH)t^P6CmErUm$u$ z|6u!9xV3^s?!zsrUL7}H71LSN3qOAXm>m#M3{KGIgh!j)hh4^?iF8>@Q^fWxoN_bp ztX8rzHL`aAM61;Sh>dFycjXhr9uyI;Tf`?u+ngQ`Xo~uvLp4kWoFjljyHgz2;eNYs7hWna-@qv)WskIuoR{J`B?B~0$x#lUVQ!yt{0wil*_XyFR(5K zJw`i$@D?f&0Ibwlb2;jSqmP5E;Q(nJKmRtco#e@>~1&h zlTpwo@azTMH=0N)+mt4*aphLI^kDe-d8jNrR4h7O;lC6rI}tj!A-r&};l!A@Sy{c* z7)iuv_wcjfRZGLG_8JvOWFnDnw}WPt4j3POBnn+1HyzOw88Y`F|iT5Q5DfoHJHvxaUZt(ciwRorzKNx?C`Pul(4SXgZ zwuMg;tY8`F4bI)dmm*>Zagh!FY6ss11;;Mr&x(XzFBu8JW;}vkTE-o0B5F@J+?Ba? zBzBF(HB7l$V{yFj_k1e>Hn_a7QS>xOm*mNZ8!zRrS;>fsWgbC_S^Ut_RQgVuY5s;w zF~{n|v_EMsH6UyeV)>J%mFzQY3R0;1>t4b8%J>6l-}QAo3SP(jCKQ~so^QwERonRI z@byxD8Elgw%wHq)h~d zh<ZL@HHA^Q__CBvn!fPG&Z!VJVCJC5oD`!LpH zAPU&Qw2b=;^C_%a7P4w#*lFv^f_oH#$=clb`h3_=BdEH~?XUrA?dqMBEw*7%D~id1 zI)E&vqRj?R?%>wr97a9l@o055XJR;0t=*srQNNzxUo*7zQmAAtIQWDG9M;5&4RET4 zc=HEdtFr78YKGHKfM+oWth8jwZ3TNbZVzM|&mbSEuHn+OddKG2!uHkcb9!|$TQz%P zb->94c|3EOLH%eeXP)BHP?~{dce-fiRx3QY0c&*irc_1QLU4-;=Z(UP_kqhX*bNLF zT?^~D;dl(C8p**gywP&vA>I?TpX9Fb7BwGL)oicXE(<`XX#C|eKAv@24T|180~Cd= zC@WwtV33X0>gp-35sESpVYdu)0tr!I8)vrxQrnuU-#E>s5zl{^WC4`1l9fCj@Z469 zn$Nt-paPm%zaW=^G@2P~tCl_jn@qG&kS=_H_fQRUTymOg6?ncnKNif`O6Twi@Og$) zTfvyK9E*Ab4|c42OYyFEM+pz=YzHplYxa^QW6#P1!VulUizZKCS;l&5_-{-I)d&*W ze4faZW@A&$LzDok`9$3bXW@X;I#;td3=M5YcgwwzsZ2HH*^Tm?9xwxk@=%{@0ue_4 z_?hsT#o<%cZmmht?#MjEnvy}~0&e%{Ha2vc6&O7RHaX`~I+JZ>TD;2|nKp3!(?&D_ zAwCE>QE+(03vw}BAyO?c9rJT3L^n{cNWQw-4woC-p5)^@dO$Z|Rn>>UQF0lh?bJBs zk}}Hj7VJOw1x79R8ZjI#Tn!-@jruisvIVX|A^7If^qO!b)MQ*xvp$cI$2JE3yV+XC*)?* zF3D?t(>%?rnD&WZiig3S+NZ*J@QRjD^T+*~n+qy|kJ(LZ5A+>6fQB&NF)N^9*5H@# zajQAYL&dY;gGctR3+b3)(M%luA$%sR)@mWg2f8jRRAr1YX$tW}e}?%!14sXnk4HXy zWfY$v+Q2oV+l3c=$Q1{FeT54ni~2D$61H?{zB}IoAM=x_@B|tcC*||8^*0>P!xa~{ z;K3KT&fwLOZUPXsK_T9;7S8#?QTeeilZrUJbYphLOCUzU3*ptL82i747-Y0|=st?b zTWw$~Ns`c~VEARO4>FO}CV?A!%EbRoZxzEVV)QQBBISr81B3k_Y)g(ZpE66P$Hg~< zGA@OEij~oFW)aY5Xt2-o{8A2dY{%{fW81%57Fe7nlXy;?EVf2X@8%E6n{IiaBm;WFP_JB%7C{()n)*9! z1PWIdIUX~jBnuF-!E<8)ZXeC16vftB6g!BOwB6YW6kJ}|kayJ`?YcF_D;!53z&DcQ zLVaHED?bljWWm)vxecJv9ddNr8pyGT76ym?Aj?%CZPP55ECwf*M#eFB$jt7pI}uU8 zdLZ~gUfrsz7hbb0yuBo}`b_1;iy(c%8PMo@ITqEn*zU8|9fqlwCB%53^FD_qj#h8$ zMRK*xs!jO=%g?Oo**&yuX?XS1QT4K|%hlzmI~h_xS5OZK$BUTF)vd1Dx}@UL9uS5r zE*>ZD(G5SY^^@4ZeEkkF4l7hKw>qzJa1X86o;S@H|IYCT91I0j;hs^9@ zEN3bJmE%qJG@kuOE({_I_i^({x&cK8YD&*9=>!AM z7&41bm!IDhDtkJ-EJ)0)k8ML0q7THL@~w`9q8i>cZ}<&ZTPOHsGMhNs;rXD}zTu zm*6%CGD74#$rC+Y@mnJ96ZZ7-E+2Lp9|L|JvkUkjt2O z4cNLwsLQb^;=2b|(|{s0qBrVD2Qh?O*vG)NVC1{Eb0_e|FoNM4hXa?Z7Ot&2x4!D! zPQKy9FxT&pt;Dxq}|otYQqID2#xS;R{Z?d48}Mf+l9+L_w@FKQSVc8Ox-yIO;M~ zBI<@9;O6UrRRn6|tBX0JR)IUpfMZ_dEHU;c zm*xe#wh~4lK);qP1n{0_LK;5TT2S$!sk|lHz-AZ${9c1K+m@-pk6R0C06X~m9H9pr zbhZ+n;7BXp12^Gtc^<{`55xYJLJlB3+ETcLl2ua`V?uF^xkw)-{Xz1I15upzD4;XU zZ0M06g6(|5TOu#dWH!O;dP1nPK{j3Rfy;1)C+AdIRGfr+HxoudHMjN=vhj=zIQIxt zCGP2?;Eps0e7E^y2IfrsSus@9hv?KF$OMae6M_Uj^+gc$wuN@!Fo!$k9FD-l* zCZ5~N=wjoV|43ld?`3?Ewx zn;I1OZTQ zu&6mtPP}7lNXW#UIT#k=2_ZTObT4FSg)fi|mVp9$UBNRr)J=xF5In_EN=s%cE<&go zT~33_XOD_Hj4}yYj5cDTo8u^VO=%=aNcu?P28SRYzs`{C>7Ph>HTaGHN<)@KVo@svH zbOsEhdJ2`?c=%9>C~c9=xNUZs>yEe0#8c48TH{33CC;Z9gMz5O;au_!+D3L+yaU$XmS&tTYhgW&dEe=P> ziylwFuQi98fBOc%YYscM?96z4{VQZgeeklcQQD@j5s$rJqb6#cDWOYSu&10fZTy6J zIQ?t59C-HEC>Hf5cvWja%VYRF9p}K-|MQpS7)Rf+7)@Fc0zkr zUZ8E!R)J+-q1H?D%D>ZEYDt=+exZJ(zOB9}y`Zj)*(?e2 zU*#L%4eo~iwtiVZ38szn^@;lZV9a=r-dKB08?FANo>SdwTUCZDB8J0e*g;E6%W~+L z7Unj@2|}%Fj7K#t9o`f-(U)#v_P|cBfQuhtDHRtdus9lp8 zkr-nlU()eR$Pm9jpH+(zA|oD(e3=*d($>-$_}WPNJXXJwbL+o8QV(}d{m9wGzl7mI z#yXQckDD@m_Jr{dTQ)Fe@^ihk)9bxW!(Eo`NTSe3CcF3 z0Q~Ng?1(0H5hEfK3}=MdIDbBy8G%4=8LjF4K?LFTC)nhcbvX=BK42_Hlky`o>rZfl zFfha%HI6*rfQ(1hrR$|;HBjfCbqL+-9kj_QW2Y(R#%0V+MgH`;MVJt7T8+E<`p%qLrd0M z)KH^IJ=Dha$52vag%TrQs81E6QgLv*&h5h@wyv}oeHN4^QrCgec=6+GdXc`YrhK&y zPtgxFKtJk5#VASAU#Uq(ou(MSQl}}#qo`l2K@jTlB__1hea{)c77;Io)K`j;js*;) zzX>5TKz~y_rwd$P^ELHvW=376&-4D-|{XPJe2dlH8!pUcqKcoF(DY|SPFSJ+RMT7a-{Ig)ZJWL;9YA$}I?&VVX#_T)ys&T?H zZ2|bqJS)y&UKBfmF==c5d-iedsOc^A7v=_=hFS|3mBZ|I{dMq|xr2M1nl(TiWd6&JjD~gMPL*Ze7f_2Ej5P;iMZv zx{yULQ6=YAz&>xvTJVG#mo0Xr_ncyKCJ+N`~>2h|cK{<2=D3^f6Rcv3LHnZb7Xl5KGd+YN;I*Q#y`k7q`epXxd z7hQY@ZY-j@G*CbHCDpX}+1WU}ily?4RZwWjH+YnSEZDo6&A`P=;p&IrDhOWB7wvd+ zt~d+>hn*q_mY_+rpZlIqO0zW>Qc{>tbomuSL-~wqSK{W$=M|jH>Iv5J>cGk z89SRvT9gSMUFX@1i3lz_;pWT8dltc7y&rRteARa@Xf)Th9h zG`#F`c++999mUprh1epS6ZRg#7pE=K!7J=8yF1mzc$|0eT5GTI`1vn;tsM)Mx(m0p z|AyCE?9UJqikx=)-8-rM&-dp@`%5(>}crX#f?7{Bjwba|bhHxR|N}a@L^HidBm|Q#DK_T?cjqhvf9a+VJcbvsP6+Um{&jJXfCycZW=XqwvG@JowAfv#Q%y4Ni1SyP*}4 z8%yS;!A~*sYT8fZ$?wyXN%(LR5@t6hVb3HIc1k3nJ%NO_coJIUNZ2u!gdG}@uzd^( z+eOnbii8QUYXqT2!nP_2+b9BD<%L>X$V+RPgsmhJW}0beB4JCBge?RTHs?v0!O@WA zIV3$1L7Q)DsX}OSwVEo2fi4??V*7wPx6=l8o~ns+B0cQ~gB&(W4%=7%?g`V2>;my+ zutQkJKMKl%@d#gG(Tb>gb}_`I%E(uQ#&`|~r&TWsXx;7cr9VOZToLtT=b7;vzY&_^ zS50VseVZ5XLE@vT(cnC|Iuwb;CMDBQA-4!#=g{<942hsvCkA7ok@&obz6|a&BQwkT zAIHaJ)Dpb5{7FU=o7S(VhZ@(_XsvDdehbRRQG#d=UbLXI=$2YL-Bbw~+;dpCAI?c} zuQOR_uz+T$t+-w6IAM!)PCUmol}70ToFMPZO{?436ua^R#UCx}m8ZlBW;hi?wm3~G z!ez3}$$I$Tt3$|ECl{{S?Btk+w>#NCpv!C--SW(QS760tKAr4*{?b-vAU!JepWMF$ z8nj)>-pj7b!V8weeq#DswjW-wm~DaITgP75g7NuL6n5RC<-c~2)w`U?IiRK%=hMf&+luwspZsu>eQ)o z{@U}1s?QA?(N11^QHXA;t>f;^%MWtj@`6qh9=lgT&>f2dHC8v1HK6!d3St!b)dW1fUIaO2}D|IKx!cHJH!?d&7#x#O-3tg<#% z?GtCsnt1136KCPt8J<2e()z4f3;$0lRgHeCkixhZh}g4Lv)Zmjvuao^kVcQX9NO%7 z>JW=>tzI?t1|aAEgL;*8FfA04S>k?ZTH8xnRt;`~y0hEH(0KOd6Hw`L9cz1YozPx9 z^Xf}*TH*jhYaeae%$^-cZ7g}I%9+FmST^3^UQ?346x^g_YiG0NA;H5fOa7x~R%1;S ze#dPo(nal!3R>{HPg@nV{3@f4jb5x8*s7%^(9#y^c^X?+&K|A8PQjdJ>JC#%i#1wr zhVw>u8f8fcb^V?UQSc`CE5WSd0{JzPry!VBsA)I0<|6qrlKCOZ6?bmi)>6Gj&+P+qwrDZGKYt)Y$6@mfnUjB_Wc#IQkmby?jd3q_R??U8)b>E47T+uxpb4@ z`fH@2O|YMvqQv*m4C&Mq|Uj2F9*Yq9j zH{`hHRrR013@5Y0Z;|H|BwgIuErG)B>uutvs<(u}=(`=SqwlsKBbvB$0VoLYb;BJ- z)8chu*SFw0Zb`;A93syus6he9M!ZgPjoPDdh?*`WsN2Ury@Pf%^h$^o6JTU2Br%Q< z#%}wZSY`93fu9pcN6Df_64@Zk*=@io^SkVFQ`dh^k^uPOO6BC(p*LYPbNMs!fTCcy zIkY5KcBZG9)PaAt8F3!B_5_(8`t}Q=6Dg*4SK0cggDzSK&bOxulh_We*p0=0LFQW{ z$KJ!%eL*I$OaCJ46}15t6stQ)rqfzodMfB0e3SHIi6_bIo=%|QNkVE{i&|uo#aH$~ z0~(okhzwvay-t=XX?xsTvfm)eMFw0u*&es*O>!b8vZAnV4^!T#r5)IVeZ7!SFgn%m7e0a6V9Ux;r6)1mx=rU(+i90AqwxlW&FyjE-4Rx?n+%|}>KNEb zx8`BjLL^U7u-)h5iHoW6Z^E~-onRNX{v#MO0}L!|A^7F1=mQudwo^MW3zBz{aqQc_ zkS&pvoEgC8z)A=6I6!V+ZKIkFs21*;GJ+VkzCuvlVwRR*XxP2GF<90m6$N7UO9dKv zfrXJYU5*TY2<2%N@*={yyf{@Ctm>G8r`2T>P1y$9zL$Kk<(vIPtl`Iw49zY9hp(b0G5s$gbJVg7U*=lMsy=SU3-J{DPqN$IGXgMPau&WD1h6H_7&iU+%;nc5@ z?q{!eqFy?0f+mPF*FNr){|3WTl zW%Cs{zrfw-G>Z=kW+7XkPiwXa+3FXKiKIC;{1EsCuF*Yya2ffriz_ld`oq4v9&^Gs!$|ziMr$DVMRV5 zU@-4L$iHtA?EH}Au!lY(FDT;RSje0old&{d?crxCZfeRt`h=V?Y4-~kg`io8#jds5 zL}O`q$2vBG-od(k244ZL&tOq+k~B8`Goru6wk5emJpCDoW;;G5A!X@kXmf(WMpFmD zCd`JDg0xL`V%IJby%}JkXKT%OVB_H43oHMD%>dyBhOw?vQ1b$aQ}Pk1|Aq`@m%k;? zDdZEl=yTT3HeP{u%8{;=vNz6?LAu(G{Zl2=Y3!%5GW88d$wNx&K(Caj4?9MNsw#lp z2~z>~{aZxGUi*+JeL7$b&+d7L#IT_s5x?1D5;Vbu1GpbZL?d9sk$aP3um{I7G=j22 z-;sgr$zyHyJz!?B+m2&~U`}0N(KgCwh+Yc=VM(gE7w)!JSv;;RYc_3$Y>^tD0jEWI z`{QQ23L!(1r?P3SFfdh^#m@gg`mm}MIKK@4mJC%^6MYTgD`)jlqG_kqZ&O>Qo6Ah^ z8V?w*81B<=gGPYqL)(kQSas;F5;0S~dAlkqiVMpsx<)V#qie`%;ccXPjP6|X=p222 zvn5?no3jP04h~V-kZxd3i{DiI_$!`pX@^r5EFh1t&fQx-gA4PhyIWjVqcU@d4l{2YE0$FY@XSP{ zL9^0nM;lqkiKlF&6`1@Aff!RO=+LLJwbt&bLIL|L*WFy*O^nQXm@H7t0KTnBId>i= zLr90DRH2%0-o3b)&LB3C()2zaU-R>FZ3R4MhICd4+wHs9zW2dLf^Wcc%IQyZxFGn# zb*efJn{Kn9yLG2hEW(46ewOws$@|85Ngw*jo^F(y*t^}_X$%@CBH1QzJ7%C z50$<`;>36}+`Ejbi+Cr?a7cAgzej7b{9wLBjhZXQ*G)&CN{V{jSQ|4kS%B$L*wVj? zM)G4gJdnEBwJ)(Xa65l?$0@M&s_PKkJRS$T{WZ+J`%jVNUI&)Q3wXTSVS}NPY%J8W zK7I5&fSMgF+Cbw;f<*TMpX(CIfnSA5s$5PkgT=8$Uy+{n7K$#3Vz6>ViU9c+`;HFl zvp0TdOl)oE!M&voP}+97Gs{`>sG=MBj#GD*Qop z>CZ%4g3o2Y!TVV;lu#=!{F?OF*P63aC0cy9i{mFxEj#}escuuYi>Loy;R5LOhWWdT zIgVqSd+Ib+^<4czF3)( zQQc24i-4{t+v+_>{;ye!VKDEA&bvu&xtiA=yqXndv~7zy0W@X6qr zecNtKo`>`@smA@Q&b+vnzg4~V&v`R#BSNsq_wc=+to zK@~};_@=0%~%6|K3VOpXd&S?x5W5d zzw5ksq15JOa8hk)^LS6_-f2W5rpnf&xGF#?^0$21i$^UQLYo^_>@+|HjM}l-88|M> zC;&3vKp$2-gTSNy<%Siz*;6yf8#SRJ|e~hCD#LJj?!kcGDU@WV=EQOP1o< z0Xs&q>4hZ=ipqTW=k)Gn=xg3Q0FLk6ho(1f-H1+USn^oossj!C7bA-IBK};yHKOR# z2Z6@2wsB*f;q>mMs2#roeuY)eB!jKIi50%hjQKCz5HZWLf3CO0YzkJDFmQo#7j0)t<1nr>~QJn%C5Is+YwV zg;n4MWo&a4-K^kuaHC~2qp3n`?FM=y%WFrkC{rW2tUdkpCc!IWpuPD+2l}Bh4k)vT z>&#YkqzaX>8`%ClE=E55ZR$i%w8`w}31%5;?e}8yPvQH=$q?yAq9sHCNvqK#miDKz z>kIG_X)0S0OU;oNihwQ)uWP@&F@|DkUp;sUmIWX$*s&PeiEj(IlJ{U+_$`*MSEy4n z*s>TX+0h2V-swU=j;tq451p(&j{bb}V5xl{wV}8z4n2lrua+I}Mn8x{`8NVP0N;fB zJ4$}EY{zx%ZAatj(KbZt6X1V*Ysy-%Qvanu@z#xMLPUhiUmL`6`NOq>pyC)364{ngp_VU^Jwl+oh7g6#>al& zuyW0y(t^^wf_ZjFz~wFQ<@r1X_!ob<3$Y5k9CFoPm}|EOyt#$>8ID|MMn2vI&(8(W ztj`y4xdMT_ygYc+=DA?+kn6~|X9RNd0Gs%wjR8zx>|MuM@p^HIv`@Pd z?HQRKuzQy+Bg5qdG%?vACUoF>(1<7xR5$(&;^LM8h1IzmFlV?zIJ`mZk|jBNAbSOf_W;PI!2!xC@m`EqtFSc&ekH! zzs-L%KV&>;%r;~gEV@y;B;i4ABi*3gL0ojM`h9h|TBBMA;Dxubl(W^f!@9FAzu*Er zKXl|5F;Uc)r^EL$3BH$X<8|EQoxBFO%QBXD0nQiJ>*6@El-+Y(ED%fNpi|f3@$kg= zq765UQksvx7e|P5`L|nLo1e-?{sf{$p^~4(Au!QkJ1*hR*`ec?K$WD>m|<|yOAW=^fOC!2N|DGJ#AmjPVq>eZa0E8CnVw$m17^q?`LQ{+6q`$g=k4nUv1u_t_d z$0UlTxZK496SXlhG2){$B`;gvNtM$7?g?#661R$~-U)K@J1)c5^y+V-PBW|49MA4f z6g!ENSmIUjl4^c8Hu(Zjlco8dLWh^z94$wioEn9`YP$7*c*6Ow#F+Xc|Tjp2<(-G4gAfK)?dJRVna}65(dO*k>*Ollf0CY3yhqR39$R^TX z^Reb$ykq^M`gYZ)s(C7txLLeI(y<7^f>d2T^brZc1r?J^sCYUhZ& zLVsa)Rpnjz1ycv7&nq5QJ+^pc;oyT#LG4f>Q z;D$}x#iAOg4Zw#sd*WTWg}L*J`oi$a=JEzo2(LuNf|81iIqoSQ_lOBaLxz+W53a19 zls>IuM9Gvq$7JV%p}x_Ra{_nG_Ek)6S)G!?z=d_@#7^b`3uvwy-{V}F%`pINbOe$~ zehrFQWG^mrR*xF$Egf^GCs0vbRyue1s72#)rcBGvt)3UC&Yk9*Gom+5P&F85MEX*yOG_q>^@VPZPb7zmw zo=~{RSzJ6Ne?s|a&#aLnT3Z8RKA39Z-FF*6MLZI|fdo3^jEKSYtS``0DrVT^oUEZG zbMBomA$?X}Nq*6Y^tq!lhRj_!`@Vwoit)2b+=GXDM~up^@cFWMm3`d!O(q6G)Zw$i zrW^nlH?{_xPL2WOkHZn@Ar-?OIU@Fv`!-Af`xi7d=ylvthUF7X2u`{+21xRrKzEYQ zKHV+m(9or{b8i5R!VY=JHv~PO_T|&dSC1lzQ>c>f&!hH zcApJqy?$s%r5V^#m2eEuSDh@gn!ZoF$yA1*8cHe-PQ~u9yP*M!q$0-v!4+pxx`@uE zaWWN6+q!`1I~+DZe*qFHl1g)o3#k6Agj0!?shn=xxfla<2|%zQiz=wdF+Sj+`2wBM zxgYOE=f=pCe!NM2Fr)l7rxzI5idNa1V;o+8$bUb5Mx^azGH#Gjj1esCJq{aoMtc}Y zuVsvyW4HxCAX+96h^U9;wB-hllpSa)8O>mFoIqp@4zuj&0~jNVOy$LhsUoH2xQHH` z8-o;fhG?PE9Ao#o9RagUpeH)Eb&zEOF1U}`0A^*Ew2<=Ziiq(*BxdU##PAqpDicAa z#Z5-8GG{Fg8=h){BT~!oNK~3*AdI*I28n>%SuxBptGIGVZrS{ibN!R;c?FIsgG&ch zPpI-O^f)TLqY8@#4INoAYJR>%OO_D$I&$!-#GhrdC$!EbxtMU2)9>~Mw3r1Y2gG-& zUaoKl^joU{BMTcDTn+(wk6%7a$o+%9^E*HXXAbGw15FEJ-_)qL%4u z_%+{u+O!mVR;rZ#f4{|~@bv#-uc%RO7Rfxr&Ds7o$!=zbo41_Fw^~xq0k=v62iDwekZXtd%}L;-6Id#QF%= zL61Oo{asYH-$6vHrD)9fG&ug|>)FN{+Gq7q(T)kX(!>s(5IeUB=^PUeycxHc=T3-m zvzvwVaInL7TRS3li_TKxO@z4x`SUC1wH2DeY3=URXu#VcZBg0$+~R^;rgX!uqvQ** zbHB*K+&*urRVI*sU*-Jr(pwXNYV#lnWGV=_y(wlQ#zbeSB(e0?`Eg?u{Vy?2(FtxK z`wjS4+j`j@sRpTDs&Ks)G&2i(WCg%T*zZBWuL$-zlXXOoddbzgWp-Hnp;mc{+%A7F zio5CPta*94`SWg>+3D&{h#o`LGE%opYG*S~im@4y<-p`PSuNGFupI5YWkGmOh1H)F zJ1euh9m%4UJ+C}>Uf`D5?HRt+U-Frl__2l2@5C#+MAZ?iBeE_&mor|}==GAU*9NT6 z<-!Z3o1;`w27a6nt=k3bcAOqJTiN!$s(~#^0WPt-`M$hU*Z2GV|G&TF!~JbdqtR5t|JCrHg8y^3%{E6sZp4*8vLs9X7N90n{z?8;*e7s;NB_O9L;ocA z8@r2pf+<5E%HQt~3s{1JHzHXZIBp!eG{326RaI$oT}e?>X`?R**x!!IsIlvvk~T0f z5M7j}+|yLlxTaA7vUi1@2}AVyi9$y^I~j@iq=Wf|a)`Ly!PpsT!!QFr>0~A&!OOas zDinH=iPr{Bn1D9fl#=QiYAZ{Nn;N@Qy*J&&jHI|oJr}rm0)A-$GX`&oVumw@^#)zX zjrxg*?>MGEi@1)v4C9d&AD_c4Wwri$I~EATk#7G!A(7@r1j6qhzW+B_AE5h6{y=_F zJ|^RgFXbmyunGFx0xn*PLt(VX;J%#T)w7+x9zEg*HcXqUQ9E%(^ zuJhuJXE)q&=IGWlTW@1UIs`>0hQcGAmt9ZYZ)8GgyRNxIn_h#mpe^6iP7HPEHIqhB zh}UQsbJq={%N?= zaFe0TFvl>?px1w^e@pMxU!*V5$Lk$q_%HcK`F;E)d<$R7yZI=7DnCm1lkP3uQ@T5J zShrTUR2QKASo@;(koH<_wKiI7)P`s&X#6Ey$N0k&CX%;$_L3{l+}?h6*P+wb@3H$b zPOm?tW>`ADd?ctt-ZKKy*&Q!F5*j#~HlZ`St~hn@y3QjPc5d0G-Z!)3%)#J}l!qpE zY97w%K<7}as|;m~19H+t~$GkdS@^xk&r;Ty(u9EE2@Z?LTk z-`08X;ORZPPH(+9X#_nBb?w-9de=Rt9y-va+&{sWr}j3r?u3q$-azF?sMlw9U(~s2 z`yx_F=N`hJT6KKK%EL31s!8sq18Qz!$L1rE9WNZ2&P32fsKdB>X7I@I^gPtL{faZU z9qrt6>FMh(Qj6`pa!cpdD@J$hJRI8LIBMy5|LDXHbR;aS^UBSq4qj?C8awwM>e_r; zj8boRURGkdvE$goq1zvs)sgy$Q`XZ#sB`0i&OIAa$I)|8$4h$xN73Xrb#A<;bIZZB z)U4C{A3FWe&880Xk=Y$v4^GY_x!N7_ldZ@J>k!+X!{x%JH6 z_SvM)Q-=?CZoB5pz71VhKd_)DLv2e(Pe#|}*Pm&>W^Bichi5P*x*XwcTTnQf(oyr! z*hPesQ-`;8?YiRZjekG;_lr*NyehU&-s$TPc5d8n4x$}B_xaw%&4NdA~nQEcj2AzLb`4^>?YTXQ&STy z>bnZ>*!FPbc=Gb26VuYOPG9vP$VIi-t~+*h-iX7tA096W^aLU`qsvQcnzF?GXdxZ2 zpE3R%vi(bDj81+9Fu|Oxs`u=-x0LVCsf308=(-0Vc0+2AH(I7+~W1G=K@~Edb-! zGXUe-NtvI!vQXC9|>?#BY@}}0O1P>-wVbOK6Ub&05!$F-~Fk4TK-UePkxg* zMjxP#p|zS?;5*Sf?-au$Z_BMr0^-^m#p#-PSEsX6@cvy);V@IE$rfcZM;V?vT#{$2nZZfdDKb%?MJ$WzlJxYfL zTeTKIQ3ZgN1po?(u3AC5#&Xi)%Yp$cl|}h`jf_6jNc-f+#ZKvx-!Xp<|6gkU#L;sb zX=n@`{MU#K*62`&MjOvOL+3CzOVOf9MeVW;{L~$c<(~*2f3o3j?^R zXguB>z)hlNj3z&H`naI~@Ehq3b4TLG#&MHTp!f7R4kM(BG2Lk9N{zfn&bwM*rc%t6 zV20!~_%@ok#yf>&EP8yLVV2-MGLvZ~=G18E6OH_h{IUG5{IdL{dve-Z@Yvdx1HI3KU`@E;q=3}^WdH?e0T&QoZfu- zsl(UNgwXZyHD`|AaJJ(B@4M={;l{JuFY^Q_m-pS;x$%y!YcAF)SATEsJh<`9fsMmR z8C^GS?%KO?6hS+W>;!g3lY2T3dx4#^H|`jz5Vmdu&86q*Aii_cHD~X-O}XXb2fMDh z4Ga%fx#i-$T{rGC5cJeT*POZZ5t&%W+F|@YjkHv(5uP?Ys{d8Lmfr_WeI4(;H;4_Q zy-$y49kgOb(_+2`%+q;dzR1HJ#|6(?MyD|qX>`%irw%^Qg%6y1xTEWq3(xG{e&*8q zPd&8p^i_A9I=s2-hI`ID>?U`@h#BlokYDz2pUARD*_=^kQ-s}VGFq%dQk?BYG_S$# zRQ7~-o|}CfNu&$V@=F@|3y}3M?GFgOS>Bc|W-4aT0NxaP0=_)X;yb!FZ3Sb966g^A zv|>!c6;axqTkblu_n|X;z_R;0O`3_4)@WpxvOI*mv)M*|5G8-Ek-w8ahdMu$ zOLX)o)ZAFwKdfMu{~sIW?)u6rY}2yC#3F zu`;2q(At*S*y8N_vW%`MvoXTzG@G4{Zi+?uk$#HN=`@+472wa5TH97pRaF#ei!g@b zH$u5=k3}IEL$iv?iW({++tG5Z!jq}WU1W`ott(EdsIJHeFSkaA$7JOeU6qdsXOzViVX@fkc4Ifi$3!>9YPXrp9$&)@#zel4iM1(B^)VSmIS*u-ZON*+S3d5Ui)dkg!N#)_O-BtORa70-x5e|#Z;k0#Ad`xsxJT{xz z|8@p4L4U2eNPQi}xn&J$P05yeQ)6;gZMxZ+Vvkn`{M( z`weHSBg$fqaGI?~$3P}59zwF%E#2>9@Yj*+Yl(GB?B&ja>;jW3J1-^2mbA9KDBE6D z=`gL!v=+xY7Z*59wJnatMbS02-M`n@5_a-BjCP07)VG^@qO3lW9op!3T0-|Kx^Fh|&J4vW>_ z5+2|C045ZY$pM|>clt!OuO%vS^TN$ViIq*!g(;bp`Ac%D@~g_$HC0Df*b{Q{${UI^ zTNfq7=NYqC4{QmeJ;G*j8cpOyc@&ZCXF?%CZ*lz&6Z$HDpQyF2vgV|kn`}inmL+LP z%|>T=c63W_T54NjS<2eV#Dp4WL0ns0VtH!6masvyN0>||m&e%meMDKiNe-LicbI6) zP#a=WRc&2c#oFqk_|=QcE9>0(MFp0cjLI0-lE#Y6?A)yIy2h-^mZFx#riT0hJU~Nx z>=wJz?tdM=hOk8e2`F}u^xbcx7z9M56XZ&S5ybKNL~c$hb)=UqF&D;I3T^h>SZAy~ zeVx&i9t{?nIiV@LzBt=xip_AEqGM{K2UKpdMmUTvk8_X)P)RmtPgm$w`JXGb$N!$# z#*c+^75yc&&Ekl#*g?ndgeC|JD`={2%u7yp$GT$*D^r%_no6C?skJeQ)-~oDo1-qN z%5E~dVrm`fEq#O&e05of0RSy;>?r%D&Vsh=2Lx`?p0s=C#=q? zPp~)VIFoDI)-~sZ$JJNGarSa&BbXsS;fYJOyX@T*wQ@hj#nCQHHih^mL!wpkatPIbe1~+S`D>rMN^VUu0A`xCQ6RssnQ-)ui z31oUUTxvAvS6meV&jAKTOgQ&6J|4lvd)iT&Pw1>FUu#OKGUpf<71pmaN4M6jE2&N? zDriY-&M3}^i78#%n31(6w=p)UX-)U)3hk2u{pdjrLoB5N=#fv%Ksf>!_(i|SgJKa1*?q4M0Z<8MtyZj z&FXd5#H{iXS4B%>vopN9Fx{9EAMZ9L=ed(|Qp*cS1?ON$_k&TNl8;icymkk>fFNe2D_`=kzpyUPqTzu%%=3Z z{A6=hV?u0d4q@mV)MPd=w6b^zjpi9drDeeb#`rW-U2JoUy?S+HT3T*=bX<5vd_`=n zeO=n3YD->eYg}tyn=7xz*^=kXBn+K{y2{WSQJPP~Mr!0*6I2t7?lHN*elTT=je39$|5~Z1C;;XbLw*ovQ?M&+LqViAsmd zia$=_#+9oo(x2@#&K%C73B#i4?$yn{C4)Nk-)px|AI72}xVNIFsc22<(0AHQxGI$! zGpAo=7Ta`LEugr$v8lFt=mN|}d=v_Z>Q{i#I!#m>fl}t?hI}4uPCU%bjqBG4c83|y za}VGPJ{hL#6}~7RU#;C*)Mrt2H-R0dAGSgP&c1xv&9kn(&I3pl8c!UTm*{1 z&kW~6aOMau4uunZ9DZN~7eqBp$I0V36Pk_xHjZ0Foj(nK7R=euEPPi8+-?Zrc$^%< zg`%mrDukPdW|I6ReEk${;G9{goyVUg!z%vvWM%}KfybsWq4=BcS$4-hYkYVi1~u?W5o_%$qxk8;MY`Is?3EG&kBX(Ga9giT9oto)WTN9;Xcq z3qul4y@#k%cj0P z)8(`UBZlYue8u&WJT9~C_Bt-0tk>3pO0p^?l}jVVM`100g7A#cDoiuHVYtX((!a02 zT<_#N`R)7y-KV;1b#dBnwYO`RXgTfxR|fNnd!es=&s@tS(jU{;(Q~Lzs4J+s=sk2L znx}bBb0ze(X_Pw>-@k>M=TR61D;lP}VEV#oa;%6DG<;xCP~aRYL=&ydAFA6>RMC+h zoxM0AvZ$^iQoWAs9;}fjhvq5&*KS|=qLyzmTb*{3JDijss2Mejl#d_T!kI?&VuE~5 zS?uoFeYt~0ESuG4vDuc-@^R-nNA7ID$DFc8W`@aR_srhR72%^>IHSLb$X!+k%t9@n z@n2%XVskm{7WeeuXToALo9*W1)Bb!WU{=owpVST~FfnyVCVY2UTrS7*DgPxVtQNb; zYH?5geI~3HlhbKkKIy;2gvDxgS&Z(9zt4ol;&ND=rC~ixOgNWeV?$g0qb4CcJ3SP3 ze)JnXN`srh@Uc1Ep$aqDyM=T5I;Kj6DRiT$G~~a`gvoAp0u#YKO!&sG!i34@bQm4( z3Ch^@6JX-hW`r3*hkN`0g4JX-T3zmO0|*xQHAbg<>;M9EeWSzf4pIpI7O>bNNJ(~c z#ux$2QB}H3h_0$Fuc%2+%gR;+R#9`)>PRIEZR_9U{#hK=AhJ24jE)GC-EM)^^1vaB z^hBOZnXt5Afu#cSk)E3W+>>l%bBN37 zg4KbHfIm>?A1KmFX2VQQtI1=tWXOM3nXoizg)JgBM~3uAi=5?KY4FLd{)5OGWwb^Z zK`Pj6Zn5`BwnSNt5oCVeXmks`N3u$=IxI#Nr#+=Kr zBU8^%CP-vObA%rjQ<^k zXz;^ZII~YNn4^?gdZ!)UJ^klYYbL7>uoUUESu?01i*%mTTQrjvH#=aZ!-)57;TDWh zzaC(bL{q*TKv^VN<+n@YIg_I{{ zN-0vDv`~tYtWtzDU79G3mqtqgl3rrOU&ZfXgYl!U`cz$P`k9IANg>C0Kg(Z}lN z>m7QdeujRcew==!Uet5^Z~XWCzwnzz*rda6;@kN)zLBqjy~`{3Tt1yo%P%_t~;$e3HzE~);+8HhwfqB0o`8M;k-+CovuT7g>Iwn0$r=F zPFJB@1v{Rzb*Z{I-2$CcXVT5oP123mjnYXvtxlu;LHm{V6YVMOd)n8vLC3XEX&==d z*6!EdqrFXglNM{YYA@BU*PaJ&?F55AWl;t$VbKM63X3M;6AW4ql7-fCG@`OltD3Zs zBm>>6CJET2gE^^mG@V?hqiJd~74Oxdj74tEZ{*so`BhC`QK=rfSfo= zfK6;S2q+Gp6;LXkE25d{iPhw`#3}`@QDCJ4S1Yhwfn^FTB`~2*ffWiYQDCtGS1GUv zr|3}`KBh-Y@eBhpp?F*|2WD5UH=xNLa!3411r{o>K!N!R%p)*vnF4bNj9se0Yyx94 z2wa>_;G$##qmu|+xLkot6qrchf)xtPRbZL|69}9i$Kp~6$s^}1B$rVO2z1RS(3yg- zlF*!>EOKGVRG?ddsS1q8brQ_Lyda?)aGi{1p|N;}j4B1+UPwo0|jxT^U2e|MK9j+~d*|lqMxe(I8|k(rjsp6f6aTh~*_p{7L*;{0s!_3Gq$wCGi>Yaq)=wptwie zE$$Sr6}O9*ix-K16I;YuakW?^7KmA5iWn=-7agKeoFPsW$9cq&q9|%bB>W_NBYYv8 z6+RN)6W$PB5}p@r+u z=rGK>!m!bBfuYq^(yYdu)pM0xF}IA%;oMw2w~%vjW^NWYnVZ0k4&Y=?$07Dd_TTKM zY$y9ZUPTeHkk4ka$!rWekF~Rr>~uDa9m|ej1(s!gWxiv+WX>`lGVd_2GS4$lFh`k# z%zeyV4D2#zu7>&POPC9pbxZ@ZhACl|GfS8>CV`1&q8JM^o0-A{Gl5J1!!s296a6*) z8Qn#npx>llqMxB3r;pGNlA)`S$dJiKZ>hh}~)Z}eE=0}ua%|MFA$Uy%h*%|8a&p^uX&p?Wd$Uq;d zv^Uh`b?=QoqD2T_{WID=TG1M*=o3OpMT)pcMIbJIKtbLqzo2)hNraN3d0tJ9s>uUt za+jLigwLOgf~KZuE>f>IsEP6elTkLgN=8{~l8MiAfI@o3fkv%JMrJkBq$Wl+2~(3{ zYJ!wRqcE7Pc~8B1Q%#;zlSkBKznUoeEm?CT-ZmFa!@tf&;};S_lE$a;cB@x6sLAC- zC?}n-zTTidS?{+#-?_8%Ebw10qRylZ&DaLjPO;a0;A!zRNzLnR3F6vI42gdxNbU_kn>^k?+%>0j1AsXwB> zPk+1qdi_@YMtvJt>LvPoy<5Ln@6?Bbg&wFE^hn2l%YVY3@yr#6I zjqEX3(fS^=vEB+hI_#l@v{O{FF0 zbzk5o3z%UzC7%(c)!ljIhH{*m4-QpNFJ;ok_Re3{`=S6_mNC=%(3kY4XXB=PSO|4v z?=ohpl-!$?gg=5u@n)z5#o+59krwu*FTmx?8O!vj-g&Ox7xvy4R{Yv>C{0+wOcQ(O z&%#c~!k!gOD#itj2%i9-ke?+KGNLE2_no7AUySH|(WgK|Z;HP61*_V+PZC{T3NA8X z(ofP$(zQ~J7aJUvY9!&=-!rpu@UP5!OccEi;m@7`!>B>^Rs8}M*=PR-=FLPp z5sJy6f>8-B{EgYg%%Ybf{5-`@V_jyt0^w&68!=dIq(`|gWRA_ZK3 zuj)2D74Ny9nSzfNF-~SSy&U0xokY`7Hr`go%ut-8!ArhtLW?`-73bV z@*VOi6U>fPd{65?f=~b>@rA1y7yhM~nZOw7QiMa_WhR4fBA9O7m$N~ohSo5VjPjIR z!-k>I9sA*arTSejLFfAQB}Rt*1}T*c)Kv*)pmOVp2dS{}6Ntx5r}u$V2k$*|)0LfD zH=O~mm_2xz;#B*=8D>maUGmrKl{Qfb< z#TF2EYrOR=nh7RP=>dO1FFg(gHRJ7Tm<0S2c{PMBJYQtTp*eWL0cI*rBaNW&ot{ID zLE?_pj1B)nUfRjk@KDWuCK4wUGgH-jjG5FJwovIT;AD8PB&IzO;riF8Sd@!*7BdmB6QmH~&)=hF5dXjuEA8vW zluf@M8Gj4ezL4=Uq3qAHhgc2OVvANM$!t(T%JoPm~kk)mYj@ zT)P{~NKR?*oDz~#+&gC#$tfaWB>{y5tN`Fa%L%%SfTaW!5Rgwm9s#)oEFmDLcX83Z zFBT|jO41~% zj0%yO{=Ve$EAk8S)AB#S(myOeDDRW+mT#AL$u|fe!5F<1#%D8(%_10=sq$hE49Q3s zj^kh`YGD}u8;0NsF#n&0k>{1}m2LqgyhYjwqpBV@1}%q=fJAA5WRqq|VK9XxO0@Wc z_=VUhz5|~EPl^wV`^7uOo5ibP+NfP@6|2Q!ajY01a>CETSHce#{u~I));>U{p*eW09si-OPXRh>Pg??;>A6xFn)FJJ^EbwFbek{+A z<@&KDek_Mb9O6{D*wc+I>PDiwk%isJf^KAfH!{y(Qnnw<@?)8PEZvW#`7yU2O9jlM zHhzjfGue+N`LRSlmf*+Y{aBnIi}hnMer&EEo8!l#{Ftlf{X6}c4nJo1V>Ul#^lBgnX~-ZOg}cmk4^Vu)BM;}KQ_gWP4;7x{MbZ47Usu7 z3FcAyeuzIa*pE%{W8?kUI6pSlj|KTL(T@p!jQ3-V-+z}#nG6CzvU&cWh_)ViHkc?= zrI>1Ey!D?Xn8z=|WGq?!R70bmodFW>4v={_fz-PSSHB-nSv%-~Tq z0aXO7A)u0g3IbLWP)-1t5$X zSPnd~9C%_m@WgW95lp9f5TcY>D@vKEqLi5`N}0i;lo>2anW&;bYw|=%^F%-ML^Jb5 zGxJ0<^F%ZAL^Jb5GxJ0<^F%ZAL^Jb5GxJ0<^F%ZAL^JbfE&-s0Jv@pcDClAyISBxT z%p*Gipp|)KB>+@2kIV#se&&&p08r9AM05cFikc^inn$w;0By~q83arxU>X6Sw|O*$ z08rjMnnVC-a2|QW2n0ROBd|kwqRe@s%z2{Bd7{jDqRe5@jsTGWP|7?}#XMqYng_&Z zxO5MSa~cycf)suKhX;k>R)`oO1i^y!+lGHYGd*s()0`D>TAViS3RlW|E zgD!^fTn+MSd4-$}(|8LZOxJ7()HOzyWJdZ?`cmqW-j!aKp7Ov_`~%WmunfOLx&oHq z*Fyg+0V6pb=Je)DW>|I)mPW#oyGHyLmfJsswV)SZX78}LPrO~c0ak%Fi5G}XU_!4H zm%ys~c35-2Kxl&X_LagCn8sTqIANWAvLG9NG;|tn6_dqic-neRFCc+F%X;WzxLDkK_>hw!PDMY2K?75*rF)5W? zMYk&jl=sjT<*sBZb9%+for-o>GK+g2_bB>Z$yL<5f+^}O;=Q*^wNr|5VEQ*^w7DLP)k6dhkx>w%4e%Cw^Ta}_gQMHMq%MHMq%MHMq%MHMq% zMHMq%MHMSvMHMSvMHMSvMHMSvMZt>qbT_nO#;e(i8Ly&>8Ly&>8Ly&>7E*qNVpS-Z zVpS-ZVpS-ZVoNBPVoN9(u_e?tQ%nhulBw7d3Z~c+3Z~c+3Z~c+3Z~c+3Z~c+3Z~c+ z3Z~c+3bxo^$s#|t(2vdcWAk`VH#dsWp*-yJlNI|y$y2Nf1ygJZ1yd{t1yk$>1yigA z1yhU#1yf7}1yc+I1yjrcf_Z8bD?rIqbiaZr8ehQ_HLqZbnpZGI%`2Fq<`qm)^9rV@ zc?BEe{~>{XY_uO6rC=ViQ+1?2bA%ro?#G7tu>e0N`!UInDOQD2v0_yyn88og`!U7R zP^dbd_V_x3)=%dA80*IvKSuj8CCrFYOwYK_=s}eUdUfDOD<%f@f(AmbJPtB*BTP!f z%hO?@<73J5ENo4>5+q@oWR!-127g6-06tw>#9WwZ3=)16-T`rSBS^YJ*h>^9P==3S z!tpl4#fEZ20<0_R^`GdU)8DJ#3=0tHdXs)Q|8M?P{y}~R-wIQZE`BV8FMJm^_}rxP z=vL~YbrW?oY}olHcuicQU9C;j&P>o6xKFv~xjoz#u8zxqHP#XA*X(QT0T#1sVL>&D z9mo6(^M{WxH^TyH5wi$pk{G&^euCajZ=x&cBzhJtP@hpRfHeISd4lO^)O+`zKV}Q@ z+IChCO14-aoQ=b7wpI;FHiP#Ygt~A!)(lQ2!Emfbm$MScp8l0Pq9E>o-C~BFl@)_L z4!fOUqo&Jbak^FyBzK2BfgSnQ@*&9(8N*~MQ^}s*k$Tj}jV_zr;wT;DaW$R^>>0GW zN`@p`9I!LBcyKbfWmwF1i*uEq?D2;QvO?)VH#=-LW09ZULxz3pB*KZqYI3a{l&r)a zvD;j(!a>Ns&>s+;$Fia~*`vCxlh7a}Du)wxDK76#_mg4YpOJX3o0bhuhNoehsnxV} zP_hzj!)11w3;K~gB#ezO5C(Bi$nQt@k5Jbb0Hz-*NVF8{XmfS(fB*=sb-kEvH zK(YraH$iX)i^J)(`-*r<7&0qVg@0D3mS=y1zw=`#Y2(dVYA(~XehGL zVuz?N(ZRH*uk?kMQA#&jEZ~T;aPY?+5zt>i5G)v)Y_?e)^M@ikZAKWX^AxhDSEw?z za!UlEo2+vOe;mkGaBy?Z8JrB!J|NJU%NaE!+2H^=;_4=Qy5pp&mBU_p@H(;Do!#_- zWSawY&roC-hM*ekLzCgPSZuw>9)Da(;#UY>1y+;M+Kb+Y4D!ioF#QNkinHO&p~$MU;Ech@9#XmLCOCZ%y5g**y7^5TnoRurrVd3`{qv>_LG}>E0-kx3 zhoDEOo^_LkBr7g;6Ne(Ju5e*PlC2)%3>P{SU3Fp$8Ir7cu>}uG_WQC;7>cZTw0T_P zhoY;FZR3U_tL|-M2PbzsxdjbM_B*VN3HJ0eKS2!iay|5^R1S};u394oecbPMHGB|qFAu6=gOL5+P&P||kE})|^SSa_iDFSbo8&q0bXV&{foRC zeMtw9P}#FJRT`LA90Tj=qhaf}9d>kY66P2_H(YOU!!EoB^yT`I{4@OD_~E)^x<;K& zdy94 z_|xD3@#R?*@BQ0nXalu`ysv4Re`w?*u);ZAIxa=QvgBgee%K)BV8eL2{)GNweK`LV zpR4QAou`X{ukjnS^SFatCi?|!1DXQ+k>}8_(Dk%T-9=?kBHDveH2>&`K33~3eU0iw z-ra9db2;y!_o;Z~y(OL6!r}w@R7@19H%Qy4f&G-Tr1vE(C5gYlp2+25fbg)e-0&~M zRfd`R1NvmxkGP$W)qSbEMVGIWwU22V;gz|x7<^y4u+>0g?{5N)Xzyh&QdiRW!&j;G z2UaR?DuDS-){KSO8H z-m7(Rk8;Vd#c2)m6LT38MBhofsHdrMu#w54Inogpu-3csG`)rO@~!my6n?&*e#Cov z9X)}I3)7ToV4Zjz%on@Fr^Gy1xLs>_-!M=AuD+K4g?H+%g0{O=JBNFjtKc*+SrN$` zW8&yjbUsW*)S@5JM$P-0vTf1h>E`y4_+J&&2=Doo)J3ef{v^GY^M3IuJ&dNBn-mKE zwToV*wx9+=_->K|!CA}(bI)1A>q4bIo1dqEf_54AF}IGBV8fP!Nv0>GV<==@jY%%7dOl@tW5)%eO@bdcO{$1kU?F0FC)Mq|~vRI*pto zy(g85SBVDL$r@pJ+)$vG_}gHjXQbB16|nze-Aq0GZ+bR$A2kylL~)vTG#$eNZ1n2( zGW^mgXo%TS)T^xbgoR3`y<10642Kvf;LCLXf;lBod%bozcPYGqR^}_F8g|EDN(WLmQ!~)tkxTQU zX2rJXvEHP`)QvRWoJKWxFLG0Q6^6h#kQxSEt@cOlSZ*tn8OrQoEcC6^1Jok4Q}ey1 z2wvwD@6Jo8LmUp>LY?$3+=rmwv>ZU|DI+O&qz0s3o%ERK5H2_D)UV^e=3BKNXc4si zTdbYAigrU6uRtF_yxJEx98;UT4_rmfrs&}H%dshz9_hXNMku< zf;*@k$UAC1wGDYUUPo;}_{0wC9I&p7zL9k&E9rZKkZQe@V*PbXsjMFK7)vVI|* zMt2wkF898_n4T(((F47_2do7#6;g%QZ zkG!KErC;U7lV;STV2%DD{{$bWdjzE5dUiAYGxaG*b8(c$lV-M zr;!}`Jl&n#Gwk`y{$T;j8Sm{6vjvoQ%wc%c`}HmC9jxMt`U-tyC|A_Ke5C&Jky0FD z|MHRg%SQ^_s{ZnkB3?rYs=M$1Pkp40qs)9_LTwQ*aW`>kwe?G1;j) zPkpT>|5g*l5jYzuj=s(o5n=;fUdgelLHs?so0n++p_Nzm6pG9kDdvNTN{6*Kl?Xe3yMHd}8

v3k|FRgL_6+hI_?1p(SN}&% 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 diff --git a/tests/test_periods_projects.py b/tests/test_periods_projects.py index ab4ff6e..202eba0 100644 --- a/tests/test_periods_projects.py +++ b/tests/test_periods_projects.py @@ -1,6 +1,8 @@ """周期、元信息、常规项目 / 分类 / 标签 / 执行记录 / 设置。""" from __future__ import annotations +from datetime import date, timedelta + from app import constants @@ -19,6 +21,45 @@ def test_周期列表会自动补出今天所在的周(h): assert sum(x["week_count"] for x in data["months"]) == len(data["weeks"]) +def test_跨月周按周四所在月归属(): + """口径锁死:一周 = 自然周(周一~周日),归属月看这一周的周四落在哪个月。 + + 2026-09-28 是周一,所在的周是 09/28–10/04,周四是 10/1 → 整周归 10月第1周, + 所以 9/28、9/29 写的记录统计在 10 月。这是口径不是 bug(界面已把日期范围与 + 跨月事实标在顶栏、录入页和周期管理上)。改这条规则要连带迁移历史 period_id。 + """ + assert constants.week_of_date(date(2026, 9, 27)) == (2026, 9, 4) # 9 月到这天为止 + assert constants.week_of_date(date(2026, 9, 28)) == (2026, 10, 1) # ← 争议边界 + assert constants.week_of_date(date(2026, 9, 30)) == (2026, 10, 1) + assert constants.week_of_date(date(2026, 10, 1)) == (2026, 10, 1) + assert constants.week_of_date(date(2026, 10, 4)) == (2026, 10, 1) + assert constants.week_of_date(date(2026, 10, 5)) == (2026, 10, 2) + # 9 月只有 4 个自然周,10 月有 5 个:一个月不可能正好 4 周 + assert constants.period_first_day(2026, 9, 1) == "2026-08-31" + assert constants.period_last_day(2026, 9, 4) == "2026-09-27" + assert constants.period_first_day(2026, 10, 1) == "2026-09-28" + assert constants.period_last_day(2026, 10, 5) == "2026-11-01" + + # period_first_day / week_of_date 互为逆运算 + for y, m, w in [(2026, 1, 1), (2026, 9, 4), (2026, 10, 1), (2026, 10, 5), (2027, 2, 4)]: + first = date.fromisoformat(constants.period_first_day(y, m, w)) + assert constants.week_of_date(first) == (y, m, w) + assert constants.period_last_day(y, m, w) == (first + timedelta(days=6)).isoformat() + + # 全年按天扫一遍:每天都有唯一归属、不重不漏,每月周数是 4 或 5 + per_month: dict[int, set] = {} + day = date(2026, 1, 1) + while day.year == 2026: + y, m, w = constants.week_of_date(day) + assert y == 2026 + per_month.setdefault(m, set()).add(w) + day += timedelta(days=1) + assert len(per_month) == 12 + for m, weeks in per_month.items(): + assert weeks == set(range(1, len(weeks) + 1)), f"2026-{m:02d} 周数不连续:{sorted(weeks)}" + assert len(weeks) in (4, 5), f"2026-{m:02d} 有 {len(weeks)} 周" + + def test_新建周期会按标签推年份并跨年(h): base = h.periods()["today_id"] latest = [w for w in h.periods()["weeks"] if w["id"] == base][0] diff --git a/web/app.js b/web/app.js index a45f5e5..c41c207 100644 --- a/web/app.js +++ b/web/app.js @@ -374,8 +374,8 @@