From 8735c12bd79cb2930d6107c61e19d07b1374d8d7 Mon Sep 17 00:00:00 2001 From: "LAPTOP-KB8JC2K2\\acer" Date: Fri, 27 Aug 2021 10:20:02 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=E0=B8=8A=E0=B9=88=E0=B8=AD=E0=B8=87=20=E0=B8=A7=E0=B8=B1?= =?UTF-8?q?=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B9=80=E0=B8=A3=E0=B8=B4?= =?UTF-8?q?=E0=B9=88=E0=B8=A1=E0=B8=A5=E0=B8=B2=20/=20=E0=B8=AA=E0=B8=B4?= =?UTF-8?q?=E0=B9=89=E0=B8=99=E0=B8=AA=E0=B8=B8=E0=B8=94=20=E0=B8=A5?= =?UTF-8?q?=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EXCEL/eva_performance_plan.xlsx | Bin 10263 -> 10421 bytes .../20210827031202_EnhancePlan.Designer.cs | 1081 +++++++++++++++++ Migrations/20210827031202_EnhancePlan.cs | 32 + Migrations/DataContextModelSnapshot.cs | 4 + .../eva_performance_planEntity.cs | 28 +- .../eva_performance_planInputModel.cs | 4 + .../eva_performance_planSearchModel.cs | 2 + .../eva_performance_planService.cs | 10 + .../eva_performance_planViewModel.cs | 12 +- .../eva_performance_plan.cshtml | 9 + .../eva_performance_plan_d.cshtml | 9 + .../eva_performance_plan.js | 4 + .../eva_performance_plan_d.js | 4 + 13 files changed, 1186 insertions(+), 13 deletions(-) create mode 100644 Migrations/20210827031202_EnhancePlan.Designer.cs create mode 100644 Migrations/20210827031202_EnhancePlan.cs diff --git a/EXCEL/eva_performance_plan.xlsx b/EXCEL/eva_performance_plan.xlsx index aa1a030a7454873d50d7fec4d1fb548c45e52bbd..a242efb2ed35524dc2f6a37020cb1d0291ce08e4 100644 GIT binary patch delta 2961 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�TdfMx_8q?SbOP~1)JR;w7x~HCom#mz9*Ej86h5T4Omu48r zp2K8~a*YnLXm02*18Kq@B{1Ag5%vCU-?*(n@o2TYtUnUJ^tSY}&^|A#d+x;@p)zMN zdnVKq(e#z;Ui7K%Fnkbx@ybj?1JN=Oue*je_pwTPX_Hl+P~oTLq@KrB7?&Y3$SXUl^wqc5;dRVGI?At(YP zDyhsaM=zUIyg-rj+(=$l26A)+hnB_lRVHdCDhp4xs=;~%E(#>$n5c8K_r7KrJFy4N zT@oB7h}+6)?!(jWaLvUB-vLeunPGnoo=fgIZh>(<5YY)K#el3oZP@{&z)*q);~l06 z#XnvTR=YnNI%VY4${*{n(<$zlEk!R5?t@cV=wyKWPL%OhW}3txJ8`KHzZ{@Gd86o;u%nMxi5c1@ePxq z0~E6=B0B>G=$MOu-;-)3QUTbLy(KLhI|FMRR0IG3xDNmT7ytkO0000000000000Y< z1tvuSm6J;*KmsrrlZ_@H8zfcb&LRQ;01X8I02BZK00000000000002dlgB1O0wo@k z3MWqjCm)krCpjFwp;>840RRA60ssIJ000000000000000068F&uqQnMx|8lFBL;aT H00000lFD^D delta 2847 zcmZ8jS5y;-5)BC*0wJMyDG34sL3)+m1f_SBUZe;?!-5bg280j{QKX6p;!*`9Q82Kw z3euz)I))B{3qhobw5R*_op;X8&&)Y<=V$J@cZOvD@N&ZxGm|=NnaVtImRS_z9aW^l zn^@X>di%((<5mU3or|`{q!1cE$@_J>uLk{YaDJ!N7i3N?;Ixhmc3`q$e0Zzg4losFDbbk|!LgXi8=iyusw0CLgvNe|1@G6I ze$KAdNvIuw36f{Cu|^&w7h}sAk>MkKO_tpRR35d+yp_4CI;vvmK`(&-t6I2!w$OZ) zxAK+=w|IuLx?7_t1)u6I;(pv#i~zzfAHMLiw}+agQ=BA8V!Qjj)m`F2qNd?qAFn9D z<<`aSLDE3dR>rDC80Lwpzw9^G>_68w_WP7OoIZHHue=tsuUpb(n7-AyQ*hMXICg4u zTV{C66M}kM(}EE)9D?~OG~I3go zA(bvXrdkt!UF`*{n2NAEZeU(z_xhXec=IZH?u9zCxx2!lHQJ7I!);opryEk{V}f(^ z5@-Vd@dvooS-@d8;i{1@=c@0Zfi4L&*z7;9*%mpM?>%^U(%Nq(D;l!aIZ z;(f8gb{>dniB2IOfdGIsFaRJ30082`mC;c#*H9sWfw3s%zY|g^E+V|x^;*=F3h%K& z=;@hn`zy8~JiZ<_XPYk;j_Df|U40V<4aO%&Qcn)+OIYp_N#TwHEVC&51}aK4_=v83 zHybps9T=J+N;PM;k|tNKX_#Iy7*tXs5HK9Y_0jzf&?gcy7Mt*>SzHdza9P(lje$K> z{7DI9vb*V9hy}E`NKyK%sRj<=_U2MM=^GA4ajB3YdrfoIGE#Z@*rk*3%+ui^rj?3Q z2pPURtOz8(%IPhO7ZeAZC#WT8f9c+&*}Gg$85gz6g>v(2iRzIM$Yx3cHRs(&X8BaY!7nyoM1^xD`w+$bhLv8U>w`x&k0ZbL4M;QsmRs|Pa*Gn_W?W?3p}(Em?tWmg*6uk|zXxi!3*kE)sa z=4I+htect8?|y}T$q4@eJhR@)W$xdw%av<5(e8RhF*GZmaL;Ojkc;H%K-s=Zqj}zH_zjzRk$LvL-#LqH z4K3yeeQ9Eei5X2989hk7ufFZNYhYrVIG>xvVc)^`RRuUCE3+!0Lv@rRR{=g(?0h`ckMWs)Pf5W`<6QMv{+$czve7dZ#W4 zJa}whla;fy^-y^Xuj4m1dx>ZW_}eeaA$lB`JUb+6iU9!NX9NIv|LYg15Z{=<0LR#v z(8yraFRuu9?8xLrLfSY^OuA_s?q)n|bOu+8hn+?fliLs~iJBbSYWq=V!^(b0KjGde zF%IIw$aiOFcFD08pT*HLlk2)${iV(N+X0!dBord;;XFhu5t4lz=gCGoi&-5Gi{8+X z?NW6{PRh%z0YvH2*xp z=#Xr($(B@y__bjb{d*um%z{oyAGJNO?R9ATH+GraG5r}ww|g`gO zpZl&6=y3R{J#h9me-D+t>BQzpXHvDt_%Nk*>jngk?WMe3y)$&dlzQp-dk}jzLI4!_ z{dwOXKgm8lB|Zf~UYr-_1u`1x5DZ?}NUAYl5M|u%R`TLsGOaBclPBEwnzJ*+`ZOwz z6N)RqRTmWX_Xi4erGslyYg3g~$YDj?Y7x#*ngZG`a3!9z_qn zaaW=7`UF3`HKXkuapz`J12n#IEq6xv%b-p|Z@Qg7>9~0tX1wBt zN%2q7#_C@E-9k#|43h-m2X#dM!gWq{%gX}`TA5op}*L99=KR^T#zYBM%dH;}_1 zqx|q{&F};{Vx%&Wv(&IFs_6aaq|pWkTAkKoDOhm~s9(ME6UX}0Q)YaZE!3(ZnMj02i=2B z(F32Bu11IEE7~+wtQF7n!{42Myo$PVf?W{#TT|Uqx}bl)PFA=B!xYgIeoo}yH~Hu0 z{|PX$9Bu|Qgb*7ce8f|@Ja9^YsDO|V`L`h=B+rV7eI5NL-fq0U-~(D^5H> mXp8=$&-$m1J%9iJ&;Q{+t0D=aot!>{C=n+o%{(phtM?zJDl&Bd diff --git a/Migrations/20210827031202_EnhancePlan.Designer.cs b/Migrations/20210827031202_EnhancePlan.Designer.cs new file mode 100644 index 0000000..39fbcd8 --- /dev/null +++ b/Migrations/20210827031202_EnhancePlan.Designer.cs @@ -0,0 +1,1081 @@ +// +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("20210827031202_EnhancePlan")] + partial class EnhancePlan + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn) + .HasAnnotation("ProductVersion", "2.2.6-servicing-10079") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + modelBuilder.Entity("TodoAPI2.Models.activity_log_evaEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("causer_id"); + + b.Property("causer_type") + .HasMaxLength(191); + + b.Property("created_at"); + + b.Property("description") + .HasMaxLength(4000); + + b.Property("ip_address") + .HasMaxLength(191); + + b.Property("log_name") + .HasMaxLength(191); + + b.Property("mac_address") + .HasMaxLength(191); + + b.Property("properties") + .HasMaxLength(8000); + + b.Property("subject_id"); + + b.Property("subject_type") + .HasMaxLength(191); + + b.Property("updated_at"); + + b.HasKey("id"); + + b.ToTable("activity_log_eva"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b => + { + b.Property("id"); + + b.Property("command_no") + .HasMaxLength(4000); + + b.Property("create_evaluation_id"); + + b.Property("created"); + + b.Property("fiscal_year"); + + b.Property("imported_date"); + + b.Property("imported_file") + .HasMaxLength(1000); + + b.Property("isActive"); + + b.Property("limit"); + + b.Property("limit_frame"); + + b.Property("limit_frame_quota"); + + b.Property("limit_quota"); + + b.Property("managed_by"); + + b.Property("percentage"); + + b.Property("report_type") + .HasMaxLength(1000); + + b.Property("theDate"); + + b.Property("theRound"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_id"); + + b.ToTable("eva_adjust_postponement"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponement_detailEntity", b => + { + b.Property("id"); + + b.Property("achievement_final"); + + b.Property("adjust_postponement_id"); + + b.Property("adjust_postponement_quota_id"); + + b.Property("competency_final"); + + b.Property("cost_living"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("employee_no_at_this_time") + .HasMaxLength(1000); + + b.Property("fullname_at_this_time") + .HasMaxLength(1000); + + b.Property("isActive"); + + b.Property("is_for_postponement"); + + b.Property("level_score_final") + .HasMaxLength(255); + + b.Property("level_this_time") + .HasMaxLength(1000); + + b.Property("middle"); + + b.Property("migration_eva_result") + .HasMaxLength(1000); + + b.Property("migration_total_score"); + + b.Property("new_cost_living"); + + b.Property("new_sarary"); + + b.Property("new_sarary_with_quota"); + + b.Property("order_at_this_time"); + + b.Property("org_at_this_time"); + + b.Property("other_money_at_this_time"); + + b.Property("position_allowance_at_this_time"); + + b.Property("position_this_time") + .HasMaxLength(1000); + + b.Property("promoted_percentage"); + + b.Property("receive_quota"); + + b.Property("remark") + .HasMaxLength(1000); + + b.Property("sarary"); + + b.Property("score_final"); + + b.Property("total_promote"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("adjust_postponement_id"); + + b.HasIndex("adjust_postponement_quota_id"); + + b.ToTable("eva_adjust_postponement_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b => + { + b.Property("id"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("evaluation_group_id"); + + b.Property("isActive"); + + b.Property("performance_plan_id"); + + b.Property("score1"); + + b.Property("score2"); + + b.Property("supervisor1_id"); + + b.Property("supervisor2_id"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("evaluation_group_id"); + + b.HasIndex("performance_plan_id"); + + b.ToTable("eva_create_evaluation"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detailEntity", b => + { + b.Property("id"); + + b.Property("Final_summary_chief"); + + b.Property("Final_summary_competency_chief"); + + b.Property("Final_summary_competency_supervisor"); + + b.Property("Final_summary_competency_supervisor1A"); + + b.Property("Final_summary_competency_supervisor2A"); + + b.Property("Final_summary_supervisor"); + + b.Property("Final_summary_supervisor1A"); + + b.Property("Final_summary_supervisor2A"); + + b.Property("achievement_chief"); + + b.Property("achievement_supervisor"); + + b.Property("achievement_supervisor1A"); + + b.Property("achievement_supervisor2A"); + + b.Property("chief"); + + b.Property("chief_a"); + + b.Property("chief_a_date"); + + b.Property("chief_a_reject_reason") + .HasMaxLength(1000); + + b.Property("chief_a_remark") + .HasMaxLength(1000); + + b.Property("chief_a_result") + .HasMaxLength(1); + + b.Property("competency_chief"); + + b.Property("competency_supervisor"); + + b.Property("competency_supervisor1A"); + + b.Property("competency_supervisor2A"); + + b.Property("create_evaluation_id"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("eva_employee_id"); + + b.Property("help_org_id"); + + b.Property("isActive"); + + b.Property("level_score_chief") + .HasMaxLength(255); + + b.Property("level_score_supervisor") + .HasMaxLength(255); + + b.Property("level_score_supervisor1A") + .HasMaxLength(255); + + b.Property("level_score_supervisor2A") + .HasMaxLength(255); + + b.Property("order_of_data"); + + b.Property("score_chief"); + + b.Property("score_supervisor"); + + b.Property("score_supervisor1A"); + + b.Property("score_supervisor2A"); + + b.Property("status_chief") + .HasMaxLength(1); + + b.Property("status_chief_a") + .HasMaxLength(1); + + b.Property("status_chief_a_click_date"); + + b.Property("status_chief_click_date"); + + b.Property("status_self") + .HasMaxLength(1); + + b.Property("status_self_a") + .HasMaxLength(1); + + b.Property("status_self_a_click_date"); + + b.Property("status_self_click_date"); + + b.Property("status_supervisor") + .HasMaxLength(1); + + b.Property("status_supervisor1A") + .HasMaxLength(1); + + b.Property("status_supervisor1A_click_date"); + + b.Property("status_supervisor2A") + .HasMaxLength(1); + + b.Property("status_supervisor2A_click_date"); + + b.Property("status_supervisor_click_date"); + + b.Property("supervisor1"); + + b.Property("supervisor1A"); + + b.Property("supervisor1A_date"); + + b.Property("supervisor1A_remark") + .HasMaxLength(1000); + + b.Property("supervisor1A_result") + .HasMaxLength(1); + + b.Property("supervisor1_date"); + + b.Property("supervisor1_id"); + + b.Property("supervisor1_remark") + .HasMaxLength(1000); + + b.Property("supervisor1_result") + .HasMaxLength(1); + + b.Property("supervisor2"); + + b.Property("supervisor2A"); + + b.Property("supervisor2A_date"); + + b.Property("supervisor2A_remark") + .HasMaxLength(1000); + + b.Property("supervisor2A_result") + .HasMaxLength(1); + + b.Property("supervisor2_date"); + + b.Property("supervisor2_id"); + + b.Property("supervisor2_remark") + .HasMaxLength(1000); + + b.Property("supervisor2_result") + .HasMaxLength(1); + + b.Property("total_summary_chief"); + + b.Property("total_summary_competency_chief"); + + b.Property("total_summary_competency_supervisor"); + + b.Property("total_summary_competency_supervisor1A"); + + b.Property("total_summary_competency_supervisor2A"); + + b.Property("total_summary_supervisor"); + + b.Property("total_summary_supervisor1A"); + + b.Property("total_summary_supervisor2A"); + + b.Property("updated"); + + b.Property("work_period"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_id"); + + b.ToTable("eva_create_evaluation_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detail_historyEntity", b => + { + b.Property("id"); + + b.Property("action_detail") + .HasMaxLength(4000); + + b.Property("action_dt"); + + b.Property("action_emp_id"); + + b.Property("created"); + + b.Property("evaluation_detail_id"); + + b.Property("isActive"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("evaluation_detail_id"); + + b.ToTable("eva_create_evaluation_detail_history"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b => + { + b.Property("id"); + + b.Property("achievement") + .HasMaxLength(8000); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("score"); + + b.Property("score2"); + + b.Property("score3"); + + b.Property("score4"); + + b.Property("sumary"); + + b.Property("sumary2"); + + b.Property("sumary3"); + + b.Property("sumary4"); + + b.Property("target_score1") + .HasMaxLength(255); + + b.Property("target_score2") + .HasMaxLength(255); + + b.Property("target_score3") + .HasMaxLength(255); + + b.Property("target_score4") + .HasMaxLength(255); + + b.Property("target_score5") + .HasMaxLength(255); + + b.Property("thefile") + .HasMaxLength(1000); + + b.Property("updated"); + + b.Property("weight"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_detail_id"); + + b.ToTable("eva_evaluation_achievement"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievement_attachEntity", b => + { + b.Property("id"); + + b.Property("achievement_id"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("the_file") + .HasMaxLength(1000); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("achievement_id"); + + b.ToTable("eva_evaluation_achievement_attach"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b => + { + b.Property("id"); + + b.Property("behavior") + .HasMaxLength(1000); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("score"); + + b.Property("score2"); + + b.Property("score3"); + + b.Property("score4"); + + b.Property("sumary"); + + b.Property("sumary2"); + + b.Property("sumary3"); + + b.Property("sumary4"); + + b.Property("target_score1") + .HasMaxLength(255); + + b.Property("target_score2") + .HasMaxLength(255); + + b.Property("target_score3") + .HasMaxLength(255); + + b.Property("target_score4") + .HasMaxLength(255); + + b.Property("target_score5") + .HasMaxLength(255); + + b.Property("updated"); + + b.Property("weight"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_detail_id"); + + b.ToTable("eva_evaluation_behavior"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_groupEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("code") + .HasMaxLength(255); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("main_dept_id"); + + b.Property("percentage"); + + b.Property("thegroup") + .HasMaxLength(255); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_evaluation_group"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("evaluation_group_id"); + + b.Property("isActive"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("evaluation_group_id"); + + b.ToTable("eva_evaluation_group_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_operating_agreementEntity", b => + { + b.Property("id"); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("indicators") + .HasMaxLength(4000); + + b.Property("isActive"); + + b.Property("mission_detail") + .HasMaxLength(4000); + + b.Property("mission_no"); + + b.Property("target") + .HasMaxLength(4000); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_detail_id"); + + b.ToTable("eva_evaluation_operating_agreement"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_idp_planEntity", b => + { + b.Property("id"); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("develop") + .HasMaxLength(1000); + + b.Property("development_method") + .HasMaxLength(1000); + + b.Property("end_date"); + + b.Property("isActive"); + + b.Property("period_text") + .HasMaxLength(1000); + + b.Property("start_date"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_idp_plan"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_level_scoreEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("code") + .HasMaxLength(255); + + b.Property("created"); + + b.Property("detail") + .HasMaxLength(1000); + + b.Property("isActive"); + + b.Property("max_score"); + + b.Property("min_score"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_level_score"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b => + { + b.Property("id"); + + b.Property("cost_of_living"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("frame_group_guid"); + + b.Property("help_org_id"); + + b.Property("isActive"); + + b.Property("level_text") + .HasMaxLength(1000); + + b.Property("monthly_remuneration"); + + b.Property("order_of_data"); + + b.Property("org_id"); + + b.Property("position_allowance"); + + b.Property("position_text") + .HasMaxLength(1000); + + b.Property("salary"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("frame_group_guid"); + + b.ToTable("eva_limit_frame_employee"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b => + { + b.Property("id"); + + b.Property("created"); + + b.Property("frame_plan_guid"); + + b.Property("group_guid"); + + b.Property("isActive"); + + b.Property("limit_frame_295"); + + b.Property("main_dept_id"); + + b.Property("remark") + .HasMaxLength(4000); + + b.Property("total_salary"); + + b.Property("total_salary_limit"); + + b.Property("total_salary_limit_rounded"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("frame_plan_guid"); + + b.HasIndex("group_guid"); + + b.ToTable("eva_limit_frame_group"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b => + { + b.Property("id"); + + b.Property("created"); + + b.Property("executed_date"); + + b.Property("isActive"); + + b.Property("limit_frame_005"); + + b.Property("limit_frame_005_total"); + + b.Property("limit_frame_005_total_rounded"); + + b.Property("plan_guid"); + + b.Property("salary_adjustment_date"); + + b.Property("status_chief") + .HasMaxLength(1); + + b.Property("status_self") + .HasMaxLength(1); + + b.Property("supervisor1"); + + b.Property("supervisor1_date"); + + b.Property("supervisor1_remark") + .HasMaxLength(1000); + + b.Property("supervisor1_result") + .HasMaxLength(1); + + b.Property("total_salary"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("plan_guid"); + + b.ToTable("eva_limit_frame_plan"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_performance_planEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("created"); + + b.Property("end_leave"); + + b.Property("fiscal_year"); + + b.Property("isActive"); + + b.Property("percent"); + + b.Property("start_leave"); + + b.Property("theTime"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_performance_plan"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("created"); + + b.Property("end_date"); + + b.Property("isActive"); + + b.Property("list_no"); + + b.Property("performance_plan_id"); + + b.Property("remark") + .HasMaxLength(1000); + + b.Property("start_date"); + + b.Property("step") + .HasMaxLength(1000); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("performance_plan_id"); + + b.ToTable("eva_performance_plan_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_promoted_percentageEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("code") + .HasMaxLength(255); + + b.Property("created"); + + b.Property("detail") + .HasMaxLength(1000); + + b.Property("isActive"); + + b.Property("level_score_id"); + + b.Property("max_score"); + + b.Property("min_score"); + + b.Property("promoted_percentage"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("level_score_id"); + + b.ToTable("eva_promoted_percentage"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_salary_cylinderEntity", b => + { + b.Property("id"); + + b.Property("cost_living"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("middle"); + + b.Property("monthly_compensation"); + + b.Property("position_allowance"); + + b.Property("position_level"); + + b.Property("position_type"); + + b.Property("salary_max"); + + b.Property("temporary_min"); + + b.Property("themax"); + + b.Property("themin"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_salary_cylinder"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluationEntity", "eva_create_evaluation") + .WithMany() + .HasForeignKey("create_evaluation_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponement_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement") + .WithMany() + .HasForeignKey("adjust_postponement_id"); + + b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement_quota") + .WithMany() + .HasForeignKey("adjust_postponement_quota_id") + .HasConstraintName("FK_eva_adjust_postponement_detail_eva_adjust_postponement_adj~1"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group") + .WithMany() + .HasForeignKey("evaluation_group_id"); + + b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan") + .WithMany() + .HasForeignKey("performance_plan_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluationEntity", "eva_create_evaluation_create_evaluation_id") + .WithMany() + .HasForeignKey("create_evaluation_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detail_historyEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail_evaluation_detail_id") + .WithMany() + .HasForeignKey("evaluation_detail_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail") + .WithMany() + .HasForeignKey("create_evaluation_detail_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievement_attachEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_evaluation_achievementEntity", "eva_evaluation_achievement_achievement_id") + .WithMany() + .HasForeignKey("achievement_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail") + .WithMany() + .HasForeignKey("create_evaluation_detail_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group") + .WithMany() + .HasForeignKey("evaluation_group_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_operating_agreementEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail_create_evaluation_detail_id") + .WithMany() + .HasForeignKey("create_evaluation_detail_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_limit_frame_groupEntity", "eva_limit_frame_group_frame_group_guid") + .WithMany() + .HasForeignKey("frame_group_guid"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_limit_frame_planEntity", "eva_limit_frame_plan_frame_plan_guid") + .WithMany() + .HasForeignKey("frame_plan_guid"); + + b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group_group_guid") + .WithMany() + .HasForeignKey("group_guid"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan_plan_guid") + .WithMany() + .HasForeignKey("plan_guid"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan") + .WithMany() + .HasForeignKey("performance_plan_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_promoted_percentageEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_level_scoreEntity", "eva_level_score") + .WithMany() + .HasForeignKey("level_score_id"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Migrations/20210827031202_EnhancePlan.cs b/Migrations/20210827031202_EnhancePlan.cs new file mode 100644 index 0000000..97e832e --- /dev/null +++ b/Migrations/20210827031202_EnhancePlan.cs @@ -0,0 +1,32 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace tb320eva.Migrations +{ + public partial class EnhancePlan : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "end_leave", + table: "eva_performance_plan", + nullable: true); + + migrationBuilder.AddColumn( + name: "start_leave", + table: "eva_performance_plan", + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "end_leave", + table: "eva_performance_plan"); + + migrationBuilder.DropColumn( + name: "start_leave", + table: "eva_performance_plan"); + } + } +} diff --git a/Migrations/DataContextModelSnapshot.cs b/Migrations/DataContextModelSnapshot.cs index a26f068..241cba4 100644 --- a/Migrations/DataContextModelSnapshot.cs +++ b/Migrations/DataContextModelSnapshot.cs @@ -838,12 +838,16 @@ namespace tb320eva.Migrations b.Property("created"); + b.Property("end_leave"); + b.Property("fiscal_year"); b.Property("isActive"); b.Property("percent"); + b.Property("start_leave"); + b.Property("theTime"); b.Property("updated"); diff --git a/Models/eva_performance_plan/eva_performance_planEntity.cs b/Models/eva_performance_plan/eva_performance_planEntity.cs index f77b9ac..37fd2d5 100644 --- a/Models/eva_performance_plan/eva_performance_planEntity.cs +++ b/Models/eva_performance_plan/eva_performance_planEntity.cs @@ -15,26 +15,30 @@ namespace TodoAPI2.Models public class eva_performance_planEntity : BaseEntity { + public int? fiscal_year { get; set; } public int? theTime { get; set; } public decimal? percent { get; set; } + public DateTime? start_leave { get; set; } + + public DateTime? end_leave { get; set; } + [NotMapped] - public string display_text + public string display_text { get; set; } + + + public void SetAutoField(DataContext context) { - get - { - if(!theTime.HasValue || !fiscal_year.HasValue) - { - return ""; - } - else - { - return theTime.ToString() + "/" + fiscal_year.ToString(); - } - } + } + + public void DoAfterInsertUpdate(DataContext context) + { + + } + } } diff --git a/Models/eva_performance_plan/eva_performance_planInputModel.cs b/Models/eva_performance_plan/eva_performance_planInputModel.cs index c4d4220..4f5cc9c 100644 --- a/Models/eva_performance_plan/eva_performance_planInputModel.cs +++ b/Models/eva_performance_plan/eva_performance_planInputModel.cs @@ -22,6 +22,10 @@ namespace TodoAPI2.Models public decimal? percent { get; set; } + public DateTime? start_leave { get; set; } + + public DateTime? end_leave { get; set; } + public string active_mode { get; set; } } } diff --git a/Models/eva_performance_plan/eva_performance_planSearchModel.cs b/Models/eva_performance_plan/eva_performance_planSearchModel.cs index 5108fb8..3e8fc69 100644 --- a/Models/eva_performance_plan/eva_performance_planSearchModel.cs +++ b/Models/eva_performance_plan/eva_performance_planSearchModel.cs @@ -14,6 +14,8 @@ namespace TodoAPI2.Models public class eva_performance_planSearchModel { + public Guid id { get; set; } + public int? fiscal_year { get; set; } public int? theTime { get; set; } diff --git a/Models/eva_performance_plan/eva_performance_planService.cs b/Models/eva_performance_plan/eva_performance_planService.cs index 2395646..7afaa6f 100644 --- a/Models/eva_performance_plan/eva_performance_planService.cs +++ b/Models/eva_performance_plan/eva_performance_planService.cs @@ -99,6 +99,8 @@ namespace TodoAPI2.Models fiscal_year = m_eva_performance_plan.fiscal_year, theTime = m_eva_performance_plan.theTime, percent = m_eva_performance_plan.percent, + start_leave = m_eva_performance_plan.start_leave, + end_leave = m_eva_performance_plan.end_leave, isActive = m_eva_performance_plan.isActive, Created = m_eva_performance_plan.created, @@ -124,6 +126,8 @@ namespace TodoAPI2.Models fiscal_year = m_eva_performance_plan.fiscal_year, theTime = m_eva_performance_plan.theTime, percent = m_eva_performance_plan.percent, + start_leave = m_eva_performance_plan.start_leave, + end_leave = m_eva_performance_plan.end_leave, isActive = m_eva_performance_plan.isActive, Created = m_eva_performance_plan.created, @@ -152,6 +156,8 @@ namespace TodoAPI2.Models fiscal_year = m_eva_performance_plan.fiscal_year, theTime = m_eva_performance_plan.theTime, percent = m_eva_performance_plan.percent, + start_leave = m_eva_performance_plan.start_leave, + end_leave = m_eva_performance_plan.end_leave, isActive = m_eva_performance_plan.isActive, Created = m_eva_performance_plan.created, @@ -185,6 +191,8 @@ namespace TodoAPI2.Models existingEntity.fiscal_year = model.fiscal_year; existingEntity.theTime = model.theTime; existingEntity.percent = model.percent; + existingEntity.start_leave = model.start_leave; + existingEntity.end_leave = model.end_leave; var updated = _repository.Update(id, existingEntity); return Get(updated.id); @@ -205,6 +213,8 @@ namespace TodoAPI2.Models existingEntity.fiscal_year = i.fiscal_year; existingEntity.theTime = i.theTime; existingEntity.percent = i.percent; + existingEntity.start_leave = i.start_leave; + existingEntity.end_leave = i.end_leave; _repository.UpdateWithoutCommit(i.id.Value, existingEntity); } diff --git a/Models/eva_performance_plan/eva_performance_planViewModel.cs b/Models/eva_performance_plan/eva_performance_planViewModel.cs index 7a1fc8d..7a18268 100644 --- a/Models/eva_performance_plan/eva_performance_planViewModel.cs +++ b/Models/eva_performance_plan/eva_performance_planViewModel.cs @@ -11,7 +11,7 @@ using TTSW.Common; namespace TodoAPI2.Models { - public class eva_performance_planViewModel : BaseViewModel + public class eva_performance_planViewModel : BaseViewModel2 { public int? fiscal_year { get; set; } @@ -19,5 +19,15 @@ namespace TodoAPI2.Models public int? theTime { get; set; } public decimal? percent { get; set; } + + public DateTime? start_leave { get; set; } + + public string txt_start_leave { get { return MyHelper.GetDateStringForReport(this.start_leave); } } + + public DateTime? end_leave { get; set; } + + public string txt_end_leave { get { return MyHelper.GetDateStringForReport(this.end_leave); } } + + } } \ No newline at end of file diff --git a/Views/eva_performance_planView/eva_performance_plan.cshtml b/Views/eva_performance_planView/eva_performance_plan.cshtml index 9ae5f7e..51aed10 100644 --- a/Views/eva_performance_planView/eva_performance_plan.cshtml +++ b/Views/eva_performance_planView/eva_performance_plan.cshtml @@ -34,6 +34,15 @@ +
+ + +
+ +
+ + +
diff --git a/Views/eva_performance_planView/eva_performance_plan_d.cshtml b/Views/eva_performance_planView/eva_performance_plan_d.cshtml index 5d5d337..8f34069 100644 --- a/Views/eva_performance_planView/eva_performance_plan_d.cshtml +++ b/Views/eva_performance_planView/eva_performance_plan_d.cshtml @@ -105,6 +105,15 @@ +
+ + +
+ +
+ + +
diff --git a/wwwroot/js/eva_performance_plan/eva_performance_plan.js b/wwwroot/js/eva_performance_plan/eva_performance_plan.js index 250c6e6..23ddf09 100644 --- a/wwwroot/js/eva_performance_plan/eva_performance_plan.js +++ b/wwwroot/js/eva_performance_plan/eva_performance_plan.js @@ -24,6 +24,8 @@ function eva_performance_plan_FeedDataToForm(data) { $("#eva_performance_plan_fiscal_year").val(data.fiscal_year); $("#eva_performance_plan_theTime").val(data.theTime); $("#eva_performance_plan_percent").val(data.percent); + $("#eva_performance_plan_start_leave").val(formatDate(data.start_leave)); + $("#eva_performance_plan_end_leave").val(formatDate(data.end_leave)); } function eva_performance_plan_GetFromForm() { @@ -32,6 +34,8 @@ function eva_performance_plan_GetFromForm() { eva_performance_planObject.fiscal_year = $("#eva_performance_plan_fiscal_year").val(); eva_performance_planObject.theTime = $("#eva_performance_plan_theTime").val(); eva_performance_planObject.percent = $("#eva_performance_plan_percent").val(); + eva_performance_planObject.start_leave = getDate($("#eva_performance_plan_start_leave").val()); + eva_performance_planObject.end_leave = getDate($("#eva_performance_plan_end_leave").val()); return eva_performance_planObject; } diff --git a/wwwroot/js/eva_performance_plan/eva_performance_plan_d.js b/wwwroot/js/eva_performance_plan/eva_performance_plan_d.js index 272e5a0..1a7673a 100644 --- a/wwwroot/js/eva_performance_plan/eva_performance_plan_d.js +++ b/wwwroot/js/eva_performance_plan/eva_performance_plan_d.js @@ -8,6 +8,8 @@ function eva_performance_plan_FeedDataToForm(data) { $("#eva_performance_plan_fiscal_year").val(data.fiscal_year); $("#eva_performance_plan_theTime").val(data.theTime); $("#eva_performance_plan_percent").val(data.percent); + $("#eva_performance_plan_start_leave").val(formatDate(data.start_leave)); + $("#eva_performance_plan_end_leave").val(formatDate(data.end_leave)); } function eva_performance_plan_GetFromForm() { @@ -16,6 +18,8 @@ function eva_performance_plan_GetFromForm() { eva_performance_planObject.fiscal_year = $("#eva_performance_plan_fiscal_year").val(); eva_performance_planObject.theTime = $("#eva_performance_plan_theTime").val(); eva_performance_planObject.percent = $("#eva_performance_plan_percent").val(); + eva_performance_planObject.start_leave = getDate($("#eva_performance_plan_start_leave").val()); + eva_performance_planObject.end_leave = getDate($("#eva_performance_plan_end_leave").val()); return eva_performance_planObject; }