From 7fdf9f7b019771cc1b55f1bfcdcf1dc92f4b8f1b Mon Sep 17 00:00:00 2001 From: "LAPTOP-KB8JC2K2\\acer" Date: Tue, 14 Sep 2021 15:52:06 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B8=E0=B8=87=E0=B8=AB=E0=B8=A5=E0=B8=B2=E0=B8=A2?= =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ApiControllers/rep_eva_xControllers.cs | 4 + EXCEL/eva_create_evaluation_detail.xlsx | Bin 13253 -> 13592 bytes EXCEL/eva_performance_plan.xlsx | Bin 10421 -> 10507 bytes ...10914074108_UpdateRemarkToPlan.Designer.cs | 1089 ++++++++++++++++ .../20210914074108_UpdateRemarkToPlan.cs | 23 + ...083030_UpdateRemarkToEvaDetail.Designer.cs | 1092 +++++++++++++++++ .../20210914083030_UpdateRemarkToEvaDetail.cs | 23 + Migrations/DataContextModelSnapshot.cs | 6 + .../eva_create_evaluation_detailEntity.cs | 3 + .../eva_create_evaluation_detailInputModel.cs | 2 + .../eva_create_evaluation_detailService.cs | 4 +- .../eva_create_evaluation_detailViewModel.cs | 1 + ...reate_evaluation_detail_firstdocService.cs | 20 +- ...create_evaluation_detail_processService.cs | 13 +- ...on_detail_processWithSelectionViewModel.cs | 3 + .../eva_performance_planEntity.cs | 3 + .../eva_performance_planInputModel.cs | 2 + .../eva_performance_planService.cs | 7 +- .../eva_performance_planViewModel.cs | 2 +- Models/rep_eva_x/rep_eva_xInputModel2.cs | 4 + .../eva_create_evaluation_d.cshtml | 8 +- .../eva_performance_plan.cshtml | 7 +- .../eva_performance_plan_d.cshtml | 7 +- .../eva_create_evaluation_detail.js | 3 +- .../eva_performance_plan.js | 2 + .../eva_performance_plan_d.js | 2 + 26 files changed, 2316 insertions(+), 14 deletions(-) create mode 100644 Migrations/20210914074108_UpdateRemarkToPlan.Designer.cs create mode 100644 Migrations/20210914074108_UpdateRemarkToPlan.cs create mode 100644 Migrations/20210914083030_UpdateRemarkToEvaDetail.Designer.cs create mode 100644 Migrations/20210914083030_UpdateRemarkToEvaDetail.cs diff --git a/ApiControllers/rep_eva_xControllers.cs b/ApiControllers/rep_eva_xControllers.cs index 1e0f408..6e68b77 100644 --- a/ApiControllers/rep_eva_xControllers.cs +++ b/ApiControllers/rep_eva_xControllers.cs @@ -357,6 +357,8 @@ namespace TodoAPI2.Controllers i.leave_period = MyHelper.GetDateStringForReport(p.leave_start_date) + " ถึง " + MyHelper.GetDateStringForReport(p.leave_end_date); i.selected_round = p.selected_round; + i.plan_remark = p.plan_remark; + i.eva_detail_remark = p.eva_detail_remark; var context = _process.GetDataContext(); var all_eva = (from x in context.eva_performance_plan @@ -422,6 +424,8 @@ namespace TodoAPI2.Controllers i.txt_status_chief_a_click_date = MyHelper.GetDateStringForReport(p.status_chief_a_click_date); if (i.txt_status_chief_a_click_date == "") i.txt_status_chief_a_click_date = ".................................."; + + return i; } diff --git a/EXCEL/eva_create_evaluation_detail.xlsx b/EXCEL/eva_create_evaluation_detail.xlsx index 76d636386ddb4b88fc8f657b4055824805332c04..b38cbf0c9ab5766d8e56ffa0356905a0f23b85e7 100644 GIT binary patch delta 7601 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 delta 7235 zcmZ8`Wk8hO7VePJEe!(<&Co;1P}0&N-Q7ro#LyrOLx_}sG)jYnbOh zYiYB|l4J|DsxgEC{Z@>!8tkY}l6isehye5|C$daXJl*dn{y1EKHfPbfFD_`W_JqjU zNGG61CUtVN2T^KETjR_gh`dy^F^~*%a~OkVTa-Z2*qs@!K9~(P)7rC(y~}816^Yox zJZNkAtkp98wY)CHQHF)%xiLGRRJKqv;_-&M)7&Yfv9 zW`r$3hkmcG3_0(xvIwnXCzg4$K8p zwf^Sn$1(?+WA(e7%CgD`$t}~bA~ikInYx!Y%;n+-6In2bRl~?Z?nd^W@nsAbc?GLq-9F{!w!tXUDD+6>-!vm_tFVb>?W{?xRe$eO(D(GUu+cs;aOQ>p z$}VKiiQ6+C+8b_8o@57uW^O#|`W+2>cdD>k|&FH%lOh2tVCsvvH~SThiVKD z-ZM8VN>7gFeml*ra2-5qwZB#tJ|0pR(74-6t>)~y9i0=dJ9P}VB}}Y*tvkdXM%^HL z&S*&RCPG6BVp^+|E*LY_we)ty0T&jKT;iiy>^uIfk|OvCybz5HyP_}AofRDb;Db}M z(!n&6X@tnSKu2^6Ug2op-3Tx$nX5`{W$QzLd&y`oye8G9ix7u0zRIytp zRZEg;uw^h18BC<8O`K26DvGy3_0`}0^c-f4#_=-Jua$OCrzB40OTKDZ3Tc20S@+SV zbh?<O z$2>8_>Qt~8NOKocfuy-BoAlfFyAugHijp?t<403+V2~Qv<5c!u`UZMX{R+`JWXP zNXomftl;2FA1!onC45< z=k4^oYalYD1v{w(r1hP(5u^aJxb+oI;k$M&hWV8re=VFO)dAs+k5^L3Gdy2!0w#vI z?F7=SE4Pz~&`i5=b~DP*+%b4x`XsE$9jLrlu#oHGV=8w<>A@XoQGmg$i|tTopHO+< znu~MbHV{?8Dnc5Zg-SDwSdJPcIB4f1=25kuCq(W(6qt1DP6T}pXx`qY-%;UqqF#=IK;CqbJ zuxYnRSzu9FrvhO>F7!oAx($bKZuu(rPP`Ck?3>6MUd;4fpXAn`)XFqvV#|lYzSuaq zQdJkG+YQ;h1b$8-Vvcp~2`r$)8>w$ycXoO^Xk}I0CDdWKS_=MEKKwo_0t-KK(?#mv zqpsR$Bjh5=h20FZ}SVML8uwc*`>UBVro?Nn5S@## zv)EV2)U`I?56Hc^fJ9|dQ?l*qoWU#{g8hEJQ{P70hiIGbQikO3S2h?FkJh;;S$J{3 z#L+2P0Hb~Vp#9xG*N$31)1^V^!HAp{SRv%na|O1w0b#6{PSV7GVo?QALWyUMDQUmE ziKpp+1Q~a*zRVhf$zRkU0If31&cPYW5BW=hkhvh)Gm??3k;7XZU$7;>1%?!4_6^A0 zO`eE-rTbQS8v49yCi!J6CyJGs0Cnh{Jg5b?5Ouoem-!RS{RTg+EAC1_vGCIgk=a-> z45|KZv5$Da1w}D9iSLS(j-)SUQ@1aJ&ymWKva<@Xh+w6I zm*;E44Oz&C{5}y9LDwrIW7roNotM27@@-52^pFKc^PR&EGKzQAK!bVrmArt(u_h!} zP_S)ow{<+};;GHj*_wm?bgiFggW>ns@WN@TEZ%5@M>wMwcl_bSZ`N<(SJi$A&a6qG z?dhLa+cjHdQuzh15PdK^Lkmn_Y>Rz$b32^7aQ}4~@_0p@>nTyNMjdc(*9vcE4j8%7O%)hlCrCRn zksTRdLP~%nAGL)Zp&}11#)5Bg-8RmvP*_W(ax-ZU_A1qzF}s|6h!3!y1_f%M&YSMR zEjCx8JGc7L#{Hs2Kmxvl#WH{T3xQz8zJXxM7`nZ6pZVbNv%4MmP$*&9J4CwRQN%|aw&=1jj}MDn3^01{nmC+86N;RdI4v}qlYD!n0ozsMiRVMc}GZw6zLZR zDsyhmsy%Y&GBZ0C0ww*$JPokx5zKDwx_?o>+^nvmz{}_jY%(gdH5?M|e7M^R5xLaL z9a}o)11jjx^~re5r`Ig?-2`10z{+d0S)zi&E4b$wEF>WuXT9!`eN{oRW8MHtu5cc)sALu# z(%AFyp5!36DwiK>niWfZR(OQ>H_IF;2K0v^Z`^sBR8>{3l(_@jsdF%o8yr(iR^+CR z&Q71Fd1AeO^*9i)TjgE#d3zrQb1M2e&N{N^M6SV>)mD%leca&cAIR@4ChtA# zR5?AZ@k!jUpvv5-Xw(Juq)X^%v+NB;a?Nwjr^5^S8cEF~BEcZw3|vKHa-hvfYPn!! zJj{fbxo2y`=%eJMDcR^%r`D`gdaI<;@4kk{d;ia!z`GREKx?98TH=LRwxn2BSbsQ( zgr;sYwk}ag%*qPX`Ko_f!A9u$n3dSZ&g7Vj+?e(9JXQ~Ji?9{K0#7N}SK3HVvED{k z#L!QFCEbvREHAa+;4?MT!w(DVY7;cA__TKfxT~z;Mm%+DI}T_wcj2z}iwqPPBi!Lm zzk?!)$y6YgGmTM&A72NJo0^Nu!@!Fy4Lpk(R1Ps6K<8L_am~wV=~&;#9k#nRQ)u31 zSAcL-zw^#}>Cv=B#jd{}=1n$)Sei!txekrp`ZTVC6;RuTQ~1r7k?HGAUGyn=QJ5y< zM6EY^nBiMbrN~C>`D$TqXfSqa_w)p0o@q zrD*Ik1KHQgZbd}H4hFCyMjtu(v^q6kv4vX!Ifw*Tn&q9LPq0#bd!BqfNng@kslXC5 z+h_L*#xKkwTCp||@MOxfBBtSa*7jVN5Gtm3`A>&y4GkVWJm2^;w!0I1w=Ks5JOKNHTs%4bz`JnO_= zgY|h!l)?`?7sgKSv!vpc%b_+^IV!4?`RQwdM=3XlXNBa9QMEX8MdH*0jY`Y_%6k#&nchj989JVQONChr zkLHM8$MvDBKf%SBRKF^fu~x<}Er7XXw5CO%Z2l$P`CiL$(QH#n+F60Vu42ENd#O;I zjCP}7TPUdjvwLnV+io+DTksgF3~FK9qR6y_6RAvV32D1kKxFZ?bTaAbo>=CCn06+|t3)K9i;4!{84U zG3N}7|I3jgqf=m*=jirAXFok-<-W9-+YeL9TtuV?@7`u9$2hp6?(}3_*RdOL{14~{ zb`@9NV<3ZybuxIy_a`v!;ZJuh4RNGn8FXZrrSEa~5-7~d51I}3*%XZ8cBkj#c?3J6 zm9=R00VO=FK|PVj}$Y z+z?-!-e~+BHn_|k`#5&?ZTu`hCp$&-OkbOpe=t6pfo4K8GrNLL#5TDF>Rphfhk&B5 z;Iat}GeKJu*#_7X3;p!M76U7#b_a!Ri}WS{?f=&jj&CBqBK7bvTRy0i(oA;qowTJE1odXtn$rl2rR^$ z>e>^;-u-GHJqJS@WcjO~7Y3uF?1ZqC+B(JF$9qa5840r_$>h7Pwk^ma-*j2n8p-Cp zNfg+F%JpXkvpUiZAKMmONQTMal9qLnkrsbw>ZqniNz;=k*)j3?Y?AlB^M@<1i8e#R zrx@!6Ma#AiMz08LoJ-* zaZNfLPUJimZGlnS|7h3zJiFUx6KXx$39_fm`bWU8xOt1A(mz@0!>aaA3c=J8O9BIe zAA7vr@#}?R`I3a#g~mE(By`@M4{M38{LZ8xB_lKUig__}%;c9j)u5&deerV1^?>!W ztH|4s18VH;&7?Iic^O!Gg}TuJL)7xIRd_G6!>o~Rc4n3b#d`tL2JK&cRlVNWP~&=}z6Rlj#LtKI7h^Tiu@8NGht`)hoUf=z zK^EHVl$7F9WykjgCr^HiHg!Rd`yYXwNryQE7)qd`Tm2%AT_iZ`{_C?l8SDo6Wh@jo znHjlq1bMsqkvbkOR&R|XVUhkQN(|}NM;{c_O{-t2@rwi)|M)aJMLNzg_zuAzUkTX1 z&j)ONiTiJ&DgGgvhn2py{89clVUe;+b>>R%-HbIieKSFGnFPY$w9+jjh3R-aY)=PeFpDL(WAGEObMZ@A4Jqdw-a{3N=s>$tdJ5w_H4jGrS~9)TJ@oRe6t87UOIuMz)|iO zEdAc3v7;J*;_0#X4tj{IOv(zmC3v+)!CtSUe;$|-;f ziGt&^r&Yd4&`~@h@HS*MkZdO$wXtL4`}fBuIl#U}?qyY`Uk4LH=@t`{t=#;(c%|{^ zs6U}*i*<6_jBntZ)*hi%i?(z=9~F;97EItL(`VOKY(`I_A23rTnqkgH!*srZ9${+t zZ7+e3?`I{}rRw@4CrsW*%o}pL>!a0AD&}J7-A4OB}_MM2F#|fdv>6AiFuJc5}2wQQUiw%^XGn}woV;B z-(W2?OW|WUt4EuIbwKW>y?Z)fZqNR(O@W|8KUUSzJ8a53q**27GpG};O`l-2MMbbV zORqTk#V7MchRQAFmE!QG&b#^I&28{E{18Dx!#zy6fPwG*XGTJ+H^}%Z(7fX3wDR)S zzmyTBILNs5I_Qp}%^Y82oqUzJ`bBd$NZ@SuzF+vgWN$teY$`u+UP4NrHt2dVY<-K~ zmttaahg{wdpwQ_38CS+-8y^))h>t&6Zv4uS4gDF9?R`a7~Bf3U;yp+YbnuH;pfOWO!{^ z%nzr6Zc^NhgE=?jML*SSzB&2`uKFGS=BBB<6ZmB4tWGp|<(@-4%lP29F$3xMqsHeQ zVKSoP*~gZdSBH%Iuo08F_5lwr^CKp6CL!ILnzZ6t)w1@FwBI>kGwu}BlcSaN@B%b) zY!h5#byXAqz_g(e%!C3n*NEUF8(34jCHR2U#91gsH@JmMwD!v-47QYhS)z7yTvTs% zcMroigh-y}d%-T2bAFFTR7ddg=|L)`nd7toaY82Lu3=_XFa0A>cgue@x{;Cn!6N4# z-L1;qP7uP(S1axjMG-z^wiPVJZS+#Nr!;OxQ+C~?8;Q>uRN8^vPPx>T?!nzq*gT*^ zB(#WWtz{Hh36e?d;f2`gK%EP~7~eF5j99#~++p%uSnBzBv{|-j$t%Tuzh?t^^#`ufC`Yl>M18&^iAK}$fF`AW)=Gdm!nCw&OgXr ze2jp14^opGKT?>V9(`T{XKTdTOD}A7-Vz~10Dr664cS~IC>X0U%w~G*y_~1x#Z@_X~)3D#LYneYdK|8;4|~nl*s|j zH;5uK40IZ2it~)mYj>Y7IdPatoi?mPU(liqG~HjyxO%Fl45N_K64#P&YZ)oOX^tBE z8II_FLF#26yVQ|Y=a?In<52Jn3&zYldK@2#CR1M6sZ=J-&+_T@_1eU<#V|sk?@)iY zQLxIexO1#~1v2+Lv9;{LMFd98rird<3&u@49i30bX2(loXK1yUfyf|;{YpTy#Ui@I zHDR>;rA8G!c);ZS&8Txb*#Izt@275&$U?Ssg3x@aU3KvDk!!zi$@8d0oUq|&N6}0# zWQT9TnJ46xhZ`*_D-rn^v0oDOXN{e;z!%w$T+(DbQe|w{)N#SBMtL%5)S4J0(@7)663xtfjvyl?hdm`etF;1gRVxefsYNa2lxViB77U0fZ*}xKlTk1-X#F$`2V|Q|Ct9oVEsS6Gk7$-jm!R>)jc~nT`M!I-gTef}7g>?A~D$^UK${w*@{_02X(5 zp4|VTyG0>QD%b_4A0-vuace;GK*p?fkArkjW9c`f^No}tf_r2gnemEW1DtPa@f!(X z9|k~EuSugtyN8{TKyxOa2h0N}7@loVZuN&%T@5TJ)!1kx*Nl7k-D|(HOplkwyHpj zmZTEK^LQj1!CRN{a%LPDDXF__p4C1V zk!B35OI^gL1NmiOB*o{FswE}%#4C_4`Rxng%UV2Y(>s4&q-M2jHdY;6$Wcbo0W&JAEq)C9Z7%u?lkr1z$O1YdG(8YaHvVD9|&S6O@6CJ3f)Ex!Ewm(Mnp zma7E>xM#N3o{0O6j+mIF#^;k6IV?F%QfoXitK>i*5k78NP4)LyCB~n&)@G!#t*@(4 zm0>p_1!D&J51o{}JT2d>P0LlzJ8OmBcp1Zqlul*PSz6QwVnw*q9O~8!v3`5AUQ@I| z&}QR|AaJ>)dV|>6b%2g^l)P7e6z!Rf%KBgho2mk@RB+> zdZFqJm^1&N{+0oqr6Cvn!^-LD%@sQoy;Y-ZJ<`CvZGWL+ML5iXdou4&+wzmb?0X%O z67b^r<-tf-#bsC?*Q-_VW66@q?`~*G+^@#hI6;VvrScTzvV^bM+osg}`De$&R0*n2 zm@~!>EH+e5eQu@MwuRJg$aU9AZ(`Ke5_7FuB+ky*Aq3}WrRq&O1A>#N70^Xk>WT`A z@L)I3~fCtauGF4Pk#1Q->p+11bh5yzxHaMrUmwwO+pZZLz7w^ zcR0t&*(`oGMr2qExQA1me9lq6lCdnlaBZmj+R+Y^y$!l>kNEw}#GN3U$hKi;m$6k& zZPuDkP0}f#{@mmDsHpkofARSH2#gPhV2XZCqO2UjNYzYrJybms61bM6Y<2o%u2DKa zqm`97{A);yyfdEQctE~if9yb&JS%8v^EF9JKXxq4PTk>T(d3AX;{c~HkMFj))aCG6 zaYxI)>wonX5YSh&`t(t>OTqvq`EZAFD}z<2^g@Mx6yogK*n!Rf_Dx!z0ufgT@*9Hw zI6iX@tQ>ew)jvT;J^V)1F>p|<&-?P+P2b_?#14C+A$nKdQwfzLY#zy7K{%4NQV577RY0{7YoMPVUP!^E>lKq zGf6l3QQqR89Z7z|-`vdEk~>g(@2jTq9hx|Nll!l#F0Z}Jp8V=PnwaV8ImRLtl2Jr^ z^@T`b@=9R9;v(kG``#Y?_9#-}-JE5yWa~M>4(Vqbh!i;otIX@?4{@rp3wDI;?MR}3 zO@SHK@6oxBJiJ-sU98{mqFCP2&vRhDn+FUuBpcK!IW4zYIh7ssszbXk^c=Z^m=WoH zY`%8&1NQyhD`AJK3PW|Hep5Q7W3zxinr!g)VGO`elYdD&p!~y6HLe(N@cCcO~_AJ);S>T4Gi|=~VBF9OPBHdY38R{ho(= zP@r0zbKLNf{hL+B?ej8?Eg} zBX?%U{;K>yo$f!=zcA`#*7-yx00(dMIiwh9Q=}L9C`@r zWaRv;013iu&x;vp3J*~12vm8R34d{+iwoZ``!YPY7@dPC6HnzuJYKb*n8>(9#%W|; z^0QK5ZrQYHk`Ss7&VFf6fAJ$!FGsswUEr3fS??t%xeB8BSl)HYxFM0I`lK~NDQ zyFzoJD%>)~6JvIn`&or4XFWzO8BQ*(W$2TOf;t~a$Rzs`MLf^6i6ZBxX7Op(iELad!0! zY53s%J>z>@XqPa3uoKLU-U?apI{ybGbexgz*tm6)Pskm7$#!ojzy9-S18p)tpiQfV zM#|4Qn<`xTL;lWaluwLi8g@JN+d}QpVy{!;yyrX2+VRJTMc!pc%mFC@cPG6}CE%oV zP6n;(Hug}Isby8cuJ2ZffpV@e0;BJVHlgFe5`gWvVKsjgB)PnyJ5RJ+x{ZvCQh(v$|5aTQ z>f$lF+U=gO%00lWQKYHOw-!P@&G}vY@-}KDUgnX(;*{+kJUr_VHv}vZ;KCW6-|`3% z!L>GU&#rwkj=49t{F8b3*^%U7D6RXyH>D)XL(j;RVlLZ!<$@F)ZuDB80{G$1|C$Y%-?qY=Af6BA ziG#FSxf6&v!GgDmgAx7`_1+8`(+>_e_47E0JzSacZa>`%C^RKY>*O|47u1J>#OVciJ`Q|JdSBu zq#V?bcH*?|L<>jWrGET#r=Z~jYCBi9UmrTFRl(#s(`H(*k1~i!S+GtUJF99`oU3Jg z4kN^aSZ62NUT4|ov85sAej>I{5zxq5z4iu*sH-%y%u@APH`aCRxYI2$UYFx{u|S|2>J4J3uq^Ychxii6{73s(a|6th z;onfr47Z@0COE)lh5vu#_$zh%TkHfP+=zY@OlSo25`M!Gbe;r+)CK7OKKVHSfaia> z{~!oTaF^1fj}j&5i%Jqkr4V${ghMG!;lEdCMh5`c|78u3|D#AFT$R?P2a6M)NW+-M IB>(RH2lZ*5YybcN delta 2957 zcmY+GbyyP$8^uR6VzkmJBcwq<1`MRTM-31dr4k~S6b2(ihSV-0B{{mgL_|cSOWM&O zG3ip^yZ1id^F8-_|2@C|&NLIqNzjJ9YrG}6%yGgb zaS0YZp~qV6HkaW`=FRU49V)Wm*4&xp`F0asm*}+mG>e?aZ91fq$LX?P2co| z#f|{U4DljqTD+T=QYz4D=$sNl$ly2w%j-ta?naRVf`&0ai-HeFTUi5=DggX8ci*p- z3Oce_2oyXf{VUyD2b_v#6`Hx)Oo-V*@HSn07XhNXPKfmjXT-psTNy_E{f z6S&qyn2CzELf^qv3Tn1lCqR8~0!oh9k92JUg6@U-p3^$5#uUPEAmG_vGdjedD_}uZ z1T(%~$+h}?iw>2{0i|!88mKNHRZ#K#i4?D{@mmNaKhxucjt73|7?eHh8@u2%_<#*q z@@Y0PYLYX18Zvln^^6d~K-Km0#;3h3yG8LEFt%hP*hh1xX*6D(;juov<|!z_kGcWC zA(1&1uiWF3wGy6u9B(?!A7SHC)oFT``XifozOK$9C7D08;gw>dj>V_VrdaH_Io#&6 zIZbf2R=L0|%t26zJ)9)^d7jq%MJ4)|aZ)YG>5o&pjv24EvsR_&YBg+zACuj7oZCBZ zp}}_ie%+TZnbUx&S2h#wBwRUq&CDhwsB$90+`Rsnrpe9+zlkvUM2rpFKxsk{gy<=| zIWYjxN&^5e129)$R%Ev2g72z4Z78n%nk@Z$q&J+NB7^l2IW6|d(}r|6N8(Z^TYGC2 z*XA=^$p)LhEyJu1-JsvQ$rQtuD4DAh&ggHi2mV9{>Mtg!iQFM`8eF^1_BfVbAaeeSB7d#`CM!{ueB?u37AV<(LspSHy4qAc3YYrMb5<1W36z=NOZONcX=5gkpDcAw!N-1Rw$ zZA#ZFcaLerv)yUw|?)0wV2Gos#jcs#bzwx!$ z2<7K?fSx@k*$Wx9IWBzB&4}O@$$Wh&a3g=i!jJO~LtHipA|6?p;c7lUpdHsh zf@a_0F(~~mwUkdeH(k6&ou^E+e_gr6LOvv9WyIiyc$dc*Nhs;bw+LRXdvlN(Yt6PI zM`z@z-ts!5g{}*{+V*B!jt(vBG^Q@H5c>;^beh&wl%W$R?Mo_sO0-^3PF+@UL?%?R zRWp<&n+U9I6ZYmz@yk?OwpNAznch!d&_ZVik|rW^qj<4N3i`Svy(u!!PNUQKY;;WH z2RzlpZ?2%=<>iMKuM4qE89y=)gZ8J=B6;nlrBPVV*jFckB0Q=1nA+0zcM@)1%Xzvl zk)N}p9iM5pZk)1I>&AZLNS)GKdiAJg_r0DNTYYa$gpR+b*H=7GD3+8wtt-mBo=v{= zbFPHj_sv!-{~>GUE7f*UYRAJ7vq$>%$YtA^P-qfIn65#68;Wf-yEc5Z0C@95eT#T-aI;sswFA}oCLd#bk7ea2NyLHV3?3mnKN z$mIY-RpR5cA7#98cec}S(Gr{RI&~~+!19I~AMazzn9}>;K}Sx44sTJ)pZDdDBCfLl zTJn1G>}Shj`X{3B!#u|nwNRIo!Ky4f{c_0pIt1g$%+#bl7)L+BY_hZV@efYwsq8_m{il5 zCT_vdzMaa}lz1}lRLfK0pqg?Bo0xF&UgSh)+QYV1Np7GvEFC`LTMuEeYgMK9EEOp$ zcH>V6_z>JR~nrV_Ir1#%0#6k%PCxmdCf7DduN5z;&z~7%I5B74ACDK&OX~S3_D&C#uB; zcMcr{ zsxVk(*q%D+v1X`#@;SpaIOJTf>?Jqg-~rovbq(UbW^*6Y+OO=9xgoFO&XqN90^Fd% z^SiCAle0j*cb623yto(bCCJ>E^vdke8M%G?=-*aK>8{KJxxI)tzHdNv?q1sxL>?bG z`6U(&=uU4uajjJx0!KcB*ZS-;Qo~`|a7h_L=iR-m1~H+VkvNBcLi3uFk&w76-`b-gpId+cIcV4`L921D{abB4)Cp2d zW3401xf7?W%@{Fjeb(3%oAX7s=sG03h`LNgMCp9wEric)FjA~gyw=bHtR=%ENXRE# zHYBDco@LRgl6<_VZ4V>$^&@_j)^}#_7QOY8d=wUk`<6JmR9+{wUqzh9i$MV? z7cHAxQ*GW-B?|AK>f(PZum@MDeCMDP``~&JpcJm&zNkcvU`(l1KDQ3aS%f}=m1^tg zIz4ih!Wn-Bo5|*Mw>XPmEg(Ww-^JV-QMGDhkI3C~k&~7!=38Yk_G=SIsvT1Q^Zq&c zAVmM2yY^sHf>}%*Sd{Jm=K$beM~S%vYY?PjpaLoc5}0rSZub8bnFIh}{1*uTjI&`n x|HAk&*8;`_0vJO<1-8Ep)Fl7_Z2oFK-T%Q4F@=K4gzdbTH9=m|ApXC#{{WA*cwhhk diff --git a/Migrations/20210914074108_UpdateRemarkToPlan.Designer.cs b/Migrations/20210914074108_UpdateRemarkToPlan.Designer.cs new file mode 100644 index 0000000..ad9b267 --- /dev/null +++ b/Migrations/20210914074108_UpdateRemarkToPlan.Designer.cs @@ -0,0 +1,1089 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using TTSW.EF; + +namespace tb320eva.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20210914074108_UpdateRemarkToPlan")] + partial class UpdateRemarkToPlan + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn) + .HasAnnotation("ProductVersion", "2.2.6-servicing-10079") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + modelBuilder.Entity("TodoAPI2.Models.activity_log_evaEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("causer_id"); + + b.Property("causer_type") + .HasMaxLength(191); + + b.Property("created_at"); + + b.Property("description") + .HasMaxLength(4000); + + b.Property("ip_address") + .HasMaxLength(191); + + b.Property("log_name") + .HasMaxLength(191); + + b.Property("mac_address") + .HasMaxLength(191); + + b.Property("properties") + .HasMaxLength(8000); + + b.Property("subject_id"); + + b.Property("subject_type") + .HasMaxLength(191); + + b.Property("updated_at"); + + b.HasKey("id"); + + b.ToTable("activity_log_eva"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b => + { + b.Property("id"); + + b.Property("command_no") + .HasMaxLength(4000); + + b.Property("create_evaluation_id"); + + b.Property("created"); + + b.Property("fiscal_year"); + + b.Property("imported_date"); + + b.Property("imported_file") + .HasMaxLength(1000); + + b.Property("isActive"); + + b.Property("limit"); + + b.Property("limit_frame"); + + b.Property("limit_frame_quota"); + + b.Property("limit_quota"); + + b.Property("managed_by"); + + b.Property("percentage"); + + b.Property("report_type") + .HasMaxLength(1000); + + b.Property("theDate"); + + b.Property("theRound"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_id"); + + b.ToTable("eva_adjust_postponement"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponement_detailEntity", b => + { + b.Property("id"); + + b.Property("achievement_final"); + + b.Property("adjust_postponement_id"); + + b.Property("adjust_postponement_quota_id"); + + b.Property("competency_final"); + + b.Property("cost_living"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("employee_no_at_this_time") + .HasMaxLength(1000); + + b.Property("fullname_at_this_time") + .HasMaxLength(1000); + + b.Property("isActive"); + + b.Property("is_for_postponement"); + + b.Property("level_score_final") + .HasMaxLength(255); + + b.Property("level_this_time") + .HasMaxLength(1000); + + b.Property("middle"); + + b.Property("migration_eva_result") + .HasMaxLength(1000); + + b.Property("migration_total_score"); + + b.Property("new_cost_living"); + + b.Property("new_sarary"); + + b.Property("new_sarary_with_quota"); + + b.Property("order_at_this_time"); + + b.Property("org_at_this_time"); + + b.Property("other_money_at_this_time"); + + b.Property("position_allowance_at_this_time"); + + b.Property("position_this_time") + .HasMaxLength(1000); + + b.Property("promoted_percentage"); + + b.Property("receive_quota"); + + b.Property("remark") + .HasMaxLength(1000); + + b.Property("sarary"); + + b.Property("score_final"); + + b.Property("total_promote"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("adjust_postponement_id"); + + b.HasIndex("adjust_postponement_quota_id"); + + b.ToTable("eva_adjust_postponement_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b => + { + b.Property("id"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("evaluation_group_id"); + + b.Property("isActive"); + + b.Property("performance_plan_id"); + + b.Property("score1"); + + b.Property("score2"); + + b.Property("supervisor1_id"); + + b.Property("supervisor2_id"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("evaluation_group_id"); + + b.HasIndex("performance_plan_id"); + + b.ToTable("eva_create_evaluation"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detailEntity", b => + { + b.Property("id"); + + b.Property("Final_summary_chief"); + + b.Property("Final_summary_competency_chief"); + + b.Property("Final_summary_competency_supervisor"); + + b.Property("Final_summary_competency_supervisor1A"); + + b.Property("Final_summary_competency_supervisor2A"); + + b.Property("Final_summary_supervisor"); + + b.Property("Final_summary_supervisor1A"); + + b.Property("Final_summary_supervisor2A"); + + b.Property("achievement_chief"); + + b.Property("achievement_supervisor"); + + b.Property("achievement_supervisor1A"); + + b.Property("achievement_supervisor2A"); + + b.Property("chief"); + + b.Property("chief_a"); + + b.Property("chief_a_date"); + + b.Property("chief_a_reject_reason") + .HasMaxLength(1000); + + b.Property("chief_a_remark") + .HasMaxLength(1000); + + b.Property("chief_a_result") + .HasMaxLength(1); + + b.Property("competency_chief"); + + b.Property("competency_supervisor"); + + b.Property("competency_supervisor1A"); + + b.Property("competency_supervisor2A"); + + b.Property("create_evaluation_id"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("eva_employee_id"); + + b.Property("help_org_id"); + + b.Property("isActive"); + + b.Property("level_score_chief") + .HasMaxLength(255); + + b.Property("level_score_supervisor") + .HasMaxLength(255); + + b.Property("level_score_supervisor1A") + .HasMaxLength(255); + + b.Property("level_score_supervisor2A") + .HasMaxLength(255); + + b.Property("order_of_data"); + + b.Property("score_chief"); + + b.Property("score_supervisor"); + + b.Property("score_supervisor1A"); + + b.Property("score_supervisor2A"); + + b.Property("status_chief") + .HasMaxLength(1); + + b.Property("status_chief_a") + .HasMaxLength(1); + + b.Property("status_chief_a_click_date"); + + b.Property("status_chief_click_date"); + + b.Property("status_self") + .HasMaxLength(1); + + b.Property("status_self_a") + .HasMaxLength(1); + + b.Property("status_self_a_click_date"); + + b.Property("status_self_click_date"); + + b.Property("status_supervisor") + .HasMaxLength(1); + + b.Property("status_supervisor1A") + .HasMaxLength(1); + + b.Property("status_supervisor1A_click_date"); + + b.Property("status_supervisor2A") + .HasMaxLength(1); + + b.Property("status_supervisor2A_click_date"); + + b.Property("status_supervisor_click_date"); + + b.Property("supervisor1"); + + b.Property("supervisor1A"); + + b.Property("supervisor1A_date"); + + b.Property("supervisor1A_remark") + .HasMaxLength(1000); + + b.Property("supervisor1A_result") + .HasMaxLength(1); + + b.Property("supervisor1_date"); + + b.Property("supervisor1_id"); + + b.Property("supervisor1_remark") + .HasMaxLength(1000); + + b.Property("supervisor1_result") + .HasMaxLength(1); + + b.Property("supervisor2"); + + b.Property("supervisor2A"); + + b.Property("supervisor2A_date"); + + b.Property("supervisor2A_remark") + .HasMaxLength(1000); + + b.Property("supervisor2A_result") + .HasMaxLength(1); + + b.Property("supervisor2_date"); + + b.Property("supervisor2_id"); + + b.Property("supervisor2_remark") + .HasMaxLength(1000); + + b.Property("supervisor2_result") + .HasMaxLength(1); + + b.Property("total_summary_chief"); + + b.Property("total_summary_competency_chief"); + + b.Property("total_summary_competency_supervisor"); + + b.Property("total_summary_competency_supervisor1A"); + + b.Property("total_summary_competency_supervisor2A"); + + b.Property("total_summary_supervisor"); + + b.Property("total_summary_supervisor1A"); + + b.Property("total_summary_supervisor2A"); + + b.Property("updated"); + + b.Property("work_period"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_id"); + + b.ToTable("eva_create_evaluation_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detail_historyEntity", b => + { + b.Property("id"); + + b.Property("action_detail") + .HasMaxLength(4000); + + b.Property("action_dt"); + + b.Property("action_emp_id"); + + b.Property("created"); + + b.Property("evaluation_detail_id"); + + b.Property("history_group"); + + b.Property("isActive"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("evaluation_detail_id"); + + b.ToTable("eva_create_evaluation_detail_history"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b => + { + b.Property("id"); + + b.Property("achievement") + .HasMaxLength(8000); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("score"); + + b.Property("score2"); + + b.Property("score3"); + + b.Property("score4"); + + b.Property("sumary"); + + b.Property("sumary2"); + + b.Property("sumary3"); + + b.Property("sumary4"); + + b.Property("target_score1") + .HasMaxLength(255); + + b.Property("target_score2") + .HasMaxLength(255); + + b.Property("target_score3") + .HasMaxLength(255); + + b.Property("target_score4") + .HasMaxLength(255); + + b.Property("target_score5") + .HasMaxLength(255); + + b.Property("thefile") + .HasMaxLength(1000); + + b.Property("updated"); + + b.Property("weight"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_detail_id"); + + b.ToTable("eva_evaluation_achievement"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievement_attachEntity", b => + { + b.Property("id"); + + b.Property("achievement_id"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("the_file") + .HasMaxLength(1000); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("achievement_id"); + + b.ToTable("eva_evaluation_achievement_attach"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b => + { + b.Property("id"); + + b.Property("behavior") + .HasMaxLength(1000); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("score"); + + b.Property("score2"); + + b.Property("score3"); + + b.Property("score4"); + + b.Property("sumary"); + + b.Property("sumary2"); + + b.Property("sumary3"); + + b.Property("sumary4"); + + b.Property("target_score1") + .HasMaxLength(255); + + b.Property("target_score2") + .HasMaxLength(255); + + b.Property("target_score3") + .HasMaxLength(255); + + b.Property("target_score4") + .HasMaxLength(255); + + b.Property("target_score5") + .HasMaxLength(255); + + b.Property("updated"); + + b.Property("weight"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_detail_id"); + + b.ToTable("eva_evaluation_behavior"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_groupEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("code") + .HasMaxLength(255); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("main_dept_id"); + + b.Property("percentage"); + + b.Property("thegroup") + .HasMaxLength(255); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_evaluation_group"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("evaluation_group_id"); + + b.Property("isActive"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("evaluation_group_id"); + + b.ToTable("eva_evaluation_group_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_operating_agreementEntity", b => + { + b.Property("id"); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("indicators") + .HasMaxLength(4000); + + b.Property("isActive"); + + b.Property("mission_detail") + .HasMaxLength(4000); + + b.Property("mission_no"); + + b.Property("target") + .HasMaxLength(4000); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_detail_id"); + + b.ToTable("eva_evaluation_operating_agreement"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_idp_planEntity", b => + { + b.Property("id"); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("develop") + .HasMaxLength(1000); + + b.Property("development_method") + .HasMaxLength(1000); + + b.Property("end_date"); + + b.Property("isActive"); + + b.Property("period_text") + .HasMaxLength(1000); + + b.Property("start_date"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_idp_plan"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_level_scoreEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("code") + .HasMaxLength(255); + + b.Property("created"); + + b.Property("detail") + .HasMaxLength(1000); + + b.Property("isActive"); + + b.Property("max_score"); + + b.Property("min_score"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_level_score"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b => + { + b.Property("id"); + + b.Property("cost_of_living"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("frame_group_guid"); + + b.Property("help_org_id"); + + b.Property("isActive"); + + b.Property("level_text") + .HasMaxLength(1000); + + b.Property("monthly_remuneration"); + + b.Property("order_of_data"); + + b.Property("org_id"); + + b.Property("position_allowance"); + + b.Property("position_text") + .HasMaxLength(1000); + + b.Property("salary"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("frame_group_guid"); + + b.ToTable("eva_limit_frame_employee"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b => + { + b.Property("id"); + + b.Property("created"); + + b.Property("frame_plan_guid"); + + b.Property("group_guid"); + + b.Property("isActive"); + + b.Property("limit_frame_295"); + + b.Property("main_dept_id"); + + b.Property("remark") + .HasMaxLength(4000); + + b.Property("remark2") + .HasMaxLength(4000); + + b.Property("total_salary"); + + b.Property("total_salary_limit"); + + b.Property("total_salary_limit_rounded"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("frame_plan_guid"); + + b.HasIndex("group_guid"); + + b.ToTable("eva_limit_frame_group"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b => + { + b.Property("id"); + + b.Property("created"); + + b.Property("executed_date"); + + b.Property("isActive"); + + b.Property("limit_frame_005"); + + b.Property("limit_frame_005_total"); + + b.Property("limit_frame_005_total_rounded"); + + b.Property("plan_guid"); + + b.Property("salary_adjustment_date"); + + b.Property("status_chief") + .HasMaxLength(1); + + b.Property("status_self") + .HasMaxLength(1); + + b.Property("supervisor1"); + + b.Property("supervisor1_date"); + + b.Property("supervisor1_remark") + .HasMaxLength(1000); + + b.Property("supervisor1_result") + .HasMaxLength(1); + + b.Property("total_salary"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("plan_guid"); + + b.ToTable("eva_limit_frame_plan"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_performance_planEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("created"); + + b.Property("end_leave"); + + b.Property("fiscal_year"); + + b.Property("isActive"); + + b.Property("percent"); + + b.Property("remark") + .HasMaxLength(500); + + b.Property("start_leave"); + + b.Property("theTime"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_performance_plan"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("created"); + + b.Property("end_date"); + + b.Property("isActive"); + + b.Property("list_no"); + + b.Property("performance_plan_id"); + + b.Property("remark") + .HasMaxLength(1000); + + b.Property("start_date"); + + b.Property("step") + .HasMaxLength(1000); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("performance_plan_id"); + + b.ToTable("eva_performance_plan_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_promoted_percentageEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("code") + .HasMaxLength(255); + + b.Property("created"); + + b.Property("detail") + .HasMaxLength(1000); + + b.Property("isActive"); + + b.Property("level_score_id"); + + b.Property("max_score"); + + b.Property("min_score"); + + b.Property("promoted_percentage"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("level_score_id"); + + b.ToTable("eva_promoted_percentage"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_salary_cylinderEntity", b => + { + b.Property("id"); + + b.Property("cost_living"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("middle"); + + b.Property("monthly_compensation"); + + b.Property("position_allowance"); + + b.Property("position_level"); + + b.Property("position_type"); + + b.Property("salary_max"); + + b.Property("temporary_min"); + + b.Property("themax"); + + b.Property("themin"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_salary_cylinder"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluationEntity", "eva_create_evaluation") + .WithMany() + .HasForeignKey("create_evaluation_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponement_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement") + .WithMany() + .HasForeignKey("adjust_postponement_id"); + + b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement_quota") + .WithMany() + .HasForeignKey("adjust_postponement_quota_id") + .HasConstraintName("FK_eva_adjust_postponement_detail_eva_adjust_postponement_adj~1"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group") + .WithMany() + .HasForeignKey("evaluation_group_id"); + + b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan") + .WithMany() + .HasForeignKey("performance_plan_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluationEntity", "eva_create_evaluation_create_evaluation_id") + .WithMany() + .HasForeignKey("create_evaluation_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detail_historyEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail_evaluation_detail_id") + .WithMany() + .HasForeignKey("evaluation_detail_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail") + .WithMany() + .HasForeignKey("create_evaluation_detail_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievement_attachEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_evaluation_achievementEntity", "eva_evaluation_achievement_achievement_id") + .WithMany() + .HasForeignKey("achievement_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail") + .WithMany() + .HasForeignKey("create_evaluation_detail_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group") + .WithMany() + .HasForeignKey("evaluation_group_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_operating_agreementEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail_create_evaluation_detail_id") + .WithMany() + .HasForeignKey("create_evaluation_detail_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_limit_frame_groupEntity", "eva_limit_frame_group_frame_group_guid") + .WithMany() + .HasForeignKey("frame_group_guid"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_limit_frame_planEntity", "eva_limit_frame_plan_frame_plan_guid") + .WithMany() + .HasForeignKey("frame_plan_guid"); + + b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group_group_guid") + .WithMany() + .HasForeignKey("group_guid"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan_plan_guid") + .WithMany() + .HasForeignKey("plan_guid"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan") + .WithMany() + .HasForeignKey("performance_plan_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_promoted_percentageEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_level_scoreEntity", "eva_level_score") + .WithMany() + .HasForeignKey("level_score_id"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Migrations/20210914074108_UpdateRemarkToPlan.cs b/Migrations/20210914074108_UpdateRemarkToPlan.cs new file mode 100644 index 0000000..451991d --- /dev/null +++ b/Migrations/20210914074108_UpdateRemarkToPlan.cs @@ -0,0 +1,23 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace tb320eva.Migrations +{ + public partial class UpdateRemarkToPlan : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "remark", + table: "eva_performance_plan", + maxLength: 500, + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "remark", + table: "eva_performance_plan"); + } + } +} diff --git a/Migrations/20210914083030_UpdateRemarkToEvaDetail.Designer.cs b/Migrations/20210914083030_UpdateRemarkToEvaDetail.Designer.cs new file mode 100644 index 0000000..2b9ee92 --- /dev/null +++ b/Migrations/20210914083030_UpdateRemarkToEvaDetail.Designer.cs @@ -0,0 +1,1092 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using TTSW.EF; + +namespace tb320eva.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20210914083030_UpdateRemarkToEvaDetail")] + partial class UpdateRemarkToEvaDetail + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn) + .HasAnnotation("ProductVersion", "2.2.6-servicing-10079") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + modelBuilder.Entity("TodoAPI2.Models.activity_log_evaEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("causer_id"); + + b.Property("causer_type") + .HasMaxLength(191); + + b.Property("created_at"); + + b.Property("description") + .HasMaxLength(4000); + + b.Property("ip_address") + .HasMaxLength(191); + + b.Property("log_name") + .HasMaxLength(191); + + b.Property("mac_address") + .HasMaxLength(191); + + b.Property("properties") + .HasMaxLength(8000); + + b.Property("subject_id"); + + b.Property("subject_type") + .HasMaxLength(191); + + b.Property("updated_at"); + + b.HasKey("id"); + + b.ToTable("activity_log_eva"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b => + { + b.Property("id"); + + b.Property("command_no") + .HasMaxLength(4000); + + b.Property("create_evaluation_id"); + + b.Property("created"); + + b.Property("fiscal_year"); + + b.Property("imported_date"); + + b.Property("imported_file") + .HasMaxLength(1000); + + b.Property("isActive"); + + b.Property("limit"); + + b.Property("limit_frame"); + + b.Property("limit_frame_quota"); + + b.Property("limit_quota"); + + b.Property("managed_by"); + + b.Property("percentage"); + + b.Property("report_type") + .HasMaxLength(1000); + + b.Property("theDate"); + + b.Property("theRound"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_id"); + + b.ToTable("eva_adjust_postponement"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponement_detailEntity", b => + { + b.Property("id"); + + b.Property("achievement_final"); + + b.Property("adjust_postponement_id"); + + b.Property("adjust_postponement_quota_id"); + + b.Property("competency_final"); + + b.Property("cost_living"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("employee_no_at_this_time") + .HasMaxLength(1000); + + b.Property("fullname_at_this_time") + .HasMaxLength(1000); + + b.Property("isActive"); + + b.Property("is_for_postponement"); + + b.Property("level_score_final") + .HasMaxLength(255); + + b.Property("level_this_time") + .HasMaxLength(1000); + + b.Property("middle"); + + b.Property("migration_eva_result") + .HasMaxLength(1000); + + b.Property("migration_total_score"); + + b.Property("new_cost_living"); + + b.Property("new_sarary"); + + b.Property("new_sarary_with_quota"); + + b.Property("order_at_this_time"); + + b.Property("org_at_this_time"); + + b.Property("other_money_at_this_time"); + + b.Property("position_allowance_at_this_time"); + + b.Property("position_this_time") + .HasMaxLength(1000); + + b.Property("promoted_percentage"); + + b.Property("receive_quota"); + + b.Property("remark") + .HasMaxLength(1000); + + b.Property("sarary"); + + b.Property("score_final"); + + b.Property("total_promote"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("adjust_postponement_id"); + + b.HasIndex("adjust_postponement_quota_id"); + + b.ToTable("eva_adjust_postponement_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b => + { + b.Property("id"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("evaluation_group_id"); + + b.Property("isActive"); + + b.Property("performance_plan_id"); + + b.Property("score1"); + + b.Property("score2"); + + b.Property("supervisor1_id"); + + b.Property("supervisor2_id"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("evaluation_group_id"); + + b.HasIndex("performance_plan_id"); + + b.ToTable("eva_create_evaluation"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detailEntity", b => + { + b.Property("id"); + + b.Property("Final_summary_chief"); + + b.Property("Final_summary_competency_chief"); + + b.Property("Final_summary_competency_supervisor"); + + b.Property("Final_summary_competency_supervisor1A"); + + b.Property("Final_summary_competency_supervisor2A"); + + b.Property("Final_summary_supervisor"); + + b.Property("Final_summary_supervisor1A"); + + b.Property("Final_summary_supervisor2A"); + + b.Property("achievement_chief"); + + b.Property("achievement_supervisor"); + + b.Property("achievement_supervisor1A"); + + b.Property("achievement_supervisor2A"); + + b.Property("chief"); + + b.Property("chief_a"); + + b.Property("chief_a_date"); + + b.Property("chief_a_reject_reason") + .HasMaxLength(1000); + + b.Property("chief_a_remark") + .HasMaxLength(1000); + + b.Property("chief_a_result") + .HasMaxLength(1); + + b.Property("competency_chief"); + + b.Property("competency_supervisor"); + + b.Property("competency_supervisor1A"); + + b.Property("competency_supervisor2A"); + + b.Property("create_evaluation_id"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("eva_employee_id"); + + b.Property("help_org_id"); + + b.Property("isActive"); + + b.Property("level_score_chief") + .HasMaxLength(255); + + b.Property("level_score_supervisor") + .HasMaxLength(255); + + b.Property("level_score_supervisor1A") + .HasMaxLength(255); + + b.Property("level_score_supervisor2A") + .HasMaxLength(255); + + b.Property("order_of_data"); + + b.Property("remark") + .HasMaxLength(1000); + + b.Property("score_chief"); + + b.Property("score_supervisor"); + + b.Property("score_supervisor1A"); + + b.Property("score_supervisor2A"); + + b.Property("status_chief") + .HasMaxLength(1); + + b.Property("status_chief_a") + .HasMaxLength(1); + + b.Property("status_chief_a_click_date"); + + b.Property("status_chief_click_date"); + + b.Property("status_self") + .HasMaxLength(1); + + b.Property("status_self_a") + .HasMaxLength(1); + + b.Property("status_self_a_click_date"); + + b.Property("status_self_click_date"); + + b.Property("status_supervisor") + .HasMaxLength(1); + + b.Property("status_supervisor1A") + .HasMaxLength(1); + + b.Property("status_supervisor1A_click_date"); + + b.Property("status_supervisor2A") + .HasMaxLength(1); + + b.Property("status_supervisor2A_click_date"); + + b.Property("status_supervisor_click_date"); + + b.Property("supervisor1"); + + b.Property("supervisor1A"); + + b.Property("supervisor1A_date"); + + b.Property("supervisor1A_remark") + .HasMaxLength(1000); + + b.Property("supervisor1A_result") + .HasMaxLength(1); + + b.Property("supervisor1_date"); + + b.Property("supervisor1_id"); + + b.Property("supervisor1_remark") + .HasMaxLength(1000); + + b.Property("supervisor1_result") + .HasMaxLength(1); + + b.Property("supervisor2"); + + b.Property("supervisor2A"); + + b.Property("supervisor2A_date"); + + b.Property("supervisor2A_remark") + .HasMaxLength(1000); + + b.Property("supervisor2A_result") + .HasMaxLength(1); + + b.Property("supervisor2_date"); + + b.Property("supervisor2_id"); + + b.Property("supervisor2_remark") + .HasMaxLength(1000); + + b.Property("supervisor2_result") + .HasMaxLength(1); + + b.Property("total_summary_chief"); + + b.Property("total_summary_competency_chief"); + + b.Property("total_summary_competency_supervisor"); + + b.Property("total_summary_competency_supervisor1A"); + + b.Property("total_summary_competency_supervisor2A"); + + b.Property("total_summary_supervisor"); + + b.Property("total_summary_supervisor1A"); + + b.Property("total_summary_supervisor2A"); + + b.Property("updated"); + + b.Property("work_period"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_id"); + + b.ToTable("eva_create_evaluation_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detail_historyEntity", b => + { + b.Property("id"); + + b.Property("action_detail") + .HasMaxLength(4000); + + b.Property("action_dt"); + + b.Property("action_emp_id"); + + b.Property("created"); + + b.Property("evaluation_detail_id"); + + b.Property("history_group"); + + b.Property("isActive"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("evaluation_detail_id"); + + b.ToTable("eva_create_evaluation_detail_history"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b => + { + b.Property("id"); + + b.Property("achievement") + .HasMaxLength(8000); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("score"); + + b.Property("score2"); + + b.Property("score3"); + + b.Property("score4"); + + b.Property("sumary"); + + b.Property("sumary2"); + + b.Property("sumary3"); + + b.Property("sumary4"); + + b.Property("target_score1") + .HasMaxLength(255); + + b.Property("target_score2") + .HasMaxLength(255); + + b.Property("target_score3") + .HasMaxLength(255); + + b.Property("target_score4") + .HasMaxLength(255); + + b.Property("target_score5") + .HasMaxLength(255); + + b.Property("thefile") + .HasMaxLength(1000); + + b.Property("updated"); + + b.Property("weight"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_detail_id"); + + b.ToTable("eva_evaluation_achievement"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievement_attachEntity", b => + { + b.Property("id"); + + b.Property("achievement_id"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("the_file") + .HasMaxLength(1000); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("achievement_id"); + + b.ToTable("eva_evaluation_achievement_attach"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b => + { + b.Property("id"); + + b.Property("behavior") + .HasMaxLength(1000); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("score"); + + b.Property("score2"); + + b.Property("score3"); + + b.Property("score4"); + + b.Property("sumary"); + + b.Property("sumary2"); + + b.Property("sumary3"); + + b.Property("sumary4"); + + b.Property("target_score1") + .HasMaxLength(255); + + b.Property("target_score2") + .HasMaxLength(255); + + b.Property("target_score3") + .HasMaxLength(255); + + b.Property("target_score4") + .HasMaxLength(255); + + b.Property("target_score5") + .HasMaxLength(255); + + b.Property("updated"); + + b.Property("weight"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_detail_id"); + + b.ToTable("eva_evaluation_behavior"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_groupEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("code") + .HasMaxLength(255); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("main_dept_id"); + + b.Property("percentage"); + + b.Property("thegroup") + .HasMaxLength(255); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_evaluation_group"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("evaluation_group_id"); + + b.Property("isActive"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("evaluation_group_id"); + + b.ToTable("eva_evaluation_group_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_operating_agreementEntity", b => + { + b.Property("id"); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("indicators") + .HasMaxLength(4000); + + b.Property("isActive"); + + b.Property("mission_detail") + .HasMaxLength(4000); + + b.Property("mission_no"); + + b.Property("target") + .HasMaxLength(4000); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_detail_id"); + + b.ToTable("eva_evaluation_operating_agreement"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_idp_planEntity", b => + { + b.Property("id"); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("develop") + .HasMaxLength(1000); + + b.Property("development_method") + .HasMaxLength(1000); + + b.Property("end_date"); + + b.Property("isActive"); + + b.Property("period_text") + .HasMaxLength(1000); + + b.Property("start_date"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_idp_plan"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_level_scoreEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("code") + .HasMaxLength(255); + + b.Property("created"); + + b.Property("detail") + .HasMaxLength(1000); + + b.Property("isActive"); + + b.Property("max_score"); + + b.Property("min_score"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_level_score"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b => + { + b.Property("id"); + + b.Property("cost_of_living"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("frame_group_guid"); + + b.Property("help_org_id"); + + b.Property("isActive"); + + b.Property("level_text") + .HasMaxLength(1000); + + b.Property("monthly_remuneration"); + + b.Property("order_of_data"); + + b.Property("org_id"); + + b.Property("position_allowance"); + + b.Property("position_text") + .HasMaxLength(1000); + + b.Property("salary"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("frame_group_guid"); + + b.ToTable("eva_limit_frame_employee"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b => + { + b.Property("id"); + + b.Property("created"); + + b.Property("frame_plan_guid"); + + b.Property("group_guid"); + + b.Property("isActive"); + + b.Property("limit_frame_295"); + + b.Property("main_dept_id"); + + b.Property("remark") + .HasMaxLength(4000); + + b.Property("remark2") + .HasMaxLength(4000); + + b.Property("total_salary"); + + b.Property("total_salary_limit"); + + b.Property("total_salary_limit_rounded"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("frame_plan_guid"); + + b.HasIndex("group_guid"); + + b.ToTable("eva_limit_frame_group"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b => + { + b.Property("id"); + + b.Property("created"); + + b.Property("executed_date"); + + b.Property("isActive"); + + b.Property("limit_frame_005"); + + b.Property("limit_frame_005_total"); + + b.Property("limit_frame_005_total_rounded"); + + b.Property("plan_guid"); + + b.Property("salary_adjustment_date"); + + b.Property("status_chief") + .HasMaxLength(1); + + b.Property("status_self") + .HasMaxLength(1); + + b.Property("supervisor1"); + + b.Property("supervisor1_date"); + + b.Property("supervisor1_remark") + .HasMaxLength(1000); + + b.Property("supervisor1_result") + .HasMaxLength(1); + + b.Property("total_salary"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("plan_guid"); + + b.ToTable("eva_limit_frame_plan"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_performance_planEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("created"); + + b.Property("end_leave"); + + b.Property("fiscal_year"); + + b.Property("isActive"); + + b.Property("percent"); + + b.Property("remark") + .HasMaxLength(500); + + b.Property("start_leave"); + + b.Property("theTime"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_performance_plan"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("created"); + + b.Property("end_date"); + + b.Property("isActive"); + + b.Property("list_no"); + + b.Property("performance_plan_id"); + + b.Property("remark") + .HasMaxLength(1000); + + b.Property("start_date"); + + b.Property("step") + .HasMaxLength(1000); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("performance_plan_id"); + + b.ToTable("eva_performance_plan_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_promoted_percentageEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("code") + .HasMaxLength(255); + + b.Property("created"); + + b.Property("detail") + .HasMaxLength(1000); + + b.Property("isActive"); + + b.Property("level_score_id"); + + b.Property("max_score"); + + b.Property("min_score"); + + b.Property("promoted_percentage"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("level_score_id"); + + b.ToTable("eva_promoted_percentage"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_salary_cylinderEntity", b => + { + b.Property("id"); + + b.Property("cost_living"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("middle"); + + b.Property("monthly_compensation"); + + b.Property("position_allowance"); + + b.Property("position_level"); + + b.Property("position_type"); + + b.Property("salary_max"); + + b.Property("temporary_min"); + + b.Property("themax"); + + b.Property("themin"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_salary_cylinder"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluationEntity", "eva_create_evaluation") + .WithMany() + .HasForeignKey("create_evaluation_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponement_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement") + .WithMany() + .HasForeignKey("adjust_postponement_id"); + + b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement_quota") + .WithMany() + .HasForeignKey("adjust_postponement_quota_id") + .HasConstraintName("FK_eva_adjust_postponement_detail_eva_adjust_postponement_adj~1"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group") + .WithMany() + .HasForeignKey("evaluation_group_id"); + + b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan") + .WithMany() + .HasForeignKey("performance_plan_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluationEntity", "eva_create_evaluation_create_evaluation_id") + .WithMany() + .HasForeignKey("create_evaluation_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detail_historyEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail_evaluation_detail_id") + .WithMany() + .HasForeignKey("evaluation_detail_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail") + .WithMany() + .HasForeignKey("create_evaluation_detail_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievement_attachEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_evaluation_achievementEntity", "eva_evaluation_achievement_achievement_id") + .WithMany() + .HasForeignKey("achievement_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail") + .WithMany() + .HasForeignKey("create_evaluation_detail_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group") + .WithMany() + .HasForeignKey("evaluation_group_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_operating_agreementEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail_create_evaluation_detail_id") + .WithMany() + .HasForeignKey("create_evaluation_detail_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_limit_frame_groupEntity", "eva_limit_frame_group_frame_group_guid") + .WithMany() + .HasForeignKey("frame_group_guid"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_limit_frame_planEntity", "eva_limit_frame_plan_frame_plan_guid") + .WithMany() + .HasForeignKey("frame_plan_guid"); + + b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group_group_guid") + .WithMany() + .HasForeignKey("group_guid"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan_plan_guid") + .WithMany() + .HasForeignKey("plan_guid"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan") + .WithMany() + .HasForeignKey("performance_plan_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_promoted_percentageEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_level_scoreEntity", "eva_level_score") + .WithMany() + .HasForeignKey("level_score_id"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Migrations/20210914083030_UpdateRemarkToEvaDetail.cs b/Migrations/20210914083030_UpdateRemarkToEvaDetail.cs new file mode 100644 index 0000000..1f22890 --- /dev/null +++ b/Migrations/20210914083030_UpdateRemarkToEvaDetail.cs @@ -0,0 +1,23 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace tb320eva.Migrations +{ + public partial class UpdateRemarkToEvaDetail : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "remark", + table: "eva_create_evaluation_detail", + maxLength: 1000, + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "remark", + table: "eva_create_evaluation_detail"); + } + } +} diff --git a/Migrations/DataContextModelSnapshot.cs b/Migrations/DataContextModelSnapshot.cs index df29aa3..bc7b270 100644 --- a/Migrations/DataContextModelSnapshot.cs +++ b/Migrations/DataContextModelSnapshot.cs @@ -298,6 +298,9 @@ namespace tb320eva.Migrations b.Property("order_of_data"); + b.Property("remark") + .HasMaxLength(1000); + b.Property("score_chief"); b.Property("score_supervisor"); @@ -851,6 +854,9 @@ namespace tb320eva.Migrations b.Property("percent"); + b.Property("remark") + .HasMaxLength(500); + b.Property("start_leave"); b.Property("theTime"); diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs index ecfc4c0..9212574 100644 --- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs +++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs @@ -191,6 +191,9 @@ namespace TodoAPI2.Models public int? order_of_data { get; set; } public int? help_org_id { get; set; } + + [MaxLength(1000)] + public string remark { get; set; } } } diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailInputModel.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailInputModel.cs index 905ffc1..7d405c7 100644 --- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailInputModel.cs +++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailInputModel.cs @@ -34,6 +34,8 @@ namespace TodoAPI2.Models public int? help_org_id { get; set; } + public string remark { get; set; } + public string active_mode { get; set; } } } diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs index a8ae210..53055cd 100644 --- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs +++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs @@ -209,7 +209,7 @@ namespace TodoAPI2.Models employee_no = fk_external_linkageResult2.employee_no, position_number = fk_external_linkageResult2.position_number, position_name = fk_external_linkageResult2.position_name, - remark = null, + remark = m_eva_create_evaluation_detail.remark, status_self_click_date = m_eva_create_evaluation_detail.status_self_click_date, status_chief_click_date = m_eva_create_evaluation_detail.status_chief_click_date, @@ -275,6 +275,7 @@ namespace TodoAPI2.Models existingEntity.work_period = model.work_period; existingEntity.order_of_data = model.order_of_data; existingEntity.help_org_id = model.help_org_id; + existingEntity.remark = model.remark; var updated = _repository.Update(id, existingEntity); return Get(updated.id); @@ -301,6 +302,7 @@ namespace TodoAPI2.Models existingEntity.work_period = i.work_period; existingEntity.order_of_data = i.order_of_data; existingEntity.help_org_id = i.help_org_id; + existingEntity.remark = i.remark; _repository.UpdateWithoutCommit(i.id.Value, existingEntity); } diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs index e7ab70f..690ce94 100644 --- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs +++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs @@ -122,6 +122,7 @@ namespace TodoAPI2.Models public string txt_status_supervisor2A { get { return getStatusText(status_supervisor2A) + MyHelper.GetDateStringForReport(status_supervisor2A_click_date); } } public string help_org_id_external_linkage_external_name { get; set; } + private string getStatusText(string s) { if (!string.IsNullOrEmpty(s)) diff --git a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs index a758824..238050e 100644 --- a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs +++ b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs @@ -252,9 +252,14 @@ namespace TodoAPI2.Models orderby x.fullname select new external_linkageViewModel { external_id = x.id, external_name = x.fullname } ).ToList(); - i.item_evaluation_round_search = option_all.Union((from x in _repository.Context.eva_performance_plan - orderby x.fiscal_year descending, x.theTime descending - select new external_linkageViewModel { id_guid = x.id, external_name = checkNull(x.theTime) + "/" + checkNull(x.fiscal_year) } + + var allround = (from y in _repository.Context.eva_create_evaluation + select y.performance_plan_id).ToList(); + + i.item_evaluation_round_search = option_all.Union((from x in _repository.Context.eva_performance_plan + where allround.Contains(x.id) + orderby x.fiscal_year descending, x.theTime descending + select new external_linkageViewModel { id_guid = x.id, external_name = checkNull(x.theTime) + "/" + checkNull(x.fiscal_year) } )).ToList(); return i; } @@ -292,9 +297,14 @@ namespace TodoAPI2.Models orderby x.fullname select new external_linkageViewModel { external_id = x.id, external_name = x.fullname } ).ToList(); + + var allround = (from y in _repository.Context.eva_create_evaluation + select y.performance_plan_id).ToList(); + i.item_evaluation_round_search = option_all.Union((from x in _repository.Context.eva_performance_plan - orderby x.fiscal_year descending, x.theTime descending - select new external_linkageViewModel { id_guid = x.id, external_name = checkNull(x.theTime) + "/" + checkNull(x.fiscal_year) } + where allround.Contains(x.id) + orderby x.fiscal_year descending, x.theTime descending + select new external_linkageViewModel { id_guid = x.id, external_name = checkNull(x.theTime) + "/" + checkNull(x.fiscal_year) } )).ToList(); return i; } diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs index 69b3b47..3ee5edd 100644 --- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs +++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs @@ -95,6 +95,13 @@ namespace TodoAPI2.Models var leave_start_date = plan.start_leave; var leave_end_date = plan.end_leave; + var plan_remark = plan.remark; + + + if (!string.IsNullOrEmpty(plan_remark)) + { + plan_remark = "หมายเหตุ " + plan_remark; + } var data = ( from m_eva_create_evaluation_detail_process in _repository.Context.eva_create_evaluation_detail @@ -123,7 +130,7 @@ namespace TodoAPI2.Models into external_supervisor2AResult from fk_external_supervisor2A in external_supervisor2AResult.DefaultIfEmpty() - + where m_eva_create_evaluation_detail_process.id == id @@ -209,7 +216,9 @@ namespace TodoAPI2.Models chief_position_level_text = fk_external_chief.position_level_text, leave_start_date = leave_start_date, - leave_end_date = leave_end_date + leave_end_date = leave_end_date, + plan_remark = plan_remark, + eva_detail_remark = m_eva_create_evaluation_detail_process.remark } ).ToList(); diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs index d270a2f..1b069eb 100644 --- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs +++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs @@ -41,5 +41,8 @@ namespace TodoAPI2.Models public DateTime? leave_start_date { get; set; } public DateTime? leave_end_date { get; set; } + + public string plan_remark { get; set; } + public string eva_detail_remark { get; set; } } } diff --git a/Models/eva_performance_plan/eva_performance_planEntity.cs b/Models/eva_performance_plan/eva_performance_planEntity.cs index 47a6cca..b1df5bf 100644 --- a/Models/eva_performance_plan/eva_performance_planEntity.cs +++ b/Models/eva_performance_plan/eva_performance_planEntity.cs @@ -26,6 +26,9 @@ namespace TodoAPI2.Models public DateTime? end_leave { get; set; } + [MaxLength(500)] + public string remark { get; set; } + [NotMapped] public string display_text { diff --git a/Models/eva_performance_plan/eva_performance_planInputModel.cs b/Models/eva_performance_plan/eva_performance_planInputModel.cs index 4f5cc9c..5a493cb 100644 --- a/Models/eva_performance_plan/eva_performance_planInputModel.cs +++ b/Models/eva_performance_plan/eva_performance_planInputModel.cs @@ -26,6 +26,8 @@ namespace TodoAPI2.Models public DateTime? end_leave { get; set; } + public string remark { get; set; } + public string active_mode { get; set; } } } diff --git a/Models/eva_performance_plan/eva_performance_planService.cs b/Models/eva_performance_plan/eva_performance_planService.cs index 7afaa6f..7b1f898 100644 --- a/Models/eva_performance_plan/eva_performance_planService.cs +++ b/Models/eva_performance_plan/eva_performance_planService.cs @@ -101,6 +101,7 @@ namespace TodoAPI2.Models percent = m_eva_performance_plan.percent, start_leave = m_eva_performance_plan.start_leave, end_leave = m_eva_performance_plan.end_leave, + remark = m_eva_performance_plan.remark, isActive = m_eva_performance_plan.isActive, Created = m_eva_performance_plan.created, @@ -128,6 +129,7 @@ namespace TodoAPI2.Models percent = m_eva_performance_plan.percent, start_leave = m_eva_performance_plan.start_leave, end_leave = m_eva_performance_plan.end_leave, + remark = m_eva_performance_plan.remark, isActive = m_eva_performance_plan.isActive, Created = m_eva_performance_plan.created, @@ -149,7 +151,7 @@ namespace TodoAPI2.Models && (m_eva_performance_plan.theTime == model.theTime || !model.theTime.HasValue) - orderby m_eva_performance_plan.created descending + orderby m_eva_performance_plan.fiscal_year descending, m_eva_performance_plan.theTime descending select new eva_performance_planViewModel() { id = m_eva_performance_plan.id, @@ -158,6 +160,7 @@ namespace TodoAPI2.Models percent = m_eva_performance_plan.percent, start_leave = m_eva_performance_plan.start_leave, end_leave = m_eva_performance_plan.end_leave, + remark = m_eva_performance_plan.remark, isActive = m_eva_performance_plan.isActive, Created = m_eva_performance_plan.created, @@ -193,6 +196,7 @@ namespace TodoAPI2.Models existingEntity.percent = model.percent; existingEntity.start_leave = model.start_leave; existingEntity.end_leave = model.end_leave; + existingEntity.remark = model.remark; var updated = _repository.Update(id, existingEntity); return Get(updated.id); @@ -215,6 +219,7 @@ namespace TodoAPI2.Models existingEntity.percent = i.percent; existingEntity.start_leave = i.start_leave; existingEntity.end_leave = i.end_leave; + existingEntity.remark = i.remark; _repository.UpdateWithoutCommit(i.id.Value, existingEntity); } diff --git a/Models/eva_performance_plan/eva_performance_planViewModel.cs b/Models/eva_performance_plan/eva_performance_planViewModel.cs index 7a18268..0459d68 100644 --- a/Models/eva_performance_plan/eva_performance_planViewModel.cs +++ b/Models/eva_performance_plan/eva_performance_planViewModel.cs @@ -28,6 +28,6 @@ namespace TodoAPI2.Models public string txt_end_leave { get { return MyHelper.GetDateStringForReport(this.end_leave); } } - + public string remark { get; set; } } } \ No newline at end of file diff --git a/Models/rep_eva_x/rep_eva_xInputModel2.cs b/Models/rep_eva_x/rep_eva_xInputModel2.cs index 25b91d2..a09b39b 100644 --- a/Models/rep_eva_x/rep_eva_xInputModel2.cs +++ b/Models/rep_eva_x/rep_eva_xInputModel2.cs @@ -60,6 +60,10 @@ namespace TodoAPI2.Models public string txt_status_self_a_click_date { get; set; } public string txt_status_chief_a_click_date { get; set; } + + public string plan_remark { get; set; } + + public string eva_detail_remark { get; set; } } } diff --git a/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml b/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml index 0e6486f..4100bbf 100644 --- a/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml +++ b/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml @@ -60,13 +60,19 @@ - +
+
+
+ + +
+
diff --git a/Views/eva_performance_planView/eva_performance_plan.cshtml b/Views/eva_performance_planView/eva_performance_plan.cshtml index 51aed10..2bc6d8e 100644 --- a/Views/eva_performance_planView/eva_performance_plan.cshtml +++ b/Views/eva_performance_planView/eva_performance_plan.cshtml @@ -44,7 +44,12 @@ - +
+
+ + +
+
diff --git a/Views/eva_performance_planView/eva_performance_plan_d.cshtml b/Views/eva_performance_planView/eva_performance_plan_d.cshtml index 8f34069..5e63820 100644 --- a/Views/eva_performance_planView/eva_performance_plan_d.cshtml +++ b/Views/eva_performance_planView/eva_performance_plan_d.cshtml @@ -115,7 +115,12 @@ - +
+
+ + +
+
diff --git a/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js b/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js index 9d1e062..fa01752 100644 --- a/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js +++ b/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js @@ -28,7 +28,7 @@ function eva_create_evaluation_detail_FeedDataToForm(data) { $("#eva_create_evaluation_detail_work_period").val(data.work_period); $("#eva_create_evaluation_detail_order_of_data").val(data.order_of_data); DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_help_org_id"), data, "id", "external_name", "item_help_org_id", data.help_org_id); - + $("#eva_create_evaluation_detail_remark").val(data.remark); } function eva_create_evaluation_detail_GetFromForm() { @@ -43,6 +43,7 @@ function eva_create_evaluation_detail_GetFromForm() { eva_create_evaluation_detailObject.work_period = $("#eva_create_evaluation_detail_work_period").val(); eva_create_evaluation_detailObject.order_of_data = $("#eva_create_evaluation_detail_order_of_data").val(); eva_create_evaluation_detailObject.help_org_id = $("#eva_create_evaluation_detail_help_org_id").val(); + eva_create_evaluation_detailObject.remark = $("#eva_create_evaluation_detail_remark").val(); return eva_create_evaluation_detailObject; } diff --git a/wwwroot/js/eva_performance_plan/eva_performance_plan.js b/wwwroot/js/eva_performance_plan/eva_performance_plan.js index 23ddf09..e8e8cc8 100644 --- a/wwwroot/js/eva_performance_plan/eva_performance_plan.js +++ b/wwwroot/js/eva_performance_plan/eva_performance_plan.js @@ -26,6 +26,7 @@ function eva_performance_plan_FeedDataToForm(data) { $("#eva_performance_plan_percent").val(data.percent); $("#eva_performance_plan_start_leave").val(formatDate(data.start_leave)); $("#eva_performance_plan_end_leave").val(formatDate(data.end_leave)); + $("#eva_performance_plan_remark").val(data.remark); } function eva_performance_plan_GetFromForm() { @@ -36,6 +37,7 @@ function eva_performance_plan_GetFromForm() { eva_performance_planObject.percent = $("#eva_performance_plan_percent").val(); eva_performance_planObject.start_leave = getDate($("#eva_performance_plan_start_leave").val()); eva_performance_planObject.end_leave = getDate($("#eva_performance_plan_end_leave").val()); + eva_performance_planObject.remark = $("#eva_performance_plan_remark").val(); return eva_performance_planObject; } diff --git a/wwwroot/js/eva_performance_plan/eva_performance_plan_d.js b/wwwroot/js/eva_performance_plan/eva_performance_plan_d.js index 1a7673a..8326e8e 100644 --- a/wwwroot/js/eva_performance_plan/eva_performance_plan_d.js +++ b/wwwroot/js/eva_performance_plan/eva_performance_plan_d.js @@ -10,6 +10,7 @@ function eva_performance_plan_FeedDataToForm(data) { $("#eva_performance_plan_percent").val(data.percent); $("#eva_performance_plan_start_leave").val(formatDate(data.start_leave)); $("#eva_performance_plan_end_leave").val(formatDate(data.end_leave)); + $("#eva_performance_plan_remark").val(data.remark); } function eva_performance_plan_GetFromForm() { @@ -20,6 +21,7 @@ function eva_performance_plan_GetFromForm() { eva_performance_planObject.percent = $("#eva_performance_plan_percent").val(); eva_performance_planObject.start_leave = getDate($("#eva_performance_plan_start_leave").val()); eva_performance_planObject.end_leave = getDate($("#eva_performance_plan_end_leave").val()); + eva_performance_planObject.remark = $("#eva_performance_plan_remark").val(); return eva_performance_planObject; }