From e778bbad02cd0f5f71482f140e25a6534b3c28ec Mon Sep 17 00:00:00 2001 From: Koda Date: Fri, 15 Sep 2017 19:46:18 +0900 Subject: [PATCH 1/2] #853 Add a feature to set initial value of content to template --- document/database/A5M2_knowledge.pdf | Bin 75858 -> 76362 bytes document/database/knowledge.a5er | 42 +++++++++--------- .../dao/gen/GenTemplateItemsDao.java | 3 ++ .../dao/gen/GenTemplateMastersDao.java | 3 ++ .../project/knowledge/deploy/InitDB.java | 4 +- .../deploy/v1_12/Migrate_1_12_0.java | 21 +++++++++ .../entity/gen/GenTemplateItemsEntity.java | 19 ++++++++ .../entity/gen/GenTemplateMastersEntity.java | 19 ++++++++ .../knowledge/logic/TemplateLogic.java | 1 + src/main/resources/appresource.properties | 1 + src/main/resources/appresource_ja.properties | 1 + .../TemplateItemsDao_insert.sql | 2 + .../TemplateItemsDao_raw_insert.sql | 2 + .../TemplateItemsDao_update.sql | 1 + .../TemplateMastersDao_insert.sql | 2 + .../TemplateMastersDao_raw_insert.sql | 2 + .../TemplateMastersDao_update.sql | 1 + .../project/knowledge/database/ddl.sql | 4 ++ .../deploy/v1_12/migrate_v1_12_0.sql | 11 +++++ .../WEB-INF/views/admin/template/edit.jsp | 4 ++ src/main/webapp/js/template-item-edit.js | 1 + src/main/webapp/js/template-item-input.js | 12 ++++- 22 files changed, 134 insertions(+), 22 deletions(-) create mode 100644 src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java create mode 100644 src/main/resources/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql diff --git a/document/database/A5M2_knowledge.pdf b/document/database/A5M2_knowledge.pdf index 6b165d63912930f7d4c9f57d076cebbc1b60c744..ac92566ced4c9390d7f6670b37b835e6357b89fc 100755 GIT binary patch delta 55587 zcmV)FK)=7z&;-iV1dzoCF*PwaF*Y-i%o+zVH8D3aHZzg!a(^-~K0b4Fa%Ev{3V57d zm&tBkHw=aMehR;VHBkc)Xp?TTXi>C%0gZ(hu?@#r^zBO?GDVRe@CV#u4TltUrTg^x z%P(JEo)5 zc{`8X;9PzFZ7_U2Pk;Cd#cQASy3e<_vCjK=`TIP4a{TL`F8}(&dD%bx+dHS-=Kaxr zrrnL{a9@)T0vmtH@F2O6MA{*DBe}64CD)DQ)`iq&H>i0R?mPCNxS6g95kdj*}`EF!Mta_h# zU?t^!AkpeZ$``G|;DMFYyoBxJV&6)d!|abgN2DOn`J7eAUL)pvEp`$Qo z2dm>q3c;L{RF0osT7fy|3n`0Lkd>rT>qeF;Bq=s!E)L5vE2Ij^>sa-6V=iGqnwU|T zOGa|$mVm%q8d@Ea0s!+YFmamr0`pu5=pLC7%=>>znFO}fjm2k4P6(S9Ras(@utN;I zsLGPCw?mZam4!luB$-kciWojgrj&*9fW&VjW61@r_P^B&=) zSJpNPB&m319XN*~A1>WkN7#^7>&7~w3?DtOu(6JcR$f+6SqC;UKkRO-V`#@M!-I99 zR%1L|M#_2-V~kvR#^$`l7*pa*DVr+@D0_eD2(}mlq$4qcjq1d4{NvcIKOe)f@DXQh z8H*RW1iP{Ej)v64GT8Ex%8oUQ1h$IxjCGuD!zsTxER;y<9Vregywn^!ccQQN} z-S8^mK7_rZdz>FiH?kB}s@=#^QfYs5BTHGO+l?&2m-k{7WNE7uyOE`p4Y0b@YJjf*UrT)j+-n1hd=-^oHNfgps{wyj!?t%G zBv=iwy3}e!?jv%)H21i~f>A0K5)vJe=&gy4uo_`?tJR1Ch$w)q1rU+wh(vEqbcFi| z_gmdZSdFl{)oO&*2&-GICRk0dy47kzRui(iHLJK>gOP9TD#1NoyzZ#`1YZfhj`~VS zbV8z!COW}ag0G{#5_~22I_6djtDUggM^_scPmrah65JEqA9asQKN#K70w83SkkzYM z%@`|VEIw2Je-y|^ntbv7_`rKy-{0TQ%LhIS@!2Pzd(SWDzc0tP*Ei|)$bS$20*%3a zMw3AZ6O#r9RRIE%TnFIJ;(dmo9q!z}+rGiTJ-a>MzQMwc6hGwPUd9i3f4Je}hXULS z_@M|lYWz@wdksI7;Uvoc0rzSA(1aT!erUnHi67c< zW5*92xOebF)Ve|Y_ON}!ZPC{6wQqPW3cvU*x?qO|XD8gbaCsqJywbiAw5U5DC0d0Y zJR~;?*Wf#o(Yr^Ycd1t4e@0^FMge|D8g7#_pT7BD;6BqTPz&@z`$o1^Y~RSWK0#-; zw?4sS;lk$N!sX$@7vLfk;UbpcB86~~%WzRDa8avp(Q0tf>u@m|a50;3v1Z_6x8UNm z;etAFal3HwX5r$`!6oRyCDDgVasZdq5H9J_Hq2rknli>sna538f51&y#7$YkO_|`P zEaRrE;HIqNrmW$ntmCF^;HGTirflJ+Y~!Zv;HDhIP1(gwIgXpMhnupGn{om-gJiYRH*u_{k-Q{x)?o(mZl4P!u2}u2HWF9=;`&R;tdmW>^@i_b@W#LC=J%+7q`nB4Sfc9GJZZVX zvjS@(3*}J(3Apu!Zw6*6lg<>(qAAeLHC+^>TsF`6$wZ0{n$3~ui_l6ztc}KjF9yRt zyvM)V4Z~W$H-v@+q)BHqMRHZun$bN@ya!2QqhaOvGmMs{YsJ%KKO#AI*m1n zV_FL|-$yT4h1+C_PwARL`^|CO+;~0$=opbT=-e2Dp@vU*KZa9(sfqz7@{%gMqW15uTzTEw+$*l| z^wUqj=jE4!r=PyJy&-T+HlT%He9zZ_&l#St;dB<^93GyBGrOtCf-4GENr3J?Fn3R4 zcNeB{{q7}vydG}f``+Ko)51qyP(`h=!*g^6z2OZAWoX_j69Q^x@kE>KUCey4E1RZ}y6ZO`!nFX44s-PX!vb)rH4jm^SV;aFj} zuwOV)5OCj{jKV4jC8^}Ig=|x>VmfMpjZ8VfAxd)M@G*AmWt>jZFsR#!sJr$eie$=$<&$I^81YhkU%tQ*?GJ93CvsCG*IQ3vP~rgvr3&z)8omK6^9i;^pRd6f;_B zYD@Gv@m#*mcambUAk@-LMHib6;zYK}I)dVkCcLOf3EQLvJ4l6E9*J3(vrV>t+~fO| ze!afXXtazOtNu|RVB$NlX)h+$nhdTfypzn zQZSI6UP7h3?bwC2R4P@lg2>i5pu2xheF?1Y$q4hY)K-FO&^2dGg83;*aTKIr^eLsn zRMoAyEw}B?DjFW_a#*3UBo+&QCAh8E8Z*rnkEQaKnB5MoZol6fj{{K%!xESS7d}QL zZ%?(%yoh9(<*>|cZ{K@NEJ`%vF|0GNvzO)l-G_e4(als{U|C7Ul7*^hR}v8iIC%Dc z)t649DzRn8%^y%dr2Zq=(G*}QPi&}Pt4$GcT&=}sF@A}k4_K+-n+ZugbLowwJlcXZM|ucSMclwbxuiDg?ef}N1F9Zk}VKiEin)$O|~%O+2cYe2RT*wViT zllu`mI$rPf>RE?VQ&s(=V3I?_{@+(yEf~HYK6|G}&z3Bn&UtRlEF12<2#wGjL-P%C zK_i&|EbxfGp}qimpMPhSnf~1nGrw3MGb*ooV{^x-{;fN<%~G z8B|`-IQqWAacM0>VaLI|`S-vx{}8NQ3V&Ehi&~FHKb@=Quz@0@?@*55sJf<`x}_Jx zQi%DL4`WS`0pvrGRoilakHyG<;WI{8kYZN^K_O#5#u5|DON~JCDMs>4f!VgSwpf1s zGCyGM(|fj@{vgP=mSbG50H*0Jf}?1DVpT!qO@#R5o9mum)U2mz{y&z z7Y(r2-=V$^{>YfxiF8sDWMGSqQ0~rDT9t7((n-TIt#YT*X?5D2-k?9g{Xx))W@BbF z9J4;a>fCIPiTEytkg4%FlzNx~FcXoL7*7QV_crd`vx=e^CUQ+jX{A>~=nWEdPSSl- zlN?&OQs35B@=untY}&gBW(!2>p-hKN!z(rsnAL`$i|M4SsRqw%ES;{S{Kg7;;W+3s z#=gI!z7M*hf}^ueT_?RPVOFf$h8?EMX+pYS=Gu10p0j)QWNmrP!o4nGL35L#6c>NO zqW}{M#F@di6!dA(A7ZT!K)t6^SGyhVkLZ6yKBq+Eb{FBR91MXG@b3=bwcTD>=^7>{ zb7?o>wpLg3f@qnB!-ztY_2Y5tE4^zo49vnYkoo`JZ|l`Gqq5lX3w>Xm?J|H9AG z{7+$y7WoKYBmS62C8-L`{ke#vQ6_(Fa;9j?ref-h!T3QkNar(ojaWU}Uw6S6=jMHw2qlgR~ zWpiKvBGIfJ`8o2b-w3dDc9G|}pf6zC+GM`pi&P|yaFX<&g{d^07kW<7K$i(0I8fX%p zmsP43St!FpK1!nuDxwm?o|^$)HE?Xe2Y`GqwtlSYwU~L;FewDZz)cIMxH$rA2H=4| z=ZCk*BYyqq`}pf~2CqDE!qAL-($>a2|MZ66<5x5J)Q&W9k6(Wf*cE}{>RBXdIi=c> z=96YYnVILuHN#~Qzhv2 zQeC4kek7pJ-v@ni3Hzv1^VBjmjBFrSgT`nu9$*{z%6Mje274b0%`)r)yUcRnaj29_ zFD@)imX-k}M>T)w<(-ofjYy3=n2Mc9MkAumksAl{d0Drf0y`xK2_QII<<^*AOxu#? zYVuh_bS3?sYs_;Ei&KBu{Rva^fgo!G_umX;&ox_VOOScG=prrvD+vH^y~frR1*L!^ znHpjpPDYaOSTB(T%4Au+d>L7$3s_>`{0HiL)bCO{LC$~JVydjhnuY}qg=_mp(vXM< zS_wOWJp>L;hIsFr75!i9{K1iv|U;O%OqD?Z3=BB`(YT+B<@A@Nh65 z|E~Wrx6)*?(uhnX-N0;(lTNrDMJgClIyTEJ#kb-=ISdL@<0mCeaLYE1A{6r9kfL>mV;yqhh`_{kUxaTE9^3!x) z;TiEEutSf#|FW1%BBaR^q%f?{(kh=;MFP!c0oQ+d8Vi#GID8ne!U!AbxfhZ!&Jm;2 z8$LKc@80j;^R~DB^he!4G%}peU1&5G%*zKqhT5O~`scu2626Im+xY6tpYAh`xH-;$Qf`?kWVp2{^22uzRhWd+5K5}!}RTH z`yPMyE;pByx-B{3CiJlnbeh{_JWdquy6XcePc!J!qq26!mIFOhETmhRWpHU_&gAIp z3(>fyf#duQ_51O-2GlsRa;$MH}Kgs%&imvObQA4N(zZqqTKkLkONtgb=shj=X!rr1X3^| z@qtpsDtu>~#>7I1Q(1`E$NL|6z)JH8?$Jk;%>B=CwlKQK{SEgX>_6*h(L!7wr5J=b zn;G}=#X*`8Fki55ew+Gx;7}Q=8GFozWXMJ#SIm`5l@e(7E7fc*8?{#k+Dzi(reor0 zWieaIlJ=5tYaH4SMmRPI^F4nRNH`B&=kaY#w&&=8<#{u)^>eE`JEpn8tt?i|^ka8} z_}&E#=W`nz%a$Ge8bTE`%b{k`{?f2i9%rHP*oXNZ_`zR?;a#BCsPmC_CHtvb>kW~M+=*5v4ib7Yl$bEgwU2@ZQ49V210@755`H;slXwy0Mara&j`D>1zsq=9Y!L;ojrAj(jQ&p#8dR z#uSu7^4<45Rh7f6*8DdhnUZ*~d%BSIH+n`O%O?b7-{8I60uCGRDtQC!3O)d{Ivo$No2lYkx`0lJf) z9vgq+l+{~7J>O)a8Je%)QUfxl-=_YV`XaFBW7G-ifI3fIrrr=CT$n9qFIFy9I2_*A zI(p~S?CIIFv*%_7x%mpF2@K8^`07dRL$=&{m{^>IZXU=uccNMj{=438pFH|qo zF0^MlGndMj%My@=q@kN2{@}8+pm!?3{PBO?z5TrtI0WV&Q2`s6Q zM+j`qpQ=v~#l1=X0L~A$xSB0V$l=SHD+q#Zw z)##50X`^f3>#9P}oS=maJurF3adp4Ev=bm@EOX~VbRgEx zxlugtJJb)smWg1%=BSl8Lg0r%Ij9BoV8(2jIPyO~S{Oy##j)bdV7acat8fif4HLgn0)?x%=mREDQvDS^2~KDRZGqA)le_#13l7cO z9x+8f(T{SiI`sdap#K{2=w^SZ0eEy1>VXJraO4~N65Vh%6tEV~EesZh3-b$0y-AN` z>ik>8t(vK2nys1EY=$@&bK~B4xG-8+>@W2NoTdX?-)VOlzfo_}hXH5dXr2jY;D{pK zB6&x~2y;Nd;y#Z3>(!LWiMrsbCZ9(ZCkEO3fa;iL>iWaKR4JE@fU|!&9ZQV;*!g5f zV;N6+$CIjd#VvqVl$|SbV0gNXYy^K7OvKGycY0Rg>{-I6Z5We(20tJGmN-Y9rd|_A zjbt2RFm1~Ypsm}s{G6E2yJFgMS(EdDnTKJBUU3_? zqvy&?66f-+V?VFDx*e#lV)=Q*={#Ks`hjf+Z{@3KAUWy@5VC(28B|YQL@mNuz6E3W zRp2ZhjN!$21XaugZPlecy6BhuieL2`e$$U4j2z;Tf>h+dj{y75VVgEvpR3~tBY5C; zAzx%LS(GIOFounN=V2T-i3Se)f#TRZG8ogLh|Js*uXnTbx^kS()%Bu#@+WdR3$X^5 z=gWCq!jQ{-{$YP{(g=Ec>8-q-?LRs{e_2M#K6GwX_N4(D(0m6)IhgMNAO8w8wNGtQ zyAf*OKGpoXKjXLj#lg}5$C4vYw%%+sd(D1xu(Y{^<8ruvB%TPJT9{vCeCSbBcrls= zg#5f}NNOmEbu@li=EPzqLwdUu z>X{+jO_qDKpw`4jQ*uO!=K^}N!m(UdcGOe0&#j6uu~Hw+(tH!ir{_Z_)w_>m9OFC< zu6Ot<6_VKGBV;UcY?@1pX(_EDjUaJtSRb~Bogro}2C*ufzzZ0=aE#J70t08%aNeo} zUxazg{Oo_i>>7L}wkj4wv(-wC@r#8Lm=^5H1g`>4|3`!Cs|IYUEfKBz6^lE2_R=CC zDNYe?*Tc|q-vh(Mv0_MsBAZR}Im>xWw-m!1c#O)Kl4$a--#1qk)QyJ!>zMIi_f@pJcH;GGpA} zs62R=9pHoyQIApgMvU;}!CeP;A3SuxVbi0~83tGTWN?hlpBc0UI5o9ASQ(rMGmEV?!K4yDUN0tj?W7~i`%Wv+-!djgy_Qgi}&AmO^$*#*fbwS*(2$CFRV`A z1SBAK7@<8<|8Rt1$3uB%A}mttFR&%n2z@K77xZ9O8Q3-hgfJ&~g3R(;_Jfioi4G_B zREf`WykRLywI#5K6NLqn2W62}In@$to~r8b$$nD}fR))+M$fyQL8w}qV4WS0({6v& z1yh4k$o2eU(UkPoI?pkVgNll*+cHQ0G%q`{oRmQ|b(!aA&2kM+0Pd6$9M0jnPtg2~ zrE9k0B#>)aR$w_`z;!j^jo+jG0XTbt%0{{TS7cq$BR31jIf0}~DJdS1N^za(^}}o)SXVN|@zp4^pyXH$0N%#8&x8rw;3kNZ+EVf3$z$jZ8*f zJ)Lv2y_{F~QJ8DBj3mHeOGIFHIe+*pXS)KY&7dFqvFcKGk}@4P z2mHGn)nJw3R)$X)(xW45!4T56F zPRm(Ot*Wf#VSeeyWos}XL(L_yV6h@Z} ztRg||?-0y|^LX&l;7Nac$e;TU#)AtB2g}R2+TiAQsc%xBr!0{2L|hYjS7d1^71wiG zs*^=oKO1DzcE--rCAv&kXkuw|*wQLRwTNSHK_-z&+BrKP7QzaAi9zzWqHG!#;{!;- zoG}r#I&@A*35ysTT91T;qY&*deCIVg$@=U9yQM5&iZZtkE#QCS^Pjg7I~rzuYozti z%-ijM{h`zKr5fSaLChC;V1`3#fqE>iJ*dldt*+M-g=7K8uSjhq4(hm$=k$$%F*fE6 zQXAPM0lL5l?2$7{rc-H>$j9!Q+ETm1tT6C~-h6MN=N<;_fMyeZMKm#(GKXo9&ikJ; zh#GM^hT+=*)O3HR#+^TZpIx%ImS<)_Y5V=1GEhj5`>_%nMOl+w-Qbo`>ORT&^yH8w zq|k0oB5e~tB&1Q8|O=aH`6}H z@^qY@KU#>;_k`Hw;r<>vUvXN6aDd2x{dCLn!0gZ2|MFomRgvqSed+O1;X`ZJ|90`Y z=bmGpe!A8Q%v2>SG%cSih)atumY$m3`OO1eoLQ?4d!$!2;c-A;GXv&p%nNovP&?G>)hzziT|w9FPE zQ%=pPJ2OtF(gioHSJANZNos)Mf_(@K=eNhh4$Cm2UJr>)s^P*>>`uVHh%iXsJKavM ziAzY=9Z+0);2wYYf4gtb9n)&*;J1eE2o86c5R-qN<|(FXiwd^T*FA*1$21qY;=c&s zSiu(@_tFU`{4+p~Myv(P)RUy=9cG4|;Z#wT)U29Qi)u-&0BAMTCWRwebJSpFI5X16 z`b1yWeLM~$s>u>Ijg`eIqw-;V!p)O9jjB;II{j|HM-S<-FfS|`%SOtK>g|t2`>5UX3~6kwOL#oh;KI?mWA>vx5s0i^c8Z$6xc!*Bn27?AXH(Z+*ml)^(p{=H|+Z z@;=LaG)uEAjr@7)IM3%5|NTKZIk1_>)^Wm4Hxh%270 zYFy`yv&k4qF_I-qsZtTV?W$QbiH{ig36g)bp$as3+Q2&4h}+#p)ow4q0V#k!Ei(YS z_U10jq&Sg(;|m=BpcU{gcganpwR4v)Jv=~K0t`V48S*=U@27`PBthwYAGt0ilNjc= zs6PeGP8?RNW1Zfk-WDU9Wyq$Su<};P3ZuTPrE0_Ga0VQrE;vL>^+|oTzEU2;aUR*hc==6 zMAD~4o)L=Q%85oL9MhnR7{A5=mOBf`$<+>U;L`Fw5i+wzYv1x1leY@UTE5IFdC2Mxx<3s+Zsgth4HKF zRAOJmWH44eTkUI;@|la!+{*{0C279mF7gH|B)!V2xL=xYDZLq8bu)U?^FWws)pE>Q z#rCZVO3}QFN@if!xBe4vfH;2}h)zh!yzDB0Zlx^S?Ft+X!b&_>p5)B_f%*cl{35BI zYE$>e^>Z4l;feyBZ49)8R?v!CS*vJOsUbC`wiMORQ8b(9@@ihoo3uq|>0DS0OCrvi z*TiNx6B3?Hcp?l8E~=W6L@#DUukxZWBokPUVG2FicVBjU*Y2(^%Bz1_H?yLy=R18c z$~`!ikuN{~8qr4;D@YVK)~m?3Y6q@c_dE}g*e_n=^F!(nDMYoXE#S+qkE^O!TpNhk z?cGzmIO^%+6kxVg@QPk{&>Qtf>!Xd4LbP-`2*zE!HuWh96Nu8Tk^yj}jUDNkUh!hQAL4V`1U^ z@0H-Sq*=Ce_e)XT2*53?=P^4=q^ zxgZ9(I2q19IACKqw|HL`YE6NDKV7acl^V^U5|fc=`d6A(0Q1Fv;OCvhWwy?h_y)fM z)|P3~b;aXyP1JuD2jEnxE)s+{|>y zC&1GpNcGD4)`=~K0MyYMuw%z}kCPJM{k;>UV&$+HY-jrzf5=L!(=`G(^!Mt5FboQ{ zD7|!~NI&u|gWC#)@xTANZrh3<(#b5dGEo>gNHP3D*QkFhZSYuT)wUeF8<3B1xvtSoMtguXl!eL>~;iyJ3B@SR5y|@T1ayg@1M9cuOXC}tT^o^EWyzZ{M zie8nfFY=6CV0@W=Bj<}f$qp>#SzSu<>Q+MY4CjCSc{pBPU(dV8+)s4OZBf|~94ka! z4@tj~b{H#HPkXAHpv{bwbR{RHCDDi5?Z?{PT+T3l{%5evX~2>HJMbe8`0)Yt5cMea z6!jeSM(XVm8cUW8yh;bIh3MA9?T4=y9w|Idzm|Tw@J!+Lg*Ox|>?~kkAM=OYolB}7 z$v%IYeWv(q@eP&dD~1XqNnc^EVE-zqrqoMUE?;@A`Z^VlB*HFK97)?fcKqUnOWZVc zhNbcjvOo;)ovW>eLR7&xxIG(<7v)WBW^4YDEXQGH6((RjCgn&ZACJ%9@)ivBd`4Ev zWq`8~&Q?nm78lxZth}4o+OCq(I2kFnp#p#7P-Pe}YO;{fC8_#hJ-yc?7I+EZm9$-^#jy7ToCy#AbO)6T`T|`@vd? zWyLU^&K=~^X~{b?Kfm$6oEVMD_6vV@1&$G5XSrs`5+8_TG{mbUd$gF#qCA4XS^X`~ z%bnb*LZM*g;#m1#Q=cPIjtub#?u(-w8qOUlyvn;;Kqu%louTuuvBgZ9qB!C4b%DIKZJK6D+X$0}>SJ!{t36r(b z|K7^*N$#g7lZm^&zP@te#2^nE{MOF`uYIginVcQvI${s^o|t2B zG&e;#%rR1yXM1iw$S3m2e97EfDojgZHk;kgz3z26bZ<6G`lSLd#PN&vq360yJrrTlv`?up9d@`b*W>!! zC|n2^!=-Q|+zbgbR4m7KT29*`k$V8mUUy}7rQaEJMxAkIX=Sp4@y37BRDEl68{D}z zje}FuLYAX-I)`EP{%~3>OxBvzF!D^1qBb3Xm@ECxNOUFl8CP-De)a4~7HnBE>Su&! z7Qjw!BG2I^YjQd}H#g@3mb^Kga}ycx2L<6CMZZT7kXb^yC`!6eWGqIpd6o}Dg{M7q z-gV2aOD<(KQ!1tODF1(>-TVQGch$*=EmP}pg{Fe@gDbt&UbJQlHQWYXEi|5;pCxsr zot5s&YHzK_naxiDS->lt;;M-wwG+2$OruanlpQ7kjvx%MGZ(F~07S)u@jgM#+N_wD zLyMC_zaW*fXEGJF~VQbc3EY@mE_4;b7g?%+#qxenm zA&bOsiPmzujLm=AMH|=q)vJwav(zrh5pn=W;0zLK#F=Tj(yF$arI`|0+k!_P7i;@o z0JldY*|*24-CI7}a2yLM#z%Xg%a)nbTtVi<)oQQDcv&N(t94`WvfFf5n$63o;TUFe zPGDILqyXujj>~9+p_5sKhdA;jN+*XgOZ^J|&Z%c0;=uByC(F{lH(`d->=8ea3So)h=Et zCQ-V2#pmwz{p&CL{`=jA$}{B@MfjW**P-JYn)G2D58JdTvYYb^-w1o5Mk-_U&umN*Qov?!o+~x|s!muzZV8==U zR!94Q4N>1BQW0@C(LLJ9+7U~Jea9d+U;QY}*}uq%iGrF-{;V&h8)nmTID>omKR^8J z*S5!>8f`tF&yU0KvC@V7gCF~t%hRrdj6{a_#iD;%2Vz@A=$8>1kAYX?;9k%p^#Nv_ zlNwPI@GVJI(I=2F1IXXed4u=)fFE_D`h04Jp5Z*+!yz6L;p_MMq+Szx=GZ6^B!`0$ z=L3<2ceC9&B7#vS1F3nnQga+(l2ka^ z)U#F49u9u`Y}fEWJ4PUxmVO-`YDkoR#)KgdY*&-6U(dTI(Itli@fR0w?B^`#4#D$z)?r zG`$fH_r!SBEX1=EuSDvT%n3-|W5+^`l^kz=zSHUTRzI}a>jgn)anVn z!VFA?q^bG5YiNpgcNUI0eEBS^nF7PHmSvu{ET8;6ZCVCH|MA1Az^OK@5=+~Hf}>9cBom?08ct2j zcIG<6-l(^*vbZvtU!ITn2@ZSVEKTT?oyc?z`h(Hjcn(j7gBRK@E-x)l=2z#}){n1a z-SvTp<#GBo#0!vdbPO+}!~x6U(FkqzwlRFQqz8nQ*5X1-aY#1uh#ioB*SuYGc!Rs< zDT)d_S_X-5bxX-hrIKZGa|vnD-s}~N`r@K}_j3!tgErj9?$r^ub@h)qhAE@K(tOo? z=>9bFYvBDew8M$UC#6wG^S9mdV6bkbY2LG@b*$e7eg8VxH@vzas`EGYW7Q~x)Sg4 zk}cbYv^2tdf^4tttQ}w5TO(Cr{%~ou zG(T7!Y^-gr?d%@gJ=i_73+OoZMI7z|q{qHIUMWW?&|z`&?Ry(U?tFkV7m*WFyCcBu zg)LD8$B90fa4R%_#|4sTJBox<#7T;4Seh+JMzP9^wyC)?Cpjv2@5Ft`^*c|r1_O|t z;c$)NN+~&;OR-PBmc{i_vH?C^CID9CCe^@KI67Hj6j?O#@_ODAP*Lo5k@4XD>W^bb zs7&)Y6xmam?0%7CdZV{ZOz_Gojl1A~V z`ySOaR%A_Evvs?oShV~$v!yll)T!i4FXhV&!T z>SR(};T_9-o#8M#S1=59V-CFB=XI`B^b}uDCQVlh@>x_POOD|s;aj<95w{SOQjS;q zz?XizUSF!!Zq@ev0PLtwvVM4kqWpDq|o-RV3JJaJJT9}qv3rTu>b5yzJ%9x#*sR_h<7|?3uIV6_aZ);a)J}p z3+{{Vn~FtLny*w|4tcOv|3TJ%FUphQdYvyp3!-_AcEiKGg59N*mdTjBXt;{2&*UtB9#HCMUaP*Z zX{Wga_cNwrRdj*=)5lcZO?BbUGS4G)4k7SPxQEDE$^RSd=U1r3xGvkVL|aT&Qk85a zSHWxLqFMstZ^kQ6>xD+4m1$>Y6LSeHb&-HtA{lmx;z^#X))kMLLR{s5{;-SM$ z6h7ZlPI-c&F0i8k%VIcxQhMRRwcXtd7eG!fT-e>cc0n)@+3E_}mY+IrsPn3=E3%N_ zXB^cv%E*B~7^KM!@+@TXjHOeQLLst#8y4(TAQt%*0Gi# z1MTGNLOqZZazkv2xRh^C+y^J?v`DIorb|hC+$sK)bV@#zIF&qq)f8rg)|f=;<_2>M zeO@FI5G2+&p!KXfYRsBdx8XJ*m9DcPkDKeeQ>4p z1@)RyGBn|CZQarp#W##u!`RWZq^?inyWgh1PxiGEWJ7H|MtI@bdd)u}}iW!r+xGxojTZ9oygC zJHF3PR~a9F*+7KY?^?X3B@mA8A|=LgJ&Xe5qhkPlC%L6(?`8oCOwVWuEkBb}atTvs z_e4>0K|h@mcp(|PVeiZL9&F%a)Mz{|&q?Mf#Hu`9PN=$PTE2=T7_T?ZONcMp-9*K) zIrBIf$YaswjkTelaH1M??5lkFa9;8LQ*+dReuTVElGri}W;WSqH`_SVPms4s z;+ZhR(;WjWAXcvJ**Km>7D$zA<=Mbr5w zKEjC=yQ0YbD_2k4b%N|8IBn@};drzeW0O-vPJh#4KUh)HVuESDk)hpy@dT#ECS+G{ zJulggFMPx<*(XHCWjI>u7zPsUH%%r0nLuX0`o)VnUQwx+PD`TTgW+~L)~wq1D_PZ+ z6X;?R37ZAoQ7igE&X>}O(MeG~vz9C{G*<|&%f4zj&jUqp;4D?Eh~~SZVDX;mECVLv zwNE%6%94{HMF;|iBa=F-*6^)pXS&38@eny}G*E zvya>BmoMw9y_&kZ+Sj#b^P(&P7xYpN>Zy&Ytaz-T3(Nb*H3ez%Q|KqvgMHx>7t22DFFU^Nyxhu^V7Zh9RCVv7BtnobOa3WgXvo$G| zu>?OT%&Ofi7bvbOYs}25{NQMGaxxh%Nz%k=$R!!68PQW5)ho!dn{41E%`C5SwBJ`G zO?7OZ(bRMR-(x5Zp5Z+%rSLV!e?LNKAd|Y{C?59>%8u(XXXBkJe6oMAXo)y`8uDen zCf8+x-zgy!Lw~KN*Kkb_~zG^VFCb~-lRlt%Z#4JVm~Tl+subB_ew zegQ^7AK&$`d&Ui44D8a#t~|%SC3HOW@ndJsOdQ+vtZ#sqfVSOzQU0}0it0K#>mb*a zKAg{A&gCBUbzAr2^}3O5vJRuRn;;9%#o1RyRB-hfu7B&mdmxPRaT)tK+1eG|E4M;{Ax7?y9vQ4)`2K!iiL!PiaX>4f1`r@B;UOkrdJ0&+w+8)^x3H z__WSd-G8#X*OUg;djWzLtJPmkE4Jl03ByRT<~lm(_`ff(1~K_5L3_qP9IDl3-exm^ zNd%bCOL$$J5%D&O=n>xAdl$3_uaUVws-<}a7hPj3Sjx{A=EM2&Jg$<#R({c2@|L$( zwpTaTHm`VBJu6y)1{NQ$V8nUsrfYg8E=DIVkbhtF%Vx#I>!CaKZhft_-rA~f*Dv{3 zeY|Hef}sR<#l*}Q-Vq~-WhY*+3L`p>z~|1CL$oEwQGmi=R6Y7M($#9bW$O44tNtth z&JrpZVRp`_-y`6S;!?$8=j9gs5_=ZVQ%DMo&6*XhH`wk8Od=&_Q%jD@igs3+ue=)> zwttRjl*k3{20H7#S7VdY+=E@vt+pztOoFy7MlX?fmn;E^h&D`t(G?qffyZ^%a!e98 z(Qkf}`XAt<;r-fs)P2;$@tVk#S-0w_?$+1l*XMWVkI$btfAajn`7`IEM8neZWEqz- zUE06AkK-jN5@V`(6;jURw49T8G19rS=YO!wqSckPjrGlAJG(6QL-4Bns4SQ)#E)a+ zapB8hAU&q6QxZmYFo@X5p*#~0aCBHPLx!CUd=wHT-=Aj$TVzJO&GLxlFICEA3s_Xv zbUBeuxQdqM^=_hE&anFobHh(*MOSlJjdKH#7HNGmYh}}3#w%q*fV3vil(yIL z=I9wr%m%LY#LnYD8GounZKxY$dT@NgNE#U<3;t9{l_|UyxZ`vk90na% z<||8;NhOIV416#QE?6xhpMt$(DH2Zc9H~;mtG}^Xu0=^*Y`bF~gK-A?jvu(!O0bBl zRL<3lFQ$Myr2d*Y|o~{1Xdt&+G!Jhrg3a%R_qceSgl}`~T{F ziNtFhr)b+YS+|7OrsDmhq8RYjpyA#i?^rsU!IP818(N3&)@%|65-uxkqw|~U|wR=xj6WqWC z2H*vGcbPGG5p{wj=v8`FolAAiq~)VR^{(RlylrzPyS(g*vYs$g>QCj6nJhF=A}FkU z@h{;A>9*fvL4Rt<587|@0o4nu2qn;#jo4LG<(Z^!dTGMFjCkMFsm*;NViP4bRPmy- zMRiGCQCHOsbyLOr4u5s#yYpmw8U@FI>xo7J+laD4t2E}X)9?V^IK1P|TT9kNTh-R+ zO&YJ%vdUqF#C$X9Y^_?4M(@@dmOFFNuS$)EM|LralPmZ1X_+X%v45zg#e$3UBr=aFijl7X z{M==lS-h-E$Na<~x&1#PwIIpET9D0XwCtwS#QDy;*@*X5>6_7-T&rjIrmMM9)ifz| zYZy(VRd3gEpaOi%c-PE$BbC~rTLT<5hUv(12GeLKoNve|xsu8&XY-!nWwv`yG}-xg zEu1bExP69~N`JX?kL-}cl3d9(1v&{mw3Ls&^il%E;F^pQitJ0*(Y!+zaP0$a# z?*qXwg{rIm?*W&-{pde~^2OYexTqy{HoxNjwyIaS%PHvsrII@IXFJqo1EG`y^AXvEPo7*ph@Xeh7>LWGy;UMN7k_& zU3u&WKXUZ|UOW(Qu1SpDYLp2j?qLuECO#vkF!jS9H*LAB)wt%2C5fF5?Yo|Bn<*vb zRNJ`Zw(8sZn^T_d23w4nOe$HQ6IxGol+NAzi}-k66C6?5QY2fHMVYhItmA-%Crb%r z(Y>Ywu73}#BCzIZzGq3udRB4_T@pE4bS3lMDTGq*d}q~%Szk@ON3m2Lh_EGbw4qZp zRiJXzO214t5fD!_l z5TYhgj3S5#N`R07@vw}{0v@(OM;W3VFv5vwJUQf_98LlVhtXp^XY#xEy{fLB=~TZ7XzkA=kzdL#RBkrB>tkfRjnQ99oLrspn=1+u;^V~wT5L~T|!GHKc z_jo>dVs^GnpSxo@{8g*QeENGxR4Q7gOeQNr81a!<)8^ zY&Dg$eE4m#Gr^@uInwh>_8#I*jGR*&g@2kGuT*xWs?a<2rY2I8DcZ9u#P13*T1nm1 z#wS=0x}#;2%VGB1+Y&di5x2>ST3MuCkE86EXt;Z#+lWJ9aR zStX^ct1LI-Tasj%GT0b;(BJQkj@sdwy1|-K@@~Ua?3`<@HH=Kr){`!;$xe;s>wmtc zvx?&So~w?!y}fQ zjO+{KlzY!1#h7LMJ#Ry;Cwtet=)NVgp^&)QCzIf?H`=jJ;|ay;MN{7DI4SwjaQ30K zmL2}#?LP0pgw3=CJLu|}NDdb))3GyYQ<3Y{MCV{K*^}Zj6`uEaKI)*QOk~|ycx~5pwfzSC}n}gsEKIB;ztU^V% z3_i)ydqRH8+(Y;D#;vxQDSu^=KB*3+N9JG?^yrE< z>&3gEzLsE&tH$0VxGY!Tid=Nckz{6;$uW?bTj&8kl9ztq3ytoIc8#QKs0Z=E5MQ7@ z1+B*6t_=y86_%8YYABYXSsaw5qsix=?~Umu$CAxt94p)#461fHNa?m>nt{r)vKH8? z4*hD-({nMzRTst3On*jah!tpKkJC2hLcIH9Puz_qdEyL@EOq!^;E|;cRV1E=)G$bq zQ$f+IhZ)D)P?Dif>NIU&Xs%_chGx*StZy?9LACIeB2TB+^T+8gnS z_j-KIGTCgpSLpLBS+!HHYC9QmxXy79spC!(^f32v$f^#Q{TZ5L$f_I~tVY{)G}_!^ha6YP)sriHi&YiJE1Es>h?(~`nO;vX z#6D#ee5gyTDt|c8uSii@s8A<&G23W=my7Q0nBCiLCC*4-z}*tLQf+j8lcWO8w4E{P zka`#Na`_>ce0n{?P$pz`GxPBqNN?8bvFTK~WLsb|R)bX5r2B4V2zx8_MJ$4KFjv^b z_9mSf**rWGb~K)gLcJc9d==~_80@w}=v@QCx}wjrBY$hxu1|m+nr1m(dAbUJR_Q4{ zw4JVCtS6IO*2hrA@W3xr^ej>rAzByI3vOMVtK-Bs1{1)tPSk>m3xtSsmz zs}7D$PD(>#^`2XU;4FunqYj`|l0Ha=Jp4KHuYb%iGsSepo=-FROes^&5a$+jA0=79 zBqd3A=r^t&5u%0**+Ux=t;_Lozqlu&HVYV60@*T18XDy7GYLi3cvG5pSvhzAj(p=Hj6d}p-t4u+51+kRz3{6yw5`2d>wcMqr_gnfuG3Tp%0J)tXf|Ex2=mYnjrTex8>Tx`x?0SyXZmB(0?6WPg3e%Tf>as%6^UwH~OdiJ)iiYV|K!)rVeP_r}!}r)#Ptipx~rv9xZE zzT{C1{&;s}#MK9f$EAT~{i~&|Y&pro@F2@cQb*D-2HyvE9yyEKYUh!L8_Zazbbm;u zlSk5pPSnSGYf^grTrecSHlE~19UY#jc+f5AUNY%(yk;z0fE_T}u$IXF7g8;ww*{ng4PxV%W>`3@gO7afL&WMr zNOKHw@N1^QvVmVL+K@ep?DVODqJKg!rw2wZS1>+!xmVNOZc9-FKh27taqL{q_gPah zYz<86F*6&gsv&30T%lkGzF!lrV7V%n2xTF<cR-{YY9^$)SFzc`pa^^++~L5?PnKn#mrNLuJb!X)O?F_w zGd0)GLas|gLRr^YnErlDPYQ;X|ML%KJj?G%1uIVRWrO3oKc=!Y&eopSnMYyXJ;sc- z-g^gQJTXoqr<;Ra#N~OkpAt;fa;Y*jI2`!^3FA0M!%NgBQH!-X*v%ekA^JDx#S+Y` zWK|N}>FJCC<9U@cT!XjVP=But3LIErr+!dUtRNIFQ9@Z7?p7s5wfRIK%WlfBEjN+S z`LvO*1hz%I`ubqJaK&hjBJX*N`6_cGqd>E(&=ir&ILVUHR&wtU@f#7{D?m~cErP~X zx)R1)9px{uy6&kJ{?jLps{J>rDbH7+kMIU2Qby1_(3lJT7RJNv2?R66UW z;gEM*bgxr0oW{hCh7%o&)bC>rJ8kxhH=S*o9s1;UJ00Wa^97}p{hOTPhktQV#<1*ETtDAr?q;5y{hZ|7 z&$-s|t%6tW)O#zN%71z`ck^{++w(ikEAuqhrTkqXI@X>;+r!xJSW$z;=%ou9h?FK9AS?EVs$9F}5X+>|0 z($ZQqmnIiwlU|kh18MkcGGMmr(f5h5GbS2vyZ{`(Xr7rxZ+}vhbSjz2vtt{KlA&`` zQ{L^LfWb59Jj?!2ukGd1UA8+g5Vesv!SZO4*M}8f8A$ZQ-^0;Z^#*enj8;Khb4c=N%^|6xHHW&CBEFTv zI1!EfiwCs2Cx6~m$c$L^bow+YXZfPQ2JC&M<=tJ5>vWVxjp3Z-Wy31j%a)+wJ;A&b z+iub6HnQo2ypfx2!?}_t(FoXvBb34pxoynzq zzthuW*@If2ZXV}VD&BG4SKRzSDr0(@>vrc?tZ*kLR?z%?lX)>-lc~fvmN+CA$+~Sm zEQBSgEJ^!hw$a#+68pELvxuOX)#3pn_9EoA+<)6^+XGs+X>A~p+u+f4nRRYqFeJOq z9k;s>$B?`u&Fp!*xo)I0A(KD&%25zaW5}Kk`ZHN0I=|>!e(oy8H#$3~#p&{eMb8S; zG-TayUC%gk+*(<#=z(56#k9RZkNUPZn5UV|jdcZPD>+z7tQt}RVQ;ImRC-^j|IM&m zuzxD4u4P)i+;QQxpQ&|J-MT-X_WYr~9P zlkxHv^(0;Qw<>mr(<%Rnb9VA{U)E}TpMUpH!EnyVm)!HnL0j252O8tb$;LczC-V!M zUK?uq0ZLD3mRq&C#Jm#{DRKdu&aKv0q&7-=BH+Q6@_s>@=jF#Gj_VtNuCI2XUy;C^ z3W+y0mQf&&zYQ&`5ck={DJ1Q)-JF-(r^}q}^OmgD#a$-p9_s$BmL{3Jnj0}k(|<)< z@$%YQwP5wIA$R%(Wm)o)O21=!-C4!b{9HvG$(hxYEF%-G$Gpk>BXbKmApry6EbF{B zyNaG@sII0S$GWWNjp!rJX|f4F-x6fyqC2&MTUF@{Y`c7_-X#~k$fhwNUmpi0$ZfJT zm1IK?O(n@&no5$v7H{)pc1rz%(SJ@uY`96Ht+RIRwW$YAnAEeXa>nECa8OzWHoj%1 zN_4N)OkE}W?k8wCp_wxG9gRqzKm#SS7BcpeKaxq45uo+gk7FU( zBo?GRr@(&uF7%Tsqeq^0iNyjbZLDY$LuKQ5r>=&f>v@0e_<^LV;#Dt`GJlwcGI#*$ z0!f1#-;!rb&c5U6-mA~#p$|a(2AU6koWyRm?T3x0M|F*OxA+M>J6#!g@T9UD!nWOV5I2R`6^-p$lfS;Nsix14d;ucvpE5>G+9pdO_gtydFt zArw*qZN21T`zY^8Ax8_;y?@Q!qce75{4VSt3VAD2lt=6iucM;(m5S!2>%FtBw4HW8 z5M;6!o*A01n}#I!()Rni<``i^|9gP;8_c{Is=@TAMmqZ>7?~k&nXdC8HmJL_fL9L< z4Jt#!qeb=7OZm%BapQXgf5-fsc^O&?*`YhsvN9k<6D>N=7G{DVGk-8Th{y9UI;nXI z%t}epbV(u;E5$JFWSBG|^fMvwNBAVm^P<4RpXAGu3?GwWYN;ubv~Fmuw>3(4@w`Ak zNB*Yk1^%9QpdRg{`4Gl-88M;vZ3$#^9W9N9zs*)VM4)d9#_9Z!Sn#BVon@TIpIh<< z>T314og{;vaJ%l^Ab&ZYscxiUdl2>yXx@;ViTX5p87J-2$R#i&IMSUp`?S6DZLeVW z&bNDK=i8OW`N?xD-Vns-gwO6j*M2q=&#%wUFqYo8eK+%9WBwA`%g`r~d;dbx5j7Xe zE5^-iu{ddt<~lz2V6dXUKk)5x_cA8FpZ9;6C!uC!m|muXJb&r?wkY;7TW!~IXGSdY zSCnkB=+V-^$c8&Q#|@%2WwH!HK2(1|7Fbr6)D8%EELZs4)f~)Q8!1S#Y=Relu81;m z*|QvCyDxG+B2j^1oG*tf>LjHPULuQXwY@?VMeBPLxNuMrx3cybTQ*C zZ%^ap7Mk`(u(JaVT2|Rfj@%#RhyqE5QeH0BmfOqA2|-B6x~p43Nf49C(_kz~(!@jR zle-jAF`&voHfoSBRc-BrKeb8_oS?&S{V4@L3t7b{$$vj$f~WQznV;>Vb=hZ1OpTdr z*w5J@7ZihzAnG^iCc+?3yxNkw97L;tbUnV|4$E&^mO^Z)G}A*%csoQ15~7hhElG-= zwgW3joqDPV|D41HT-LvfPd1A?A-pV$kPN8SIu!CHrEzt6N8P>YCU^K7V~MeD{Z^mi0HbhQ1Q)FCZmVBapB9~ z3$xjrA6iyAl{IZGJJJ(G?dNSM*Joztu?-_7UKJ&_%FR_LNC@YwNosmQ54}`<%y2(a zA5>J`OorTt&*3jRftPaGc%J?i^Uq+-HlDYy)qgV?e%Xe(juz%7t;uXLrxr5?7yexj z^eIj-QFL$=yu@fzdn5dZDOt4(wDoqW>-3x^D@kai`IpxZ*9(Ly6-{n;^Im3D45j7pVPosC*@4!>HQG0rpHQk&zbdEC%8~V`Zm#fpIvJq(ID1H|6AsACWL3-|}-O^1n37W1aAN)i>cA1w^C=?2XLZMJ7 z6bgkxp-?Ck3Wb_ijm@ERQL(lij(^w;>Zs|OdD8C1ChnfYSK_Qisb`KvJV$lbes%xC zQnGLax_Cc&KKZ;beE>asAc@m$(A|e3secLTvPG-^KCtAA4nq&lmLkllGnMb7P^hD# zw+>b6@hH@S(mg2DQPFEN(l*SC?$)b^sXOLJhP43oJPL(6`Z71RQ7`OY)_>V36bdy< ze{7Zg$z!Cq4kqXNNaS)q6lzK9wf)H(Jz_n2B=SGKm+m=I1G&8miri+K*mEp-?Ck3boYKz2Y$RFsj|^x$LNG%ezmWbcB${0 zxz*3jsZFSMYhVh6LcQm8-{EQSFA=#}wTCdOKH9q2i# zKM+kW16?!u>arZ@@0UHdeDDZ#Iq10+oh`ayzj}Jb?v^Wt_Ix`>)Czu3JQfnp-?Ck z3WYkFVi=ZTN|RA(9)AdeAWInU5OEP?FZ5%Gh9CbNkY4`d&lQC&N zlVE8Je=KO2>zEF}d)K_kq$uBFv{}5!*nrNw1ngk^IoZrOvv`c@qWqFE=VTY7P<{x{ zZ?KC|o4gqF1S2!Qf;8@eXA=GkekQ;F6~t*i*vzCUBz`39x!A#2hs`bYdpdI?lZ1Sd zDNjPa?9FxvcRMWui?SKgzLVyWPRnF7e1^~{f1ij9^CS8ljsCvD&mbQ+L!P&Ca|=JB z&oP;;%oN0D8a}Tyc@e(b;FrKl5MRPpDElX%?mPg$BkYKY!jxJd={6}Z(s*dI_%01& zCa&anx6nFC@`=mXDd%Zoj4dIY-lJVz!nq#Y6Y%?h z2?R_YhJ=Y{;zSR63BimNa0nq70?sf2lLUL-CXAV}XI=~;la~R{!&I%R_4|E$@9&(w zzkSXv|w->WzUTdSiiuz`SsafefLamtb?*&k6%7f z8?Rir_~A>jiOwjeF8;(NEQ^RCUi`?V!N07$_yjhw#+i#hc_{(Y5H3EM|M4l9n-d#NVD*SCXQQLU&?8h&IR){gKo88#Cb>q&J3>z)D z^ZyK&O9^Gd#Rors`9#Kzw9a093RXh6Xf8etD;I-x@#2GzpnuG!MSSJ*iP%VOwbmD} zLZeOe(T0ov{PGFRHY(>YJ_E}vWzhcOwbDWJ^Xs_w-UM~=#-$Ew6JwZLZCC}>thN*9 zE;Nh1y8^HoP8i9h5gC6j1=hCsf9dywi6#BUoGYO>)*PKy)VER_5xDOkg_SfWItQ!! z#M%guXF|bRP7*2QmC2NXHIFx=6n-zp$cxVclLxjRe>r~*BoldUe+*G^vBjjKTsf+l z+vi{%jE%5N*d%Hn)y3zb%uAzGyB_^lpf(n2#)~&`@w{{f`mgIe!?9Yg%V)}L+`wmV zBgVoY#?L-^i32(%{l&Ad1385a8j8Pl8Km3CX4JKXZOvHf`U^;WBRwo-UA3mLVteeosS*M;(awq8T=bNtJAI7Yr) z{`!gX*W2ZV=XtKr|}0L{i`>A{8B=leMF?TiHO{`&b`?TJ`KEKypFadXY;wV zzXJ>5GOtP8gmp*UKZQ&kjQ~de1mL1zV~-bKe?bJJ4^qSL8a}aZ<2iWQcq*1hf6P=Y*63HF^7`IfLuA<^$dKVleWFm% zfAM^lQ4f1j0lCR#q3lyXBmTxB2BD_I1`AxSqIDfT^GeR2xcQKN{nA>OXT28f6V4xx zZP)6F2-h>&6JQ)^g1dP2d++?-VyaWOx1xIerfNOdjBr1IgWZ~5jy?f5q`BPnKJCOP z0zLglz>^l33D&3k`*(n5Ah%cpYRrFnfAcRcq8D}FZsfCDb(I2VMdaC2w;ls0K3~(E zI=X#uiIdVw0&BkuLL*F8O9g80T${){+#bE{rxCko&F3*YgJ3-SHJt^f4Z1*f63I< zY@u%qv?XyGA)n-8ASx*4B@l`L>ne}9V$zwp+YC6<<)MwtsBQl zM6WdM!?tjk*Sf~3=qARgpQ@B@ZBySygsl+~w+Ao$KB804TeRzDH(z*`e;uDZ3Bd!& zqg7|aeo;!Kg^r!#3zKXU7ZGNCE(81%(gg&bD0C}voEr!@NH;JWpwlK~%k!81@A{#C z>VIoK^q5YCXr#G#_9O5&NF3TGizF)8#=vJpX2`s+?pVz{aDe?hFX!CtMBshSD`9yT z5IW2ly?um}lErwV{4S$6e|9i?Jkah6+zaPhCFp#o%Puv5ybS??+!9vM*AjqLB0tDE z8{NQBq~EX3#**t&0_)_7Wp8zrZ06 zIFwwMl4hpcOY(Zruw^+BsSI3=%g;zx5O0+pDRie4>IpI-*mEi(lbyO8f7+{mXNkPa zI9OrudYf=qvI|Z3u5NFHBFgCIXksnM zh4@29^4UvVtEQK@GB4?_W#Iw5hl6ZRfziRcjkG5`)K07O@B(yvk=0(jmQD(;)lSB& z_70___JR=E+8tRk0Bv}xe+l!kb8p^OalG3;jFh0vwO>DOp%HXc(`=li1Z#~pm|4P~cu$~Ne?2I=YfypRxF_6D zNO<*o`}l!JIf{6YcY?|$!>+NicLz_!?zm_4(FyMw46A%l_rT$vaj4g@LcLS`dim?g znzxIf!H@DJumni2PQZr>905YDgTH$_$+wdEL;+=QZkKj1WL}x(Vz&WJJW%+8|tSwe4M(^7KA`X=6n1)W)!8 zR?-qR=l~Pp&jK!Jw!<6C@6cs5s48gPeuA=}^A--c&wk6=cci=$AZfZeq&@E^gSzfVdd}gyAUdFrb}Na#niAj9Y*aX40aGVHSW~F**>nq~qG3T8M2?7RxU#6*#cfO3 zyZJe*f4kP~g1VNnP16Wy)X&qXB%Rn^mDFr|jmkEYNVeC4CNx-$b|4h!-Lxa8Os|tu z<{~2+^=Z+RU`^|hxqwuoM<&)AJjB*je;E6Yf~+aK?2ijNyKnHTv>g3$@&0|T9_h&e zRBHCeH9l+1_}4eeU;QQ!W&OTiB*=pBRbTq`e;3#No@tah`o(p>XR;+9cd_cKq^l+0 zS+wLo0o4IMMRW1=2kG+$rA=Ra?*B+4y>(h%JpI>Dj&_`2Zn2FJViqJ4v1K3L`|1w< zo_lo{;0vAH09Y@#zvUtl?%MFnW2zk+KHth!y63yfT$1lH9ltZpu$Q!9)H~8#Qtv-O zfBQ(T5W7oUdR&^vMR6^8w-90(EO(^2;CikAM&AYcP1}DM#t$8aIAECI940f}R#Mk1 z4O^EJPfrG}#^qIlL=bH<(@{_x6bUNgli=mWmE}XUb=0e*3 zG{}eW)Uh*8_G9T*cS>W%q-P z#0ZS9&^QoMfk*!v*VV~I*pU-soxZ5l>Bd5jRP&vOqxdTv3}Vh|gMtfzRy(nA9O2s0kFgA~m%6 zj4#9UQoxpxhA$Ot+9+!W8Ls{3f08^r_fTxfb(%C1Iqs0(T#c-;tAE*8Bpy0p)zsF~ z0vnE(`(_YoyY@%9X&N$A`em4hbqz*6!ihg#{z;@wLeTfVgPz-}I9m+?e_N_VTMr{{C#kNcey&W^}O|^etq8f0Hi2N^=Cm#ncFhlbe>D{=-fj= zu0fo3h6gg0NBTd~UtypQlu=-Fz)n)oE8~wC^a_OejR@y5ShSF_rtt~%jKy1F&{kh> zo&$fWd1TmJuD|-r)x+*nBZ<7m_wAx%e`|0{jJm1o%zu#P-_A-_V z_1;@Y&pL8UruMdeXZ)i@Z&P4uXr;)6#sG9c!wf2RzX-QXv#a8`q2xl^N2&qbt!4)f4QTCSBu9jtBGi3 z;A&iYM!SOWl|54D?x@ofV?wOwROG2c+E*jw#2DADD?w5(|q?M}_a74Ujh= zoT;Pvt*}T?5{-8UfA+Jk8ILF4(fY0%9#8cbL)x zdsO8i2*d_HP=j2-x2=8Oxo^kL4Kr>X@+3z;s0n@8Qd~Jrf39G26rZVOMBG@&8 z5BwB(v`|3kG`%KQpmFFHlr+6k;2a(IsV$5L%hHXX7EYmY*ftgL2C6hoK=Qo- zW7tK}y=DKyfB%z2yRAPr5$on27c?O$mMK{#ikANPX@^$w4Cxl82&N1cDZVeb&IPUf zyR9J0(4iHuqi8putFy7>daeYo&eh%$+llhlbXa7t2=aZwbuMUTy0w7UibpI<$vCxg ze82V;?_Se-B+=cGXhM)F(Qp%uvXPFDsAxGMHo>fvzM>{5q z$8FC>!;wNxmzA(pbKWJ9F8yW>hclNMlk~ zq(>fHkam#1sMeY4UFB5~flg-aZK`(#!|xo5l0hX^2??TCTWI)JP4SA9iQIz=oigEA zmaN)Ff3D!$*1qrDw`1pq8MhAkUhjGk6Z){Bch#1r^q#4s%bvZwz7 zcE^Y+S-5!mTd->ftI$XDSkegNsHCf*HMd-7(fd*BHM_MbQPm+lXzCjSJZ-J@&Nb)E zO4ngGi@O$#EaZm$ENHxB%>@9Gj43T$q-IzZr{SUGx|9HGDtgwrvm|W~JS;F{vgIYD ze==}&)`8a(FiO$1oiA|A`qX_?{pb}|{CsjKxh^HmJhzwR)#7o>Y7$}@yy_RfAYKdb z#CfF89nxnc$Uv~?sern$Yureni4@ab!4|HvY{cS*r(0kQ|I z^gYp&Wbj8I|BmAlCMyT}AMc#w&e0k>e;Y!&f3I+;;=S~_!pRgbp8vgKsKXg1rZ=J; z!~9qiRrZRfb*ttntaokCaMOJ*$)j@*1+@-! z;)e$`okwnXpD5T~C4EPPOGDvcqK?h{!=FQ?HgN};IH_|GK0wC6g_Q547Q^vH<9Gj=TeI${| zF#F>RIC4vGUOqaTj)wBy8Zb*W@^fs4o9F98$#p3~hXdAgca%gvf_Pk^fBA@F%ox5p z8%wU|O1#F$JG%>F9mJa+i302Lb(j%xE@`H_wWKUs8Z@scqg3Cp4@9U~cYy{TNp%lM zH4lf2uph?JM7TU1^G^{5`cm` z-yVPhhzUw}mlelZ`lf>CQ~TiezKm_lIWKnn#faTrPohiTv*N(={{Sq<`FVFIeH zKxcpLAj5TtT#}KX9vURuS$~kO_b_MnVdVoSV^L$Ld@!wpy5i0nE~-|bY%6I~SWYG% zkz6A2jszQNo??cTFS>9pQMm>6AS3I-1&=I23QYoasUVux38YApeu`_=3-fAP-WT69EFCo1{n?|%%>+8kV*>(Wg& z?8U0J5+YPZLcoD7(+5W@v*Xw2@T0^BCTpn>!Nd7ND#Xl@%`^9uz$DGw%;YzkDhc#b z$}U>PsbF_XJ%ARV3o>;CJzyHewbujSa6g=?JHC}@HhwKdAoaaf4`4wYIM`^=b<*ed z{$Ig#JP$B19j=8NxPRx)^a3UPnmlDee26_yeePG^`CG4k@bj;LY`S3Y#SVh$!vWuJ ze<%yk#(>K#vHE*fn#Rq-($OV!bvXEi9h?67x8FVg`7>mIMxsxkWwSiWM9-?rwTgzl zVufSZSt?16u|rv{)%Hfdy_(eA>~*bt-0F3$g&Lfcxum!ttA7~iC1-&R`&ZQx!LGy9 zg9@&F9Liwhq+BZawzcm&_wCr+u;A7q-+5g>j0t_%P~65G>T8bTbG5wRTg9M2H&@BA zHjzei1q2`_rGTPaF=$~rBx#lclJ-+u9FHrP@#(rriR3O^E5JTdnTo89>jyEBB!7z=Lr=`Qgw-nfTOa9G&Z^|Q-K48tn2FJglHO+5%GQcrw@ z+N6w~kI>Gfj5!m}GPhlv$5oQt^_k+seL6;)nRPxP$;0}eX1|G&VL2XG`AJxg~H*=A~H5jj^bg} zE5>~$=||$+1#u>%n34-OrsVFObAu)M^hoK!KokOP<0QFZ^H>qY(TA2BmgiO05YJ@tBbE7g3$-5;b*N)&xVH*D8LGh1bPb@ z$)<;X@76!RQgwDAK4db${d#Pd_77@+uk(^pi6eVqBrrmJ=IR zIHx`=B^=m_nsesF(tAm*nBIpr6|`xZCZP6AAP>y#3SJ%B97_Lz%;m#ME~wV$HQ9a!Rb1Ylj{+5^z(41M<^<#9@r3>;L|p z%MkXxbm9)RYz*o1naP@KkZM(~*C;o+fb^8|A}>?Ki!W6dY1hxs&%8{Z{YqDm_?!&R z@Xm{ot@+xe%S4kxJ<9&xXx(c;M(Whpf`8r|VWoHQG7vR{mF@+(^N(kSDxUoPxClI$ zO`=Gl;afKO>JNoqTVfpHw&{{Dx81*wO-Wbnx~a7Z@R>B9PW{?Y2KH-GmL_!Ab)VPW z{`w*ppx;%wfB44XI_|*b%^gO(eftk}Le73w#gCH?)he;c{6DqJFM@glEZw5*-N0cOx!0D`i!fu0_>F-nNWLVhd(oNfM6NQ^Yl2t1u*a3@i>^RspTwSH^cz^Vcx*oHD~Y+(7X6vK06tP#7ogXFvD z#6hJM*baOHCr8}b!3t?HZunz#L{!yhZu#S!R^{g#%5)j-%#V+{&TZRnUHAyYBntJy zPuyZgh`=Lt#{ecFo17W*7W+1ErSGM%(&7jpBTBH0*5C~cWcjBig=F(nn&f60^lU$4 z8zvz@JMQ3Ez=Pap^=BED*fW4c!rgAqp6QY|>BUyS*lPkG{uQ@!mpWcnrxj&uYln}u z2KZsu6INOJP1T=5Lk7xowc+Rta=su?$35vFYVA8lp0-O9 z*Z0XUP8)c)LQHF+aF4Bk=T-jaw{9IQNg{*;izyj<=)pBL?g_H*uhUSJxe<-TNq+BB z2Dk=0O9is&gTt+IS01n>WK2ty?URNG^)%~QApq2E5kqZ#V-7mUlxHrg_$VH4MVm4= zEl9cTk#XZSHTx~Ai^|$qC))#78uocXS?|<&3lhP0Qq12fdQW*PDQ#M*=)fxfxkTy> zEu_VX%f>xA2E@dU2J|dUPKGhbd?4Lft&q+ihgbUjVf6583bvG8N}Q}e?FnE`Mak_^?fz_~?i6&jnQjT@Z4Gs@iKF`2Z0QRt7P zuZfX6n*OUpr3w*j9eZJu{dFCraCGbVPxyU`SIA0S`@ZSR8j3b}mD6DLZt0N;Eh1 z^^K$ixhdDU>B{jvnkSX>gx!bZ&6G92m9BLc^E zhZo2uCZrQ55itpzs$t++(a)Ajsh>6%;v-uY{${GM(ZHIm7qvx`t#1&;^RxLeW-Loe;I6Xi<|GZE z3zRL@o7Y{M?2No47izTnGqmx!4?;b$LbmE|+(I_s)`Ge7^f|FqxwqZpAV0A;lLNS4?@| z9zWcptCQ9uj4W?;H2|^5x7*TpK&v%HATdSW%^fG7B|rr9Al#V6shHtupX69%W%?7A z8_bshAT zjdS!w7Wd5Hln#26C2$JBIf1V`Y4Y?mV%m-8D2`Fm^BGQU*#WXuU+)i7YM{s<;y%RK z)R#f;p99ed*(v;=o{e+!->jqmKuY$%%a^;l1KZ8W$akt3dqAl6>dj}*+VfV2k)0&V zrC1^vs{-v)62ZIOP6yK9QkQO`Fqxzbh}cw8h(h6Ivzv~Cz4sU^tr{kgskpOQY$rtL z!~%->3eA6Olmf1AP$KEKF|$;5ZCd4FxN8@-e{+9vM=1DH5+r54QW`}ixq6-4!)yg6 zV@JAK-H$6?J?+5S`>=^TRwoHJCc-p_N z>RPPc0%WowhX7q}PpL5`vBvRv2yM^qynz20+xg~aj7yNVX5cwCX;9Y2I zUJ8Kutx)p#GEEmN7f(f8kyunH)yth;pcn6y%z0-jd}OSa}@yKKYm~Z(${W zf($p`9{_P2;HxqVR#7wJTTUT3=A5uXYoaOyB*+cTVpiJI`qsA=>(sTLy<4WD^?=X4 zwOLZ<8hn0B6>M}HY=HHQ8_5yd4%5?{K*vvDBE&W?@=t($^Ft0E6 z(ME{_VZ>K#1qd6edA;4#GwPZc(o2onl4wiS))Au5_=JQg(wxvy&lZ(3Pjrf6*e*WU zmZFuf+#2Lqd{cf8jvsbd&>owVAa~$@l|w!24R9`D8A%?XUpd&k{cOkJxROby-yB2p=WDQne-R=j>OFH>IV&|&}E?!2m0S}qKmT!IH-Hg7of zp&+vwg)6WTuD#=}+%U$Bq{$Ra_C3fv_Eo!HzV`HbOWh?x*$Ym*#F0(!JQ@bNYt3jH zHIq$pYNPb4I9`h34kKxB-nusQb^+Pj8aWS&%i3Z6g7L)^y3+d3+STPPHv^D+8#32m zi$2*~?m7*V^wVZJwzji>5sR<%*gtpj0gpq`^luos#?O=rEUI1yOYUK+Q<>vWjp6mn z1m+je8qZQ;jpYKecmbDqww00VCH9R!`}ME83jPJ*=CepL-AQHEwk@j`20%dqtQ)E$faT~KL2$Q zXcXJnik`orE_$rn08~_tfi<$)*ON2xNi%Q-&9lXRNmkUNXTQnXehnHM-KmeM{~EAg z_g=f;u4voOe!(e3*JcZXq;oqIl*{=12D+0w6pXD<$SS5n zxsL7zFFV4_>TU{9SR>OnqG)*Pk2v6xS=Nj08B&L`te8EmB+HHRZ^!2r{BTn9G>p*P z{76qf-RR^Meu5`<7qx(i>NO#CkSS2Hc$x!5_PJkp05CmSLh49(nE%rmGL`ID2M<0- zP!EQ>e97Gl4hX_qoSC*nn4pe>C@lx4Fxs)G>xeJ}XDmJ-hF&5SY~E1}<0)oJf0Nuz zh|WY&_s2*=+F#5xW$RWu2PEHzUv4gyI0ns0KCPTNhM#7rS-FS`^Eafz2CrY46;Dzp zkw*gv#}^1{0w((N+-DSw{k$ni{Wc-_<5eqkm|5Hh*DN7cv`m{+z+dnuq}EL#~cj^H)uU+tqoiSL+&MGa#|GMbnYi=-%pz zRF=`ND%aZBG@F8Lxg+ZAr>5cVm{-nLJ(@T`>^24=#TTN2hW~JK>Ux~GZ`hT!M zEKq7(BG54j*Z%~MTZkGR&E?x_aTnRjUezJXCL=K`w2wjXI2tD@9yt`7E`FK_13-Y8 z0@VbCBQU^EqZq%S-Oxh9mW0{L_mT_zU+%C1%6jp~=cJ_VB;Tz+gJO<_`z?~CbmMp# zLFBA=yu#qKjKp9NOhO(F-lLqn5hUea3DanMwOBbg9npuJgSG^gy_+a>_&kqIY$J57 zNZK`Q)iDeM%{c;t3#i#FvD^;P93p^pxv(JhEGn);kHtn?PM|#Y+7pCftuy#hEWf=- zUNjDRG)pm7R~`~nXh+!3*@@xo!>}yi_TV}Zp{Vb7i@7KqZYmyg!vqTsgOi}Ot8w_k6oBd z0xNjWIJcsDMuR*&bbz}E<#Y)HO1v}xHq@4_jKLNt?1_5T*7Rlm1V zxJz*kZzzz@ic*KQ95ZZsG0eag)ueSbUT1>=kRu(oCY%a;=jRMk|6UX^nE@(|Cn*p5 z6-fN0)qktd)M|QNluj{2k@oJo;>(C8jWGV%NpiS|dv@wZa*16+1ny3s_+Z^1RyIc`YJ0#i;x z0IafZ#%c<}y_O#FrjY>YK^hF#UUTja7dk~Ds`oTE3`nHF?Q5cVH!<7mb$LBn8y>-R zjG=39mB5y(p-Rj!CQOy1VCHg^e*+VTh7L;~iLmM>j42N_9RBpr&qvnVa>6T~MVzsO z^F3%NkMr7E!Z-XdE?Ci0zerwqYjAoG(ES6qZ55(^I3^CaKELW+v??~I;)2*fnk7|( zjsFxjN+6r+0(x1m`6TiC&`LrgR<&=+s!*nSghxF0I^`HmRPAg4%1f0O-SQ>0e?5T$ zJ&R5o4q;4jnb-Gr^Q=O^B5f*CjMw7NRHYd6$$B))``Byww&tJmg_V?qvm&1aKy#kN zb#1t9A7pl4BL3aH5(F11mzm_$8Xwm#XM8GDkDvD!!HTKg(m_RKM|S11S4|lSY*}fb z3Ey%H*(qr7#rAEhj8Nt5R;S&t%qIR24lI+@ZB`fCk7$nbfQm0gcg*mOU}N>u*+Q!O;wy^NjAvqLocC@%4x;Vmxd-p=+}Gqw z0rt&>SiL}f4(fhA-PRcZDZM?goUlrt9$2MsKwFw@m4`YH8MD=xabZ&-6?W;=*Zd4G zd~NcY#Yk%IZa*R6Hx)OdKSMxQs?23X;KB?k*B6Ffi#Bos5)^{-X{gTwaDIJG9^vJ8 z&YRKutnXNLuP1zCo-pUU3M?`>Vwk;MN^(S?LD_uJo;U_#wxOh) z1}mYo8HaptQakZrucS8u_E%3NF(3oRnx;D@4ktE~2m9I7%;|g%kjNIG0MyKoK4Iq! z!(S8oJX~9m{li;)H|>m-*M4^bj^?BM5`^)FwKmNAiqk|vaF1A&Mu4|j;&D7Y3huix za)kudf!gr+8$%R+U{^CeLfa=1(Sok%UTEuty9crq^o=v~5&|4E&wT0R1J;k2RB z2OSGVwuOVBSTr1f_)Y;--RB}@_aW?whyC$kjq!0DAgr9KbvhOuA!n1;JLgEZ*9x`z7=RuKxs~y%v4i7D-Q#hNws7$g z1M7QBI%IUTgfWaHaFsz&V$HgIl>OH_^^0y3>5t)&NQ8Wd-Ck$14+4rJK`I~V4e`@o z#?M3p!1^E~-gt^M!|@69QC)@E)_%$t1WL&D@-gG}mmq$9+lG;!THA6lw&*NTszp<` zC$whZ+~;#vCk#PhZJn~-(Zi~GqWSWAf|2z^f*WuRP0U`%MvBD-E5W~%v@LKa@a4iD z&CG3RE82ghk~ovxSdk3+CubEQ)#MC^E!)8NfI|xO9N5xoVpTb0U4);fb0%y&fh%S4 z7#vx5`)3ww=D@c>@}m!l8D;)N*x!oo@yL=c=-#pMHMuYLvi+W#g zDhJCJAaoo+8z()p-@n=cH7s5%&N+;+`d2$HeS;gHW8$F`%&os;MNNNb(L%H?__V?$ zCP{Kuex}N+O!s(G&Y4?0?J)CZs(4>7A~LBu<-e3e_on>9&!$2x;imkd?4&B3{fxu+ z=55@7A~kd3lMV(ZN{ObKqXxIfxj!2Kvc0g2!TXNxi$_>x1M*zOH5A@iJ+sbx+iuUV zds7W(RGkEWA{GAO38B)=Klu`MP#7#7jDf5gDS$<;gD2XLJg8Y|a7(z(HOZn(F!$4X z@xsxMp_0%P%P{Gn(o8WCvMm3T=nlj8GN(XH5RH1S~m@~8-K zoFZGAMw~>HA&WAB?T8~>_|M2)HV*7B5NSm3m+%A>8FgOw?6g8mFWQ*GRAV6q!u(qk zCsnE3nKENbNYu7N&>(E+P4@aN2|~&zU}kWgO;|3@mOp!8AUmgiVjx7Cm)tjLg0@7P z=Mw=-4%NA=JE%PWCuSDRTGMMvh;{7xDGXFcfCG~uuKF*-Ev*73{X6J*#B}N-!24C> zooyIsN!=J<#G>Y74C`JLL3oSnlu(xBcH%}c>N9gXUrpYPXP5xf?M(t$0RUh-Um6bG%mU6 zHHD0N5}V`QzgxyZ%?eYn3P`ZmS64KaUV;R29RNhE{e6xR$O|lSW`q*b^^#7 zjpbf|OIB&4N)k>AycLv~xBBLZBerfu7Gf+Awj(hil@_p&(ucsnpanVt55iSXCg!~r zfh^|Md`VsTH@XK~eisJ*9^p0mz#;@*1YIR` zIojdCZ~9N1xXa9r6xUftOH^uR&SsTf8gH#25D>9T&Mm8kHrgIKq;iFuaS*O32Mt&h z<>MtbPR4{S+7P)&vRA>RY-MY6rFCn6Hz}Kbs7EOBxbBa5w}RK<_#>u&1>i?GnWst8 zfVnHX3{5sr(}=&e(UG*6N|GdrF*xqKQ27TVs}>Qd8oIi_^n%`(%0{QghF~|z_Xw1y z6K4EU(z?X!G!)z7jEUVQ(G_IU2!)*%jX}VhMlH!vk02OHmqw?y?N6oK5W&aHL-_I8 z3ECM=kQK=+tnb#ORDfxDI$-QwexF%10WkY1-M;-EFR5^pjQtaVSbbqfM?1hh!5$?)&^EA8%@+; zdu1iiB*Q?c{;r2D#^QQ-STtf@d4-;L!}v<%XO1wt`_k3*B@XUU)m*(MgR3V92fVhi zab(F4i#AW`+WyI?Tt29-ZawSP`SPeEwe0+vj|SHq4my*u<+xFf|M5XB;0w;CZsQH7 zlQYV`TK_utmjm;@5H=&6TrZfVFc#A$iQrwYOiyLdk4h3W)^0tD%!xise4X3}vjr2u zPi#y_4Ea!iM5R5c;PE-Q#S)Te7toq{A<0W0@p^ct`suN~^)v~w912M<0WI=KciJZ` zhW^=l@t4wmX@UG)cs1Mu%(?NcPGh`3SY9+@lu>m|VRR7WX=#Ip2FekfQ;IklHisS@ zs8EeuAUGpAU7#Pe6gOId%LKy`a`xjwQQ~?orFV@LHNmgeTCj9DwSoiD06>J_!~)?n zYr`E`+_)3Is!CcwQ>96T8YNUnj1GjMNav#Ji?SU=9-^0p)wu7ZQMeyxEw#u0Xd2Sx z*T@*qXh}r@YPcSz5W>vdBb*}UVHtH%+)<#Ki{j4wYK~8NQ`F~(xZQE?CI59szjXd2 z``t-)HQOzQ5DO#YA70!I4rte_fnjZbR=^W674W6QJdf-r$A#!W3HrIIBbogbqJgc= zHDj(C6t1dMYS`7Ojv`A*7}bm0cjK06IE)TC?xk6xWVXM(WXbOF0-WxAKFj!?RPb6K zoU40qDmLoOgq!Ght#cefs|oP*If^@~>X4voX@-jFB<4YGi_voefX3pd(4^Km3)wn) zxf`%l+~js<5M&vrwGGG6yPqWnBcuN2bo`q-9D$e;kx}BLdaNtz59DEfu0*G=C3VSLE zcP##BJxybufgD7*y6$@

