From be227895a51d79e17fa09ab9d832b5ba53d696c8 Mon Sep 17 00:00:00 2001 From: nakorn Date: Tue, 5 Oct 2021 22:26:47 +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=20https://app.clickup.com/t/1me7cdm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EXCEL/eva_adjust_postponement_detail.xlsx | Bin 11931 -> 12104 bytes ...eva_adjust_postponement_detail_normal.xlsx | Bin 11338 -> 11448 bytes ..._adjust_postponement_detail_normal_02.xlsx | Bin 11061 -> 11415 bytes ...@eva_adjust_postponement_detail_quota.xlsx | Bin 11489 -> 11597 bytes ...a_adjust_postponement_detail_quota_02.xlsx | Bin 11451 -> 11559 bytes ...20211005133544_AddRewardSalary.Designer.cs | 1096 ++++++++++++++++ Migrations/20211005133544_AddRewardSalary.cs | 31 + ...0211005143227_AddRewardSalary2.Designer.cs | 1098 +++++++++++++++++ Migrations/20211005143227_AddRewardSalary2.cs | 22 + Migrations/DataContextModelSnapshot.cs | 6 + .../eva_adjust_postponement_detailEntity.cs | 6 + ...st_postponement_detail_normalInputModel.cs | 4 + ...djust_postponement_detail_normalService.cs | 12 +- ...ust_postponement_detail_normalViewModel.cs | 6 + ...postponement_detail_normal_02InputModel.cs | 4 + ...st_postponement_detail_normal_02Service.cs | 6 +- ..._postponement_detail_normal_02ViewModel.cs | 4 + ..._postponement_detail_quota_02InputModel.cs | 4 + ...ust_postponement_detail_quota_02Service.cs | 111 +- ...t_postponement_detail_quota_02ViewModel.cs | 8 + .../eva_adjust_postponement_normal_d.cshtml | 6 + .../eva_adjust_postponement_quota_d.cshtml | 3 + tb320eva.csproj | 1 + wwwroot/js/coregen.js | 7 +- ...st_postponement_detail_normal_02_inline.js | 32 +- ...ust_postponement_detail_quota_02_inline.js | 27 +- .../eva_adjust_postponement_normal_d.js | 8 +- .../eva_adjust_postponement_quota_d.js | 6 + 28 files changed, 2446 insertions(+), 62 deletions(-) create mode 100644 Migrations/20211005133544_AddRewardSalary.Designer.cs create mode 100644 Migrations/20211005133544_AddRewardSalary.cs create mode 100644 Migrations/20211005143227_AddRewardSalary2.Designer.cs create mode 100644 Migrations/20211005143227_AddRewardSalary2.cs diff --git a/EXCEL/eva_adjust_postponement_detail.xlsx b/EXCEL/eva_adjust_postponement_detail.xlsx index dbed5e3e436c9a9a2a828f1ed44c83443eb3d76f..b84fc23b648d66b4bb9713536e676d3b2577e27c 100644 GIT binary patch delta 4580 zcmZ9QRaDdsx5j4%M--48Lb|&{YUpMFiIJ321`r8prT)Mm9pccXGziiuAqXht&@dn& zjetmZe7@f~YrSWkeYMwmetX~Si)TGM)3Vp9YUcLc9@cK9MFDBf%OL=$5 zq&s_U)cDD*_>~Wr&j+_z^9}1X9XSc8^8Af+$2z}}T*bW^NGC<$fuea;OAS#rW{*)xGCGJ$O^gMq|~iAlmvS#gbFgf7Af0iYc+I>Kd^sUg z4N>Ss3EaRdR$EB@O%e|$;Rl>1jG&+)|JurI0+){rj*LSbKkwl{x8ae8zOX59S9F*N z`!H_W$FI6<<9Bhj4mZD)^Nj0i?`v-j`I}v%5|^)?Y~u z?S`YB^9sNx>&t|ihm@8oGr3KDt|mDuR#BcN-J;CCBo!2AatmMW6Qmk`skg;XAGIb< zdsqF5mvK<>g$IP$6fkv%Rvm4p)~Ze8^pCA(UXbaqB_0T0C)cXx#A14ZiEH5jUP zEG4sCJ`~Svl~%W{ss!=ZW*7vSKm|Q$q?XSCH5Q4!c zC~^255J-m;!%4&pn7J*h69owk-!N|kx*$>#Zn;x=*UX=C>wEdb`D*A1pIcNE(6^}F z`1jpsP%)&%w{ZR)M(@$a~|4PG52^hA_y zt*E`636D604b8f_?*z48ofT(JiC<*=S#EmK(Z%zw`65pWus*qXRhN)pJC7LJyDQ!z zE*lQL%#b@e@T7{cKzYFruR3jJ6~g=aCKxMfPfj&`TiB!jjBT9Jyd(I{9z$Xa-dn#| z$ugObAMu}M=-S>oI8#Yt9QwH=BF)|-xjOD0KXSDHE6ILw8N45K5Gw33FM7J(b<^cU z%Rw#1fZ;{}2VN$J9iG2h*CcF8Dxc^4JqcMUBy_P?EwLU-ZOkrv}*x$D_H+a?4GJk5~dULE!Ic%+U znL(!@t9E+IA>VC4*2SK)1^e}i;!kwT=?lUn324U#K8^Q7!hraW^?uZ{CvJjgwj3k;0J6bFJ6Z?%CKRDXfhyNW$^ zUgRqUzINNZkeH^rNSCEQ3|9e!4=)q9;9p-=YYxwP=dHJDCIDLoylFFp<%#={g+l6~ zEnT2^IZ84+m^y}oKe8t5>NU0moMhir$zG)oRjRfWxUAeJ=YA7vEZ5h6qrEAljE zwW%)bj}ta(0#xV3ds9d1b+S86Vq0F{|i`B}@jR4csmfdyw!MZZ%R_ib{YqS34lR|QO54Z1Lz zJL8-Lk4QI&bilq1a_98*VN=G=rbmm8Pw7Ev0;1 zhNz@BugUlkE#QyI+r+f8Ya5r9<<1|-%#!t_5=4H*a{p0`YmoC~~j8;ZMHv*~c*_=Xjw*(9jNY;!39>&x#V?92QME~XS2 zvMW5(wL+Zb42PIvzDf2_eSs`-zG~n9DQFHd5=j;nnT{s z-Z%t7OAP=}7e4uqc3$Xq*u9#?F(tSh<|eL3u*UFVU7PCX5}-P!cUz|gVlfz*JoyP0 z!&{nH-J0mfKm=Po5~Pg*xZ;!1yzf$_X!e9~5xOmqn~&Ue6eBXUgakqO6l$-~5Cwcz z^S#Fg@Ng%aW+m$Wym9ZrZ-UFlu3^87=+s9UCe&8<&gG-7{cofL zqJew0#Vbj&_)Rqs6C*!;t@L)qyrA#_eroFE>n!rx_kzKpLG>ho>-c1x+y3}R9|9#@*~uUE@Ti234u%zTp*y7U6j`xy?N z9rD<-H%(MkO|o2;$Z>9-pnkgPZ_{{#R||#}69N``*&n@cfj}grAP@`$0=;w=@^rNI zK-n32c|3D<@DzOM;@oPYn?R>V+QzoWq%PmdvPT}p&0J|xH9!C}WkGo|dfW5*)QZhv zavIv!x>Ikhge9qQ2frZ?J0&;NRD5=mdCk+hQ{8raxGmKknQ19!bo6Pn?L)@={IeXj zr+^_x>XXKU{?%+fRn|lvYV;iT`*IgzO2(ixUDJ#c`rD@n>2rK8)IQ9IU|6&?*zpNB zr>^vEL5UV*C8wg4AY6@w{pnw=B{ouCv!)@m$awN--vWrD!$+XaK^iB~l8Yc4tj6_2D+1HHEzqbixF9tKj zd}S_rndH3HPgbrzImljg)55Q6C9F-TNdyr(97>ZUN&Lhss;vV9Ac1{F?J9n3lawtw zn2y7U*;-C7*G^EP&|Qg_C6~@>+z{y6y6k*kBOaA0N0`N4Gu|QQT9O%xoY3mf){acz zX%|x-K4(EF&~#dZi=lo>#7*v|HvKU=dQr6T=08`M-AcGqn0Wz z;}7*i^Mej!_vn4;>vyr=a-Jo-w(qB0_#E?auP5+MG0#xAf#-H!(=0l^iUm?TEgeZA zVKM8r$Nd-BsdR~ld}J>llV0N4kQng0-Kx{XN8-VJvug%Pe!Kal3R08Ey}VR2)a7n| zEtBmpp6xbOL3?NPwHnndWl;6n)Uc)H^489z>-=2#38$++nfS2Owva%z5S250(GOQ% zM+KDCM_TRILq6({`Dyq|mjinzlY;>*7RZi~#-$D4`7t)8Qzf;}Uz3DNn)N>RRtJta ze=N-scpfV_HyS-uKi<(QK%cMcE?M$aZUt5TstIlDcE?YlTC9K=8DW#V zU}KD}{WZQmO6qk5eUO6k_@b&TGDgj2=0*@>cz;1^(p^e@R%KN2Za1KY|BO$qgS0fF zV2Qpha3+4e)xH;M4y}vzdT+th#H!2H4ysxC!qk>s5w%y1E=|Cf@h2M&azGL3K!w>#;)qeu3@v~rn5}CuSB}$ z;3{%&{Fu{Ixn_v(ozu$KOj6azNVsX;-s^oHx%*>q#s}mT935anbR&77kw_xcl~6>VEa2vOy3PO`>^5B` z->jaG%;Z&>#|g@BT-^Lm{JGB#gFvaZNxQXbML9XafHk5^7}m1@{jAdGpIP9kr~G4) z>3Bu4D({r)ZHoY|fFsK1;<)Iyu`G4j1sPL$nFPM*XRaPM}kUlBS4Eo=#ZZu!@wiP{7Z$;c) zDr(5M0CwvvW?$@eHU=9hS5)5~;y9uA?P$6mwGo;0MD@YDhE1@cO^G6Uk9aI>iK!C5 zZ0_B?Hc@w{RT5p?FB;$elqaMbC-bEvxCWO|>^TjKLXX?lxAmY2)ASu70XBc$n zxy7vZN1br4JEWVHrBk{jrBkF4`H@nR3rkApf^?^ZG}0p7Eg>jK`aRG4 z&-;G!@7y_OX6`w6&fH;(Z1dVBEL@N78ILV62-J?)#$o|_gIJ$4&XY!ye_AeVcDa61 z@#ZtGAxLOD$lKuWT{UB|WBTWby{N7}Ro&WA$9GFGjJEMWVAwS~pG*O#VM~Co*M(?r(&))?yZ+<7!Df&zMTCD~| zSVim)2nTs^fB}_FId9&}70VE150G=Y0lCE8nX-V~u)$E@6>*v36wKvDAT{ zmWBSCsVFMp!4P`iac#PW{R4a3j`rCTlfZ>K-gi3@hC9B60@Up&dDP_H-=gJt-RouI zXq!w@#v05Rqw~eK;yA_%n64)5GZ|#DUUaDp3jiSs&>;;6xI$n&NcwncKQ;)&#*APk zfC6qF+oA-IvQ~e4&#&W{msOVv4>xBlkS%Ea?)-V?Lrx#mx5j-fPv1XW>!esJ%oxVf zxcjKbLT;i9bBEg={`g9Z^Q&4EFFGB?_D=bv=;gT0&d$y~TqfQ`aW8O=9yG=iEpleI zuc!1q_+MXYx73(CHhpJTJq(G`d**X(7XWns>||PFA1bG`-QU5;GDk8Lkv@*+b#CRb zPa9Iv5$DR$CUm_@&3$>Y$p$1Qy0)lq?=Z&YC5}|gX1Vp9I}5D?!#~1UbU;tl)b|xi$dRpekBs14wf9!Kjr2qJJ1|Tb02${BYYnYJ&y`K zSFXOyfb2@A?NyV>QP}z3nbjP!Q6lcO`(j`Ac#LxQj3c3bNs9Ax$foI$1{Poc5jwu=DoIcBmn8eP?{TMLVLz z;y($6g`hggL^Gi$2ZMb>+}w-2KO)w z$yxY@gU|rG^~wU=mLh5Q{IeT|$=Kwa{hBr0@S4K8;h>hWvTY8YF9bAFr7%`5#qpTw zrnD0fl+LjKl+G_W##UvKu`Wh5!kfb6Zl?L+o&AR=?i{OO6jxbLdVM{*af?C@Ziy8WrDi# zq^xIk1%36fZ9)mPssO(4uoVaZiv{etI9>CSQ@nfIatN8X$@cMQgB6afoVegKFeBzj zf@dZ!oSY4sbkPc>grp~M@sf@tG|%OE6&xWwPLnJ&Gbl>;$g+Nxit(4k$@scdBkmMRpMlWJynTRqs4sLCTyIm8P)r z(^;s{OO(A`)2~nKIn}UGKV&RKuVdriNXbW3hIMM@x&Fv(bglreUXAW!f|8<=m_nMo zAD(lI3G#*j?mtUo2NUEOUSS7xpi`QOHC5q7?0x)p%049g2w!@vMHWCIc*Sm2y((dF z^@4w)#D60b1+egJqb8D&Mfo>*beOY%${qA#vN`mb-E#BIPBMy z4yT7p=!O*B^f^)N+bOO!0zal-2qarz^t+^oMgZ0gA6>0O8pPygVl-Bx_f5O%pQcoQ zKR?|32!5szc2D3Gkmk5%UqdSKCP&x@_u)>8n`+9g9=N3YvG~1ibpXJzVdkPa!z z^@KH(o;fN(vc&72VE&lD#{wW6nbib=D4XJ3LRjxOcKsdKCJczy2`I^ z6u1H@%TvWV9LKe2xv>po`8@@8^6H3zY+uYrDV+nhLQP?E$UQw9*Df#KFM1rO#kRsA z3mDp+gV-xaUtiABOpdNpjP#>c_A(c;c*00}wxetfPYo%onfe5@CHgDIlVJ;MI`m16 zv)7-N3`B(b%d(3^r~h4JdG`q8(2u}xbM^SNw#TzHv=v?6k>L(y=JWqf4eX5x%-95S z8BHJPmF?S1omtoFuKg&+Jwd6cKg;6IOZO$c(C*;M{pf2jbwtg2ebVDwWxg6#39|7!`?ye)%|=TDlc6>2o^v^l z@Oe3)eaKE%dvYw2rM-kE4+u3_xXxA|Wm3UDwiMH37Mt?_1O7$6W=;dDv;WXojI}p| zoEwQ~ti-&UT*AH3R;B)q!pv{!`=^g$$s9h)UzJ`D&X=?@tUXFMdVyRy@cQuE5Q>Is z#IfJ*(Y2ryHz)KiBkg>zr@wgFx!}|8fUVK9&Qzxl3ODihVe;K8 zsD)FDOTzSyzi9tC@$nD@KHhm*hNc__2oy?$;DS;ERYvBC%Lb(IoKp9_z@ve))Gwqo=( zdL(N(Qdb{^u5-Oki+lV`ccvrszm$BBx9n&qQ)bc4^nA7w??K04(MGSFX3zAh4bn(6 zSsr^0VDb0N)o{^mn(3SjGJhHqd)viDr_+n7tY-;LlhS>vv0X-eh0-M%Ly;u&U925T zNqPLj8&sq%dBY=o)#b~ZFc`K@HycdX)=fry`;_6=Z!62aZFvRds{CMW;#(Pt>U5$E z`{|!m1mx})iQ(U)VktBx3TcF0_9Qx|Kdc1S08}?tIWED7H)=%M+(~&_nnNj$wq<9uy<#f7ML9P>% zz&Gi-Ju{cbx=a3(doP!-D@XUamVu{XrxQ^VDHSofZ6NlN5gDl2P6YJ~gE3-$P_IEwJEGr~@jJhdsK zYUq>2B_4RX2JC3uoUF11JExS{q7)`qz%=EJ8Vm0xCguj4b$A7bmjtu3$x(=2NM}K= zV_yo=d|CVtIRTsFC0lIAmDCIzH{o^~|8&1~yFAiE_NPXr&t+4hbmQeDOrl4>3~M^~ z2It@kIuNZ;X%|FrDj)s?s(VjiZ~13!SF&L*fES#I9|mCjV2quQ2_fGNaSqu6y7iDZ zb$9A{GxJ+@*ok=@C|uSS{W5jp*&Fwh@=)k%b9tClU(L6B@=_P)Aeq&rk+<2u*9P7A z!^o+l9%t&Vcf&MGUnVZ4eM>&G;V(1_s)2F;YCLqTc`x(Wo7L9RVTVoo&LtuEOi1P@ zjU4K5!SsSvWTE1zL^J=yw=Bs;05$abkceA$K^OnBS%n~b%l!p=;6SCq<@rU@Y{bP_ zIt7B4hxy=P{Hu=S3%an#;Bb?+@>0D#ZurKnx+~A*ZfZ;_X(_*Qy*u8RA(aR1u{bR= zeZFHp##LmvcN3FU^c=IUDw;>0&$h%Fl`~pp2vUcr^{H=FSL0Qf*X1G+VB8xOJ3sNO zzgDdT534Hgz)Bzqq!d4(y8U-)i4a@yse9Axs zJiWsW4J+`2&fDmJ)@!fYiHxcV2<&zu1{ksbBJ$CnHVm;qz?iIr(J^Wb8*FT7z=T%6 zz>|nGl}`B1Tbm9y4r5iW;5o9iBpk43!w)wX5~*Z2mAfl(CmP*Q@j!>G<;ApyFIq;^ z6vk!F2*iLt2S^*It&dtdeZ^}9ZQCAN$gCTSwivX8 z!d3|_022;MX^_PNo%B_{fatH$;fl0%G3&BdE6>bg!^K9NQyyNL|2}FU5GCk;g9stYtB8h;2;zl-3uzGD zybQGem3$Bg^1oP676XD0N{%4r<3htnNbN;DA2^dHxQ(IaZK?aiSO+b!-_T zj49&t!lwBXJDko7J@{&%!Iy0W>g1<&;ogr_- z8sbD;<524XF;98WmW~5UFAxLA+;R=0)yoO7V{at6Z@R|b_k54dzbuHUkPO`>8&b_z z&dbk>GaRLh@SY7|+?dWq$zkdzl>Kh4xyT#CDLClCV1Q6hnI9XPCM^KnYDO$RD(=)! z=eefaqB1&)eJn}Js&W&3kAoFXcRrYthMQ~=FYQg>ez9_rsDJ0&T*V5r8(cear+7^B zC%!O0r!CZaLIK7~_t}e%VpjfoH2ov0=w3c(rflILg2_fTrC|cH4BGC$*X0jrGrDJs z@(((pI2>B!eYrZrYCQ{GNblg9^31m0H>@N}+sWc`64;SKm2_zfhCvwaLzyfn`H%H= z^oJ_03}#9{{Sn{!zDn6r!yY()Q-q-2eh@fid#mcnGw0gK5_LN-CBU0~vqq`dSbvew z_Xc>jm;m<7^SDl~Q9}r?{^>f`kDFlhE0n0{}1np@Or8si})I``?E1FHWRs zYDVSq;rQrVK7qE|KVbNiL*AsgxD_~;)h(~@Br_6oD?h#b046J@rC`9m)}3ztvjK zOz3=k104yi{24Mm{1tWA$uP5oDU)A;B;A5E;Tub#`6PKQ4JI>OQ}CUs-sEXl`gE^j zP*0ak58NgUwRW49vu1}g^0zKgd)}o^2o;iiH~KldqN5(~)bwxKt?4TGUF?RqX3B@) zLcWkvdqHTCZT^(ah1YoKDWhM@MhK%pWd3$uTd$&CHX(D3QS{FB`#WO1PC z-ooW+Y2=nVki<+)6G@2eaKfa)EvTV3?E?AkT>;cS|8lLQyHF}+vM7fGwVHK4Q&ICe zp2SX++drEAtpRmUQKIB+jc~u*I#CgKZ!wR{u`*uBQedfHmSdbA8DG(#X0MAF+B_t9kg6Tp%#W z*P5$o1*M!e#jkNz_fx=#M@+kB)wW?0^bPjXql{T^07XR7B^SOky@~SI%g_92?$B-k2 zRW^E$H-d5F5cL*mk3u=x{d-S(miGo@)BX>-$Y_R7S@0d##CTy+kAt%Z0EjuSi1}Kc z#)gSa6kWw~-^3$Oh`^PenbYPb6pCk0Y{N}RLQG40f8X>#K!3h^M@|xVs3482ch3+* zVUkrWH|X1>-SWCKzKqTSMXS~qtj#IL^+d(&U8iVAK+oo5!m|E)Elhmz=$Dapm-nKo zVDQSeP+T`e-KwwFS0gm>!Mly&87Is^#GW_k%8s|kO2HRU?2hBsmpiTp9fFj*6P-fN zAPz1wi-QnKVv%2cw0jEDjw@l}U&72^34`c?jtkdCTpBgX%o#{+%58Y$teX*Kv!R(U z!ibgI$U^^uNdZ5cQ5}a$r8mdMYn`!d#&4TKv5!c|G>ZvEc!=!djwNW?`|$Z5$d+CY zww`ll8|u9z>GGtA@_-@%=)XoSPD;*g|3WEm33KePEA49n?c3aaZ0a2nThI30*TK~+ z{S2JZvj#mQiH;@btX|`Ap}!Az>k>%yAz$cMd5Z+8ns;iD$MIAeV8 zAaaYmYgvfM-w^c{jh@{$dzLmgx|M;NCsin{PZKin5JSbZ49!?2I4&qB3{bIx&(4nf zMo~Gv5vFwkeK8=Zf8g)#m6_Uy2ggi}H-KJ&LN+dzmr{;<)m&IBXI4GKE=PdJArSin)=TXajA7YYau4<=%;phL>U|$+icE32GiVak z2pJ`ng6HK}TnXb|PR+g&NSwPDr{JGllw(f~Xye0yLorqc9W%N2E`ct7(=~>f@epy3&5Bx25uxu3#-Jknjw*6UMjA1|wEo_fg;p)~Mp4$u;TbgTIIF zuLi+igfHSyfo81j%d8d=9J5Yxb}KG&YgBrM!R8Yla5*SAY!|Mhg(mdg@ASuN1NzzH zS7>F8S(>b2q0carJI~Y~f$z+M=o557pe(WhmeLf;)2i4$@4Pu#yPt*%VFU1YZT#Pw zheBWI&7ZlsfZt7omZ0toHz-g&W%$uFj~KfzW7;FyUbEGN(n_d~E{5eAId7gwq+O5g zoJ0TCJH($WGOo3+aF~I(^bfnl?7A#D<#NHpm^Fc`qA+7z1z=8X4Xz0Ym;xgvlt(}z zfteBVA&flKW)V^#K&P-uWye4Ozz7%s!2FL)I=gt-m^%NZjlJsfc00TT>%_lbq8<}I zES@h0{uCpZ>H=_mLs0Ouvka*TQO*;cBJl{-yu{HR<7pXmbcz#Jj?Jgr5&ukl)lHKL z@3?8#cRcGD=5Hx1F;Ny@>^$elp^0I{Z$*9jLi|nz8V->chcppzcS~t)-;88Jwc_pu z_skTFB>~jKs3-MozbdpDJX2uj5F*vCRJoEgi^Y<3ZKBZFI&KKR8)zc6iQf=m0rf(V z1R)mx>OR{6FPT`pmUTytl9fo((obfO&?L)g0P?%SUEY~rM?q3c{Q;Wix;<==Sp=Tt8K0}%$z zuRC)*yQ$lST@%B^or0AiEHXE4(-!MeTVEEn4I4c063#P?G%??6aJOiA%q%)K`&@Ghwfr`9B2{NwSW8`Lh zF)9vWPI+G-g=})KBS@-!NTCZ8l^qlA>M2)clnZXC2#>0_Xx`+W@hw@jv(L~X>JOZS zlD1ehOOq_gh&2_5sOMIq!H@!_{jVqjMYWS&b;DAUIj26oa9MY%Rz-e^GR(Rowrjon z=(e$r?u>6gsP~?KBZ==RAzk@}Xk95r$OnquI}ia%xc5xm5#IC$%Yn-rS(S%^CE}fV z{Hkz3ic-`_YgkhjlP4^0BLtb7b6-J!GkEECQKxG5s7B~OB#KKEmhzwvn|$ab`cd zuGaQU{adeIrPO@D%1cq{tnw^o6@Ly$aVx0iPr_)&rzB#MKx$qJI$_(48Z8Q~g@hUC{xLB#75f(thXsTtIi<2)mb z<~d_(so5O_v4|@gX$~uLO>3-Px7dHb73evPlMj~9e3w9n4TH&{+SUXz1U|&qBHRxZ z=`1!l$#SPPVjsUn!v*8k2J-4#O3F)Q-Uxeu+`RGBHQT7fHLv@>+R+r>zP(cUQz8H< zvtmFtq%a#V7TA5a>$Oo#!eaYYaD^`4nvv+@R>j#vGAB-rb)NX*z^t#V|5*!u0QAX(Vmc+$9ALO|yEmgqu{A4x`{*J`j$01x-;Q3oY==iQbr zjFEW;+wD)~CkzeNC3Z&X>67z zn5#91$`@4w1&o!SJ8OkQSPjEwO1znDU8vt zBNv&Lq(96R(W}LB2oXnc2Y+$kNXD^^xT6KTLy9p^ZLTl%#hmtC$s^So`^}tKK zqTCR3G5L|7{zU^kw8o%}{MkZz-uj8Sr_x@LtO8#3y##^5l}i$G z=NE=B#K(|Ae$;0FqF>=q)Hx9`2yMHd0h)4uTBp70aQ3~?*W6#n7&AlmnE%+!-Imn%QcfkuH*xYsl0qyKmyJ_b&autrYBJ!jn(kdC+2%blwIMa%;$2R} zLVymH*0d!!P@(e7ChifuF6dQLq{J-GeF;Bxbd$ppfUf=xb=+$yA+6cx1ZVo!ElS*ad!~( zXvNDg^R9P<|7?)sOo4C3&tAZJ{HzQrILT4*9<)IR5~#FksTmOyqy{ zy;djyzzh`tfd5bS*}KPsapDlND9Hj5SOEk8WB}@OkQ(ssX7`_(1X36#GbQ;y>Iir) z`@bua0yYjNf+;dFAu!Uw*s; e(~|vtOP}eF`>ezN@A!ar7&QwmvKQlDRsRK5u4jS( delta 5452 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 diff --git a/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_normal_02.xlsx b/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_normal_02.xlsx index 02c8e2f957b75c4bd75c284a8b521dfd0dee6953..6134efdac34bfc3ea8f4aac4f0313120ee4b9825 100644 GIT binary patch delta 5435 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 z z{ffnsDM4`~;%^pk{(J!ESXAjEpB;ENbmGPZ{(8iWx(z8V)A-zFmLjyYMi?(`}Jl7e*IwhG^30mZ)y z$|AG35w8JVx0NA=MA~n4h8J>ob90u~_ zP1TY2GrXV6?Mq7FUVidyD{H-qC?GLDWX(VWB07GPam|~xvuK)HGPrCnOe%HhwJ_wN zb#Cj>Mm>Y7Sy6Mw6lpoH)AhpiOb(ndDc<$kesS<_VMC!@PA3eZ@bAg11*G@$?r9=; z;mknM?ns_mN!jXwylMOZU-0U^IW~s0)yK&U&S$B6@o{b5{u-M2h{_?C? z(gE5wGTON4j_LH16!w#>TJun=sU7forJ3ImqpT!&S$;ZD<>)=a8KZvF|HJFWY5KO3 zS0J@p=00KN#tFP~BTE03KQaO5T=EL;uSI?L+_51JbsZ%>}~4gAn*74f86v+aADLcQD#|`)dEN z=CNItXdk+UDk-&LI&#g`4p*bsA$LcI*WPbuL3>f^^1%1-?xMfhABmW2#{J&hGSg^= z{l@3?_2{1yhr^?bp~d%8Vp)zVUob7{{X>naJMupZpcE9}H$3Z79OngzRl3L+%IvL+ z(?tu^6TFsl^r&BunxTf&)3rl6aJ7q3N>bH<#C8xJbM1=f&|^AH=Nc7yiDKsvBZ%hc zZJFvzup{rCT{l;06LK=I6-Vib4vK!CbY+VJucPucy*_OKp(yT^&AqVsG%^5p&~GBQ z@aLV_$BkU`MUdk&0~UG<#Ec;z&1H<9Y^x`_vz^5Ui=6ETQf`xBQ=t@h@!L+|`~>!> zwA{WOl`>PV5enR+OmzvCm|r{RZjO6Rt=+tOOrzk*>qJ6FjqFf(%3M~H9>-VEMJZ3% z=5y&l{}8in-;gv&c&|T5l2aOX2|$@w+X-)aJ<|w&ywM^)xcAL@UKVGPoUs4TcDnzW z^GxyJ3Iq)DO}!mfdbbGmALX!hwGZ1eQc|V{_L> z+4;0a)OEGce3j=4m>hi83#IEL6Xg(^rhWLpRos!&>vGgZtq`s1DMrN_*g}irAE4Q8 z1d|BSM}Md3WnHhhTWfc;%}U2;7*M#vqc1E}Aj~}6;3~O4I){;X0JT)+$nTUDqiYst ztl#Lblf@HS>x*Qhl?eQ%V(x+eevKVTK|r($KcxB?3IgJP{|X3H1p)v@)wUe0K%`%S zxq7D{W!DmRn?kQ|MnS%FNL{DQUT>g<(y;)iw{eB4I{E&^zUEw+GmkVT%L92iuYR&& zHZ?-?s)$~fH6213NEZFl#yBU%p6Zd#x};dbRCFMSsXf;k@jfXkIikA*?POG878nKU zeabZp+HY~8>(<(n^+>@A!(aVWiA?`YKv&+m0%r(%$#~h`@G*QVJke6V zF1wBy0JHck7ko@I7P89n75B?RHgT{!X1tGOwqi`^K-@U;MdrM35!ah3PgOAn%a9w& zwlbFNFuga{*T(p=)(^2Ms2f}y5f5sG#ihTTO?_!R-F4lH1|ht88UYz=OG@VediPk- zxECrN-SgZVo?iDlWjbjIi9bTRt;}BZ+0gZ44sWNU?xbg44gXxZr?Arii+g-zR9|rk0Fl=$L<+8 zRJA0#vf@1+PuZsA`Se3in}xV6pXutz&0B-0bfP}7r8@K~`MRiD+|u#$m4C%@Qf5@- zcAbTJRet`%q|ADIhv=}!xVzmxSkNV$zuZ_+6YWM{pw}ymZks*eJNqYG zV-i35#gBUgkF}o81-d-*7!)&0)4t~RWoowSi2tB_-uVIUr_$`>fM+&^kbXHgY4!Ox zw$`pR@wk+W@Ext7gLCL$dv(EFAcQ5=O{x*e+K$q^S?*1m!{XIIL7sdEL zYtg@)`hUg%4jRqJhJM6H51PYAtMl z##jLWivJSnQlQ^FfO7p$EdGz?fd1cF_FqUwukcYZ{&%AOM+g95nE&RhEU1+o{f-oh zhVw!GI+q^Q&VfFJ@}i^pA&mdezke%Vvj2Z4V3ZRL<>z4h_a6Q=IN9IChWwWR#*J>| MXU8Gq`)Bok0Sp7As{jB1 delta 5588 zcmZ8lWmpu<8eNt~x?|~vrIC_GIwe$6KvGIdlv<>_mR`D-kS=iQ0D$+-0zPgY zPS$R2PW z7s5np&QbG9`@+n5KHH5CU@5H9q;I|{QD3eevxRwx6Ot1hL&=LXFqo9X)SB{`xxxjs z<{hCE!>uHv$Yv4TQyEQZgN!lP%-B=FaI6Jh*O%r<7c>oMuA6|H+mZb5m(cpN#0+Jq z^=z7yy_&4d*1gef84*XJ_+$1{e0&(`5QIJzVCy$q-q-!M`0X=x&Y5Vj&F1u#Uh@lv zmg_VuV}djuUO0>@m|TQ z903@RbAHgyqLK=Q<0$daJK2l0DeY=&(JYKX%x(NdQAsl^yBHczxxK-Q^~bwc8aLQ> zD&&+K6~FOsX6k_A197##ZDjH9AX6f*5<@KjoB=N;hI25QVFZd#sCE7Q zK=}TCl;d|`knJg$pzCgJ4zs3cW`7>+1fJDjw|?{xiwV~U7o^?<2W?BDL_uZ009;sY z=}RBQ-G7SGW4)7@#Qru6o2(avuvCuK+@HYX=smM6n?m@%61>?^OSlqZyUD1!?w>AW z%;Gm0ZxR`r>ADf@dQ5qL!Z5UxulhaLQ(xeU5L$pvjt6+e803o%08ryW?-@W4Z6}Z_ zaR>GZW4I(cwqvpUQ=CeQI@=^BRcf}p^kXgKrFXg)vMTm=|!-o`m*` zVL{khFV=qR9`DnrpT8r5afQo_Ki4+us_?Dx#iCQC(B&u=g<8v)n_H-pk%oaY7hdTK z9J=rYq;V{67LK=(H|FZ7m(le>h~%gpTuA%zI&$OV;Bu3~=CSb6v-&FaZcn2M9`Vb{ za}jgiQB4^RVTwsvV`Jm7itH#+ZW~s7q`A2^RHZf~9O;wRq&xFXzTsOp{-oxrAq#4R zm)6EkVi?ip>GFd^_q^15bHR4)X|rauQCk+rk|@Ecvr9zU*sHL#8ah|V0>3*CzHd|d zt8YS}FUlAs&6~YC4$n^nMJZfz3R0m9;@_vDg+faOjE$2Qtoz5Nwhj)Fvfk%m4Z7I@ zKkVcrZoZ&Q?@{-05rXn`n846E87blI&1oHjB0=Mr((Ye~k z?N#LY4)FXwJ(!nGZOx8M;_G^+cEe~GjWuJ~56gB2xCwgW! zQoUi(>QUJV5@hqIcMcm;FY*mD>YmpphmStfu3)nA1;&XE``%hp3+%j|%|rR&!3mDE zd^w7l!>IVnQ^#U0a zI=dAmM6~a4WZZk~bk{cJa<{h+cRyyhnKpYZcg>jmYDZ~Lm3n)_71CZ*W2Usxy?$C~ zARgQ!w}Zo?82!+P^w|jbvvp^ znb74>5ohaJD3}Lfi22@Q22U!#t=kC}_$FY_IJB#ngDitpN_#$3pcvA;fBz~tHhmmN zm`QUnW{H;Vvy|yS+e|m!{jzu9#9g}dRZdQm>2`5c?nnBGKt~Z7H=@7=q4E|d&Vwv_ z)eT&~`qS*6$vN@3V;(&!{=5+kCkR#RDpGKnuu1aJ#h^8$Ekst2m`6TDPuQ2d+9U7b zO<&v26{*7r#OzcbhDS5?eA!3Mf%ztPV7rCP|D{_>eKHN+lT0pLY7T$0~ zZi9{ng&I+7139Uo#nckO{o96BY6c)=76{=_zyJWuNB{tWf0K`=*9T`?&%dZ=_T_}@ zcQN8ls+}h|pPyVe81mL4B2#f*TDEYllkcRaalyEhX-IPx`Fs~5cHlMBN(`I{UuZO% zXG66Ry9MR`i4uL8S3e>^Urvc4qD_e!9gX=&m)bpCVxkfJ84GOZ2^SEQjh$&VTOkvI zQnW6iu}Kcxd1tpe%34;*SMmi&QK)@Tozm_!$NRSPsxJ7Ne6I^VWPToeQpZdKxG`vj0Yv%~S-r`E0kony2f&mBd?V4wTP;;2zQa z{B=F-I(kccWv&DP^oHn|r-91^o(<|81eFdTs=}PB5vz|f7iMy6Gg`V#h(eWqOD`FZ zpJvU+u`}ZYDLlh~JBYKgXIImO&uHii1s)7{CNCwIhB@#Ub=ElWq;)tCbc!kD^?cFp!|7Uxx7Zrav1`yd0DFG*gqOqw1zH&MvY0q2(?OocFB|mowT?*04M}%r zpj!z=ENd=C;$uC32!Jdr^kb$tmZ?nmy*@8xR-GggpmK0R;ytZXH_FZA+WAPCxC=g~KyPrQK0^Mc0y&QYE#l4$gIMrMs=x@wRIR7oXWkTz5gaH7I&k6(Z;+DqE; zD8`#>4P%QS-+zf#8tqzrk)@qp&Td`GHS7)tM5Cf;lGvMw#(SH=4- zp+Yu2E3BHMu50KQQWa~?Z;+jAd*cKD(eKOcneXXkLvpzc5B11l!!nvZ>T#+FD@phq zM;*K}>>UIPgOI9`&5!?Za=f3RQ*I{sC$Hd_$?K0Yv-)tggKsxvuAeNtTvsd+Yph=h ziIf}ySL|v&Th61KW9~_E8W2_Zjwndd4|&(s>`4yKIEjofnG1w?kqw3ZeAt~l@Ync| zDY=a`_emXV*O#VvUlJZ8M-NPy8tXsW5ut(%DGO;~x`R9J@DUbg+D{6U-oZP3d9)*9f&6IvTL@RmST2SU*6=Mp59pr~{KPp{R zxbc1R(%?E0O93wd7v`v|WkALmuMMhF&dI@HQ1U9I4!rgisZM5!d>t^*?n=Bvf^oDX z*-8tU0CmvM+KmEFW`BM&mh+gUAfqJ%MaVY2^^It0a(ik0@UG>Szq4cPc4XWf$uScY z4wW!l)#-KojOduKp7)tqQ}x+^xU)VN_mK$sFteZ5*U`2M^IUU&fzDT_8uDp{rv-3M z?RTL1OM9mc3Vz!$BFfS*0>7X;Ekr>`A?QDVyPbk-e`#uSEDrdq485`&5I?q}vma0xUtuhKC%1NczjWsJ ztYg-XnHHM`wAa?|mUS|E3fZ#}IB8{|D3J)VdtvxtxqEUCRXL{7Z@QIYZz0H_+aaw( z^eO(WQ2?7t-BL+ZD{u0=8Hkp?nACV#{{BpsZ=c^J*PqRd;e|lWR$1||CeCq+o#Uwz zrgx5Xn~4l#G*94Y{;$J8a!zySvyiaKnPQ$j>-kuw>@u>g$CHRmY)F#prxtEQCMzGF zI#~Ow+e&T0cO5V%%&9K;`e#< zcwK-`l=5VSuI7}JTr{&hWb&6XKFe|h(dYXP*Vn2x+%<{GVlRplnMXb~rK~sYk|quR_9J}5B~k7?9CW#`hUUU$unXNx7hYdh z=J0A4NhLA9;Vmv6(5)IUEuqVal-AdwBr2<}eoxF8Lo_nZr^U`|fhBE#*p*|hbhqVU zHMyNNfgsYpJT4%k0W)NT`~hAJK*=dflPLtybGaEX%Us-ejE|`*-s}G`(R5tee~J~8 zj+j?`BEQ@sW9?K#IO=uvT!#5}DZv4eBAnP+Sx&zYafN0|Bu!JVBtq@8^ z*Jz4rQ=y+hVlXRmonzO;3$DZuCYPmY-XCXkozTgd3u6FIG8pIW!D$w9%5et(yW>lvV5i37n7^IxA;*rfgDpzcNF6!A(O`*fe zSv-g>Exezsz=GRZuZdH>{~V%)8&+Zd>kz$$`W{!9drL+(MUT09@@RS!8BS!M1!5Ex zj_OckJ?(g!phfukv4pY38}W*B&&%v}Sf~08hcgB9;K-5VRi16lmQBj{5EZ+9r^I;0 zIZ~YSr~w@{+qgH|jC*-xDYN34-$IW`pK8#^X0a?@N1PhP6VYaRh^0WN4)a`Xt_dnq zXZp%D?Q!zS8o!F8zNgU7h4dR;=azuEWQ)Kd%M=@xXNqz*ULJT#=|}+nTN2BM6FcEq z?z;@;4&Qr?8;nLC?augFhYVD`tU_Ix7o&>F9OufPbXDQx1klgap%owU|DN9x4y1(i zfA#b&&(S)__qvq&CFPXbS*7gK)Gz9$y>E4R>mbP8OX^*%#QGyuT7VV8{w4HBCCO0!Rpd|(Z;OKHRp zR=ScM+T161F!Iq-`IwK*$FxpeDH-*13D#`-Q}0OVBKxL&+aj5dsGhL1d!gc)B+Ii{ zpdNxGb@9helUY~`S8Y6Z&z_1xe7xm!eQW1vYbiqL$eEU4(8v;9S3k`orzpoW%i8&h zkgXxfhfBbf7Q&i&s@pJ-b*$TrncaU(khY#-8UKxtdM_zbN3BP-cop^;8z;U13wP95 zizOI>AdGEBv+*HKUP_*iT|#(MoWHYuU-1Opq?$VD(PT8 zp?P}N(Qh$s)9?NDQ+0DjsaL-frw8<+whGBHG3cDA&Qn|0?piN-@Yu-Se19FJ0YV#S zy1!I#@z6>fL8Anb)ROW&Gf|If4nwX7Z*^;sdD=%VA=2v{v%_Exc~UqKHi5B|m{4?u z@`6saGI=5PPrlb{Q&Ni`i5TAv^>>>DXpTH_igbe?W>1j3RvNen!K~RdGt_Fqyh)*_ z_l9pGj7*)Rt0Z5F53+Jy3G203hL^a+j+GnfRx*GG%<^x>oZ86;7()ct4GYClnewrZ z7fS7_0u)EDeZ~_OfW$nIk#I+eG|xlCySy_G(YNldARq@ZC6dG^UV6R8?zM1-5+a){ z0iWzJw1NJzRAk%#d+Js33)KDsJ6Sw9yCRQYdLv+QfKKTMfjli(Z01m!5O`~H;h69G z0g57G-k%GVnVrmS={>q6njxAWt5m*%Z~Ej+r1)QrT{HeAHKBw&anM~{Lc%|b|BP`g z=x-h{=>MI||HJ_gIM5azX3#&55dc8`PxQ~M{t@(^R~~3V1eFIr2K}XA-(Uj(GfV&g z+5g}yiJ@*}6wq{DVvhfps{i0_sQz|M{}!%LA}|H$e>=o~fB--f=uf}M1Nu+>{_$P^ zDBu4Y&sd>9z^qVjFfDL~9hwA|1pS?he`=lNkM%|TUq}F8iv!Be$AVSD{nzfl03}Cg A3IG5A diff --git a/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_quota_02.xlsx b/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_quota_02.xlsx index 1395cb8c9bd12ef2282d1494ff6334025e818d29..6ec85d2516dd9430a96879b563b0ef776a1e47f9 100644 GIT binary patch delta 5684 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 YV{?)I7ZLzye++-%W5b3%`Rnw502hK^EC2ui diff --git a/Migrations/20211005133544_AddRewardSalary.Designer.cs b/Migrations/20211005133544_AddRewardSalary.Designer.cs new file mode 100644 index 0000000..45283a7 --- /dev/null +++ b/Migrations/20211005133544_AddRewardSalary.Designer.cs @@ -0,0 +1,1096 @@ +// +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("20211005133544_AddRewardSalary")] + partial class AddRewardSalary + { + 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("reward_new"); + + b.Property("reward_old"); + + 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/20211005133544_AddRewardSalary.cs b/Migrations/20211005133544_AddRewardSalary.cs new file mode 100644 index 0000000..b869140 --- /dev/null +++ b/Migrations/20211005133544_AddRewardSalary.cs @@ -0,0 +1,31 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace tb320eva.Migrations +{ + public partial class AddRewardSalary : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "reward_new", + table: "eva_adjust_postponement_detail", + nullable: true); + + migrationBuilder.AddColumn( + name: "reward_old", + table: "eva_adjust_postponement_detail", + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "reward_new", + table: "eva_adjust_postponement_detail"); + + migrationBuilder.DropColumn( + name: "reward_old", + table: "eva_adjust_postponement_detail"); + } + } +} diff --git a/Migrations/20211005143227_AddRewardSalary2.Designer.cs b/Migrations/20211005143227_AddRewardSalary2.Designer.cs new file mode 100644 index 0000000..a30a29e --- /dev/null +++ b/Migrations/20211005143227_AddRewardSalary2.Designer.cs @@ -0,0 +1,1098 @@ +// +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("20211005143227_AddRewardSalary2")] + partial class AddRewardSalary2 + { + 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("reward_new"); + + b.Property("reward_new2"); + + b.Property("reward_old"); + + 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/20211005143227_AddRewardSalary2.cs b/Migrations/20211005143227_AddRewardSalary2.cs new file mode 100644 index 0000000..07a37f2 --- /dev/null +++ b/Migrations/20211005143227_AddRewardSalary2.cs @@ -0,0 +1,22 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace tb320eva.Migrations +{ + public partial class AddRewardSalary2 : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "reward_new2", + table: "eva_adjust_postponement_detail", + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "reward_new2", + table: "eva_adjust_postponement_detail"); + } + } +} diff --git a/Migrations/DataContextModelSnapshot.cs b/Migrations/DataContextModelSnapshot.cs index bc7b270..54ef167 100644 --- a/Migrations/DataContextModelSnapshot.cs +++ b/Migrations/DataContextModelSnapshot.cs @@ -171,6 +171,12 @@ namespace tb320eva.Migrations b.Property("remark") .HasMaxLength(1000); + b.Property("reward_new"); + + b.Property("reward_new2"); + + b.Property("reward_old"); + b.Property("sarary"); b.Property("score_final"); diff --git a/Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs b/Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs index 2d99504..447aaec 100644 --- a/Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs +++ b/Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs @@ -81,6 +81,12 @@ namespace TodoAPI2.Models public string employee_no_at_this_time { get; set; } public bool? is_for_postponement { get; set; } + + public decimal? reward_old { get; set; } + + public decimal? reward_new { get; set; } + + public decimal? reward_new2 { get; set; } } } diff --git a/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalInputModel.cs b/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalInputModel.cs index e9f8bdc..e7a4697 100644 --- a/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalInputModel.cs +++ b/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalInputModel.cs @@ -48,6 +48,10 @@ namespace TodoAPI2.Models public string eva_result { get; set; } + public decimal? reward_old { get; set; } + + public decimal? reward_new { get; set; } + public string active_mode { get; set; } } } diff --git a/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalService.cs b/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalService.cs index b89778f..f542ce8 100644 --- a/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalService.cs +++ b/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalService.cs @@ -141,9 +141,15 @@ namespace TodoAPI2.Models adjust_postponement_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult1.fiscal_year, employee_id_external_linkage_external_name = fk_external_linkageResult2.fullname, + reward_old = m_eva_adjust_postponement_detail_normal.reward_old, + reward_new = m_eva_adjust_postponement_detail_normal.reward_new, + isActive = m_eva_adjust_postponement_detail_normal.isActive, Created = m_eva_adjust_postponement_detail_normal.created, - Updated = m_eva_adjust_postponement_detail_normal.updated + Updated = m_eva_adjust_postponement_detail_normal.updated, + + salary_max = fk_external_linkageResult2.salary_max, + themax = fk_external_linkageResult2.themax } ).ToList(); @@ -203,6 +209,8 @@ namespace TodoAPI2.Models //existingEntity.emp_level = model.emp_level; //existingEntity.total_score = model.total_score; //existingEntity.eva_result = model.eva_result; + existingEntity.reward_old = model.reward_old; + existingEntity.reward_new = model.reward_new; var updated = _repository.Update(id, existingEntity); @@ -467,6 +475,8 @@ namespace TodoAPI2.Models //existingEntity.emp_level = i.emp_level; //existingEntity.total_score = i.total_score; //existingEntity.eva_result = i.eva_result; + existingEntity.reward_old = i.reward_old; + existingEntity.reward_new = i.reward_new; _repository.UpdateWithoutCommit(i.id.Value, existingEntity); diff --git a/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalViewModel.cs b/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalViewModel.cs index f7f56d9..89c4d0a 100644 --- a/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalViewModel.cs +++ b/Models/eva_adjust_postponement_detail_normal/eva_adjust_postponement_detail_normalViewModel.cs @@ -50,8 +50,14 @@ namespace TodoAPI2.Models public string eva_result { get; set; } + public decimal? reward_old { get; set; } + + public decimal? reward_new { get; set; } + public int? adjust_postponement_id_eva_adjust_postponement_fiscal_year { get; set; } public string employee_id_external_linkage_external_name { get; set; } + public decimal? salary_max { get; set; } + public decimal? themax { get; set; } } } \ No newline at end of file diff --git a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02InputModel.cs b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02InputModel.cs index 7500920..500868b 100644 --- a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02InputModel.cs +++ b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02InputModel.cs @@ -48,6 +48,10 @@ namespace TodoAPI2.Models public string eva_result { get; set; } + public decimal? reward_old { get; set; } + + public decimal? reward_new { get; set; } + public string active_mode { get; set; } diff --git a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs index 21ea622..2127403 100644 --- a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs +++ b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs @@ -265,7 +265,8 @@ namespace TodoAPI2.Models //existingEntity.emp_level = model.emp_level; //existingEntity.total_score = model.total_score; //existingEntity.eva_result = model.eva_result; - + existingEntity.reward_old = model.reward_old; + existingEntity.reward_new = model.reward_new; var updated = _repository.Update(id, existingEntity); return Get(updated.id); @@ -299,7 +300,8 @@ namespace TodoAPI2.Models //existingEntity.emp_level = i.emp_level; //existingEntity.total_score = i.total_score; //existingEntity.eva_result = i.eva_result; - + existingEntity.reward_old = i.reward_old; + existingEntity.reward_new = i.reward_new; _repository.UpdateWithoutCommit(i.id.Value, existingEntity); } diff --git a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02ViewModel.cs b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02ViewModel.cs index 4c5ce91..4c26d6f 100644 --- a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02ViewModel.cs +++ b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02ViewModel.cs @@ -63,5 +63,9 @@ namespace TodoAPI2.Models public decimal? salary_max { get; set; } public decimal? themax { get; set; } + + public decimal? reward_old { get; set; } + + public decimal? reward_new { get; set; } } } \ No newline at end of file diff --git a/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02InputModel.cs b/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02InputModel.cs index 586aec2..5075341 100644 --- a/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02InputModel.cs +++ b/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02InputModel.cs @@ -52,6 +52,10 @@ namespace TodoAPI2.Models public string eva_result { get; set; } + public decimal? reward_old { get; set; } + + public decimal? reward_new2 { get; set; } + public string active_mode { get; set; } } } diff --git a/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs b/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs index aa5efb2..106dfc7 100644 --- a/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs +++ b/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs @@ -20,16 +20,16 @@ namespace TodoAPI2.Models public class eva_adjust_postponement_detail_quota_02Service : Ieva_adjust_postponement_detail_quota_02Service { private IBaseRepository2 _repository; - private IMyDatabase db; - private Iexternal_linkageService ext; + private IMyDatabase db; + private Iexternal_linkageService ext; private Iexternal_employeeService emp; - public eva_adjust_postponement_detail_quota_02Service(IBaseRepository2 repository, + public eva_adjust_postponement_detail_quota_02Service(IBaseRepository2 repository, IMyDatabase mydb, Iexternal_linkageService inext, Iexternal_employeeService inemp) { _repository = repository; - db = mydb; - ext = inext; + db = mydb; + ext = inext; emp = inemp; } @@ -50,7 +50,7 @@ namespace TodoAPI2.Models { return Mapper.Map>(entities); } - + #endregion #region Public Functions @@ -80,13 +80,13 @@ namespace TodoAPI2.Models public List GetListByadjust_postponement_quota_id(int? adjust_postponement_quota_id) { - var model = new eva_adjust_postponement_detail_quota_02SearchModel(); + var model = new eva_adjust_postponement_detail_quota_02SearchModel(); model.adjust_postponement_quota_id = adjust_postponement_quota_id; return GetListBySearch(model); } public string GetWorkTimeText(DateTime? startDate, DateTime? endDate) - { + { if (!endDate.HasValue || !startDate.HasValue) return ""; @@ -98,7 +98,7 @@ namespace TodoAPI2.Models return ""; } - public List GetListBySearch(eva_adjust_postponement_detail_quota_02SearchModel model) + public List GetListBySearch(eva_adjust_postponement_detail_quota_02SearchModel model) { var all_emp = emp.GetListByemployee_type(null, null); @@ -112,10 +112,10 @@ namespace TodoAPI2.Models into eva_adjust_postponementResult1A from fk_eva_adjust_postponementResult1A in eva_adjust_postponementResult1A.DefaultIfEmpty() - //join create_detail in _repository.Context.eva_create_evaluation_detail - // on fk_eva_adjust_postponementResult1A.create_evaluation_id equals create_detail.create_evaluation_id - // into create_detailResult - //from fk_create_detailResult in create_detailResult.DefaultIfEmpty() + //join create_detail in _repository.Context.eva_create_evaluation_detail + // on fk_eva_adjust_postponementResult1A.create_evaluation_id equals create_detail.create_evaluation_id + // into create_detailResult + //from fk_create_detailResult in create_detailResult.DefaultIfEmpty() join create_data in _repository.Context.eva_create_evaluation on fk_eva_adjust_postponementResult1A.create_evaluation_id equals create_data.id @@ -142,12 +142,12 @@ namespace TodoAPI2.Models join fk_external_linkage2 in all_emp on m_eva_adjust_postponement_detail_quota_02.employee_id equals fk_external_linkage2.id into external_linkageResult2 - from fk_external_linkageResult2 in external_linkageResult2.DefaultIfEmpty() + from fk_external_linkageResult2 in external_linkageResult2.DefaultIfEmpty() - //join create_detail in _repository.Context.eva_create_evaluation_detail - //on fk_eva_adjust_postponementResult1A.create_evaluation_id equals create_detail.create_evaluation_id - //into create_detailResult - //from fk_create_detailResult in create_detailResult.DefaultIfEmpty() + //join create_detail in _repository.Context.eva_create_evaluation_detail + //on fk_eva_adjust_postponementResult1A.create_evaluation_id equals create_detail.create_evaluation_id + //into create_detailResult + //from fk_create_detailResult in create_detailResult.DefaultIfEmpty() join sort_dep in ext.GetSortingDep() on m_eva_adjust_postponement_detail_quota_02.org_at_this_time.HasValue ? m_eva_adjust_postponement_detail_quota_02.org_at_this_time : fk_external_linkageResult2.department_id equals sort_dep.id into sort_depResult2 @@ -162,7 +162,7 @@ namespace TodoAPI2.Models into external_linkageResult11 from fk_external_linkageResult11 in sort_depResult2.DefaultIfEmpty() - where 1==1 + where 1 == 1 //&& (m_eva_adjust_postponement_detail_quota_02.id == model.id || !model.id.HasValue) && (m_eva_adjust_postponement_detail_quota_02.adjust_postponement_quota_id == model.adjust_postponement_quota_id || !model.adjust_postponement_quota_id.HasValue) //&& (fk_create_detailResult.employee_id == m_eva_adjust_postponement_detail_quota_02.employee_id || fk_create_detailResult == null) @@ -203,7 +203,7 @@ namespace TodoAPI2.Models emp_department_name = !string.IsNullOrEmpty(fk_external_linkageResult11.external_name) ? fk_external_linkageResult11.external_name : fk_sort_depResult2.external_name, - total_score = m_eva_adjust_postponement_detail_quota_02.migration_total_score.HasValue? m_eva_adjust_postponement_detail_quota_02.migration_total_score : m_eva_adjust_postponement_detail_quota_02.score_final, + total_score = m_eva_adjust_postponement_detail_quota_02.migration_total_score.HasValue ? m_eva_adjust_postponement_detail_quota_02.migration_total_score : m_eva_adjust_postponement_detail_quota_02.score_final, eva_result = !string.IsNullOrEmpty(m_eva_adjust_postponement_detail_quota_02.migration_eva_result) ? m_eva_adjust_postponement_detail_quota_02.migration_eva_result : m_eva_adjust_postponement_detail_quota_02.level_score_final, adjust_postponement_quota_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult1.fiscal_year, @@ -213,9 +213,16 @@ namespace TodoAPI2.Models startDate = fk_external_linkageResult2.packing_date, endDate = endDate, + reward_old = m_eva_adjust_postponement_detail_quota_02.reward_old, + reward_new2 = m_eva_adjust_postponement_detail_quota_02.reward_new2, + + salary_max = fk_external_linkageResult2.salary_max, + themax = fk_external_linkageResult2.themax, + isActive = m_eva_adjust_postponement_detail_quota_02.isActive, Created = m_eva_adjust_postponement_detail_quota_02.created, Updated = m_eva_adjust_postponement_detail_quota_02.updated + } ).ToList(); @@ -231,10 +238,10 @@ namespace TodoAPI2.Models int? newkey = 0; var x = (from i in _repository.Context.eva_adjust_postponement_detail - orderby i.id descending - select i).Take(1).ToList(); + orderby i.id descending + select i).Take(1).ToList(); - if(x.Count > 0) + if (x.Count > 0) { newkey = x[0].id + 1; } @@ -250,7 +257,7 @@ namespace TodoAPI2.Models var inserted = _repository.Insert(entity); - + return Get(inserted.id); } @@ -277,44 +284,46 @@ namespace TodoAPI2.Models //existingEntity.emp_level = model.emp_level; //existingEntity.total_score = model.total_score; //existingEntity.eva_result = model.eva_result; - + existingEntity.reward_old = model.reward_old; + existingEntity.reward_new2 = model.reward_new2; var updated = _repository.Update(id, existingEntity); return Get(updated.id); } else - throw new NotificationException("No data to update"); + throw new NotificationException("No data to update"); } - public string UpdateMultiple(List model) + public string UpdateMultiple(List model) { - foreach(var i in model) + foreach (var i in model) { if (i.active_mode == "1" && i.id.HasValue) // update - { + { var existingEntity = _repository.Get(i.id.Value); if (existingEntity != null) { - //existingEntity.adjust_postponement_quota_id = i.adjust_postponement_quota_id; - //existingEntity.employee_id = i.employee_id; - //existingEntity.sarary = i.sarary; - //existingEntity.cost_living = i.cost_living; - //existingEntity.middle = i.middle; - //existingEntity.promoted_percentage = i.promoted_percentage; - //existingEntity.total_promote = i.total_promote; - //existingEntity.new_sarary = i.new_sarary; - //existingEntity.new_cost_living = i.new_cost_living; - existingEntity.remark = i.remark; - existingEntity.receive_quota = i.receive_quota; - existingEntity.new_sarary_with_quota = i.new_sarary_with_quota; - //existingEntity.emp_code = i.emp_code; - //existingEntity.emp_fullname = i.emp_fullname; - //existingEntity.emp_position = i.emp_position; - //existingEntity.emp_level = i.emp_level; - //existingEntity.total_score = i.total_score; - //existingEntity.eva_result = i.eva_result; - + //existingEntity.adjust_postponement_quota_id = i.adjust_postponement_quota_id; + //existingEntity.employee_id = i.employee_id; + //existingEntity.sarary = i.sarary; + //existingEntity.cost_living = i.cost_living; + //existingEntity.middle = i.middle; + //existingEntity.promoted_percentage = i.promoted_percentage; + //existingEntity.total_promote = i.total_promote; + //existingEntity.new_sarary = i.new_sarary; + //existingEntity.new_cost_living = i.new_cost_living; + existingEntity.remark = i.remark; + existingEntity.receive_quota = i.receive_quota; + existingEntity.new_sarary_with_quota = i.new_sarary_with_quota; + //existingEntity.emp_code = i.emp_code; + //existingEntity.emp_fullname = i.emp_fullname; + //existingEntity.emp_position = i.emp_position; + //existingEntity.emp_level = i.emp_level; + //existingEntity.total_score = i.total_score; + //existingEntity.eva_result = i.eva_result; + existingEntity.reward_old = i.reward_old; + existingEntity.reward_new2 = i.reward_new2; _repository.UpdateWithoutCommit(i.id.Value, existingEntity); } @@ -326,15 +335,15 @@ namespace TodoAPI2.Models _repository.InsertWithoutCommit(entity); } else if (i.active_mode == "0" && i.id.HasValue) // remove - { + { _repository.DeleteWithoutCommit(i.id.Value); } else if (i.active_mode == "0" && !i.id.HasValue) { // nothing to do - } + } } - //_repository.Context.SaveChanges(); + //_repository.Context.SaveChanges(); return model.Count().ToString(); } diff --git a/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02ViewModel.cs b/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02ViewModel.cs index f3088d7..64bb306 100644 --- a/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02ViewModel.cs +++ b/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02ViewModel.cs @@ -60,5 +60,13 @@ namespace TodoAPI2.Models public DateTime? startDate { get; set; } public DateTime? endDate { get; set; } + + public decimal? reward_old { get; set; } + + public decimal? reward_new2 { get; set; } + + public decimal? salary_max { get; set; } + + public decimal? themax { get; set; } } } \ No newline at end of file diff --git a/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml b/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml index fb83d78..fd602ae 100644 --- a/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml +++ b/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml @@ -123,11 +123,15 @@ + + + + @@ -149,9 +153,11 @@ +

