From edc9bf053ee59d6720bfae0ebbac8c60db2515fc Mon Sep 17 00:00:00 2001 From: "LAPTOP-KB8JC2K2\\acer" Date: Fri, 10 Sep 2021 15:13:26 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=E0=B8=9F=E0=B8=B4=E0=B8=A5=20remark2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EXCEL/eva_limit_frame_group.xlsx | Bin 10394 -> 10678 bytes .../20210910071115_AddRemark2.Designer.cs | 1084 +++++++++++++++++ Migrations/20210910071115_AddRemark2.cs | 23 + Migrations/DataContextModelSnapshot.cs | 3 + .../eva_limit_frame_groupEntity.cs | 3 + .../eva_limit_frame_groupInputModel.cs | 2 + .../eva_limit_frame_groupService.cs | 13 +- .../eva_limit_frame_groupViewModel.cs | 2 + .../eva_limit_frame_group_d.cshtml | 9 +- .../eva_limit_frame_group_d.js | 5 +- 10 files changed, 1135 insertions(+), 9 deletions(-) create mode 100644 Migrations/20210910071115_AddRemark2.Designer.cs create mode 100644 Migrations/20210910071115_AddRemark2.cs diff --git a/EXCEL/eva_limit_frame_group.xlsx b/EXCEL/eva_limit_frame_group.xlsx index 8f3b893c3498e5d299bec40c86b8069dcadaf71b..02b696b12e8879dc0d52cf0e8c285d653fa72ae4 100644 GIT binary patch delta 4664 zcmZ8lXEYpI*B&J!q6|jQh&qfuqC_W&UXw9`=)FaE8FfT2qYlC#Y7iwx2`PvWLbzHa zdJj>e6AZ@ZzF*1rzWdKUYoF(=z0O+u+2`2@_psRrKLtdCr3GgeNdbU2KmY&)002-= z!~?y2-R-=*+{I8HPil-Gdga0C!V8-&BhC#zl50iYE9a*ZecYn%F}}@>Scw4F0GxXG z)~kre1>9x&jd8CyNI6#*4gv!UQ$JQ%X1m=K(&_QzT$BX6N~NL(_OnvMEesEDjp}Ic z=aeZ{D5Kw1KnYUkC${(%yS9bUS`t+&0xZ2@m%0?gfJ@)Uut-r1Wh7y=auTy1GDl{- z(Sv1~xtW%)v$NUCxzQ=^u~WBOG{gfHt8U}^foj8`4L8w*d(%FUY$?XpvC=*BcQ1u;%f|59vW`CrL!P!CS;$!0JZ)i86m?yDzIn& zwc`YK?fq9sD{Y?)`7GSHi%fX2Jv}R=!?&;lf9fekJzDj8>F)kq{3_&)nTxDxL*|^+ z=r^s0p}e_O$i$}1%-fjUvij6_@D=mmLsevVrJW#3lqyiqfg0rdoH9psYsg4j-GGnd z0BsRD_IqqzxSBmA-_n8?C2X$Nl0LZ!P>q zu%5lMJE&VkNF2+7^FD9I<4X#X46SZ2)d8BiRifj$sv)Yj*9qa`twJNlHDcmG<{G!u zb7muXIRwI$baU4vXG;j`lq6RNXQAnLQUMpd|S#rB-`9JlZCDQ#~Jf zd(s4X_pCR7xJ1wisHMoW>Ru9H2dxr^v%(~r+BKQ*8+srl5#ROP5~uJ(Rx-S(cj1cfS>dL0P7zj__;Vb`umCh z%Srshh)>XVO;p?7NQq0ZqU3E4s&uuil7c797dspX0nNl^ z&xQEWnS;O6c%&~5*)@A&_C*}}2K&fs!`11guMv&nkAXfWR-HXiEl6keKp z>PkE?{L0c(*a&{n382!JkuS6`!QTBzdQrpJ z;3dCgikD9?r6Y;E(ROOgk3(T|Pmh7KyY^9Ea-x$A2N%Pg!dsF)D6nz_)o<$dosH)k z9&;m2ogBS`b8-s{`UdOu-Ia}L4o$SI8+zKfd%yA~yKuo|(LQ?1$@M1^Tnz!G;mdm_ zlW7kPGL_ChO*Be11Ep`yIDLut*CnO5T2o3^4c`?mCak{7D{=%Bqcc;K6K16f9p+}s`nsy z(&eCB3U$$FG#VkO&q}5Lc{}L2d&nRK?g7gSO8a8DZJN0IL&ve>mZa=D^gWmB48Mf* zS^K4C=Uk*%69s88ln;2W_zt8M^O6WK!pPFWUogzYsUeB52e- zyOC^f|Ae#V=xSY&X@=)wdoM&6HyNs%)vTYLOl7mKF@QW0ipA>Y~=C{`^-06|e&Jb#16b&5N9P)1vrq17r zquh>}HqnayYekQ1RR+C{9;bUG;e114S~gc*@nj8__&X$l^f;>Ige5bX+*=zn;*U8V zD%3i_;Ldq}shucWP`QUCzug^1PLD;PM#85PXBNFozzzMa3dQhD zt|G^tzt1NabmEQHbXa@;iWv!R8P1WlO-=xN-d1A#c?C?Kp|Dt$UCd8(MjM0)*ai)3 zqH``(Ux9me1g=oub7U9!zuxzGRd+grkq2*={dd~-nya+qqRGNF67=lH_Ds1TP1dHJ zktR3;JGjniJaUqeIQ$)2v1BD)DLp#n3;bMVAi~#1+U4aToM!fLZIe(0`*}N?2 zym$VI95V8y0vx(ogoj3z=D0#w!7F6HzLm{t3JtzY&&b^Wyi1ev@_|Rs{gbL`&Lb6KniS#F`ft^j8USt_BWKeq^t1N)9~6(%S9QK4 zI|>k0i7pdWZS!M^86^@1Ovj~MIj2mvqzciFS=OWo`lGY@-@azw)EYUK^$JCpHH_Os zKd>OuIVh?;WTA3yUAc)5stH`*2_gpFzR;Uy8^Rq&j%E${$`$W-S(N)I_*BDhB3RGv z9`YSOYNL1E5Dp%~phHnvnTR#u%0A3Lv7*2>OA1{Q(s_4|?yQ>cnT1fxI< zz@=F4W}^X!uy*%JUoP)vAXgR1TTvvVSsv5-gId6;_G<+YiGN0Y7mIPn(a3#?(r0(6;J#cWV*Yr=0$i}s) z#wxtLkwX_|tsb$hR~`KoK~`mV7WLN6ERPl8j!Jx_{jt~TMyLLjFtazz5rL~AYCv#u zLXRT&xttR}T8(9~PEmx8>UJ&&7{P zt2m~;%T<}BWnc?%pZ4h@;u_m3EB#EN@Uj`^i(;)Xw5BuKFlD}D zyFKf^1Ip%a*O6>T{a8;q-S~kSy}hAT%P*QSGaPK=dim<7qlpQY6&2h#_oP9c?%JI~4RPY--c-xH;IR3k|D^Yc>;uaNj?*n0-94A(wP^y$ zmc+5T6xFL`_-=zXUGP`7+>nDwzTXY97#Xp~b%M;`68-T>av{Z2&e-kyU1_P$aK@RE zBktdXrJ5tP@D~~k;dRj}q2#ZKWdG3k#-pQ?YNsnzF9*a9QVF8flfL{CnflAPDrtBt zC|+{i6OP4bm(L!Jl@uM-XdNNd$<>ETa!&7@3byy%ddC-q+P&@YTrp_w=Y`hjVoAw} zGINHvOuV?);nMZS$Y;@i1NXN5L)RZev|~&YV9qEy@p??$WH;5zOrgj|J=&$Wh@)h_ z^lpfWmgg?JR`C(Tt7U)$Q zA$%dL3++Q>dH75rMQ}woDiXeoe(J2QrANSUVw*Phaf&qfxJaayNU2Bb;a@$|$_*hy znzy8o=^T1K#YIS?!}!<$ya;JhgnEmBvdGC(5R;f8=L>Ys-(xeHJ5ptb5^EUHEYvY! zGRKA;Z>A}iOmsOkDMhnhbgy}pE6ETB)>r~+(Vd;+AbkvZo#uJOtN`NlNo%UFj!?&y2UoP>q94$7Ob6!6B3S>V`*@NeUyJ|y<{qfm*$YJLeY z%$ShyCEB64m;2_Ur6Lxi)(0&ocB4qsG@D3_@@)ckWU5I#S^2LI!%QyULXIyyr|!qy zk244br_dl>78FWVrkx(kG>tVRhr1t&S5Qe5Z3&czdAe@-z!)K(g>sa#>%UAb@u$;$ zcNK>pCpnDQZM}LuYI}gL()<}@mRdK%b$_df))HydI#&tzz*EHpEgKYGK%truA_ifU z3F)xNn<5J@8B@t#G3@RVDhpEcb|Yd}7aBTMRZmr9op-4;UJsdfZ(MHrz&H>6rKL0t zSlsXd$6yqpQ3XrF$<(MtOG?s+<7ObCToN2>(;)!>9yfAw!b#AEZqS#gN?{>xdU8AG z$*N^Z)5Vsj^AP0JLHXXsYjxVu45|8ZckIUF;<@d)d&4} zgUr}^he;rhSI13WR_0cUC{9)ZH<{kR(lGWVgTsSoINM*JXr%(Ry>qxcg{t3z4BvN4 zvv7t|q11Y*-FMLzzC%7#n9Zm0DO!R+hYQz!TCQuc3{tE+aD5nYFBm^{F*z*gY*2e% zOsl}L{JinSTKC7cKsUIIK2~a3OrzIuZQ< z?rcpY5oOG*hd(b~g2_DTjSy*Uc?J^>J{pQ7`(no{UcDbk{^9O5TWw0ZgvNRvQ4%zP zlX~{1-0TDDr!{t3CWm-il8k0&{c`)_2EO>3^k3tt%_C!z!5hgxLQn)X?OBMt^l3I) zUGuFav$ZkyB%4stC};Pi@+2I;kd>d5xZZ4I-B4O8mX+V)=AIlUO|jX7B8SccH*O8! zo05IlUT?U5i+Yhm<&Q>rn3SA&&;j#x4*3 zc+mY=U0jol69=f=(n@IwAoc2@+ZzY>1` Tb|1idUaT*S2N=x%&!PVU%Jzq2 delta 4373 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 diff --git a/Migrations/20210910071115_AddRemark2.Designer.cs b/Migrations/20210910071115_AddRemark2.Designer.cs new file mode 100644 index 0000000..4b6556d --- /dev/null +++ b/Migrations/20210910071115_AddRemark2.Designer.cs @@ -0,0 +1,1084 @@ +// +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("20210910071115_AddRemark2")] + partial class AddRemark2 + { + 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("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("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/20210910071115_AddRemark2.cs b/Migrations/20210910071115_AddRemark2.cs new file mode 100644 index 0000000..47d535c --- /dev/null +++ b/Migrations/20210910071115_AddRemark2.cs @@ -0,0 +1,23 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace tb320eva.Migrations +{ + public partial class AddRemark2 : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "remark2", + table: "eva_limit_frame_group", + maxLength: 4000, + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "remark2", + table: "eva_limit_frame_group"); + } + } +} diff --git a/Migrations/DataContextModelSnapshot.cs b/Migrations/DataContextModelSnapshot.cs index 241cba4..6a2a8d8 100644 --- a/Migrations/DataContextModelSnapshot.cs +++ b/Migrations/DataContextModelSnapshot.cs @@ -767,6 +767,9 @@ namespace tb320eva.Migrations b.Property("remark") .HasMaxLength(4000); + b.Property("remark2") + .HasMaxLength(4000); + b.Property("total_salary"); b.Property("total_salary_limit"); diff --git a/Models/eva_limit_frame_group/eva_limit_frame_groupEntity.cs b/Models/eva_limit_frame_group/eva_limit_frame_groupEntity.cs index ce48ca1..b4b9c77 100644 --- a/Models/eva_limit_frame_group/eva_limit_frame_groupEntity.cs +++ b/Models/eva_limit_frame_group/eva_limit_frame_groupEntity.cs @@ -35,6 +35,9 @@ namespace TodoAPI2.Models [MaxLength(4000)] public string remark { get; set; } + [MaxLength(4000)] + public string remark2 { get; set; } + public int? main_dept_id { get; set; } public void SetAutoField(DataContext context) { diff --git a/Models/eva_limit_frame_group/eva_limit_frame_groupInputModel.cs b/Models/eva_limit_frame_group/eva_limit_frame_groupInputModel.cs index c482f0e..cdc3a32 100644 --- a/Models/eva_limit_frame_group/eva_limit_frame_groupInputModel.cs +++ b/Models/eva_limit_frame_group/eva_limit_frame_groupInputModel.cs @@ -30,6 +30,8 @@ namespace TodoAPI2.Models public string remark { get; set; } + public string remark2 { get; set; } + public string active_mode { get; set; } } } diff --git a/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs b/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs index 029ee07..108f11c 100644 --- a/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs +++ b/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs @@ -119,13 +119,11 @@ namespace TodoAPI2.Models into eva_evaluation_groupResult2 from fk_eva_evaluation_groupResult2 in eva_evaluation_groupResult2.DefaultIfEmpty() - where 1 == 1 && (!model.frame_plan_guid.HasValue || m_eva_limit_frame_group.frame_plan_guid == model.frame_plan_guid) && (!model.group_guid.HasValue || m_eva_limit_frame_group.group_guid == model.group_guid) - orderby fk_eva_evaluation_groupResult2.code select new eva_limit_frame_groupViewModel() { @@ -136,7 +134,9 @@ namespace TodoAPI2.Models total_salary = m_eva_limit_frame_group.total_salary, total_salary_limit = m_eva_limit_frame_group.total_salary_limit, total_salary_limit_rounded = m_eva_limit_frame_group.total_salary_limit_rounded, - remark = m_eva_limit_frame_group.remark, + remark = m_eva_limit_frame_group.remark+@" +"+ m_eva_limit_frame_group.remark2, + remark2 = m_eva_limit_frame_group.remark2, frame_plan_guid_eva_limit_frame_plan_executed_date = fk_eva_limit_frame_planResult1.executed_date, group_guid_eva_evaluation_group_code = fk_eva_evaluation_groupResult2.thegroup, @@ -204,6 +204,7 @@ namespace TodoAPI2.Models existingEntity.total_salary_limit = model.total_salary_limit; existingEntity.total_salary_limit_rounded = model.total_salary_limit_rounded; existingEntity.remark = ""; + existingEntity.remark2 = model.remark2; int j = 1; foreach (var y in from z in _repository.Context.eva_limit_frame_employee where z.frame_group_guid == model.id orderby z.order_of_data select z) @@ -257,8 +258,9 @@ namespace TodoAPI2.Models existingEntity.total_salary_limit = i.total_salary_limit; existingEntity.total_salary_limit_rounded = i.total_salary_limit_rounded; existingEntity.remark = i.remark; + existingEntity.remark2 = i.remark2; - existingEntity.SetAutoField(_repository.Context); + existingEntity.SetAutoField(_repository.Context); _repository.UpdateWithoutCommit(i.id.Value, existingEntity); } } @@ -329,7 +331,8 @@ namespace TodoAPI2.Models i.Add("total_salary", "อัตราเงินเดือนรวม"); i.Add("total_salary_limit", "วงเงินในการเลื่อนเงินเดือน"); i.Add("total_salary_limit_rounded", "วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง"); - i.Add("remark", "หมายเหตุ"); + i.Add("remark", "หมายเหตุ"); + i.Add("remark2", "หมายเหตุ กรอกเอง"); return i; } diff --git a/Models/eva_limit_frame_group/eva_limit_frame_groupViewModel.cs b/Models/eva_limit_frame_group/eva_limit_frame_groupViewModel.cs index 371172c..9ebf9f2 100644 --- a/Models/eva_limit_frame_group/eva_limit_frame_groupViewModel.cs +++ b/Models/eva_limit_frame_group/eva_limit_frame_groupViewModel.cs @@ -28,6 +28,8 @@ namespace TodoAPI2.Models public string remark { get; set; } + public string remark2 { get; set; } + public DateTime? frame_plan_guid_eva_limit_frame_plan_executed_date { get; set; } public string group_guid_eva_evaluation_group_code { get; set; } diff --git a/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml b/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml index 5362385..9e55a6b 100644 --- a/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml +++ b/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml @@ -129,7 +129,7 @@
-
@@ -155,7 +155,12 @@ - +
+
+ + +
+
diff --git a/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group_d.js b/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group_d.js index 44f895c..7d5a6b0 100644 --- a/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group_d.js +++ b/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group_d.js @@ -13,7 +13,8 @@ function eva_limit_frame_group_FeedDataToForm(data) { $("#eva_limit_frame_group_total_salary_limit").val(coreFormatPrice(data.total_salary_limit, digits)); $("#eva_limit_frame_group_total_salary_limit_rounded").val(coreFormatPrice(data.total_salary_limit_rounded, digits)); $("#eva_limit_frame_group_remark").val(data.remark); - + $("#eva_limit_frame_group_remark2").val(data.remark2); + console.log(data); } function eva_limit_frame_group_GetFromForm() { @@ -26,7 +27,7 @@ function eva_limit_frame_group_GetFromForm() { eva_limit_frame_groupObject.total_salary_limit = $("#eva_limit_frame_group_total_salary_limit").val(); eva_limit_frame_groupObject.total_salary_limit_rounded = $("#eva_limit_frame_group_total_salary_limit_rounded").val(); eva_limit_frame_groupObject.remark = $("#eva_limit_frame_group_remark").val(); - + eva_limit_frame_groupObject.remark2 = $("#eva_limit_frame_group_remark2").val(); return eva_limit_frame_groupObject; }