XmfXij9Z;k|k*#;m-A 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 CBz<=P delta 55107 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

+ + +
<%= jspUtil.label("knowledge.template.label.item") %>
diff --git a/src/main/webapp/js/template-item-edit.js b/src/main/webapp/js/template-item-edit.js index a361a33c8..5864a6182 100644 --- a/src/main/webapp/js/template-item-edit.js +++ b/src/main/webapp/js/template-item-edit.js @@ -231,6 +231,7 @@ $(document).ready(function() { $('#typeName').val(result.typeName ? result.typeName : result.title); $('#typeIcon').val(result.typeIcon); $('#description').val(result.description); + $('#initialValue').val(result.initialValue); $('#deletebutton').removeClass('hide'); document._TEMPLATE.editable = result.editable; if (!result.editable) { diff --git a/src/main/webapp/js/template-item-input.js b/src/main/webapp/js/template-item-input.js index dde111141..ddba815e8 100644 --- a/src/main/webapp/js/template-item-input.js +++ b/src/main/webapp/js/template-item-input.js @@ -122,12 +122,22 @@ $(document).ready(function() { tag += '
'; return tag; }; - + + var initialValue = ''; var addTemplateItem = function(template) { $('#template_msg').text(template.description); $('#template_info').removeClass('hide'); $('#template_info').addClass('show'); + if (!$('#content').val()) { + $('#content').val(template.initialValue); + initialValue = template.initialValue; + } else if (initialValue === $('#content').val()) { + // 初期値を指定してから変更していない + $('#content').val(template.initialValue); + initialValue = template.initialValue; + } + $('#template_items').html(''); var exists_date = false; var exists_time = false; From 48dc8d74d1072e17cc3b740e02a3325ebf6d4280 Mon Sep 17 00:00:00 2001 From: Koda Date: Fri, 15 Sep 2017 21:46:18 +0900 Subject: [PATCH 2/2] #853 Change version from v1.12 to v1.11 --- .../support/project/knowledge/deploy/InitDB.java | 6 +++--- .../Migrate_1_11_3.java} | 8 ++++---- .../webapp/WEB-INF/views/admin/template/edit.jsp | 2 +- src/main/webapp/js/template-item-input.js | 13 ++++++++----- 4 files changed, 16 insertions(+), 13 deletions(-) rename src/main/java/org/support/project/knowledge/deploy/{v1_12/Migrate_1_12_0.java => v1_11_0/Migrate_1_11_3.java} (76%) diff --git a/src/main/java/org/support/project/knowledge/deploy/InitDB.java b/src/main/java/org/support/project/knowledge/deploy/InitDB.java index da4ae3da0..92a71f12f 100644 --- a/src/main/java/org/support/project/knowledge/deploy/InitDB.java +++ b/src/main/java/org/support/project/knowledge/deploy/InitDB.java @@ -25,7 +25,7 @@ import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_0; import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_1; import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_2; -import org.support.project.knowledge.deploy.v1_12.Migrate_1_12_0; +import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_3; import org.support.project.knowledge.deploy.v1_1_0pre1.Migrate_1_1_0pre1; import org.support.project.knowledge.deploy.v1_4_0.Migrate_1_4_0; import org.support.project.knowledge.deploy.v1_5_0.Migrate_1_5_0; @@ -51,7 +51,7 @@ public class InitDB { private static final Map MAP = new LinkedHashMap<>(); private static final Migrate INIT = InitializeSystem.get(); - public static final String CURRENT = "1.12.0"; + public static final String CURRENT = "1.11.3"; public InitDB() { super(); @@ -84,7 +84,7 @@ public InitDB() { MAP.put("1.11.0", Migrate_1_11_0.get()); MAP.put("1.11.1", Migrate_1_11_1.get()); MAP.put("1.11.2", Migrate_1_11_2.get()); - MAP.put("1.12.0", Migrate_1_12_0.get()); + MAP.put("1.11.3", Migrate_1_11_3.get()); } public static void main(String[] args) throws Exception { diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_3.java similarity index 76% rename from src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java rename to src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_3.java index aa18566d8..b5a53023e 100644 --- a/src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java +++ b/src/main/java/org/support/project/knowledge/deploy/v1_11_0/Migrate_1_11_3.java @@ -1,12 +1,12 @@ -package org.support.project.knowledge.deploy.v1_12; +package org.support.project.knowledge.deploy.v1_11_0; import org.support.project.knowledge.deploy.Migrate; import org.support.project.ormapping.tool.dao.InitializeDao; -public class Migrate_1_12_0 implements Migrate { +public class Migrate_1_11_3 implements Migrate { - public static Migrate_1_12_0 get() { - return org.support.project.di.Container.getComp(Migrate_1_12_0.class); + public static Migrate_1_11_3 get() { + return org.support.project.di.Container.getComp(Migrate_1_11_3.class); } @Override diff --git a/src/main/webapp/WEB-INF/views/admin/template/edit.jsp b/src/main/webapp/WEB-INF/views/admin/template/edit.jsp index e77d645e7..1973ea1e9 100644 --- a/src/main/webapp/WEB-INF/views/admin/template/edit.jsp +++ b/src/main/webapp/WEB-INF/views/admin/template/edit.jsp @@ -49,7 +49,7 @@
- +
diff --git a/src/main/webapp/js/template-item-input.js b/src/main/webapp/js/template-item-input.js index ddba815e8..1e334511c 100644 --- a/src/main/webapp/js/template-item-input.js +++ b/src/main/webapp/js/template-item-input.js @@ -129,13 +129,16 @@ $(document).ready(function() { $('#template_info').removeClass('hide'); $('#template_info').addClass('show'); - if (!$('#content').val()) { - $('#content').val(template.initialValue); - initialValue = template.initialValue; - } else if (initialValue === $('#content').val()) { - // 初期値を指定してから変更していない + var contentStr = $('#content').val(); + if (!contentStr) { $('#content').val(template.initialValue); initialValue = template.initialValue; + } else { + if (initialValue.replace(/\r?\n/g,"") == contentStr.replace(/\r?\n/g,"")) { + // 初期値を指定してから変更していない + $('#content').val(template.initialValue ? template.initialValue : ''); + initialValue = template.initialValue; + } } $('#template_items').html('');

^w#XRX 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 IB}Gq03U*aW1^@s6 diff --git a/document/database/knowledge.a5er b/document/database/knowledge.a5er index 43d5a658c..0f9b3befd 100755 --- a/document/database/knowledge.a5er +++ b/document/database/knowledge.a5er @@ -360,8 +360,8 @@ LName=認証トークン Comment= TableOption= Page=MAIN -Left=1600 -Top=50 +Left=3050 +Top=900 Field="TOKEN","TOKEN","@VARCHAR(128)","NOT NULL",0,"","",$FFFFFFFF,"" Field="ユーザID","USER_ID","@INT","NOT NULL",,"","",$FFFFFFFF,"" Field="有効期限","EXPIRES","@DATETIME","NOT NULL",,"","",$FFFFFFFF,"" @@ -370,7 +370,7 @@ EffectMode=None Color=$000000 BkColor=$FFFFFF ModifiedDateTime=20170620125822 -Position="MAIN",1600,50 +Position="MAIN",3050,900 [Relation] Entity1=MAIL_HOOKS @@ -823,7 +823,7 @@ Comment= TableOption= Page=MAIN Left=1600 -Top=400 +Top=350 Field="サービス名","SERVICE_NAME","@VARCHAR(64)","NOT NULL",0,"","",$FFFFFFFF,"" Field="ロケールキー","LOCALE_KEY","@VARCHAR(12)","NOT NULL",1,"","",$FFFFFFFF,"" Field="トップページのHTML","PAGE_HTML","text",,,"","",$FFFFFFFF,"" @@ -831,7 +831,7 @@ EffectMode=None Color=$000000 BkColor=$FFFFFF ModifiedDateTime=20170130131057 -Position="MAIN",1600,400 +Position="MAIN",1600,350 [Entity] PName=SERVICE_CONFIGS @@ -840,7 +840,7 @@ Comment= TableOption= Page=MAIN Left=1600 -Top=200 +Top=100 Field="サービス名","SERVICE_NAME","@VARCHAR(64)","NOT NULL",0,"","",$FFFFFFFF,"" Field="表示名","SERVICE_LABEL","@VARCHAR(24)","NOT NULL",,"","",$FFFFFFFF,"" Field="アイコン文字列","SERVICE_ICON","@VARCHAR(24)","NOT NULL",,"","",$FFFFFFFF,"" @@ -849,7 +849,7 @@ EffectMode=None Color=$000000 BkColor=$FFFFFF ModifiedDateTime=20170131001923 -Position="MAIN",1600,200 +Position="MAIN",1600,100 [Entity] PName=PINS @@ -1243,7 +1243,7 @@ Comment= TableOption= Page=MAIN Left=950 -Top=300 +Top=200 Field="テンプレートの種類ID","TYPE_ID","@INT","NOT NULL",0,"","",$FFFFFFFF,"" Field="項目NO","ITEM_NO","@INT","NOT NULL",1,"","",$FFFFFFFF,"" Field="選択肢番号","CHOICE_NO","@INT","NOT NULL",2,"","",$FFFFFFFF,"" @@ -1253,7 +1253,7 @@ EffectMode=None Color=$000000 BkColor=$FFFFFF ModifiedDateTime=20150910041119 -Position="MAIN",950,300,542,135 +Position="MAIN",950,200,542,135 [Relation] Entity1=TEMPLATE_MASTERS @@ -1264,7 +1264,7 @@ Fields1=TYPE_ID Fields2=TYPE_ID Cardinarity1= Cardinarity2= -Position="MAIN",0,4460,6903,3568,R,R +Position="MAIN",0,4460,6903,3717,R,R Dependence=1 Caption= PName= @@ -1272,7 +1272,7 @@ ModifiedDateTime=20150910034230 LineMode=0 Bar1=446 Bar2=690 -Bar3=357 +Bar3=372 TermPos1=R TermPos2=R @@ -1285,14 +1285,14 @@ Fields1=TYPE_ID Fields2=TYPE_ID Cardinarity1= Cardinarity2= -Position="MAIN",0,3334,5475,2219,R,R +Position="MAIN",0,3334,5475,2295,R,R Dependence=0 Caption= PName= LineMode=0 Bar1=333 Bar2=548 -Bar3=222 +Bar3=230 TermPos1=R TermPos2=R @@ -1308,10 +1308,11 @@ Field="テンプレートの種類ID","TYPE_ID","serial","NOT NULL",0,"","",$FFF Field="テンプレート名","TYPE_NAME","@VARCHAR(256)","NOT NULL",,"","",$FFFFFFFF,"" Field="アイコン","TYPE_ICON","@VARCHAR(64)",,,"","",$FFFFFFFF,"" Field="説明","DESCRIPTION","@VARCHAR(1024)",,,"","",$FFFFFFFF,"" +Field="本文の初期値","INITIAL_VALUE","text",,,"","",$FFFFFFFF,"" EffectMode=None Color=$000000 BkColor=$FFFFFF -ModifiedDateTime=20150912014311 +ModifiedDateTime=20170915171119 Position="MAIN",650,550 [Entity] @@ -1321,17 +1322,18 @@ Comment= TableOption= Page=MAIN Left=1350 -Top=550 +Top=500 Field="テンプレートの種類ID","TYPE_ID","@INT","NOT NULL",0,"","",$FFFFFFFF,"" Field="項目NO","ITEM_NO","@INT","NOT NULL",1,"","",$FFFFFFFF,"" Field="項目名","ITEM_NAME","@VARCHAR(32)","NOT NULL",,"","",$FFFFFFFF,"" Field="項目の種類","ITEM_TYPE","@INT","NOT NULL",,"","",$FFFFFFFF,"" Field="説明","DESCRIPTION","@VARCHAR(1024)",,,"","",$FFFFFFFF,"" +Field="初期値","INITIAL_VALUE","text",,,"","",$FFFFFFFF,"" EffectMode=None Color=$000000 BkColor=$FFFFFF -ModifiedDateTime=20151027035632 -Position="MAIN",1350,550 +ModifiedDateTime=20170915171315 +Position="MAIN",1350,500 [Relation] Entity1=KNOWLEDGES @@ -1519,8 +1521,8 @@ LName=アカウントの画像 Comment= TableOption= Page=MAIN -Left=900 -Top=50 +Left=3550 +Top=1250 Field="IMAGE_ID","IMAGE_ID","BIGSERIAL","NOT NULL",0,"","",$FFFFFFFF,"" Field="ユーザID","USER_ID","@INT",,,"","",$FFFFFFFF,"" Field="ファイル名","FILE_NAME","@VARCHAR(256)",,,"","",$FFFFFFFF,"" @@ -1533,7 +1535,7 @@ EffectMode=None Color=$000000 BkColor=$FFFFFF ModifiedDateTime=20150416234339 -Position="MAIN",900,50 +Position="MAIN",3550,1250 [Relation] Entity1=KNOWLEDGES diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java index b1efca39d..c5b3678bd 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateItemsDao.java @@ -219,6 +219,7 @@ public TemplateItemsEntity rawPhysicalInsert(TemplateItemsEntity entity) { entity.getItemName(), entity.getItemType(), entity.getDescription(), + entity.getInitialValue(), entity.getInsertUser(), entity.getInsertDatetime(), entity.getUpdateUser(), @@ -241,6 +242,7 @@ public TemplateItemsEntity physicalInsert(TemplateItemsEntity entity) { entity.getItemName(), entity.getItemType(), entity.getDescription(), + entity.getInitialValue(), entity.getInsertUser(), entity.getInsertDatetime(), entity.getUpdateUser(), @@ -288,6 +290,7 @@ public TemplateItemsEntity physicalUpdate(TemplateItemsEntity entity) { entity.getItemName(), entity.getItemType(), entity.getDescription(), + entity.getInitialValue(), entity.getInsertUser(), entity.getInsertDatetime(), entity.getUpdateUser(), diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java index dbce0f8ea..dcda456aa 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java @@ -176,6 +176,7 @@ public TemplateMastersEntity rawPhysicalInsert(TemplateMastersEntity entity) { entity.getTypeName(), entity.getTypeIcon(), entity.getDescription(), + entity.getInitialValue(), entity.getInsertUser(), entity.getInsertDatetime(), entity.getUpdateUser(), @@ -207,6 +208,7 @@ public TemplateMastersEntity physicalInsert(TemplateMastersEntity entity) { entity.getTypeName(), entity.getTypeIcon(), entity.getDescription(), + entity.getInitialValue(), entity.getInsertUser(), entity.getInsertDatetime(), entity.getUpdateUser(), @@ -255,6 +257,7 @@ public TemplateMastersEntity physicalUpdate(TemplateMastersEntity entity) { entity.getTypeName(), entity.getTypeIcon(), entity.getDescription(), + entity.getInitialValue(), entity.getInsertUser(), entity.getInsertDatetime(), entity.getUpdateUser(), diff --git a/src/main/java/org/support/project/knowledge/deploy/InitDB.java b/src/main/java/org/support/project/knowledge/deploy/InitDB.java index e222e874b..da4ae3da0 100644 --- a/src/main/java/org/support/project/knowledge/deploy/InitDB.java +++ b/src/main/java/org/support/project/knowledge/deploy/InitDB.java @@ -25,6 +25,7 @@ import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_0; import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_1; import org.support.project.knowledge.deploy.v1_11_0.Migrate_1_11_2; +import org.support.project.knowledge.deploy.v1_12.Migrate_1_12_0; import org.support.project.knowledge.deploy.v1_1_0pre1.Migrate_1_1_0pre1; import org.support.project.knowledge.deploy.v1_4_0.Migrate_1_4_0; import org.support.project.knowledge.deploy.v1_5_0.Migrate_1_5_0; @@ -50,7 +51,7 @@ public class InitDB { private static final Map MAP = new LinkedHashMap<>(); private static final Migrate INIT = InitializeSystem.get(); - public static final String CURRENT = "1.11.2"; + public static final String CURRENT = "1.12.0"; public InitDB() { super(); @@ -83,6 +84,7 @@ public InitDB() { MAP.put("1.11.0", Migrate_1_11_0.get()); MAP.put("1.11.1", Migrate_1_11_1.get()); MAP.put("1.11.2", Migrate_1_11_2.get()); + MAP.put("1.12.0", Migrate_1_12_0.get()); } public static void main(String[] args) throws Exception { diff --git a/src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java b/src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java new file mode 100644 index 000000000..aa18566d8 --- /dev/null +++ b/src/main/java/org/support/project/knowledge/deploy/v1_12/Migrate_1_12_0.java @@ -0,0 +1,21 @@ +package org.support.project.knowledge.deploy.v1_12; + +import org.support.project.knowledge.deploy.Migrate; +import org.support.project.ormapping.tool.dao.InitializeDao; + +public class Migrate_1_12_0 implements Migrate { + + public static Migrate_1_12_0 get() { + return org.support.project.di.Container.getComp(Migrate_1_12_0.class); + } + + @Override + public boolean doMigrate() throws Exception { + InitializeDao initializeDao = InitializeDao.get(); + String[] sqlpaths = { + "/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql", + }; + initializeDao.initializeDatabase(sqlpaths); + return true; + } +} \ No newline at end of file diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenTemplateItemsEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenTemplateItemsEntity.java index b5d0d95c5..6494ff8e7 100644 --- a/src/main/java/org/support/project/knowledge/entity/gen/GenTemplateItemsEntity.java +++ b/src/main/java/org/support/project/knowledge/entity/gen/GenTemplateItemsEntity.java @@ -61,6 +61,8 @@ public GenTemplateItemsEntity(Integer itemNo, Integer typeId) { private Integer itemType; /** 説明 */ private String description; + /** 初期値 */ + private String initialValue; /** 登録ユーザ */ private Integer insertUser; /** 登録日時 */ @@ -152,6 +154,22 @@ public GenTemplateItemsEntity setDescription(String description) { return this; } + /** + * Get 初期値. + * @return 初期値 + */ + public String getInitialValue() { + return this.initialValue; + } + /** + * Set 初期値. + * @param initialValue 初期値 + * @return this object */ + public GenTemplateItemsEntity setInitialValue(String initialValue) { + this.initialValue = initialValue; + return this; + } + /** * Get 登録ユーザ. * @return 登録ユーザ @@ -288,6 +306,7 @@ public String toString() { builder.append("itemName = ").append(itemName).append("\n"); builder.append("itemType = ").append(itemType).append("\n"); builder.append("description = ").append(description).append("\n"); + builder.append("initialValue = ").append(initialValue).append("\n"); builder.append("insertUser = ").append(insertUser).append("\n"); builder.append("insertDatetime = ").append(insertDatetime).append("\n"); builder.append("updateUser = ").append(updateUser).append("\n"); diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenTemplateMastersEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenTemplateMastersEntity.java index 97bbcb93c..fe0842458 100644 --- a/src/main/java/org/support/project/knowledge/entity/gen/GenTemplateMastersEntity.java +++ b/src/main/java/org/support/project/knowledge/entity/gen/GenTemplateMastersEntity.java @@ -57,6 +57,8 @@ public GenTemplateMastersEntity(Integer typeId) { private String typeIcon; /** 説明 */ private String description; + /** 本文の初期値 */ + private String initialValue; /** 登録ユーザ */ private Integer insertUser; /** 登録日時 */ @@ -132,6 +134,22 @@ public GenTemplateMastersEntity setDescription(String description) { return this; } + /** + * Get 本文の初期値. + * @return 本文の初期値 + */ + public String getInitialValue() { + return this.initialValue; + } + /** + * Set 本文の初期値. + * @param initialValue 本文の初期値 + * @return this object */ + public GenTemplateMastersEntity setInitialValue(String initialValue) { + this.initialValue = initialValue; + return this; + } + /** * Get 登録ユーザ. * @return 登録ユーザ @@ -264,6 +282,7 @@ public String toString() { builder.append("typeName = ").append(typeName).append("\n"); builder.append("typeIcon = ").append(typeIcon).append("\n"); builder.append("description = ").append(description).append("\n"); + builder.append("initialValue = ").append(initialValue).append("\n"); builder.append("insertUser = ").append(insertUser).append("\n"); builder.append("insertDatetime = ").append(insertDatetime).append("\n"); builder.append("updateUser = ").append(updateUser).append("\n"); diff --git a/src/main/java/org/support/project/knowledge/logic/TemplateLogic.java b/src/main/java/org/support/project/knowledge/logic/TemplateLogic.java index e8fb80b72..adfd95046 100644 --- a/src/main/java/org/support/project/knowledge/logic/TemplateLogic.java +++ b/src/main/java/org/support/project/knowledge/logic/TemplateLogic.java @@ -155,6 +155,7 @@ public TemplateMastersEntity updateTemplate(TemplateMastersEntity template, Logi db.setTypeName(template.getTypeName()); db.setTypeIcon(template.getTypeIcon()); db.setDescription(template.getDescription()); + db.setInitialValue(template.getInitialValue()); templateDao.update(db); Integer typeId = template.getTypeId(); diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties index 6ce949b2a..db6b7ecb7 100644 --- a/src/main/resources/appresource.properties +++ b/src/main/resources/appresource.properties @@ -694,6 +694,7 @@ knowledge.template.label.name=Name knowledge.template.label.icon=Icon knowledge.template.label.icon.msg=(Choice from 'Font Awesome'.[http://fontawesome.io/icons/] e.g. fa-book) knowledge.template.label.description=Description +knowledge.template.label.initial.value=Initial value knowledge.template.label.not.editable=This template is the default template of the system. you can edit only description. knowledge.template.msg.not.delete=The default template (knowledge, bookmark) can not be deleted. knowledge.template.label.item=Item diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties index d346a4b3e..bd393a2f4 100644 --- a/src/main/resources/appresource_ja.properties +++ b/src/main/resources/appresource_ja.properties @@ -694,6 +694,7 @@ knowledge.template.label.name=名称 knowledge.template.label.icon=アイコン knowledge.template.label.icon.msg=(Font Awesome[http://fontawesome.io/icons/]から選択してください。 e.g. fa-book) knowledge.template.label.description=説明 +knowledge.template.label.initial.value=初期値 knowledge.template.label.not.editable=このテンプレートはシステムのデフォルトのテンプレートです。項目の増減、テンプレートの削除は出来ません。 knowledge.template.msg.not.delete=デフォルトのテンプレート(knowledge,bookmark)は削除できません knowledge.template.label.item=項目 diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_insert.sql index 50cdf9dd6..de0c2c128 100644 --- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_insert.sql +++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_insert.sql @@ -5,6 +5,7 @@ ITEM_NO , ITEM_NAME , ITEM_TYPE , DESCRIPTION + , INITIAL_VALUE , INSERT_USER , INSERT_DATETIME , UPDATE_USER @@ -21,4 +22,5 @@ ITEM_NO , ? , ? , ? + , ? ); diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_raw_insert.sql index 50cdf9dd6..de0c2c128 100644 --- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_raw_insert.sql +++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_raw_insert.sql @@ -5,6 +5,7 @@ ITEM_NO , ITEM_NAME , ITEM_TYPE , DESCRIPTION + , INITIAL_VALUE , INSERT_USER , INSERT_DATETIME , UPDATE_USER @@ -21,4 +22,5 @@ ITEM_NO , ? , ? , ? + , ? ); diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_update.sql index 4f7f156e4..20cba5d01 100644 --- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_update.sql +++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateItemsDao/TemplateItemsDao_update.sql @@ -3,6 +3,7 @@ SET ITEM_NAME = ? , ITEM_TYPE = ? , DESCRIPTION = ? + , INITIAL_VALUE = ? , INSERT_USER = ? , INSERT_DATETIME = ? , UPDATE_USER = ? diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_insert.sql index 48ba4feaa..5ad1df82e 100644 --- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_insert.sql +++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_insert.sql @@ -4,6 +4,7 @@ TYPE_ID , TYPE_NAME , TYPE_ICON , DESCRIPTION + , INITIAL_VALUE , INSERT_USER , INSERT_DATETIME , UPDATE_USER @@ -19,4 +20,5 @@ DEFAULT , ? , ? , ? + , ? ); diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_raw_insert.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_raw_insert.sql index 0c51f5ecc..ad00cad89 100644 --- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_raw_insert.sql +++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_raw_insert.sql @@ -4,6 +4,7 @@ TYPE_ID , TYPE_NAME , TYPE_ICON , DESCRIPTION + , INITIAL_VALUE , INSERT_USER , INSERT_DATETIME , UPDATE_USER @@ -19,4 +20,5 @@ TYPE_ID , ? , ? , ? + , ? ); diff --git a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_update.sql b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_update.sql index e3388f0f4..7f2ad83b6 100644 --- a/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_update.sql +++ b/src/main/resources/org/support/project/knowledge/dao/sql/TemplateMastersDao/TemplateMastersDao_update.sql @@ -3,6 +3,7 @@ SET TYPE_NAME = ? , TYPE_ICON = ? , DESCRIPTION = ? + , INITIAL_VALUE = ? , INSERT_USER = ? , INSERT_DATETIME = ? , UPDATE_USER = ? diff --git a/src/main/resources/org/support/project/knowledge/database/ddl.sql b/src/main/resources/org/support/project/knowledge/database/ddl.sql index 007e6a342..9b38d1985 100644 --- a/src/main/resources/org/support/project/knowledge/database/ddl.sql +++ b/src/main/resources/org/support/project/knowledge/database/ddl.sql @@ -527,6 +527,7 @@ create table TEMPLATE_MASTERS ( , TYPE_NAME character varying(256) not null , TYPE_ICON character varying(64) , DESCRIPTION character varying(1024) + , INITIAL_VALUE text , INSERT_USER integer , INSERT_DATETIME timestamp , UPDATE_USER integer @@ -544,6 +545,7 @@ create table TEMPLATE_ITEMS ( , ITEM_NAME character varying(32) not null , ITEM_TYPE integer not null , DESCRIPTION character varying(1024) + , INITIAL_VALUE text , INSERT_USER integer , INSERT_DATETIME timestamp , UPDATE_USER integer @@ -1210,6 +1212,7 @@ comment on column TEMPLATE_MASTERS.TYPE_ID is 'テンプレートの種類ID'; comment on column TEMPLATE_MASTERS.TYPE_NAME is 'テンプレート名'; comment on column TEMPLATE_MASTERS.TYPE_ICON is 'アイコン'; comment on column TEMPLATE_MASTERS.DESCRIPTION is '説明'; +comment on column TEMPLATE_MASTERS.INITIAL_VALUE is '本文の初期値'; comment on column TEMPLATE_MASTERS.INSERT_USER is '登録ユーザ'; comment on column TEMPLATE_MASTERS.INSERT_DATETIME is '登録日時'; comment on column TEMPLATE_MASTERS.UPDATE_USER is '更新ユーザ'; @@ -1222,6 +1225,7 @@ comment on column TEMPLATE_ITEMS.ITEM_NO is '項目NO'; comment on column TEMPLATE_ITEMS.ITEM_NAME is '項目名'; comment on column TEMPLATE_ITEMS.ITEM_TYPE is '項目の種類'; comment on column TEMPLATE_ITEMS.DESCRIPTION is '説明'; +comment on column TEMPLATE_ITEMS.INITIAL_VALUE is '初期値'; comment on column TEMPLATE_ITEMS.INSERT_USER is '登録ユーザ'; comment on column TEMPLATE_ITEMS.INSERT_DATETIME is '登録日時'; comment on column TEMPLATE_ITEMS.UPDATE_USER is '更新ユーザ'; diff --git a/src/main/resources/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql b/src/main/resources/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql new file mode 100644 index 000000000..f8fc68aab --- /dev/null +++ b/src/main/resources/org/support/project/knowledge/deploy/v1_12/migrate_v1_12_0.sql @@ -0,0 +1,11 @@ +ALTER TABLE TEMPLATE_MASTERS DROP COLUMN IF EXISTS INITIAL_VALUE; +ALTER TABLE TEMPLATE_MASTERS ADD COLUMN INITIAL_VALUE text; + +comment on column TEMPLATE_MASTERS.INITIAL_VALUE is '本文の初期値'; + +ALTER TABLE TEMPLATE_ITEMS DROP COLUMN IF EXISTS INITIAL_VALUE; +ALTER TABLE TEMPLATE_ITEMS ADD COLUMN INITIAL_VALUE text; + +comment on column TEMPLATE_ITEMS.INITIAL_VALUE is '初期値'; + + diff --git a/src/main/webapp/WEB-INF/views/admin/template/edit.jsp b/src/main/webapp/WEB-INF/views/admin/template/edit.jsp index b4b6bc6c4..e77d645e7 100644 --- a/src/main/webapp/WEB-INF/views/admin/template/edit.jsp +++ b/src/main/webapp/WEB-INF/views/admin/template/edit.jsp @@ -48,6 +48,10 @@ +