+ diff --git a/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml b/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml index f91c6c1..6eca1b4 100644 --- a/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml +++ b/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml @@ -147,6 +147,7 @@ + @@ -158,10 +159,12 @@ + + diff --git a/tb320eva.csproj b/tb320eva.csproj index e5b80b3..d0debdd 100644 --- a/tb320eva.csproj +++ b/tb320eva.csproj @@ -99,6 +99,7 @@ + diff --git a/wwwroot/js/coregen.js b/wwwroot/js/coregen.js index 01bb8c4..24ce77d 100644 --- a/wwwroot/js/coregen.js +++ b/wwwroot/js/coregen.js @@ -23,10 +23,15 @@ //===================================================== function formatNumber(num) { - if(num === "" || num === null) return ""; + if (num === "" || num === null || isNaN(num)) return ""; return num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,'); } +function formatNumber2(num, d) { + if (num === "" || num === null || isNaN(num)) return ""; + return num.toFixed(d).replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,') +} + function formatNumberTemp(num) { if(num === "" || num === null) return ""; return num.toString(); diff --git a/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js b/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js index bb01973..58b6523 100644 --- a/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js +++ b/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js @@ -23,6 +23,9 @@ $("#eva_adjust_postponement_detail_normal_02_eva_result_" + i).text(""); $("#eva_adjust_postponement_detail_normal_02_salary_max_" + i).text(""); $("#eva_adjust_postponement_detail_normal_02_themax_" + i).text(""); + + $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(""); + $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(""); } function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankItem) { @@ -42,6 +45,7 @@ function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankI $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(data.promoted_percentage); $("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(data.total_promote); $("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumber(data.new_sarary)); + $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val(data.new_cost_living); $("#eva_adjust_postponement_detail_normal_02_remark_" + i).text(data.remark); $("#eva_adjust_postponement_detail_normal_02_emp_code_" + i).text(data.emp_code); @@ -56,6 +60,18 @@ function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankI $("#eva_adjust_postponement_detail_normal_02_eva_result_" + i).text(data.eva_result); $("#eva_adjust_postponement_detail_normal_02_salary_max_" + i).text(data.salary_max); $("#eva_adjust_postponement_detail_normal_02_themax_" + i).text(data.themax); + + $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).val(data.reward_old); + $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).val(data.reward_new); + + if (data.new_sarary > data.themax) { + $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(data.new_sarary - data.themax, 3)); + } else { + $("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(formatNumber2(0, 3)); + } + + $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(data.reward_new, 3)); + $("#themax_" + i).val(data.themax); } function eva_adjust_postponement_detail_normal_02_GetFromForm(obj, i) { @@ -79,6 +95,10 @@ function eva_adjust_postponement_detail_normal_02_GetFromForm(obj, i) { eva_adjust_postponement_detail_normal_02Object.eva_result = obj.find("#eva_adjust_postponement_detail_normal_02_eva_result_" + i).text(); eva_adjust_postponement_detail_normal_02Object.active_mode = obj.find("#isActive_" + i + "_eva_adjust_postponement_detail_normal_02").val(); + + eva_adjust_postponement_detail_normal_02Object.reward_old = obj.find("#eva_adjust_postponement_detail_normal_02_reward_old_" + i).text(); + eva_adjust_postponement_detail_normal_02Object.reward_new = obj.find("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(); + return eva_adjust_postponement_detail_normal_02Object; } @@ -115,11 +135,11 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) { if (cur_dep !== data.emp_department_name) { cur_dep = data.emp_department_name; - tag = "" + cur_dep + ""; + tag = "" + cur_dep + ""; } tag += ''; - tag += ''; + tag += ''; tag += '

