From 2159daa300079e5000c818bd5905bd7ce5fa44f4 Mon Sep 17 00:00:00 2001 From: Nakorn Rientrakrunchai Date: Sat, 13 Feb 2021 12:31:34 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B8=E0=B8=87=20UI=20=E0=B9=81=E0=B8=A5=E0=B8=B0?= =?UTF-8?q?=20Flow=20=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=87=E0=B8=B2?= =?UTF-8?q?=E0=B8=99=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=E0=B9=80=E0=B8=95=E0=B8=B4=E0=B8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...eva_create_evaluation_detail_review0A.xlsx | Bin 10386 -> 10511 bytes ...25640213052452_AddRejectReason.Designer.cs | 777 ++++++++++++++++++ Migrations/25640213052452_AddRejectReason.cs | 23 + Migrations/DataContextModelSnapshot.cs | 3 + .../eva_create_evaluation_detailEntity.cs | 3 + ...reate_evaluation_detail_firstdocService.cs | 2 +- ...ate_evaluation_detail_firstdocViewModel.cs | 20 +- ...te_evaluation_detail_review0AInputModel.cs | 2 + ...reate_evaluation_detail_review0AService.cs | 4 + ...ate_evaluation_detail_review0AViewModel.cs | 2 + .../external_linkageService.cs | 4 +- ...create_evaluation_detail_firstdoc_d.cshtml | 76 +- ...eva_create_evaluation_detail_firstdoc_d.js | 7 + ...eva_create_evaluation_detail_review0A_d.js | 3 +- .../eva_evaluation_operating_agreement.js | 3 +- 15 files changed, 898 insertions(+), 31 deletions(-) create mode 100644 Migrations/25640213052452_AddRejectReason.Designer.cs create mode 100644 Migrations/25640213052452_AddRejectReason.cs diff --git a/EXCEL/eva_create_evaluation_detail@eva_create_evaluation_detail_review0A.xlsx b/EXCEL/eva_create_evaluation_detail@eva_create_evaluation_detail_review0A.xlsx index d5a0feb4fef90740349e640f2a18cef22290826a..c483dd832313048556eafaa1dde2a2f93a886e0e 100644 GIT binary patch delta 3249 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 delta 3137 zcmZ8kXHXN0vJO=UCXrr(^xi}WRiv1p2tnzh0g-k>?@|;9AOb;<5}F916H0(k)Ei1v zj1(0DMnnt*!5|`C5mba+&zbk;y?gi1&g{3lvpYMp`)!_6p(BYZ00hLi-s9i|0Oq)H z;{wtc&tQ?0B1z)EA#mn8(aYK|R&2djZAu~Lml^dQV{QVer*bcLT9wBtNxc4xouHsr zTK1Vw^DIKVktW}$j@T#p=&%j)G83l+9fRVfZ@orl%aeNzUf-+SgBb zAihpmaVbkXGbfk$UPvAF@Aq>Y=qy}!$7f|C@8_#9#}NJJ%O=^Y!!GTZg|(aPq%BZ# z+(9&&mUxaJulNe2W|c5{&$yO8g1HbX!b~$jgMn`?l}MJ9Q^xhW-q`u#XtP#F9<+t& z{>){U-0pL5o$B{9rQ^xl{AfyF^mJV?0pGf3-tN7vv&Z!6VVLe47OkA$hRIEyLSy<4 zzu#uL=<{a!zuEEnmrM0F6LGb@P&eD?Yk+eP6V{pQdFX4qo$!JU007vy3@O2GS#TvE zCOtG?mcRu7gbDxvpg&N2$cgBfgb@E|o%qm@9=Ex>b%r98jyG|nMA{ZEUqz5qj^qt& zm}_xrbP7MNOKs^ah-^IHdUXxH)6y|{C!r#tNCwL1w|t_H5p|2U@H=r?{M;s3^xU3{ z0Ww=+|B}pE7e768ZO%3=u33M$X%d5ArQ2EgCf0+JOB30iZ$2v$?jLWEO68xV#uKg& z#LTHMCbMCex*9ntB2KOdu4dau&7#T)zC{`vym+H%%|Y%kZLQWdAw^Ng#~Z<_I9GcZ zLvMU%^8H}bi;_({dC{4ulp9+FrPWZ>BKBvtzpY`{#HDNF#nw;teu*p%dSd={O&tqV zkGZ8s7B?O89=56d6c=;R*pD_GCgfjecN?a}q3eEEPBc_Gj1P@^p5tz%F_fo$ige>t zt<*@PfhczgI(lZs?Wlr&T6^kbn&i*jSA?hZ2R`XuYs(3^x(F9?Ze;n5UGf{cwWUSa zL`D{GXp_(LI}2m9q{GsL9yJVfMD^oumsza3j&31eInr6#NzNgTa_X(a6^?Hciw~m0 zZA!DH59IniY6>crc&!tBq1o69nEHK==m$ z@exsJv1j6%YiAUidFAa;<{POY1#Hw=TXjC8vFYF(18?{fy{t~=Q{6p`a0I7WaDk+F zW#%20wwS<@LS)LUBE^OR+W7gdS5Dqvaw*X_ZNI_zC8NgD$E%?@86uim8F;qK;>>uT z@BO-xl-YrL7{`Hl@$AWTu?fDH(ytGe+$U<{g^MgwfVxr&9LXKIHlE*nfi?H7ryY-t zShj@>gLVwi4NU>9`3MpQgc3Svv`IP#d7Hn|1>atZJZ)tdk5T@4Y_@w8qd0yigv~Zd zRMw>z)2>fx1_s&1yVZ9@0PfOGu}~m$?dJmaf0+*F2pk;=h@tWB!R$wVYx@4KBjdLO z7uWHTW7I%%^GorGKlZm5=pUbXM)F_C-NpToR0`--N_r+b zdUfeq$iYh2LPUX+C+YZ)u_t%7vjP?vRpL)%e7(5!H%)g=t5(KS^eYR<`c?L4R6z&V zPTy}2dj^yChCBxMZIUVTOgQLAMDt~96XB$`U%*_lgOZ#V|KPgj0(g(b@&e#$xI};` zO{;-uZUA5qf~%2|#av=UEgBz7nr}HcQaV3u#P^7^F$0xCaz){0=Fr~UO+Kirm(%?y z$yXlwuRT;@@hrSuVXTy_$zYQ1D6SS~=WP4=?B7MBVEjK*l?m7bTHaJ?YN&sq(h;HU z^b2co-blhl&o_`dDx~=IJv#r0``4L70NjB5ho2tmlF8?;LVjR;k@DWmY6m zWmn7R>uIAPRHX6y3L%{l^R)i?-#Yvc)_>RdoBvhwLDItZ$SbmS^?F6-#srTYeLK~P zH#^pD;v@AC^C>SjiBWksI{DClr+n%VRk&6ah=8AmIH)k3b~a5gj!!^YW~8zufPX=H z;lOK?+*<6wu55KWd-=i}OvHkl`4{$s$F5hq9^bxReJ%>iic9u%jy1K5n7tmwC7%ZX zJ$8HL!T_LHZCQ7Yvl4vbZd}-_`FP}mX}@3LFk3VV<3;Y+Nppg{4JOMPS6)?>n5C~3 zm6P1cWqZGr07*f&@9J;e^z4XJwXu=E2zF~T`GJfYaDuqCO~?JR+FZatOK#>{wU3N9 zx?tRtP(dmQa!Aj9iKMg|W?b8a;WQhwf69A5do4|DAXneipVnzX?I4(!1r$bOw0=yb z>4U;BT}4gMLD`=iJ%LU2^F_w<={9=#lnVo$`@jQbmUMQji>n_e0K+#|%3wH)GBw&IJL!WmDGf4?}{l?LJXsb>Uu>~q^>pWK^ zF&?KaEX!l6DYu1EUahlPmZ}ZongR>l0%Ka1gjR`1O`Cf2+|izVAGGFu;8U{_dWfaj zpzfAXM`!aS(xcYRx%Wh?Q@X*mp4j_6M@F`ZDQ^NH4&RrhoF7;z95F>d|KxCHzU!N6 zd1}J)UG%^TE;luxLv2#PJ09?sRvv*8cajD-s3g+YxAK9!y9;ydpW2%{E#BQC+c-|q z9t%bKigzQopWnlKpDor(pII6aZvLe3ee^qiurz#d*-ZV2rvWCto`qm5EK&sFjHM$}S|3MaHM_b`m~2bjcxipqDnDE4)N;*~y|PwyL?m-p$rY13z;y0xUb} zp)2A3&E&cd!NbO?tfx(X1apR{bfx|%CDU8u;glKpG7RBEm4kMgu!M_H_VaYFznKG@ z3*cbK#Vvv(a`E$Mi52}ocIV6LabO&PyEfXS!iLgEc#I&iaN3$XF62b#Uo3d9C$Pp z5W+AFqMK*XE^h6AS!wVxAiBh9f}2LT3A2FcT=k7~qDzKq@x~2 zds64wV`bWxI*8@5R0urtv#IKmc2c}nX_L*O64+O0=v(2j^6}3hhm-c^tDA!$o`edv z#pK7rd?o)xYdWg@l?qk3`g3#@CTkJ;_j2!sDA2k8KSy6vapGJ7;Ve}za;}1L1**!> z|0ZgGhVeg=ftys7gZ|%n001QZ7y3uL +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("25640213052452_AddRejectReason")] + partial class AddRejectReason + { + 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_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_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/25640213052452_AddRejectReason.cs b/Migrations/25640213052452_AddRejectReason.cs new file mode 100644 index 0000000..6a36531 --- /dev/null +++ b/Migrations/25640213052452_AddRejectReason.cs @@ -0,0 +1,23 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace tb320eva.Migrations +{ + public partial class AddRejectReason : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "chief_a_reject_reason", + table: "eva_create_evaluation_detail", + maxLength: 1000, + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "chief_a_reject_reason", + table: "eva_create_evaluation_detail"); + } + } +} diff --git a/Migrations/DataContextModelSnapshot.cs b/Migrations/DataContextModelSnapshot.cs index 5ef6e4c..df8faaa 100644 --- a/Migrations/DataContextModelSnapshot.cs +++ b/Migrations/DataContextModelSnapshot.cs @@ -199,6 +199,9 @@ namespace tb320eva.Migrations b.Property("chief_a_date"); + b.Property("chief_a_reject_reason") + .HasMaxLength(1000); + b.Property("chief_a_remark") .HasMaxLength(1000); diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs index 434cff7..e61ac89 100644 --- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs +++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs @@ -174,6 +174,9 @@ namespace TodoAPI2.Models public string chief_a_remark { get; set; } public DateTime? chief_a_date { get; set; } + + [MaxLength(1000)] + public string chief_a_reject_reason { get; set; } } } diff --git a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs index 78a8f75..68d4194 100644 --- a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs +++ b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs @@ -248,7 +248,7 @@ namespace TodoAPI2.Models && (fk_external_employee.department_id == model.org_id || !model.org_id.HasValue) && (fk_external_employee.employee_no == model.search_employee_code || string.IsNullOrEmpty(model.search_employee_code)) && (fk_external_employee.fullname.Contains(model.search_employee_fullname) || string.IsNullOrEmpty(model.search_employee_fullname)) - && m_eva_create_evaluation_detail_agreement.employee_id == emp_id + && (m_eva_create_evaluation_detail_agreement.employee_id == emp_id || m_eva_create_evaluation_detail_agreement.chief == emp_id) orderby m_eva_create_evaluation_detail_agreement.created descending select new eva_create_evaluation_detail_firstdocViewModel() diff --git a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocViewModel.cs b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocViewModel.cs index a7be033..e64f18f 100644 --- a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocViewModel.cs +++ b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocViewModel.cs @@ -68,11 +68,11 @@ namespace TodoAPI2.Models public decimal? score2 { get; set; } - public string txt_status_self_a { get { return getStatusText(status_self_a) + MyHelper.GetDateStringForReport(status_self_a_click_date); } } + public string txt_status_self_a { get { return getStatusText2(status_self_a) + MyHelper.GetDateStringForReport(status_self_a_click_date); } } public string txt_status_self { get { return getStatusText(status_self) + MyHelper.GetDateStringForReport(status_self_click_date); } } - public string txt_status_chief_a { get { return getStatusText(status_chief_a) + MyHelper.GetDateStringForReport(status_chief_a_click_date); } } + public string txt_status_chief_a { get { return getStatusText2(status_chief_a) + MyHelper.GetDateStringForReport(status_chief_a_click_date); } } public string txt_status_chief { get { return getStatusText(status_chief) + MyHelper.GetDateStringForReport(status_chief_click_date); } } public string txt_status_supervisor { get { return getStatusText(status_supervisor) + MyHelper.GetDateStringForReport(status_supervisor_click_date); } } @@ -97,6 +97,22 @@ namespace TodoAPI2.Models return " "; } + private string getStatusText2(string s) + { + if (!string.IsNullOrEmpty(s)) + { + if (s == "Y") + { + return "ส่งข้อตกลงแล้ว
"; + } + else if (s == "N") + { + return "ตีกลับ
"; + } + } + return " "; + } + } } diff --git a/Models/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0AInputModel.cs b/Models/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0AInputModel.cs index 492abc3..4fe98ce 100644 --- a/Models/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0AInputModel.cs +++ b/Models/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0AInputModel.cs @@ -26,6 +26,8 @@ namespace TodoAPI2.Models public DateTime? chief_a_date { get; set; } + public string chief_a_reject_reason { get; set; } + public string active_mode { get; set; } } } diff --git a/Models/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0AService.cs b/Models/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0AService.cs index f7d421a..a0ac579 100644 --- a/Models/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0AService.cs +++ b/Models/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0AService.cs @@ -121,6 +121,7 @@ namespace TodoAPI2.Models chief_a_result = m_eva_create_evaluation_detail_review0A.chief_a_result, chief_a_remark = m_eva_create_evaluation_detail_review0A.chief_a_remark, chief_a_date = m_eva_create_evaluation_detail_review0A.chief_a_date, + chief_a_reject_reason = m_eva_create_evaluation_detail_review0A.chief_a_reject_reason, chief_a_result_external_linkage_external_name = fk_external_linkageResult3.external_name, @@ -196,6 +197,7 @@ namespace TodoAPI2.Models existingEntity.chief_a_result = model.chief_a_result; existingEntity.chief_a_remark = model.chief_a_remark; existingEntity.chief_a_date = model.chief_a_date; + existingEntity.chief_a_reject_reason = model.chief_a_reject_reason; //existingEntity.SetAutoField(_repository.Context); @@ -230,6 +232,7 @@ namespace TodoAPI2.Models existingEntity.chief_a_result = i.chief_a_result; existingEntity.chief_a_remark = i.chief_a_remark; existingEntity.chief_a_date = i.chief_a_date; + existingEntity.chief_a_reject_reason = i.chief_a_reject_reason; //existingEntity.SetAutoField(_repository.Context); _repository.UpdateWithoutCommit(i.id.Value, existingEntity); @@ -301,6 +304,7 @@ namespace TodoAPI2.Models i.Add("chief_a_remark", "ความเห็นผู้ประเมินสูงสุด"); i.Add("chief_a_date", "วันที่ประเมิน"); i.Add("txt_chief_a_date", "วันที่ประเมิน"); + i.Add("chief_a_reject_reason", "เหตุผลการส่งคืนเอกสาร"); return i; } diff --git a/Models/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0AViewModel.cs b/Models/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0AViewModel.cs index 3f3ff64..306b702 100644 --- a/Models/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0AViewModel.cs +++ b/Models/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0AViewModel.cs @@ -26,6 +26,8 @@ namespace TodoAPI2.Models public string txt_chief_a_date { get { return MyHelper.GetDateStringForReport(this.chief_a_date); } } + public string chief_a_reject_reason { get; set; } + public string chief_a_result_external_linkage_external_name { get; set; } } diff --git a/Models/external_linkage/external_linkageService.cs b/Models/external_linkage/external_linkageService.cs index fab603b..a9a2d94 100644 --- a/Models/external_linkage/external_linkageService.cs +++ b/Models/external_linkage/external_linkageService.cs @@ -272,13 +272,13 @@ namespace TodoAPI2.Models var i = new external_linkageViewModel(); i.external_id = 1; i.external_code = "Y"; - i.external_name = "เห็นด้วยกับข้อตกลงการประเมิน"; + i.external_name = "เห็นชอบ"; result.Add(i); var j = new external_linkageViewModel(); j.external_id = 2; j.external_code = "N"; - j.external_name = "ไม่เห็นด้วยและมีความเห็นต่าง"; + j.external_name = "ความเห็นอื่นๆ"; result.Add(j); return result; diff --git a/Views/eva_create_evaluation_detail_firstdocView/eva_create_evaluation_detail_firstdoc_d.cshtml b/Views/eva_create_evaluation_detail_firstdocView/eva_create_evaluation_detail_firstdoc_d.cshtml index dad0ae6..422d0d9 100644 --- a/Views/eva_create_evaluation_detail_firstdocView/eva_create_evaluation_detail_firstdoc_d.cshtml +++ b/Views/eva_create_evaluation_detail_firstdocView/eva_create_evaluation_detail_firstdoc_d.cshtml @@ -163,15 +163,16 @@
-
ข้อตกลงการปฏิบัติงาน
+
ข้อตกลงการปฏิบัติงาน
-
+
+ ขอเสนอข้อตกลงการปฏิบัติงานตามภารกิจที่รับผิดชอบ และหรือภารกิจที่ได้รับมอบหมายเป็นพิเศษดังนี้ - +
@@ -195,7 +196,7 @@
-
บันทึกผลการตรวจข้อตกลงการประเมิน
+
ส่วนที่ 2 ความเห็นของผู้บังคับบัญชา (ผู้ประเมินชั้นต้น)
@@ -209,19 +210,19 @@
- - + +
-
- - +
- - + +
@@ -246,20 +247,40 @@ -
-
- - +
+
- - - +
+
- +
+
+ + + + + + + + + + +
+
+
+
+ + +
+
+ +
+
-
+
+
@section FooterPlaceHolder{ @@ -273,15 +294,13 @@ var status_self_a = ""; var status_chief_a = ""; var role_code = ""; + var show_tool = true; $(document).ready(function () { var id = getUrlParameter("id"); if (id) { eva_create_evaluation_detail_firstdoc_SetEditForm(id); - eva_create_evaluation_detail_status_SetEditForm(id); - - eva_evaluation_operating_agreement_InitiateDataTable(); - eva_evaluation_operating_agreement_InitialForm(); + eva_create_evaluation_detail_status_SetEditForm(id); eva_create_evaluation_detail_review0A_SetEditForm(id); } else { @@ -300,6 +319,7 @@ $(".status_chief").hide(); $("#status").text(""); $(".approve_section").hide(); + $("#s2_text").hide(); if (role_code === "1") { // ผู้ประเมิน $(".approve_section").show(); @@ -316,6 +336,10 @@ $(".approve_item").prop("disabled", true); $(".status_chief").hide(); } + + $("#s1_text").text("ส่วนที่ 1 ข้อตกลงการปฏิบัติงาน"); + $("#s2_text").show(); + } else if (role_code === "") { // ผู้รับการประเมิน $(".status_self").show(); if (status_self_a === "Y") { @@ -333,7 +357,11 @@ $(".approve_item").prop("disabled", true); $(".status_self").show(); } + + } + + } diff --git a/wwwroot/js/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdoc_d.js b/wwwroot/js/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdoc_d.js index 1cc30f2..1530379 100644 --- a/wwwroot/js/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdoc_d.js +++ b/wwwroot/js/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdoc_d.js @@ -25,6 +25,13 @@ function eva_create_evaluation_detail_firstdoc_FeedDataToForm(data) { status_chief_a = data.status_chief_a; role_code = data.role_code; + if (role_code === "1") { + show_tool = false; + } + + eva_evaluation_operating_agreement_InitiateDataTable(); + eva_evaluation_operating_agreement_InitialForm(); + CheckPermission(); console.log(data); } diff --git a/wwwroot/js/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0A_d.js b/wwwroot/js/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0A_d.js index 02a90f9..1d56db8 100644 --- a/wwwroot/js/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0A_d.js +++ b/wwwroot/js/eva_create_evaluation_detail_review0A/eva_create_evaluation_detail_review0A_d.js @@ -10,6 +10,7 @@ function eva_create_evaluation_detail_review0A_FeedDataToForm(data) { DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_review0A_chief_a_result"), data, "id", "external_name", "item_chief_a_result", data.chief_a_result); $("#eva_create_evaluation_detail_review0A_chief_a_remark").val(data.chief_a_remark); $("#eva_create_evaluation_detail_review0A_chief_a_date").val(formatDate(data.chief_a_date)); + $("#eva_create_evaluation_detail_review0A_chief_a_reject_reason").val(data.chief_a_reject_reason); } @@ -21,7 +22,7 @@ function eva_create_evaluation_detail_review0A_GetFromForm() { eva_create_evaluation_detail_review0AObject.chief_a_result = $("#eva_create_evaluation_detail_review0A_chief_a_result").val(); eva_create_evaluation_detail_review0AObject.chief_a_remark = $("#eva_create_evaluation_detail_review0A_chief_a_remark").val(); eva_create_evaluation_detail_review0AObject.chief_a_date = getDate($("#eva_create_evaluation_detail_review0A_chief_a_date").val()); - + eva_create_evaluation_detail_review0AObject.chief_a_reject_reason = $("#eva_create_evaluation_detail_review0A_chief_a_reject_reason").val(); return eva_create_evaluation_detail_review0AObject; } diff --git a/wwwroot/js/eva_evaluation_operating_agreement/eva_evaluation_operating_agreement.js b/wwwroot/js/eva_evaluation_operating_agreement/eva_evaluation_operating_agreement.js index 62e02e2..7ece2e6 100644 --- a/wwwroot/js/eva_evaluation_operating_agreement/eva_evaluation_operating_agreement.js +++ b/wwwroot/js/eva_evaluation_operating_agreement/eva_evaluation_operating_agreement.js @@ -171,6 +171,7 @@ var eva_evaluation_operating_agreement_setupTable = function (result) { { "targets": 0, //1, "data": "id", + "visible": show_tool, "render": function (data, type, row, meta) { return " "; } @@ -186,7 +187,7 @@ var eva_evaluation_operating_agreement_setupTable = function (result) { "language": { "url": appsite + "/DataTables-1.10.16/thai.json" }, - "paging": true, + "paging": false, "searching": false, "bSort": false });