From 23e68366bbaafcd41b89e9909f812183284416a4 Mon Sep 17 00:00:00 2001 From: Nakorn Rientrakrunchai Date: Wed, 3 Mar 2021 12:28:50 +0700 Subject: [PATCH] update code --- EXCEL/eva_limit_frame_employee.xlsx | Bin 10731 -> 10686 bytes EXCEL/eva_limit_frame_group.xlsx | Bin 10318 -> 10392 bytes ...2141103_UpDateLimitFrameSchema.Designer.cs | 920 ++++++++++++++++++ .../25640302141103_UpDateLimitFrameSchema.cs | 89 ++ .../25640303051830_FixFrame.Designer.cs | 920 ++++++++++++++++++ Migrations/25640303051830_FixFrame.cs | 17 + Migrations/DataContextModelSnapshot.cs | 17 +- .../eva_limit_frame_employeeEntity.cs | 10 +- .../eva_limit_frame_employeeInputModel.cs | 8 +- .../eva_limit_frame_employeeService.cs | 51 +- .../eva_limit_frame_employeeViewModel.cs | 10 +- ...it_frame_employeeWithSelectionViewModel.cs | 2 - .../eva_limit_frame_groupEntity.cs | 3 + .../eva_limit_frame_groupInputModel.cs | 2 + .../eva_limit_frame_groupService.cs | 6 +- .../eva_limit_frame_groupViewModel.cs | 2 + .../eva_limit_frame_planEntity.cs | 4 + .../eva_limit_frame_planInputModel.cs | 4 + .../eva_limit_frame_planService.cs | 27 +- .../eva_limit_frame_planViewModel.cs | 4 + .../eva_limit_frame_employee.cshtml | 25 +- .../eva_limit_frame_employee_d.cshtml | 19 +- .../eva_limit_frame_employee_inline.cshtml | 6 +- .../eva_limit_frame_employee_report.cshtml | 5 + ...eva_limit_frame_employee_wizardform.cshtml | 27 +- .../eva_limit_frame_group.cshtml | 7 + .../eva_limit_frame_group_d.cshtml | 311 ++---- .../eva_limit_frame_group_inline.cshtml | 1 + .../eva_limit_frame_group_wizardform.cshtml | 10 + .../eva_limit_frame_plan.cshtml | 177 ++-- .../eva_limit_frame_plan_d.cshtml | 264 ++--- .../eva_limit_frame_plan_inline.cshtml | 3 + .../eva_limit_frame_plan_wizardform.cshtml | 28 + .../eva_create_evaluation.js | 2 +- .../eva_limit_frame_employee.js | 127 +-- .../eva_limit_frame_employee_d.js | 12 +- .../eva_limit_frame_employee_inline.js | 32 +- .../eva_limit_frame_group.js | 116 +-- .../eva_limit_frame_group_d.js | 2 + .../eva_limit_frame_group_inline.js | 5 + .../eva_limit_frame_plan.js | 138 +-- .../eva_limit_frame_plan_d.js | 4 + .../eva_limit_frame_plan_inline.js | 10 + 43 files changed, 2650 insertions(+), 777 deletions(-) create mode 100644 Migrations/25640302141103_UpDateLimitFrameSchema.Designer.cs create mode 100644 Migrations/25640302141103_UpDateLimitFrameSchema.cs create mode 100644 Migrations/25640303051830_FixFrame.Designer.cs create mode 100644 Migrations/25640303051830_FixFrame.cs diff --git a/EXCEL/eva_limit_frame_employee.xlsx b/EXCEL/eva_limit_frame_employee.xlsx index 04fd045e7595f99797c0661e47b286d95a6ff624..a90b6a9bc8ecb07003a1ccd4d656f822951aa9e4 100644 GIT binary patch delta 3581 zcmZXXWmFW5(tsD1Mq=3oDRGH~MM{_Mkd&1W5RmRzdU*+n1rbRFcBQ+d5nV;38<$49 zOG1#6Qu6xV@5g(;d*|1ji8FJ~oH_H%wn4K&O(!)KEogGWj2Hl*B*P6-vtbOiQ4nSN zX6mabn_b5Va#nkPrv7@?g1E$iKxZdcC${r@ey2Y=a4OIhQxJDRbTm0=41RKzdBs05 z_yRf)K9D#x8aK9Ts-Ly;Vj56#xuYi1Tt6PeP5)W26drWY77*Yd`|1N{0TfBK*`+<~ zt=JS?R`D_B?&D2MIq^63*%%&~Tw=bb+K-{bh@@C>L`yl+w>S*)l*(F4yZSE~Nw7|7 zbfNh~`_YQoJj8$JE=t+h-@{(Nf!!=vpF}E2(HkL6{7Js5AQFM^HBxjV?jyDLafwZ zyeR}J*gD$hlH&9Slt=QSS_ODh0jBUoDsbX*`^Ny+cCWMMg$J(nIZo=#I5gK!>r!(n zQHMSx(OXjZ`;!w>J&ZhD*`&KPK&3aVW14QT8GX`#7s-i#w!M*cxxC#aPO!h0GAJh;K8)SL?mmoT7GyIIsqaO>~iC#h=pK56*9V) z=KYH~C7cnx4p9NVh~6GZl!2p!JR~M(!I?m$i2E+_SO^C(1}(t;`ZW*$XruxFXaE2} zfSU-~H_*)iEgazP*7Hy9y=Dm;ADb;39K~Jz}4;~w~ zDn=T@Mxf={X2!ADMhP95KX54XGt7oqlA;g627JVD{98{tT~MH4I>q~qE)#Vj!Yp)( zvg}I=aJ*0vW*X%l>9h~)dtK>}{}wQqtk#A&%UZ*{R6K@f^nSYrX~mFkID2`0(s_$u4(N+@i#ME#aYi@d(L;iw8}`1tgb+Gbcp ze|$d5S&gSA%r09_y!{X;^rsk&1IB&5orzC6KJe-f ze$k<7A3*wY+}E9|tI@ElJgw=eZ<7P(i1%ZV(Gux(+L${AK0q69r*a z0Se>yR-V1;$}GCbF$~ksrQDSDR4tFqeWW?h9$7^abM&>B79(PXt_8!~*|8LZed-uh zD@fVy<_K|mxFXYabN5i%@rV__0?(=K!QvM*q?RQkKmVRRX_a0tdoaHy(rdB!8P^ii3F)nHBZDtYft!H-T=EOv})eV>cSz?oJTJ&YBFCqB6>^*4>rrRz9v3bv2WP?ktm9Lrb)g!>Tld0KF#u7`90{XzCIW%L79yZJBm1V ztFNaS^=g&BP}ptWI14?j6#dpw>fY>l!9TDpSGXRD$3$oi2mMts>BDe z$tI)#KpYd!f(?q9#TIDNhb%^4l0Q35%A9d61+PY``$|gGp8iDIm8nK_sT@0;ZSzqJ z7QOFn3jqzt@!_S?UmNPQgxZ%KsK+AmH`2c!xs5_M(spr&-i}w7sn-tntgyJjb9k{6 zLbL_<^+M+QIQ6@%kYz8JvpDD*zMZD_?gIZ(ME zM6LHx-^ZQ&WHrKcB{woQ$ac7cGlme`{gy=_x8xJ5-jOD) zkA@KYw_+S5seIDX7qbY1-Vad2boxf}lpik4TX&%@qJ0_cFw4$eGT>cVW z9P8!K`9LiIVOzy@hG;hi0a*@8xn3Z+^gwh7+d?jN1eYPmj^*7r{Dtbg3)I+12yS7Z z2sdpAE%2C=6J6$a-CEDfv>2oR)u^I}u}C3q_a|GR6`&zEra}kPkdNxJlMJ#u zOO<9z&L`?A`9?aQ>s{|0$(7O9EN@e_4ft@HLxS_e^DHf?Gz}<{SMw|!t0?0zu4|}* zJmJ93bl^i1^JouEIJA*oGr@f}DksHa)_;ekjDG)SkpPKgp-SExGiPWWJ@HovG2282 z)WnZ*#d_L%N@*>?`R#)5eHEe+!WDS2dZ&R?wh^=Wr&rSxh4Swzz_$0)n#Xf967`44 zUUB7>@7gB6wVKhclicaKuf2%zz2AQFb;RAhcout|vI-%i%LSo0CZvU^Ii zQlywGd1wmHz5F({gz~W_+~d=e=6G`UhK->%^%czXd|!C+WIiz~*G3$R7M(F4_G=tg z(qj`LEt)p3v3W_;%zI~RM5CY5@Ku!I%->xuUxshhyPxmVR&Qv@N@3UqeYw!03@j}V zT%jiRL@uh`FT^E&Wt5uO|3}V9%-qSc&cq>4(k-dgZNusxnvNG+r5)DUY)I}8wx$A1 zRySEtRW-ykefNhJ*J+Vc*1k`*b>pc-(d98UcNho|%Xe4EX3ms}!>4Wo9=ca#USV z*J{q#lY;peArxx&+0mb|>z+Ve%?#>fAGLHVt)|VZOP^4S1@CcV54$}EHYjE|-qJnZ ze~dO_-O{OV_hd9O_~8`#o^rhJ+_)FCD7foJTdkMU%asqWU67Lwx@ z!BgKGIar*81v&$PoTKoq5%c5hk;eBwrRf~*`aJ=+=-f?!c_E?>GF;f<4lCqh+zIEZ zQz(yb`Z}>C-@x5@HEJVV;RKYpS9ZFzkO>HOgICe|x@bw$IFMNMHuGLaa7{l0^P^g1 z7f<+S`*+jEqKXwP+(VduQx>Ts0WOWidqDY!FsO*Tkgi4Yb6TwbOMN#Dy}qmA5=Jt# z+Yce0PgVV$iADI!leih_zHScm(C3z*UD)p}c;*r~zRJu9%FqP|beZW_ScF@a{}m8H zyq(5S>B0!vBw?!R-LA+&^_l^7-;7(E(@5;|IPg!B&d8SVcc<(rBiI6?ey-GtW2LV# zVzQMi*VeMFTI?bg*$x~jhFR0^EOZDK$ruNyR)dV{tMpo`VNtcx!3HhPXa zrVY3g+3eN9>1PQm-xOw^BK$0F{`H-{V}tLP`{6ISO4f<;7DjTz^=AeiVV@^ne^Qya z(}RD2X?kJ$=^$!h0=lbHEblzen!37(Rdb>l(SSy`M&;Wbd9H~!VM-@Tkt;m3b`0Hp zvGf^^VrI>!IFYk+FFWO&jceVbI+*nj*> zxGFf5{hwsg62q(<1KvaWs=Qkv3$F=iw KlRe}8JK$f5_LThq delta 3605 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 YCp`f`lNu;g0aBB1C?f_EB>(^b0C$V<^8f$< diff --git a/Migrations/25640302141103_UpDateLimitFrameSchema.Designer.cs b/Migrations/25640302141103_UpDateLimitFrameSchema.Designer.cs new file mode 100644 index 0000000..f8bf749 --- /dev/null +++ b/Migrations/25640302141103_UpDateLimitFrameSchema.Designer.cs @@ -0,0 +1,920 @@ +// +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("25640302141103_UpDateLimitFrameSchema")] + partial class UpDateLimitFrameSchema + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn) + .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + 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("adjust_postponement_id"); + + b.Property("adjust_postponement_quota_id"); + + b.Property("cost_living"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("isActive"); + + 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("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("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("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_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_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.HasKey("id"); + + b.ToTable("eva_create_evaluation_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b => + { + b.Property("id"); + + b.Property("achievement") + .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("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_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("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("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("remark") + .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("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("fiscal_year"); + + b.Property("isActive"); + + 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("position_level"); + + b.Property("position_type"); + + 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_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_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/25640302141103_UpDateLimitFrameSchema.cs b/Migrations/25640302141103_UpDateLimitFrameSchema.cs new file mode 100644 index 0000000..23a2a41 --- /dev/null +++ b/Migrations/25640302141103_UpDateLimitFrameSchema.cs @@ -0,0 +1,89 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace tb320eva.Migrations +{ + public partial class UpDateLimitFrameSchema : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "level_id", + table: "eva_limit_frame_employee"); + + migrationBuilder.RenameColumn( + name: "position_id", + table: "eva_limit_frame_employee", + newName: "order_of_data"); + + migrationBuilder.AddColumn( + name: "limit_frame_005_total", + table: "eva_limit_frame_plan", + nullable: true); + + migrationBuilder.AddColumn( + name: "limit_frame_005_total_rounded", + table: "eva_limit_frame_plan", + nullable: true); + + migrationBuilder.AddColumn( + name: "remark", + table: "eva_limit_frame_group", + maxLength: 4000, + nullable: true); + + migrationBuilder.AddColumn( + name: "cost_of_living", + table: "eva_limit_frame_employee", + nullable: true); + + migrationBuilder.AddColumn( + name: "level_text", + table: "eva_limit_frame_employee", + maxLength: 1000, + nullable: true); + + migrationBuilder.AddColumn( + name: "position_text", + table: "eva_limit_frame_employee", + maxLength: 1000, + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "limit_frame_005_total", + table: "eva_limit_frame_plan"); + + migrationBuilder.DropColumn( + name: "limit_frame_005_total_rounded", + table: "eva_limit_frame_plan"); + + migrationBuilder.DropColumn( + name: "remark", + table: "eva_limit_frame_group"); + + migrationBuilder.DropColumn( + name: "cost_of_living", + table: "eva_limit_frame_employee"); + + migrationBuilder.DropColumn( + name: "level_text", + table: "eva_limit_frame_employee"); + + migrationBuilder.DropColumn( + name: "position_text", + table: "eva_limit_frame_employee"); + + migrationBuilder.RenameColumn( + name: "order_of_data", + table: "eva_limit_frame_employee", + newName: "position_id"); + + migrationBuilder.AddColumn( + name: "level_id", + table: "eva_limit_frame_employee", + nullable: true); + } + } +} diff --git a/Migrations/25640303051830_FixFrame.Designer.cs b/Migrations/25640303051830_FixFrame.Designer.cs new file mode 100644 index 0000000..9ebda77 --- /dev/null +++ b/Migrations/25640303051830_FixFrame.Designer.cs @@ -0,0 +1,920 @@ +// +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("25640303051830_FixFrame")] + partial class FixFrame + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn) + .HasAnnotation("ProductVersion", "2.2.4-servicing-10062") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + 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("adjust_postponement_id"); + + b.Property("adjust_postponement_quota_id"); + + b.Property("cost_living"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("isActive"); + + 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("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("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("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_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_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.HasKey("id"); + + b.ToTable("eva_create_evaluation_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b => + { + b.Property("id"); + + b.Property("achievement") + .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("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_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("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("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("remark") + .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("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("fiscal_year"); + + b.Property("isActive"); + + 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("position_level"); + + b.Property("position_type"); + + 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_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_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/25640303051830_FixFrame.cs b/Migrations/25640303051830_FixFrame.cs new file mode 100644 index 0000000..65ed5f6 --- /dev/null +++ b/Migrations/25640303051830_FixFrame.cs @@ -0,0 +1,17 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace tb320eva.Migrations +{ + public partial class FixFrame : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + + } + } +} diff --git a/Migrations/DataContextModelSnapshot.cs b/Migrations/DataContextModelSnapshot.cs index 708c72e..9de865c 100644 --- a/Migrations/DataContextModelSnapshot.cs +++ b/Migrations/DataContextModelSnapshot.cs @@ -589,6 +589,8 @@ namespace tb320eva.Migrations { b.Property("id"); + b.Property("cost_of_living"); + b.Property("created"); b.Property("employee_id"); @@ -597,15 +599,19 @@ namespace tb320eva.Migrations b.Property("isActive"); - b.Property("level_id"); + 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_id"); + b.Property("position_text") + .HasMaxLength(1000); b.Property("salary"); @@ -632,6 +638,9 @@ namespace tb320eva.Migrations b.Property("limit_frame_295"); + b.Property("remark") + .HasMaxLength(4000); + b.Property("total_salary"); b.Property("total_salary_limit"); @@ -661,6 +670,10 @@ namespace tb320eva.Migrations 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"); diff --git a/Models/eva_limit_frame_employee/eva_limit_frame_employeeEntity.cs b/Models/eva_limit_frame_employee/eva_limit_frame_employeeEntity.cs index cc8fead..7269b1e 100644 --- a/Models/eva_limit_frame_employee/eva_limit_frame_employeeEntity.cs +++ b/Models/eva_limit_frame_employee/eva_limit_frame_employeeEntity.cs @@ -24,9 +24,11 @@ namespace TodoAPI2.Models public int? org_id { get; set; } - public int? position_id { get; set; } + [MaxLength(1000)] + public string position_text { get; set; } - public int? level_id { get; set; } + [MaxLength(1000)] + public string level_text { get; set; } public decimal? salary { get; set; } @@ -34,6 +36,10 @@ namespace TodoAPI2.Models public decimal? monthly_remuneration { get; set; } + public decimal? cost_of_living { get; set; } + + public int? order_of_data { get; set; } + public void SetAutoField(DataContext context) { diff --git a/Models/eva_limit_frame_employee/eva_limit_frame_employeeInputModel.cs b/Models/eva_limit_frame_employee/eva_limit_frame_employeeInputModel.cs index 2186d94..8dd7819 100644 --- a/Models/eva_limit_frame_employee/eva_limit_frame_employeeInputModel.cs +++ b/Models/eva_limit_frame_employee/eva_limit_frame_employeeInputModel.cs @@ -22,9 +22,9 @@ namespace TodoAPI2.Models public int? org_id { get; set; } - public int? position_id { get; set; } + public string position_text { get; set; } - public int? level_id { get; set; } + public string level_text { get; set; } public decimal? salary { get; set; } @@ -32,6 +32,10 @@ namespace TodoAPI2.Models public decimal? monthly_remuneration { get; set; } + public decimal? cost_of_living { get; set; } + + public int? order_of_data { get; set; } + public string active_mode { get; set; } } } diff --git a/Models/eva_limit_frame_employee/eva_limit_frame_employeeService.cs b/Models/eva_limit_frame_employee/eva_limit_frame_employeeService.cs index cfbc4ef..7cbca11 100644 --- a/Models/eva_limit_frame_employee/eva_limit_frame_employeeService.cs +++ b/Models/eva_limit_frame_employee/eva_limit_frame_employeeService.cs @@ -80,9 +80,7 @@ namespace TodoAPI2.Models var entity = _repository.Get(id); var i = Mapper.Map(entity); i.item_employee_id = (from x in emp.GetAllEmployee() select x).ToList(); - i.item_org_id = (from x in ext.GetSortingDep() select x).ToList(); - i.item_position_id = (from x in ext.GetPositionForReport() select x).ToList(); - i.item_level_id = (from x in ext.Gethrm_position_levels() select x).ToList(); + i.item_org_id = (from x in ext.GetDepartmentData() select x).ToList(); return i; @@ -91,9 +89,7 @@ namespace TodoAPI2.Models { var i = new eva_limit_frame_employeeWithSelectionViewModel(); i.item_employee_id = (from x in emp.GetAllEmployee() select x).ToList(); - i.item_org_id = (from x in ext.GetSortingDep() select x).ToList(); - i.item_position_id = (from x in ext.GetPositionForReport() select x).ToList(); - i.item_level_id = (from x in ext.Gethrm_position_levels() select x).ToList(); + i.item_org_id = (from x in ext.GetDepartmentData() select x).ToList(); return i; @@ -119,18 +115,10 @@ namespace TodoAPI2.Models into external_linkageResult2 from fk_external_linkageResult2 in external_linkageResult2.DefaultIfEmpty() - join fk_external_linkage3 in ext.GetSortingDep() on m_eva_limit_frame_employee.org_id equals fk_external_linkage3.id + join fk_external_linkage3 in ext.GetDepartmentData() on m_eva_limit_frame_employee.org_id equals fk_external_linkage3.id into external_linkageResult3 from fk_external_linkageResult3 in external_linkageResult3.DefaultIfEmpty() - join fk_external_linkage4 in ext.GetPositionForReport() on m_eva_limit_frame_employee.position_id equals fk_external_linkage4.id - into external_linkageResult4 - from fk_external_linkageResult4 in external_linkageResult4.DefaultIfEmpty() - - join fk_external_linkage5 in ext.Gethrm_position_levels() on m_eva_limit_frame_employee.level_id equals fk_external_linkage5.id - into external_linkageResult5 - from fk_external_linkageResult5 in external_linkageResult5.DefaultIfEmpty() - where 1 == 1 @@ -145,17 +133,17 @@ namespace TodoAPI2.Models frame_group_guid = m_eva_limit_frame_employee.frame_group_guid, employee_id = m_eva_limit_frame_employee.employee_id, org_id = m_eva_limit_frame_employee.org_id, - position_id = m_eva_limit_frame_employee.position_id, - level_id = m_eva_limit_frame_employee.level_id, + position_text = m_eva_limit_frame_employee.position_text, + level_text = m_eva_limit_frame_employee.level_text, salary = m_eva_limit_frame_employee.salary, position_allowance = m_eva_limit_frame_employee.position_allowance, monthly_remuneration = m_eva_limit_frame_employee.monthly_remuneration, + cost_of_living = m_eva_limit_frame_employee.cost_of_living, + order_of_data = m_eva_limit_frame_employee.order_of_data, frame_group_guid_eva_limit_frame_group_group_guid = fk_eva_limit_frame_groupResult1.group_guid, employee_id_external_linkage_external_name = fk_external_linkageResult2.fullname, org_id_external_linkage_external_name = fk_external_linkageResult3.external_name, - position_id_external_linkage_external_name = fk_external_linkageResult4.external_name, - level_id_external_linkage_external_name = fk_external_linkageResult5.external_name, isActive = m_eva_limit_frame_employee.isActive, Created = m_eva_limit_frame_employee.created, @@ -202,11 +190,13 @@ namespace TodoAPI2.Models existingEntity.frame_group_guid = model.frame_group_guid; existingEntity.employee_id = model.employee_id; existingEntity.org_id = model.org_id; - existingEntity.position_id = model.position_id; - existingEntity.level_id = model.level_id; + existingEntity.position_text = model.position_text; + existingEntity.level_text = model.level_text; existingEntity.salary = model.salary; existingEntity.position_allowance = model.position_allowance; existingEntity.monthly_remuneration = model.monthly_remuneration; + existingEntity.cost_of_living = model.cost_of_living; + existingEntity.order_of_data = model.order_of_data; existingEntity.SetAutoField(_repository.Context); @@ -239,11 +229,13 @@ namespace TodoAPI2.Models existingEntity.frame_group_guid = i.frame_group_guid; existingEntity.employee_id = i.employee_id; existingEntity.org_id = i.org_id; - existingEntity.position_id = i.position_id; - existingEntity.level_id = i.level_id; + existingEntity.position_text = i.position_text; + existingEntity.level_text = i.level_text; existingEntity.salary = i.salary; existingEntity.position_allowance = i.position_allowance; existingEntity.monthly_remuneration = i.monthly_remuneration; + existingEntity.cost_of_living = i.cost_of_living; + existingEntity.order_of_data = i.order_of_data; existingEntity.SetAutoField(_repository.Context); _repository.UpdateWithoutCommit(i.id.Value, existingEntity); @@ -314,15 +306,13 @@ namespace TodoAPI2.Models i.Add("employee_id_external_linkage_external_name", "พนักงาน"); i.Add("org_id", "หน่วยงาน"); i.Add("org_id_external_linkage_external_name", "หน่วยงาน"); - i.Add("position_id", "ตำแหน่ง"); - i.Add("position_id_external_linkage_external_name", "ตำแหน่ง"); - i.Add("level_id", "ระดับ"); - i.Add("level_id_external_linkage_external_name", "ระดับ"); + i.Add("position_text", "ตำแหน่ง"); + i.Add("level_text", "ระดับ"); i.Add("salary", "เงินเดือน"); i.Add("position_allowance", "เงินประจำตำแหน่ง"); i.Add("monthly_remuneration", "ค่าตอบแทนรายเดือน"); - i.Add("limit_frame_group_id", "limit_frame_group_id"); - i.Add("limit_frame_group_id_eva_limit_frame_group_group_guid", "limit_frame_group_id"); + i.Add("cost_of_living", "ค่าครองชีพ"); + i.Add("order_of_data", "ลำดับ"); return i; } @@ -335,4 +325,5 @@ namespace TodoAPI2.Models #endregion } -} \ No newline at end of file +} + diff --git a/Models/eva_limit_frame_employee/eva_limit_frame_employeeViewModel.cs b/Models/eva_limit_frame_employee/eva_limit_frame_employeeViewModel.cs index 3e0c3c4..1f34dbe 100644 --- a/Models/eva_limit_frame_employee/eva_limit_frame_employeeViewModel.cs +++ b/Models/eva_limit_frame_employee/eva_limit_frame_employeeViewModel.cs @@ -20,9 +20,9 @@ namespace TodoAPI2.Models public int? org_id { get; set; } - public int? position_id { get; set; } + public string position_text { get; set; } - public int? level_id { get; set; } + public string level_text { get; set; } public decimal? salary { get; set; } @@ -30,11 +30,13 @@ namespace TodoAPI2.Models public decimal? monthly_remuneration { get; set; } + public decimal? cost_of_living { get; set; } + + public int? order_of_data { get; set; } + public Guid? frame_group_guid_eva_limit_frame_group_group_guid { get; set; } public string employee_id_external_linkage_external_name { get; set; } public string org_id_external_linkage_external_name { get; set; } - public string position_id_external_linkage_external_name { get; set; } - public string level_id_external_linkage_external_name { get; set; } } } \ No newline at end of file diff --git a/Models/eva_limit_frame_employee/eva_limit_frame_employeeWithSelectionViewModel.cs b/Models/eva_limit_frame_employee/eva_limit_frame_employeeWithSelectionViewModel.cs index d647d6a..6ee46b2 100644 --- a/Models/eva_limit_frame_employee/eva_limit_frame_employeeWithSelectionViewModel.cs +++ b/Models/eva_limit_frame_employee/eva_limit_frame_employeeWithSelectionViewModel.cs @@ -9,8 +9,6 @@ namespace TodoAPI2.Models { public List item_employee_id { get; set; } public List item_org_id { get; set; } - public List item_position_id { get; set; } - public List item_level_id { get; set; } } } \ No newline at end of file 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 cd5ace4..1ee95bf 100644 --- a/Models/eva_limit_frame_group/eva_limit_frame_groupEntity.cs +++ b/Models/eva_limit_frame_group/eva_limit_frame_groupEntity.cs @@ -32,6 +32,9 @@ namespace TodoAPI2.Models public decimal? total_salary_limit_rounded { get; set; } + [MaxLength(4000)] + public string remark { 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 4d5994f..c482f0e 100644 --- a/Models/eva_limit_frame_group/eva_limit_frame_groupInputModel.cs +++ b/Models/eva_limit_frame_group/eva_limit_frame_groupInputModel.cs @@ -28,6 +28,8 @@ namespace TodoAPI2.Models public decimal? total_salary_limit_rounded { get; set; } + public string remark { 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 b859240..257baa4 100644 --- a/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs +++ b/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs @@ -127,6 +127,7 @@ 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, 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.code, @@ -179,6 +180,7 @@ namespace TodoAPI2.Models existingEntity.total_salary = model.total_salary; existingEntity.total_salary_limit = model.total_salary_limit; existingEntity.total_salary_limit_rounded = model.total_salary_limit_rounded; + existingEntity.remark = model.remark; existingEntity.SetAutoField(_repository.Context); @@ -214,6 +216,7 @@ namespace TodoAPI2.Models existingEntity.total_salary = i.total_salary; existingEntity.total_salary_limit = i.total_salary_limit; existingEntity.total_salary_limit_rounded = i.total_salary_limit_rounded; + existingEntity.remark = i.remark; existingEntity.SetAutoField(_repository.Context); _repository.UpdateWithoutCommit(i.id.Value, existingEntity); @@ -285,7 +288,8 @@ namespace TodoAPI2.Models i.Add("limit_frame_295", "กรอบวงเงินที่กันไว้"); i.Add("total_salary", "อัตราเงินเดือนรวม"); i.Add("total_salary_limit", "วงเงินในการเลื่อนเงินเดือน"); - i.Add("total_salary_limit_rounded", "วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง"); + i.Add("total_salary_limit_rounded", "วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง"); + i.Add("remark", "หมายเหตุ"); 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 afd304c..fb09a4d 100644 --- a/Models/eva_limit_frame_group/eva_limit_frame_groupViewModel.cs +++ b/Models/eva_limit_frame_group/eva_limit_frame_groupViewModel.cs @@ -26,6 +26,8 @@ namespace TodoAPI2.Models public decimal? total_salary_limit_rounded { get; set; } + public string remark { 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/Models/eva_limit_frame_plan/eva_limit_frame_planEntity.cs b/Models/eva_limit_frame_plan/eva_limit_frame_planEntity.cs index 7b35303..4e5a0e8 100644 --- a/Models/eva_limit_frame_plan/eva_limit_frame_planEntity.cs +++ b/Models/eva_limit_frame_plan/eva_limit_frame_planEntity.cs @@ -42,6 +42,10 @@ namespace TodoAPI2.Models public DateTime? salary_adjustment_date { get; set; } + public decimal? limit_frame_005_total { get; set; } + + public decimal? limit_frame_005_total_rounded { get; set; } + public void SetAutoField(DataContext context) { diff --git a/Models/eva_limit_frame_plan/eva_limit_frame_planInputModel.cs b/Models/eva_limit_frame_plan/eva_limit_frame_planInputModel.cs index 72a1a66..deee2ca 100644 --- a/Models/eva_limit_frame_plan/eva_limit_frame_planInputModel.cs +++ b/Models/eva_limit_frame_plan/eva_limit_frame_planInputModel.cs @@ -36,6 +36,10 @@ namespace TodoAPI2.Models public DateTime? salary_adjustment_date { get; set; } + public decimal? limit_frame_005_total { get; set; } + + public decimal? limit_frame_005_total_rounded { get; set; } + public string active_mode { get; set; } } } diff --git a/Models/eva_limit_frame_plan/eva_limit_frame_planService.cs b/Models/eva_limit_frame_plan/eva_limit_frame_planService.cs index 7e60ce9..465228d 100644 --- a/Models/eva_limit_frame_plan/eva_limit_frame_planService.cs +++ b/Models/eva_limit_frame_plan/eva_limit_frame_planService.cs @@ -77,7 +77,7 @@ namespace TodoAPI2.Models var entity = _repository.Get(id); var i = Mapper.Map(entity); i.item_plan_guid = (from x in _repository.Context.eva_performance_plan select x).ToList(); - //i.item_supervisor1_result = (from x in ext.GetDemoItem() select x).ToList(); + i.item_supervisor1_result = (from x in ext.GetYesNo() select x).ToList(); return i; @@ -86,7 +86,7 @@ namespace TodoAPI2.Models { var i = new eva_limit_frame_planWithSelectionViewModel(); i.item_plan_guid = (from x in _repository.Context.eva_performance_plan select x).ToList(); - //i.item_supervisor1_result = (from x in ext.GetDemoItem() select x).ToList(); + i.item_supervisor1_result = (from x in ext.GetYesNo() select x).ToList(); return i; @@ -108,9 +108,9 @@ namespace TodoAPI2.Models into eva_performance_planResult1 from fk_eva_performance_planResult1 in eva_performance_planResult1.DefaultIfEmpty() - //join fk_external_linkage7 in ext.GetDemoItem() on m_eva_limit_frame_plan.supervisor1_result equals fk_external_linkage7.external_code - //into external_linkageResult7 - //from fk_external_linkageResult7 in external_linkageResult7.DefaultIfEmpty() + join fk_external_linkage7 in ext.GetYesNo() on m_eva_limit_frame_plan.supervisor1_result equals fk_external_linkage7.external_code + into external_linkageResult7 + from fk_external_linkageResult7 in external_linkageResult7.DefaultIfEmpty() where @@ -132,9 +132,11 @@ namespace TodoAPI2.Models supervisor1_remark = m_eva_limit_frame_plan.supervisor1_remark, supervisor1_date = m_eva_limit_frame_plan.supervisor1_date, salary_adjustment_date = m_eva_limit_frame_plan.salary_adjustment_date, + limit_frame_005_total = m_eva_limit_frame_plan.limit_frame_005_total, + limit_frame_005_total_rounded = m_eva_limit_frame_plan.limit_frame_005_total_rounded, plan_guid_eva_performance_plan_fiscal_year = fk_eva_performance_planResult1.fiscal_year, - //supervisor1_result_external_linkage_external_name = fk_external_linkageResult7.external_name, + supervisor1_result_external_linkage_external_name = fk_external_linkageResult7.external_name, isActive = m_eva_limit_frame_plan.isActive, Created = m_eva_limit_frame_plan.created, @@ -188,8 +190,10 @@ namespace TodoAPI2.Models existingEntity.supervisor1_remark = model.supervisor1_remark; existingEntity.supervisor1_date = model.supervisor1_date; existingEntity.salary_adjustment_date = model.salary_adjustment_date; + existingEntity.limit_frame_005_total = model.limit_frame_005_total; + existingEntity.limit_frame_005_total_rounded = model.limit_frame_005_total_rounded; - existingEntity.SetAutoField(_repository.Context); + existingEntity.SetAutoField(_repository.Context); if (is_force_save) { @@ -226,9 +230,11 @@ namespace TodoAPI2.Models existingEntity.supervisor1_result = i.supervisor1_result; existingEntity.supervisor1_remark = i.supervisor1_remark; existingEntity.supervisor1_date = i.supervisor1_date; - existingEntity.salary_adjustment_date = i.salary_adjustment_date; + existingEntity.salary_adjustment_date = i.salary_adjustment_date; + existingEntity.limit_frame_005_total = i.limit_frame_005_total; + existingEntity.limit_frame_005_total_rounded = i.limit_frame_005_total_rounded; - existingEntity.SetAutoField(_repository.Context); + existingEntity.SetAutoField(_repository.Context); _repository.UpdateWithoutCommit(i.id.Value, existingEntity); } } @@ -304,7 +310,10 @@ namespace TodoAPI2.Models i.Add("supervisor1_remark", "ความเห็นผู้ประเมิน"); i.Add("supervisor1_date", "วันที่ประเมิน"); i.Add("txt_supervisor1_date", "วันที่ประเมิน"); + i.Add("salary_adjustment_date", "เลื่อนเงินเดือนวันที่"); i.Add("txt_salary_adjustment_date", "เลื่อนเงินเดือนวันที่"); + i.Add("limit_frame_005_total", "กันวงเงินไว้"); + i.Add("limit_frame_005_total_rounded", "กันวงเงินใช้จริง"); return i; } diff --git a/Models/eva_limit_frame_plan/eva_limit_frame_planViewModel.cs b/Models/eva_limit_frame_plan/eva_limit_frame_planViewModel.cs index 991fac2..34871ed 100644 --- a/Models/eva_limit_frame_plan/eva_limit_frame_planViewModel.cs +++ b/Models/eva_limit_frame_plan/eva_limit_frame_planViewModel.cs @@ -40,6 +40,10 @@ namespace TodoAPI2.Models public string txt_salary_adjustment_date { get { return MyHelper.GetDateStringForReport(this.salary_adjustment_date); } } + public decimal? limit_frame_005_total { get; set; } + + public decimal? limit_frame_005_total_rounded { get; set; } + public int? plan_guid_eva_performance_plan_fiscal_year { get; set; } public string supervisor1_result_external_linkage_external_name { get; set; } diff --git a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee.cshtml b/Views/eva_limit_frame_employeeView/eva_limit_frame_employee.cshtml index 03b1364..7214d56 100644 --- a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee.cshtml +++ b/Views/eva_limit_frame_employeeView/eva_limit_frame_employee.cshtml @@ -32,16 +32,21 @@ + +
+ + +
- - + +
- - + +
@@ -60,6 +65,12 @@
+
+
+ + +
+
@@ -121,11 +132,13 @@ - - + + + + diff --git a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_d.cshtml b/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_d.cshtml index 733dc63..f0c2a41 100644 --- a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_d.cshtml +++ b/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_d.cshtml @@ -47,16 +47,21 @@ + +
+ + +
- - + +
- - + +
@@ -75,6 +80,12 @@
+
+
+ + +
+
diff --git a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_inline.cshtml b/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_inline.cshtml index 6e6596d..ea5a432 100644 --- a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_inline.cshtml +++ b/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_inline.cshtml @@ -25,11 +25,13 @@ ลำดับ - - + + + + กิจกรรม diff --git a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_report.cshtml b/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_report.cshtml index a3b1219..fa58d16 100644 --- a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_report.cshtml +++ b/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_report.cshtml @@ -26,6 +26,11 @@
+
+ + +
+
diff --git a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_wizardform.cshtml b/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_wizardform.cshtml index f2d6cae..91135be 100644 --- a/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_wizardform.cshtml +++ b/Views/eva_limit_frame_employeeView/eva_limit_frame_employee_wizardform.cshtml @@ -21,22 +21,31 @@
+ +
+
+ +
+ +
+
+
- +
- +
- +
- +
@@ -69,3 +78,13 @@
+
+
+
+ +
+ +
+
+
+
diff --git a/Views/eva_limit_frame_groupView/eva_limit_frame_group.cshtml b/Views/eva_limit_frame_groupView/eva_limit_frame_group.cshtml index 9661908..b95a730 100644 --- a/Views/eva_limit_frame_groupView/eva_limit_frame_group.cshtml +++ b/Views/eva_limit_frame_groupView/eva_limit_frame_group.cshtml @@ -49,6 +49,12 @@ +
+
+ + +
+
@@ -113,6 +119,7 @@ + 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 bb629b5..c24f1b4 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 @@ -2,145 +2,9 @@ @inject IConfiguration Configuration @{ ViewData["Title"] = "eva_limit_frame_group"; - Layout = "_LayoutDirect"; + Layout = "_LayoutDirect"; } - - - -
@@ -152,135 +16,88 @@
  • หน้าแรก
  • @Configuration["SiteInformation:modulename"]
  • eva_limit_frame_group
    • - +
    -
    บันทึกข้อมูล eva_limit_frame_group
    +
    บันทึกข้อมูล eva_limit_frame_group
    -
    +
    กรุณากรอกข้อมูลลงในแบบฟอร์ม
    -
    -
    +
    +
    - - + + -
    -
    -
    -
    - - -
    - -
    - - -
    -
    -
    -
    - - -
    - -
    - - -
    - -
    - - -
    -
    - - -
    -
    -
    -
    - -
    -
    - - -
    +
    +
    +
    +
    + +
    -
    - -
    - - -
    -
    ค้นหา eva_limit_frame_employee
    -
    -
    - -
    - - -
    - -
    - - -
    - -
    - - - -
    - -
    +
    + + +
    +
    +
    +
    + +
    - - - - - - - - - - - - - - +
    + + +
    + +
    + + +
    + +
    +
    + + +
    +
    + + + + + + + +
    +
    + + +
    +
    - - - -
    เครื่องมือ
    - @section FooterPlaceHolder{ - - - + + } diff --git a/Views/eva_limit_frame_groupView/eva_limit_frame_group_inline.cshtml b/Views/eva_limit_frame_groupView/eva_limit_frame_group_inline.cshtml index b54b4d7..389f7c1 100644 --- a/Views/eva_limit_frame_groupView/eva_limit_frame_group_inline.cshtml +++ b/Views/eva_limit_frame_groupView/eva_limit_frame_group_inline.cshtml @@ -28,6 +28,7 @@ + กิจกรรม diff --git a/Views/eva_limit_frame_groupView/eva_limit_frame_group_wizardform.cshtml b/Views/eva_limit_frame_groupView/eva_limit_frame_group_wizardform.cshtml index 6165717..5514ab7 100644 --- a/Views/eva_limit_frame_groupView/eva_limit_frame_group_wizardform.cshtml +++ b/Views/eva_limit_frame_groupView/eva_limit_frame_group_wizardform.cshtml @@ -50,3 +50,13 @@
    +
    +
    +
    + +
    + +
    +
    +
    +
    diff --git a/Views/eva_limit_frame_planView/eva_limit_frame_plan.cshtml b/Views/eva_limit_frame_planView/eva_limit_frame_plan.cshtml index 9b5f38f..d15f217 100644 --- a/Views/eva_limit_frame_planView/eva_limit_frame_plan.cshtml +++ b/Views/eva_limit_frame_planView/eva_limit_frame_plan.cshtml @@ -4,7 +4,6 @@ ViewData["Title"] = "eva_limit_frame_plan"; } - +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    +
    diff --git a/wwwroot/js/eva_create_evaluation/eva_create_evaluation.js b/wwwroot/js/eva_create_evaluation/eva_create_evaluation.js index 751f19b..e83e336 100644 --- a/wwwroot/js/eva_create_evaluation/eva_create_evaluation.js +++ b/wwwroot/js/eva_create_evaluation/eva_create_evaluation.js @@ -177,7 +177,7 @@ var eva_create_evaluation_setupTable = function (result) { "targets": 0, "data": "id", "render": function (data, type, row, meta) { - return " "; + return " "; } }], "language": { diff --git a/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee.js b/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee.js index ea29037..c227b3a 100644 --- a/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee.js +++ b/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee.js @@ -5,44 +5,48 @@ var eva_limit_frame_employee_API = "/api/eva_limit_frame_employee/"; function eva_limit_frame_employee_GetSearchParameter() { var eva_limit_frame_employeeSearchObject = new Object(); - eva_limit_frame_employeeSearchObject.frame_group_guid = getUrlParameter("id"); - eva_limit_frame_employeeSearchObject.employee_id = $("#s_eva_limit_frame_employee_employee_id").val(); +eva_limit_frame_employeeSearchObject.frame_group_guid = $("#s_eva_limit_frame_employee_frame_group_guid").val(); +eva_limit_frame_employeeSearchObject.employee_id = $("#s_eva_limit_frame_employee_employee_id").val(); return eva_limit_frame_employeeSearchObject; } function eva_limit_frame_employee_FeedDataToSearchForm(data) { - $("#s_eva_limit_frame_employee_frame_group_guid").val(data.frame_group_guid); - DropDownClearFormAndFeedWithData($("#s_eva_limit_frame_employee_employee_id"), data, "id", "external_name", "item_employee_id", data.employee_id); +$("#s_eva_limit_frame_employee_frame_group_guid").val(data.frame_group_guid); +DropDownClearFormAndFeedWithData($("#s_eva_limit_frame_employee_employee_id"), data, "id", "external_name", "item_employee_id", data.employee_id); } //================= Form Data Customizaiton ========================================= function eva_limit_frame_employee_FeedDataToForm(data) { - $("#eva_limit_frame_employee_id").val(data.id); - $("#eva_limit_frame_employee_frame_group_guid").val(data.frame_group_guid); - DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_employee_id"), data, "id", "external_name", "item_employee_id", data.employee_id); - DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_org_id"), data, "id", "external_name", "item_org_id", data.org_id); - DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_position_id"), data, "id", "external_name", "item_position_id", data.position_id); - DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_level_id"), data, "id", "external_name", "item_level_id", data.level_id); - $("#eva_limit_frame_employee_salary").val(data.salary); - $("#eva_limit_frame_employee_position_allowance").val(data.position_allowance); - $("#eva_limit_frame_employee_monthly_remuneration").val(data.monthly_remuneration); +$("#eva_limit_frame_employee_id").val(data.id); +$("#eva_limit_frame_employee_frame_group_guid").val(data.frame_group_guid); +DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_employee_id"), data, "id", "external_name", "item_employee_id", data.employee_id); +DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_org_id"), data, "id", "external_name", "item_org_id", data.org_id); +$("#eva_limit_frame_employee_position_text").val(data.position_text); +$("#eva_limit_frame_employee_level_text").val(data.level_text); +$("#eva_limit_frame_employee_salary").val(data.salary); +$("#eva_limit_frame_employee_position_allowance").val(data.position_allowance); +$("#eva_limit_frame_employee_monthly_remuneration").val(data.monthly_remuneration); +$("#eva_limit_frame_employee_cost_of_living").val(data.cost_of_living); +$("#eva_limit_frame_employee_order_of_data").val(data.order_of_data); } function eva_limit_frame_employee_GetFromForm() { var eva_limit_frame_employeeObject = new Object(); - eva_limit_frame_employeeObject.id = $("#eva_limit_frame_employee_id").val(); - eva_limit_frame_employeeObject.frame_group_guid = getUrlParameter("id"); - eva_limit_frame_employeeObject.employee_id = $("#eva_limit_frame_employee_employee_id").val(); - eva_limit_frame_employeeObject.org_id = $("#eva_limit_frame_employee_org_id").val(); - eva_limit_frame_employeeObject.position_id = $("#eva_limit_frame_employee_position_id").val(); - eva_limit_frame_employeeObject.level_id = $("#eva_limit_frame_employee_level_id").val(); - eva_limit_frame_employeeObject.salary = $("#eva_limit_frame_employee_salary").val(); - eva_limit_frame_employeeObject.position_allowance = $("#eva_limit_frame_employee_position_allowance").val(); - eva_limit_frame_employeeObject.monthly_remuneration = $("#eva_limit_frame_employee_monthly_remuneration").val(); +eva_limit_frame_employeeObject.id = $("#eva_limit_frame_employee_id").val(); +eva_limit_frame_employeeObject.frame_group_guid = $("#eva_limit_frame_employee_frame_group_guid").val(); +eva_limit_frame_employeeObject.employee_id = $("#eva_limit_frame_employee_employee_id").val(); +eva_limit_frame_employeeObject.org_id = $("#eva_limit_frame_employee_org_id").val(); +eva_limit_frame_employeeObject.position_text = $("#eva_limit_frame_employee_position_text").val(); +eva_limit_frame_employeeObject.level_text = $("#eva_limit_frame_employee_level_text").val(); +eva_limit_frame_employeeObject.salary = $("#eva_limit_frame_employee_salary").val(); +eva_limit_frame_employeeObject.position_allowance = $("#eva_limit_frame_employee_position_allowance").val(); +eva_limit_frame_employeeObject.monthly_remuneration = $("#eva_limit_frame_employee_monthly_remuneration").val(); +eva_limit_frame_employeeObject.cost_of_living = $("#eva_limit_frame_employee_cost_of_living").val(); +eva_limit_frame_employeeObject.order_of_data = $("#eva_limit_frame_employee_order_of_data").val(); return eva_limit_frame_employeeObject; @@ -51,14 +55,14 @@ function eva_limit_frame_employee_GetFromForm() { function eva_limit_frame_employee_InitialForm(s) { var successFunc = function (result) { eva_limit_frame_employee_FeedDataToForm(result); - eva_limit_frame_employee_FeedDataToSearchForm(result); + eva_limit_frame_employee_FeedDataToSearchForm(result); if (s) { // Incase model popup $("#eva_limit_frame_employeeModel").modal("show"); } - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxGetRequest(apisite + eva_limit_frame_employee_API + "GetBlankItem", successFunc, AlertDanger); } @@ -85,15 +89,15 @@ function eva_limit_frame_employee_SetEditForm(a) { eva_limit_frame_employee_editMode = "UPDATE"; eva_limit_frame_employee_FeedDataToForm(result); $("#eva_limit_frame_employeeModel").modal("show"); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxGetRequest(apisite + eva_limit_frame_employee_API + a, successFunc, AlertDanger); } function eva_limit_frame_employee_SetCreateForm(s) { eva_limit_frame_employee_editMode = "CREATE"; - eva_limit_frame_employee_InitialForm(s); + eva_limit_frame_employee_InitialForm(s); } function eva_limit_frame_employee_RefreshTable() { @@ -111,7 +115,8 @@ var eva_limit_frame_employee_customValidation = function (group) { }; function eva_limit_frame_employee_PutUpdate() { - if (!ValidateForm('eva_limit_frame_employee', eva_limit_frame_employee_customValidation)) { + if (!ValidateForm('eva_limit_frame_employee', eva_limit_frame_employee_customValidation)) + { return; } @@ -121,22 +126,22 @@ function eva_limit_frame_employee_PutUpdate() { if (eva_limit_frame_employee_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_limit_frame_employeeModel").modal("hide"); - AlertSuccess(result.code + " " + result.message); + AlertSuccess(result.code+" "+result.message); eva_limit_frame_employee_RefreshTable(); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxPutRequest(apisite + eva_limit_frame_employee_API + data.id, data, successFunc1, AlertDanger); } // Create mode else { var successFunc2 = function (result) { $("#eva_limit_frame_employeeModel").modal("hide"); - AlertSuccess(result.code + " " + result.message); + AlertSuccess(result.code+" "+result.message); eva_limit_frame_employee_RefreshTable(); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxPostRequest(apisite + eva_limit_frame_employee_API, data, successFunc2, AlertDanger); } } @@ -145,11 +150,11 @@ function eva_limit_frame_employee_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_limit_frame_employeeModel").modal("hide"); - AlertSuccess(result.code + " " + result.message); + AlertSuccess(result.code+" "+result.message); eva_limit_frame_employee_RefreshTable(); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxDeleteRequest(apisite + eva_limit_frame_employee_API + a, null, successFunc, AlertDanger); } } @@ -159,26 +164,28 @@ function eva_limit_frame_employee_GoDelete(a) { var eva_limit_frame_employeeTableV; var eva_limit_frame_employee_setupTable = function (result) { - tmp = '"'; + tmp = '"'; eva_limit_frame_employeeTableV = $('#eva_limit_frame_employeeTable').DataTable({ "processing": true, "serverSide": false, "data": result, - //"select": { + //"select": { // "style": 'multi' //}, "columns": [ - //{ "data": "" }, - { "data": "id" }, - { "data": "id" }, - { "data": "frame_group_guid_eva_limit_frame_group_group_guid" }, - { "data": "employee_id_external_linkage_external_name" }, - { "data": "org_id_external_linkage_external_name" }, - { "data": "position_id_external_linkage_external_name" }, - { "data": "level_id_external_linkage_external_name" }, - { "data": "salary" }, - { "data": "position_allowance" }, - { "data": "monthly_remuneration" }, + //{ "data": "" }, + { "data": "id" }, + { "data": "id" }, + { "data": "frame_group_guid_eva_limit_frame_group_group_guid" }, + { "data": "employee_id_external_linkage_external_name" }, + { "data": "org_id_external_linkage_external_name" }, + { "data": "position_text" }, + { "data": "level_text" }, + { "data": "salary" }, + { "data": "position_allowance" }, + { "data": "monthly_remuneration" }, + { "data": "cost_of_living" }, + { "data": "order_of_data" }, ], "columnDefs": [ { @@ -195,20 +202,20 @@ var eva_limit_frame_employee_setupTable = function (result) { // orderable: false, // className: 'select-checkbox' //} - ], + ], "language": { "url": appsite + "/DataTables-1.10.16/thai.json" }, "paging": true, - "searching": false + "searching": false }); - endLoad(); + endLoad(); }; function eva_limit_frame_employee_InitiateDataTable() { - startLoad(); - var p = $.param(eva_limit_frame_employee_GetSearchParameter()); - AjaxGetRequest(apisite + "/api/eva_limit_frame_employee/GetListBySearch?" + p, eva_limit_frame_employee_setupTable, AlertDanger); + startLoad(); + var p = $.param(eva_limit_frame_employee_GetSearchParameter()); + AjaxGetRequest(apisite + "/api/eva_limit_frame_employee/GetListBySearch?"+p, eva_limit_frame_employee_setupTable, AlertDanger); } function eva_limit_frame_employee_DoSearch() { @@ -216,10 +223,10 @@ function eva_limit_frame_employee_DoSearch() { var eva_limit_frame_employee_reload = function (result) { eva_limit_frame_employeeTableV.destroy(); eva_limit_frame_employee_setupTable(result); - endLoad(); + endLoad(); }; - startLoad(); - AjaxGetRequest(apisite + "/api/eva_limit_frame_employee/GetListBySearch?" + p, eva_limit_frame_employee_reload, AlertDanger); + startLoad(); + AjaxGetRequest(apisite + "/api/eva_limit_frame_employee/GetListBySearch?"+p, eva_limit_frame_employee_reload, AlertDanger); } function eva_limit_frame_employee_GetSelect(f) { diff --git a/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_d.js b/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_d.js index b797907..8279875 100644 --- a/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_d.js +++ b/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_d.js @@ -8,11 +8,13 @@ $("#eva_limit_frame_employee_id").val(data.id); $("#eva_limit_frame_employee_frame_group_guid").val(data.frame_group_guid); DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_employee_id"), data, "id", "external_name", "item_employee_id", data.employee_id); DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_org_id"), data, "id", "external_name", "item_org_id", data.org_id); -DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_position_id"), data, "id", "external_name", "item_position_id", data.position_id); -DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_level_id"), data, "id", "external_name", "item_level_id", data.level_id); +$("#eva_limit_frame_employee_position_text").val(data.position_text); +$("#eva_limit_frame_employee_level_text").val(data.level_text); $("#eva_limit_frame_employee_salary").val(data.salary); $("#eva_limit_frame_employee_position_allowance").val(data.position_allowance); $("#eva_limit_frame_employee_monthly_remuneration").val(data.monthly_remuneration); +$("#eva_limit_frame_employee_cost_of_living").val(data.cost_of_living); +$("#eva_limit_frame_employee_order_of_data").val(data.order_of_data); } @@ -22,11 +24,13 @@ eva_limit_frame_employeeObject.id = $("#eva_limit_frame_employee_id").val(); eva_limit_frame_employeeObject.frame_group_guid = $("#eva_limit_frame_employee_frame_group_guid").val(); eva_limit_frame_employeeObject.employee_id = $("#eva_limit_frame_employee_employee_id").val(); eva_limit_frame_employeeObject.org_id = $("#eva_limit_frame_employee_org_id").val(); -eva_limit_frame_employeeObject.position_id = $("#eva_limit_frame_employee_position_id").val(); -eva_limit_frame_employeeObject.level_id = $("#eva_limit_frame_employee_level_id").val(); +eva_limit_frame_employeeObject.position_text = $("#eva_limit_frame_employee_position_text").val(); +eva_limit_frame_employeeObject.level_text = $("#eva_limit_frame_employee_level_text").val(); eva_limit_frame_employeeObject.salary = $("#eva_limit_frame_employee_salary").val(); eva_limit_frame_employeeObject.position_allowance = $("#eva_limit_frame_employee_position_allowance").val(); eva_limit_frame_employeeObject.monthly_remuneration = $("#eva_limit_frame_employee_monthly_remuneration").val(); +eva_limit_frame_employeeObject.cost_of_living = $("#eva_limit_frame_employee_cost_of_living").val(); +eva_limit_frame_employeeObject.order_of_data = $("#eva_limit_frame_employee_order_of_data").val(); return eva_limit_frame_employeeObject; diff --git a/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_inline.js b/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_inline.js index 46fd6fe..bf0dc63 100644 --- a/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_inline.js +++ b/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_inline.js @@ -4,11 +4,13 @@ $("#eva_limit_frame_employee_id_" + i).val(""); $("#eva_limit_frame_employee_frame_group_guid_" + i).val(""); DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_employee_id_" + i), blankItem, "id", "external_name", "item_employee_id", data.employee_id); DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_org_id_" + i), blankItem, "id", "external_name", "item_org_id", data.org_id); -DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_position_id_" + i), blankItem, "id", "external_name", "item_position_id", data.position_id); -DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_level_id_" + i), blankItem, "id", "external_name", "item_level_id", data.level_id); +$("#eva_limit_frame_employee_position_text_" + i).val(""); +$("#eva_limit_frame_employee_level_text_" + i).val(""); $("#eva_limit_frame_employee_salary_" + i).val(""); $("#eva_limit_frame_employee_position_allowance_" + i).val(""); $("#eva_limit_frame_employee_monthly_remuneration_" + i).val(""); +$("#eva_limit_frame_employee_cost_of_living_" + i).val(""); +$("#eva_limit_frame_employee_order_of_data_" + i).val(""); } @@ -17,11 +19,13 @@ $("#eva_limit_frame_employee_id_" + i).val(data.id); $("#eva_limit_frame_employee_frame_group_guid_" + i).val(data.frame_group_guid); DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_employee_id_" + i), blankItem, "id", "external_name", "item_employee_id", data.employee_id); DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_org_id_" + i), blankItem, "id", "external_name", "item_org_id", data.org_id); -DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_position_id_" + i), blankItem, "id", "external_name", "item_position_id", data.position_id); -DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_level_id_" + i), blankItem, "id", "external_name", "item_level_id", data.level_id); +$("#eva_limit_frame_employee_position_text_" + i).val(data.position_text); +$("#eva_limit_frame_employee_level_text_" + i).val(data.level_text); $("#eva_limit_frame_employee_salary_" + i).val(data.salary); $("#eva_limit_frame_employee_position_allowance_" + i).val(data.position_allowance); $("#eva_limit_frame_employee_monthly_remuneration_" + i).val(data.monthly_remuneration); +$("#eva_limit_frame_employee_cost_of_living_" + i).val(data.cost_of_living); +$("#eva_limit_frame_employee_order_of_data_" + i).val(data.order_of_data); } @@ -31,11 +35,13 @@ eva_limit_frame_employeeObject.id = obj.find("#eva_limit_frame_employee_id_" + i eva_limit_frame_employeeObject.frame_group_guid = obj.find("#eva_limit_frame_employee_frame_group_guid_" + i).val(); eva_limit_frame_employeeObject.employee_id = obj.find("#eva_limit_frame_employee_employee_id_" + i).val(); eva_limit_frame_employeeObject.org_id = obj.find("#eva_limit_frame_employee_org_id_" + i).val(); -eva_limit_frame_employeeObject.position_id = obj.find("#eva_limit_frame_employee_position_id_" + i).val(); -eva_limit_frame_employeeObject.level_id = obj.find("#eva_limit_frame_employee_level_id_" + i).val(); +eva_limit_frame_employeeObject.position_text = obj.find("#eva_limit_frame_employee_position_text_" + i).val(); +eva_limit_frame_employeeObject.level_text = obj.find("#eva_limit_frame_employee_level_text_" + i).val(); eva_limit_frame_employeeObject.salary = obj.find("#eva_limit_frame_employee_salary_" + i).val(); eva_limit_frame_employeeObject.position_allowance = obj.find("#eva_limit_frame_employee_position_allowance_" + i).val(); eva_limit_frame_employeeObject.monthly_remuneration = obj.find("#eva_limit_frame_employee_monthly_remuneration_" + i).val(); +eva_limit_frame_employeeObject.cost_of_living = obj.find("#eva_limit_frame_employee_cost_of_living_" + i).val(); +eva_limit_frame_employeeObject.order_of_data = obj.find("#eva_limit_frame_employee_order_of_data_" + i).val(); eva_limit_frame_employeeObject.active_mode = obj.find("#isActive_" + i + "_eva_limit_frame_employee").val(); return eva_limit_frame_employeeObject; @@ -75,11 +81,13 @@ function eva_limit_frame_employee_Get(id, blankItem) { tag += ''; tag += ''; tag += ''; - tag += ''; - tag += ''; + tag += ''; + tag += ''; tag += ''; tag += ''; tag += ''; + tag += ''; + tag += ''; tag += ''; tag += ''; @@ -94,8 +102,6 @@ function eva_limit_frame_employee_Get(id, blankItem) { //AjaxGetRequest(apisite + '/api/eva_limit_frame_employee/GetListByframe_group_guid/' + a, successFunc, AlertDanger); //AjaxGetRequest(apisite + '/api/eva_limit_frame_employee/GetListByemployee_id/' + a, successFunc, AlertDanger); //AjaxGetRequest(apisite + '/api/eva_limit_frame_employee/GetListByorg_id/' + a, successFunc, AlertDanger); - //AjaxGetRequest(apisite + '/api/eva_limit_frame_employee/GetListByposition_id/' + a, successFunc, AlertDanger); - //AjaxGetRequest(apisite + '/api/eva_limit_frame_employee/GetListBylevel_id/' + a, successFunc, AlertDanger); } @@ -106,11 +112,13 @@ function eva_limit_frame_employee_Add() { tag += ''; tag += ''; tag += ''; - tag += ''; - tag += ''; + tag += ''; + tag += ''; tag += ''; tag += ''; tag += ''; + tag += ''; + tag += ''; tag += ''; tag += ''; diff --git a/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group.js b/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group.js index 4ae9b19..f1795e0 100644 --- a/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group.js +++ b/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group.js @@ -5,40 +5,42 @@ var eva_limit_frame_group_API = "/api/eva_limit_frame_group/"; function eva_limit_frame_group_GetSearchParameter() { var eva_limit_frame_groupSearchObject = new Object(); - eva_limit_frame_groupSearchObject.frame_plan_guid = getUrlParameter("id"); - eva_limit_frame_groupSearchObject.group_guid = $("#s_eva_limit_frame_group_group_guid").val(); +eva_limit_frame_groupSearchObject.frame_plan_guid = $("#s_eva_limit_frame_group_frame_plan_guid").val(); +eva_limit_frame_groupSearchObject.group_guid = $("#s_eva_limit_frame_group_group_guid").val(); return eva_limit_frame_groupSearchObject; } function eva_limit_frame_group_FeedDataToSearchForm(data) { - $("#s_eva_limit_frame_group_frame_plan_guid").val(data.frame_plan_guid); - DropDownClearFormAndFeedWithData($("#s_eva_limit_frame_group_group_guid"), data, "id", "code", "item_group_guid", data.group_guid); +$("#s_eva_limit_frame_group_frame_plan_guid").val(data.frame_plan_guid); +DropDownClearFormAndFeedWithData($("#s_eva_limit_frame_group_group_guid"), data, "id", "code", "item_group_guid", data.group_guid); } //================= Form Data Customizaiton ========================================= function eva_limit_frame_group_FeedDataToForm(data) { - $("#eva_limit_frame_group_id").val(data.id); - $("#eva_limit_frame_group_frame_plan_guid").val(data.frame_plan_guid); - DropDownClearFormAndFeedWithData($("#eva_limit_frame_group_group_guid"), data, "id", "code", "item_group_guid", data.group_guid); - $("#eva_limit_frame_group_limit_frame_295").val(data.limit_frame_295); - $("#eva_limit_frame_group_total_salary").val(data.total_salary); - $("#eva_limit_frame_group_total_salary_limit").val(data.total_salary_limit); - $("#eva_limit_frame_group_total_salary_limit_rounded").val(data.total_salary_limit_rounded); +$("#eva_limit_frame_group_id").val(data.id); +$("#eva_limit_frame_group_frame_plan_guid").val(data.frame_plan_guid); +DropDownClearFormAndFeedWithData($("#eva_limit_frame_group_group_guid"), data, "id", "code", "item_group_guid", data.group_guid); +$("#eva_limit_frame_group_limit_frame_295").val(data.limit_frame_295); +$("#eva_limit_frame_group_total_salary").val(data.total_salary); +$("#eva_limit_frame_group_total_salary_limit").val(data.total_salary_limit); +$("#eva_limit_frame_group_total_salary_limit_rounded").val(data.total_salary_limit_rounded); +$("#eva_limit_frame_group_remark").val(data.remark); } function eva_limit_frame_group_GetFromForm() { var eva_limit_frame_groupObject = new Object(); - eva_limit_frame_groupObject.id = $("#eva_limit_frame_group_id").val(); - eva_limit_frame_groupObject.frame_plan_guid = getUrlParameter("id"); - eva_limit_frame_groupObject.group_guid = $("#eva_limit_frame_group_group_guid").val(); - eva_limit_frame_groupObject.limit_frame_295 = $("#eva_limit_frame_group_limit_frame_295").val(); - eva_limit_frame_groupObject.total_salary = $("#eva_limit_frame_group_total_salary").val(); - 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.id = $("#eva_limit_frame_group_id").val(); +eva_limit_frame_groupObject.frame_plan_guid = $("#eva_limit_frame_group_frame_plan_guid").val(); +eva_limit_frame_groupObject.group_guid = $("#eva_limit_frame_group_group_guid").val(); +eva_limit_frame_groupObject.limit_frame_295 = $("#eva_limit_frame_group_limit_frame_295").val(); +eva_limit_frame_groupObject.total_salary = $("#eva_limit_frame_group_total_salary").val(); +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(); return eva_limit_frame_groupObject; @@ -47,14 +49,14 @@ function eva_limit_frame_group_GetFromForm() { function eva_limit_frame_group_InitialForm(s) { var successFunc = function (result) { eva_limit_frame_group_FeedDataToForm(result); - eva_limit_frame_group_FeedDataToSearchForm(result); + eva_limit_frame_group_FeedDataToSearchForm(result); if (s) { // Incase model popup $("#eva_limit_frame_groupModel").modal("show"); } - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxGetRequest(apisite + eva_limit_frame_group_API + "GetBlankItem", successFunc, AlertDanger); } @@ -70,10 +72,10 @@ function eva_limit_frame_group_GoCreate() { function eva_limit_frame_group_GoEdit(a) { // Incase model popup - //eva_limit_frame_group_SetEditForm(a); + eva_limit_frame_group_SetEditForm(a); // Incase open new page - window_open(appsite + "/eva_limit_frame_groupView/eva_limit_frame_group_d?id=" + a); + //window_open(appsite + "/eva_limit_frame_groupView/eva_limit_frame_group_d?id=" + a); } function eva_limit_frame_group_SetEditForm(a) { @@ -81,15 +83,15 @@ function eva_limit_frame_group_SetEditForm(a) { eva_limit_frame_group_editMode = "UPDATE"; eva_limit_frame_group_FeedDataToForm(result); $("#eva_limit_frame_groupModel").modal("show"); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxGetRequest(apisite + eva_limit_frame_group_API + a, successFunc, AlertDanger); } function eva_limit_frame_group_SetCreateForm(s) { eva_limit_frame_group_editMode = "CREATE"; - eva_limit_frame_group_InitialForm(s); + eva_limit_frame_group_InitialForm(s); } function eva_limit_frame_group_RefreshTable() { @@ -107,7 +109,8 @@ var eva_limit_frame_group_customValidation = function (group) { }; function eva_limit_frame_group_PutUpdate() { - if (!ValidateForm('eva_limit_frame_group', eva_limit_frame_group_customValidation)) { + if (!ValidateForm('eva_limit_frame_group', eva_limit_frame_group_customValidation)) + { return; } @@ -117,22 +120,22 @@ function eva_limit_frame_group_PutUpdate() { if (eva_limit_frame_group_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_limit_frame_groupModel").modal("hide"); - AlertSuccess(result.code + " " + result.message); + AlertSuccess(result.code+" "+result.message); eva_limit_frame_group_RefreshTable(); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxPutRequest(apisite + eva_limit_frame_group_API + data.id, data, successFunc1, AlertDanger); } // Create mode else { var successFunc2 = function (result) { $("#eva_limit_frame_groupModel").modal("hide"); - AlertSuccess(result.code + " " + result.message); + AlertSuccess(result.code+" "+result.message); eva_limit_frame_group_RefreshTable(); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxPostRequest(apisite + eva_limit_frame_group_API, data, successFunc2, AlertDanger); } } @@ -141,11 +144,11 @@ function eva_limit_frame_group_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_limit_frame_groupModel").modal("hide"); - AlertSuccess(result.code + " " + result.message); + AlertSuccess(result.code+" "+result.message); eva_limit_frame_group_RefreshTable(); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxDeleteRequest(apisite + eva_limit_frame_group_API + a, null, successFunc, AlertDanger); } } @@ -155,24 +158,25 @@ function eva_limit_frame_group_GoDelete(a) { var eva_limit_frame_groupTableV; var eva_limit_frame_group_setupTable = function (result) { - tmp = '"'; + tmp = '"'; eva_limit_frame_groupTableV = $('#eva_limit_frame_groupTable').DataTable({ "processing": true, "serverSide": false, "data": result, - //"select": { + //"select": { // "style": 'multi' //}, "columns": [ - //{ "data": "" }, - { "data": "id" }, - { "data": "id" }, - { "data": "frame_plan_guid_eva_limit_frame_plan_executed_date" }, - { "data": "group_guid_eva_evaluation_group_code" }, - { "data": "limit_frame_295" }, - { "data": "total_salary" }, - { "data": "total_salary_limit" }, - { "data": "total_salary_limit_rounded" }, + //{ "data": "" }, + { "data": "id" }, + { "data": "id" }, + { "data": "frame_plan_guid_eva_limit_frame_plan_executed_date" }, + { "data": "group_guid_eva_evaluation_group_code" }, + { "data": "limit_frame_295" }, + { "data": "total_salary" }, + { "data": "total_salary_limit" }, + { "data": "total_salary_limit_rounded" }, + { "data": "remark" }, ], "columnDefs": [ { @@ -189,20 +193,20 @@ var eva_limit_frame_group_setupTable = function (result) { // orderable: false, // className: 'select-checkbox' //} - ], + ], "language": { "url": appsite + "/DataTables-1.10.16/thai.json" }, "paging": true, - "searching": false + "searching": false }); - endLoad(); + endLoad(); }; function eva_limit_frame_group_InitiateDataTable() { - startLoad(); - var p = $.param(eva_limit_frame_group_GetSearchParameter()); - AjaxGetRequest(apisite + "/api/eva_limit_frame_group/GetListBySearch?" + p, eva_limit_frame_group_setupTable, AlertDanger); + startLoad(); + var p = $.param(eva_limit_frame_group_GetSearchParameter()); + AjaxGetRequest(apisite + "/api/eva_limit_frame_group/GetListBySearch?"+p, eva_limit_frame_group_setupTable, AlertDanger); } function eva_limit_frame_group_DoSearch() { @@ -210,10 +214,10 @@ function eva_limit_frame_group_DoSearch() { var eva_limit_frame_group_reload = function (result) { eva_limit_frame_groupTableV.destroy(); eva_limit_frame_group_setupTable(result); - endLoad(); + endLoad(); }; - startLoad(); - AjaxGetRequest(apisite + "/api/eva_limit_frame_group/GetListBySearch?" + p, eva_limit_frame_group_reload, AlertDanger); + startLoad(); + AjaxGetRequest(apisite + "/api/eva_limit_frame_group/GetListBySearch?"+p, eva_limit_frame_group_reload, AlertDanger); } function eva_limit_frame_group_GetSelect(f) { 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 01f1392..c7a974f 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 @@ -11,6 +11,7 @@ $("#eva_limit_frame_group_limit_frame_295").val(data.limit_frame_295); $("#eva_limit_frame_group_total_salary").val(data.total_salary); $("#eva_limit_frame_group_total_salary_limit").val(data.total_salary_limit); $("#eva_limit_frame_group_total_salary_limit_rounded").val(data.total_salary_limit_rounded); +$("#eva_limit_frame_group_remark").val(data.remark); } @@ -23,6 +24,7 @@ eva_limit_frame_groupObject.limit_frame_295 = $("#eva_limit_frame_group_limit_fr eva_limit_frame_groupObject.total_salary = $("#eva_limit_frame_group_total_salary").val(); 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(); return eva_limit_frame_groupObject; diff --git a/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group_inline.js b/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group_inline.js index 634638e..0bde31d 100644 --- a/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group_inline.js +++ b/wwwroot/js/eva_limit_frame_group/eva_limit_frame_group_inline.js @@ -7,6 +7,7 @@ $("#eva_limit_frame_group_limit_frame_295_" + i).val(""); $("#eva_limit_frame_group_total_salary_" + i).val(""); $("#eva_limit_frame_group_total_salary_limit_" + i).val(""); $("#eva_limit_frame_group_total_salary_limit_rounded_" + i).val(""); +$("#eva_limit_frame_group_remark_" + i).val(""); } @@ -18,6 +19,7 @@ $("#eva_limit_frame_group_limit_frame_295_" + i).val(data.limit_frame_295); $("#eva_limit_frame_group_total_salary_" + i).val(data.total_salary); $("#eva_limit_frame_group_total_salary_limit_" + i).val(data.total_salary_limit); $("#eva_limit_frame_group_total_salary_limit_rounded_" + i).val(data.total_salary_limit_rounded); +$("#eva_limit_frame_group_remark_" + i).val(data.remark); } @@ -30,6 +32,7 @@ eva_limit_frame_groupObject.limit_frame_295 = obj.find("#eva_limit_frame_group_l eva_limit_frame_groupObject.total_salary = obj.find("#eva_limit_frame_group_total_salary_" + i).val(); eva_limit_frame_groupObject.total_salary_limit = obj.find("#eva_limit_frame_group_total_salary_limit_" + i).val(); eva_limit_frame_groupObject.total_salary_limit_rounded = obj.find("#eva_limit_frame_group_total_salary_limit_rounded_" + i).val(); +eva_limit_frame_groupObject.remark = obj.find("#eva_limit_frame_group_remark_" + i).val(); eva_limit_frame_groupObject.active_mode = obj.find("#isActive_" + i + "_eva_limit_frame_group").val(); return eva_limit_frame_groupObject; @@ -72,6 +75,7 @@ function eva_limit_frame_group_Get(id, blankItem) { tag += ''; tag += ''; tag += ''; + tag += ''; tag += ''; tag += ''; @@ -98,6 +102,7 @@ function eva_limit_frame_group_Add() { tag += ''; tag += ''; tag += ''; + tag += ''; tag += ''; tag += ''; diff --git a/wwwroot/js/eva_limit_frame_plan/eva_limit_frame_plan.js b/wwwroot/js/eva_limit_frame_plan/eva_limit_frame_plan.js index e9d1824..28fcafa 100644 --- a/wwwroot/js/eva_limit_frame_plan/eva_limit_frame_plan.js +++ b/wwwroot/js/eva_limit_frame_plan/eva_limit_frame_plan.js @@ -5,46 +5,50 @@ var eva_limit_frame_plan_API = "/api/eva_limit_frame_plan/"; function eva_limit_frame_plan_GetSearchParameter() { var eva_limit_frame_planSearchObject = new Object(); - eva_limit_frame_planSearchObject.executed_date = formatDateForGetParameter(getDate($("#s_eva_limit_frame_plan_executed_date").val())); +eva_limit_frame_planSearchObject.executed_date = formatDateForGetParameter(getDate($("#s_eva_limit_frame_plan_executed_date").val())); return eva_limit_frame_planSearchObject; } function eva_limit_frame_plan_FeedDataToSearchForm(data) { - $("#s_eva_limit_frame_plan_executed_date").val(formatDate(data.executed_date)); +$("#s_eva_limit_frame_plan_executed_date").val(formatDate(data.executed_date)); } //================= Form Data Customizaiton ========================================= function eva_limit_frame_plan_FeedDataToForm(data) { - $("#eva_limit_frame_plan_id").val(data.id); - DropDownClearFormAndFeedWithData($("#eva_limit_frame_plan_plan_guid"), data, "id", "fiscal_year", "item_plan_guid", data.plan_guid); - $("#eva_limit_frame_plan_executed_date").val(formatDate(data.executed_date)); - $("#eva_limit_frame_plan_limit_frame_005").val(data.limit_frame_005); - $("#eva_limit_frame_plan_status_self").val(data.status_self); - $("#eva_limit_frame_plan_status_chief").val(data.status_chief); - $("#eva_limit_frame_plan_supervisor1").val(data.supervisor1); - DropDownClearFormAndFeedWithData($("#eva_limit_frame_plan_supervisor1_result"), data, "id", "external_name", "item_supervisor1_result", data.supervisor1_result); - $("#eva_limit_frame_plan_supervisor1_remark").val(data.supervisor1_remark); - $("#eva_limit_frame_plan_supervisor1_date").val(formatDate(data.supervisor1_date)); - $("#eva_limit_frame_plan_salary_adjustment_date").val(formatDate(data.salary_adjustment_date)); +$("#eva_limit_frame_plan_id").val(data.id); +DropDownClearFormAndFeedWithData($("#eva_limit_frame_plan_plan_guid"), data, "id", "fiscal_year", "item_plan_guid", data.plan_guid); +$("#eva_limit_frame_plan_executed_date").val(formatDate(data.executed_date)); +$("#eva_limit_frame_plan_limit_frame_005").val(data.limit_frame_005); +$("#eva_limit_frame_plan_status_self").val(data.status_self); +$("#eva_limit_frame_plan_status_chief").val(data.status_chief); +$("#eva_limit_frame_plan_supervisor1").val(data.supervisor1); +DropDownClearFormAndFeedWithData($("#eva_limit_frame_plan_supervisor1_result"), data, "id", "external_name", "item_supervisor1_result", data.supervisor1_result); +$("#eva_limit_frame_plan_supervisor1_remark").val(data.supervisor1_remark); +$("#eva_limit_frame_plan_supervisor1_date").val(formatDate(data.supervisor1_date)); +$("#eva_limit_frame_plan_salary_adjustment_date").val(formatDate(data.salary_adjustment_date)); +$("#eva_limit_frame_plan_limit_frame_005_total").val(data.limit_frame_005_total); +$("#eva_limit_frame_plan_limit_frame_005_total_rounded").val(data.limit_frame_005_total_rounded); } function eva_limit_frame_plan_GetFromForm() { var eva_limit_frame_planObject = new Object(); - eva_limit_frame_planObject.id = $("#eva_limit_frame_plan_id").val(); - eva_limit_frame_planObject.plan_guid = $("#eva_limit_frame_plan_plan_guid").val(); - eva_limit_frame_planObject.executed_date = getDate($("#eva_limit_frame_plan_executed_date").val()); - eva_limit_frame_planObject.limit_frame_005 = $("#eva_limit_frame_plan_limit_frame_005").val(); - eva_limit_frame_planObject.status_self = $("#eva_limit_frame_plan_status_self").val(); - eva_limit_frame_planObject.status_chief = $("#eva_limit_frame_plan_status_chief").val(); - eva_limit_frame_planObject.supervisor1 = $("#eva_limit_frame_plan_supervisor1").val(); - eva_limit_frame_planObject.supervisor1_result = $("#eva_limit_frame_plan_supervisor1_result").val(); - eva_limit_frame_planObject.supervisor1_remark = $("#eva_limit_frame_plan_supervisor1_remark").val(); - eva_limit_frame_planObject.supervisor1_date = getDate($("#eva_limit_frame_plan_supervisor1_date").val()); - eva_limit_frame_planObject.salary_adjustment_date = getDate($("#eva_limit_frame_plan_salary_adjustment_date").val()); +eva_limit_frame_planObject.id = $("#eva_limit_frame_plan_id").val(); +eva_limit_frame_planObject.plan_guid = $("#eva_limit_frame_plan_plan_guid").val(); +eva_limit_frame_planObject.executed_date = getDate($("#eva_limit_frame_plan_executed_date").val()); +eva_limit_frame_planObject.limit_frame_005 = $("#eva_limit_frame_plan_limit_frame_005").val(); +eva_limit_frame_planObject.status_self = $("#eva_limit_frame_plan_status_self").val(); +eva_limit_frame_planObject.status_chief = $("#eva_limit_frame_plan_status_chief").val(); +eva_limit_frame_planObject.supervisor1 = $("#eva_limit_frame_plan_supervisor1").val(); +eva_limit_frame_planObject.supervisor1_result = $("#eva_limit_frame_plan_supervisor1_result").val(); +eva_limit_frame_planObject.supervisor1_remark = $("#eva_limit_frame_plan_supervisor1_remark").val(); +eva_limit_frame_planObject.supervisor1_date = getDate($("#eva_limit_frame_plan_supervisor1_date").val()); +eva_limit_frame_planObject.salary_adjustment_date = getDate($("#eva_limit_frame_plan_salary_adjustment_date").val()); +eva_limit_frame_planObject.limit_frame_005_total = $("#eva_limit_frame_plan_limit_frame_005_total").val(); +eva_limit_frame_planObject.limit_frame_005_total_rounded = $("#eva_limit_frame_plan_limit_frame_005_total_rounded").val(); return eva_limit_frame_planObject; @@ -53,14 +57,14 @@ function eva_limit_frame_plan_GetFromForm() { function eva_limit_frame_plan_InitialForm(s) { var successFunc = function (result) { eva_limit_frame_plan_FeedDataToForm(result); - eva_limit_frame_plan_FeedDataToSearchForm(result); + eva_limit_frame_plan_FeedDataToSearchForm(result); if (s) { // Incase model popup $("#eva_limit_frame_planModel").modal("show"); } - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxGetRequest(apisite + eva_limit_frame_plan_API + "GetBlankItem", successFunc, AlertDanger); } @@ -76,10 +80,10 @@ function eva_limit_frame_plan_GoCreate() { function eva_limit_frame_plan_GoEdit(a) { // Incase model popup - //eva_limit_frame_plan_SetEditForm(a); + eva_limit_frame_plan_SetEditForm(a); // Incase open new page - window_open(appsite + "/eva_limit_frame_planView/eva_limit_frame_plan_d?id=" + a); + //window_open(appsite + "/eva_limit_frame_planView/eva_limit_frame_plan_d?id=" + a); } function eva_limit_frame_plan_SetEditForm(a) { @@ -87,15 +91,15 @@ function eva_limit_frame_plan_SetEditForm(a) { eva_limit_frame_plan_editMode = "UPDATE"; eva_limit_frame_plan_FeedDataToForm(result); $("#eva_limit_frame_planModel").modal("show"); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxGetRequest(apisite + eva_limit_frame_plan_API + a, successFunc, AlertDanger); } function eva_limit_frame_plan_SetCreateForm(s) { eva_limit_frame_plan_editMode = "CREATE"; - eva_limit_frame_plan_InitialForm(s); + eva_limit_frame_plan_InitialForm(s); } function eva_limit_frame_plan_RefreshTable() { @@ -113,7 +117,8 @@ var eva_limit_frame_plan_customValidation = function (group) { }; function eva_limit_frame_plan_PutUpdate() { - if (!ValidateForm('eva_limit_frame_plan', eva_limit_frame_plan_customValidation)) { + if (!ValidateForm('eva_limit_frame_plan', eva_limit_frame_plan_customValidation)) + { return; } @@ -123,22 +128,22 @@ function eva_limit_frame_plan_PutUpdate() { if (eva_limit_frame_plan_editMode === "UPDATE") { var successFunc1 = function (result) { $("#eva_limit_frame_planModel").modal("hide"); - AlertSuccess(result.code + " " + result.message); + AlertSuccess(result.code+" "+result.message); eva_limit_frame_plan_RefreshTable(); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxPutRequest(apisite + eva_limit_frame_plan_API + data.id, data, successFunc1, AlertDanger); } // Create mode else { var successFunc2 = function (result) { $("#eva_limit_frame_planModel").modal("hide"); - AlertSuccess(result.code + " " + result.message); + AlertSuccess(result.code+" "+result.message); eva_limit_frame_plan_RefreshTable(); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxPostRequest(apisite + eva_limit_frame_plan_API, data, successFunc2, AlertDanger); } } @@ -147,11 +152,11 @@ function eva_limit_frame_plan_GoDelete(a) { if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) { var successFunc = function (result) { $("#eva_limit_frame_planModel").modal("hide"); - AlertSuccess(result.code + " " + result.message); + AlertSuccess(result.code+" "+result.message); eva_limit_frame_plan_RefreshTable(); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxDeleteRequest(apisite + eva_limit_frame_plan_API + a, null, successFunc, AlertDanger); } } @@ -161,27 +166,30 @@ function eva_limit_frame_plan_GoDelete(a) { var eva_limit_frame_planTableV; var eva_limit_frame_plan_setupTable = function (result) { - tmp = '"'; + tmp = '"'; eva_limit_frame_planTableV = $('#eva_limit_frame_planTable').DataTable({ "processing": true, "serverSide": false, "data": result, - //"select": { + //"select": { // "style": 'multi' //}, "columns": [ - //{ "data": "" }, - { "data": "id" }, - { "data": "plan_guid_eva_performance_plan_fiscal_year" }, - { "data": "txt_executed_date" }, - { "data": "limit_frame_005" }, - { "data": "status_self" }, - { "data": "status_chief" }, - { "data": "supervisor1" }, - { "data": "supervisor1_result_external_linkage_external_name" }, - { "data": "supervisor1_remark" }, - { "data": "txt_supervisor1_date" }, - { "data": "txt_salary_adjustment_date" }, + //{ "data": "" }, + { "data": "id" }, + { "data": "id" }, + { "data": "plan_guid_eva_performance_plan_fiscal_year" }, + { "data": "txt_executed_date" }, + { "data": "limit_frame_005" }, + { "data": "status_self" }, + { "data": "status_chief" }, + { "data": "supervisor1" }, + { "data": "supervisor1_result_external_linkage_external_name" }, + { "data": "supervisor1_remark" }, + { "data": "txt_supervisor1_date" }, + { "data": "txt_salary_adjustment_date" }, + { "data": "limit_frame_005_total" }, + { "data": "limit_frame_005_total_rounded" }, ], "columnDefs": [ { @@ -198,20 +206,20 @@ var eva_limit_frame_plan_setupTable = function (result) { // orderable: false, // className: 'select-checkbox' //} - ], + ], "language": { "url": appsite + "/DataTables-1.10.16/thai.json" }, "paging": true, - "searching": false + "searching": false }); - endLoad(); + endLoad(); }; function eva_limit_frame_plan_InitiateDataTable() { - startLoad(); - var p = $.param(eva_limit_frame_plan_GetSearchParameter()); - AjaxGetRequest(apisite + "/api/eva_limit_frame_plan/GetListBySearch?" + p, eva_limit_frame_plan_setupTable, AlertDanger); + startLoad(); + var p = $.param(eva_limit_frame_plan_GetSearchParameter()); + AjaxGetRequest(apisite + "/api/eva_limit_frame_plan/GetListBySearch?"+p, eva_limit_frame_plan_setupTable, AlertDanger); } function eva_limit_frame_plan_DoSearch() { @@ -219,10 +227,10 @@ function eva_limit_frame_plan_DoSearch() { var eva_limit_frame_plan_reload = function (result) { eva_limit_frame_planTableV.destroy(); eva_limit_frame_plan_setupTable(result); - endLoad(); + endLoad(); }; - startLoad(); - AjaxGetRequest(apisite + "/api/eva_limit_frame_plan/GetListBySearch?" + p, eva_limit_frame_plan_reload, AlertDanger); + startLoad(); + AjaxGetRequest(apisite + "/api/eva_limit_frame_plan/GetListBySearch?"+p, eva_limit_frame_plan_reload, AlertDanger); } function eva_limit_frame_plan_GetSelect(f) { diff --git a/wwwroot/js/eva_limit_frame_plan/eva_limit_frame_plan_d.js b/wwwroot/js/eva_limit_frame_plan/eva_limit_frame_plan_d.js index 9a6043d..c90f88c 100644 --- a/wwwroot/js/eva_limit_frame_plan/eva_limit_frame_plan_d.js +++ b/wwwroot/js/eva_limit_frame_plan/eva_limit_frame_plan_d.js @@ -15,6 +15,8 @@ DropDownClearFormAndFeedWithData($("#eva_limit_frame_plan_supervisor1_result"), $("#eva_limit_frame_plan_supervisor1_remark").val(data.supervisor1_remark); $("#eva_limit_frame_plan_supervisor1_date").val(formatDate(data.supervisor1_date)); $("#eva_limit_frame_plan_salary_adjustment_date").val(formatDate(data.salary_adjustment_date)); +$("#eva_limit_frame_plan_limit_frame_005_total").val(data.limit_frame_005_total); +$("#eva_limit_frame_plan_limit_frame_005_total_rounded").val(data.limit_frame_005_total_rounded); } @@ -31,6 +33,8 @@ eva_limit_frame_planObject.supervisor1_result = $("#eva_limit_frame_plan_supervi eva_limit_frame_planObject.supervisor1_remark = $("#eva_limit_frame_plan_supervisor1_remark").val(); eva_limit_frame_planObject.supervisor1_date = getDate($("#eva_limit_frame_plan_supervisor1_date").val()); eva_limit_frame_planObject.salary_adjustment_date = getDate($("#eva_limit_frame_plan_salary_adjustment_date").val()); +eva_limit_frame_planObject.limit_frame_005_total = $("#eva_limit_frame_plan_limit_frame_005_total").val(); +eva_limit_frame_planObject.limit_frame_005_total_rounded = $("#eva_limit_frame_plan_limit_frame_005_total_rounded").val(); return eva_limit_frame_planObject; diff --git a/wwwroot/js/eva_limit_frame_plan/eva_limit_frame_plan_inline.js b/wwwroot/js/eva_limit_frame_plan/eva_limit_frame_plan_inline.js index a22e5b0..7508318 100644 --- a/wwwroot/js/eva_limit_frame_plan/eva_limit_frame_plan_inline.js +++ b/wwwroot/js/eva_limit_frame_plan/eva_limit_frame_plan_inline.js @@ -11,6 +11,8 @@ DropDownClearFormAndFeedWithData($("#eva_limit_frame_plan_supervisor1_result_" + $("#eva_limit_frame_plan_supervisor1_remark_" + i).val(""); $("#eva_limit_frame_plan_supervisor1_date_" + i).val(""); $("#eva_limit_frame_plan_salary_adjustment_date_" + i).val(""); +$("#eva_limit_frame_plan_limit_frame_005_total_" + i).val(""); +$("#eva_limit_frame_plan_limit_frame_005_total_rounded_" + i).val(""); } @@ -26,6 +28,8 @@ DropDownClearFormAndFeedWithData($("#eva_limit_frame_plan_supervisor1_result_" + $("#eva_limit_frame_plan_supervisor1_remark_" + i).val(data.supervisor1_remark); $("#eva_limit_frame_plan_supervisor1_date_" + i).val(formatDate(data.supervisor1_date)); $("#eva_limit_frame_plan_salary_adjustment_date_" + i).val(formatDate(data.salary_adjustment_date)); +$("#eva_limit_frame_plan_limit_frame_005_total_" + i).val(data.limit_frame_005_total); +$("#eva_limit_frame_plan_limit_frame_005_total_rounded_" + i).val(data.limit_frame_005_total_rounded); } @@ -42,6 +46,8 @@ eva_limit_frame_planObject.supervisor1_result = obj.find("#eva_limit_frame_plan_ eva_limit_frame_planObject.supervisor1_remark = obj.find("#eva_limit_frame_plan_supervisor1_remark_" + i).val(); eva_limit_frame_planObject.supervisor1_date = getDate(obj.find("#eva_limit_frame_plan_supervisor1_date_" + i).val()); eva_limit_frame_planObject.salary_adjustment_date = getDate(obj.find("#eva_limit_frame_plan_salary_adjustment_date_" + i).val()); +eva_limit_frame_planObject.limit_frame_005_total = obj.find("#eva_limit_frame_plan_limit_frame_005_total_" + i).val(); +eva_limit_frame_planObject.limit_frame_005_total_rounded = obj.find("#eva_limit_frame_plan_limit_frame_005_total_rounded_" + i).val(); eva_limit_frame_planObject.active_mode = obj.find("#isActive_" + i + "_eva_limit_frame_plan").val(); return eva_limit_frame_planObject; @@ -86,6 +92,8 @@ function eva_limit_frame_plan_Get(id, blankItem) { tag += ''; tag += ''; tag += ''; + tag += ''; + tag += ''; tag += ''; tag += ''; @@ -114,6 +122,8 @@ function eva_limit_frame_plan_Add() { tag += ''; tag += ''; tag += ''; + tag += ''; + tag += ''; tag += ''; tag += '';