'; tag += '

'; tag += '

'; @@ -131,11 +151,15 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) { tag += '

'; tag += '

'; + + tag += '

'; + tag += '

'; tag += '

'; tag += ''; tag += ''; tag += '

'; + tag += '

'; tag += ''; tag += '

'; tag += '

'; @@ -120,6 +133,7 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) { tag += '

'; tag += '

'; + tag += '

'; tag += '

'; tag += '

'; @@ -131,6 +145,7 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) { tag += ''; tag += '

'; + tag += '

'; tag += ''; tag += '

'; @@ -152,9 +167,11 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) { tag += ''; tag += ''; tag += ''; + tag += ''; tag += '' + formatNumber(data.position_allowance) + ''; tag += ''; tag += ''; + tag += ''; tag += ''; } @@ -173,9 +190,11 @@ function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) { tag += ''; tag += ''; tag += ''; + tag += ''; tag += '' + formatNumber(data.other_money) + ''; tag += ''; tag += ''; + tag += ''; tag += ''; } diff --git a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js index 5090d10..df927de 100644 --- a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js +++ b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js @@ -192,7 +192,13 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(m } else { $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val(0); } - } + } + + if (new_salary > $("#themax_" + i).val()) { + $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(new_salary - $("#themax_" + i).val(), 3)); + } else { + $("#eva_adjust_postponement_detail_normal_02_reward_new_" + i).text(formatNumber2(0, 3)); + } sum_postpone += new_added; sum_before += old_salary; diff --git a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js index 9e049bd..4739a98 100644 --- a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js +++ b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js @@ -178,6 +178,12 @@ function CalculateRemainQuota(m) { } } + if (new_sarary_with_quota > $("#themax_" + i).val()) { + $("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(new_sarary_with_quota - $("#themax_" + i).val(), 3)); + } else { + $("#eva_adjust_postponement_detail_quota_02_reward_new2_" + i).text(formatNumber2(0, 3)); + } + sum_receive_quota += receive_quota; }