diff --git a/EXCEL/eva_performance_plan.xlsx b/EXCEL/eva_performance_plan.xlsx
index aa1a030..a242efb 100644
Binary files a/EXCEL/eva_performance_plan.xlsx and b/EXCEL/eva_performance_plan.xlsx differ
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 @@
+// <auto-generated />
+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<int>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int?>("causer_id");
+
+                    b.Property<string>("causer_type")
+                        .HasMaxLength(191);
+
+                    b.Property<DateTime?>("created_at");
+
+                    b.Property<string>("description")
+                        .HasMaxLength(4000);
+
+                    b.Property<string>("ip_address")
+                        .HasMaxLength(191);
+
+                    b.Property<string>("log_name")
+                        .HasMaxLength(191);
+
+                    b.Property<string>("mac_address")
+                        .HasMaxLength(191);
+
+                    b.Property<string>("properties")
+                        .HasMaxLength(8000);
+
+                    b.Property<int?>("subject_id");
+
+                    b.Property<string>("subject_type")
+                        .HasMaxLength(191);
+
+                    b.Property<DateTime?>("updated_at");
+
+                    b.HasKey("id");
+
+                    b.ToTable("activity_log_eva");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("command_no")
+                        .HasMaxLength(4000);
+
+                    b.Property<int?>("create_evaluation_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("fiscal_year");
+
+                    b.Property<DateTime?>("imported_date");
+
+                    b.Property<string>("imported_file")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit");
+
+                    b.Property<decimal?>("limit_frame");
+
+                    b.Property<decimal?>("limit_frame_quota");
+
+                    b.Property<decimal?>("limit_quota");
+
+                    b.Property<int?>("managed_by");
+
+                    b.Property<decimal?>("percentage");
+
+                    b.Property<string>("report_type")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("theDate");
+
+                    b.Property<int?>("theRound");
+
+                    b.Property<DateTime>("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<int>("id");
+
+                    b.Property<decimal?>("achievement_final");
+
+                    b.Property<int?>("adjust_postponement_id");
+
+                    b.Property<int?>("adjust_postponement_quota_id");
+
+                    b.Property<decimal?>("competency_final");
+
+                    b.Property<decimal?>("cost_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<string>("employee_no_at_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("fullname_at_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<bool?>("is_for_postponement");
+
+                    b.Property<string>("level_score_final")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("middle");
+
+                    b.Property<string>("migration_eva_result")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("migration_total_score");
+
+                    b.Property<decimal?>("new_cost_living");
+
+                    b.Property<decimal?>("new_sarary");
+
+                    b.Property<decimal?>("new_sarary_with_quota");
+
+                    b.Property<int?>("order_at_this_time");
+
+                    b.Property<int?>("org_at_this_time");
+
+                    b.Property<decimal?>("other_money_at_this_time");
+
+                    b.Property<decimal?>("position_allowance_at_this_time");
+
+                    b.Property<string>("position_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("promoted_percentage");
+
+                    b.Property<decimal?>("receive_quota");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("sarary");
+
+                    b.Property<decimal?>("score_final");
+
+                    b.Property<decimal?>("total_promote");
+
+                    b.Property<DateTime>("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<int>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("evaluation_group_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<Guid?>("performance_plan_id");
+
+                    b.Property<decimal?>("score1");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<int?>("supervisor1_id");
+
+                    b.Property<int?>("supervisor2_id");
+
+                    b.Property<DateTime>("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<int>("id");
+
+                    b.Property<decimal?>("Final_summary_chief");
+
+                    b.Property<decimal?>("Final_summary_competency_chief");
+
+                    b.Property<decimal?>("Final_summary_competency_supervisor");
+
+                    b.Property<decimal?>("Final_summary_competency_supervisor1A");
+
+                    b.Property<decimal?>("Final_summary_competency_supervisor2A");
+
+                    b.Property<decimal?>("Final_summary_supervisor");
+
+                    b.Property<decimal?>("Final_summary_supervisor1A");
+
+                    b.Property<decimal?>("Final_summary_supervisor2A");
+
+                    b.Property<decimal?>("achievement_chief");
+
+                    b.Property<decimal?>("achievement_supervisor");
+
+                    b.Property<decimal?>("achievement_supervisor1A");
+
+                    b.Property<decimal?>("achievement_supervisor2A");
+
+                    b.Property<int?>("chief");
+
+                    b.Property<int?>("chief_a");
+
+                    b.Property<DateTime?>("chief_a_date");
+
+                    b.Property<string>("chief_a_reject_reason")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("chief_a_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("chief_a_result")
+                        .HasMaxLength(1);
+
+                    b.Property<decimal?>("competency_chief");
+
+                    b.Property<decimal?>("competency_supervisor");
+
+                    b.Property<decimal?>("competency_supervisor1A");
+
+                    b.Property<decimal?>("competency_supervisor2A");
+
+                    b.Property<int?>("create_evaluation_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<int?>("eva_employee_id");
+
+                    b.Property<int?>("help_org_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_score_chief")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor1A")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor2A")
+                        .HasMaxLength(255);
+
+                    b.Property<int?>("order_of_data");
+
+                    b.Property<decimal?>("score_chief");
+
+                    b.Property<decimal?>("score_supervisor");
+
+                    b.Property<decimal?>("score_supervisor1A");
+
+                    b.Property<decimal?>("score_supervisor2A");
+
+                    b.Property<string>("status_chief")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_chief_a")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_chief_a_click_date");
+
+                    b.Property<DateTime?>("status_chief_click_date");
+
+                    b.Property<string>("status_self")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_self_a")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_self_a_click_date");
+
+                    b.Property<DateTime?>("status_self_click_date");
+
+                    b.Property<string>("status_supervisor")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_supervisor1A")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_supervisor1A_click_date");
+
+                    b.Property<string>("status_supervisor2A")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_supervisor2A_click_date");
+
+                    b.Property<DateTime?>("status_supervisor_click_date");
+
+                    b.Property<int?>("supervisor1");
+
+                    b.Property<int?>("supervisor1A");
+
+                    b.Property<DateTime?>("supervisor1A_date");
+
+                    b.Property<string>("supervisor1A_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1A_result")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("supervisor1_date");
+
+                    b.Property<int?>("supervisor1_id");
+
+                    b.Property<string>("supervisor1_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1_result")
+                        .HasMaxLength(1);
+
+                    b.Property<int?>("supervisor2");
+
+                    b.Property<int?>("supervisor2A");
+
+                    b.Property<DateTime?>("supervisor2A_date");
+
+                    b.Property<string>("supervisor2A_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor2A_result")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("supervisor2_date");
+
+                    b.Property<int?>("supervisor2_id");
+
+                    b.Property<string>("supervisor2_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor2_result")
+                        .HasMaxLength(1);
+
+                    b.Property<decimal?>("total_summary_chief");
+
+                    b.Property<decimal?>("total_summary_competency_chief");
+
+                    b.Property<decimal?>("total_summary_competency_supervisor");
+
+                    b.Property<decimal?>("total_summary_competency_supervisor1A");
+
+                    b.Property<decimal?>("total_summary_competency_supervisor2A");
+
+                    b.Property<decimal?>("total_summary_supervisor");
+
+                    b.Property<decimal?>("total_summary_supervisor1A");
+
+                    b.Property<decimal?>("total_summary_supervisor2A");
+
+                    b.Property<DateTime>("updated");
+
+                    b.Property<decimal?>("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<int>("id");
+
+                    b.Property<string>("action_detail")
+                        .HasMaxLength(4000);
+
+                    b.Property<DateTime?>("action_dt");
+
+                    b.Property<int?>("action_emp_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("evaluation_detail_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<DateTime>("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<int>("id");
+
+                    b.Property<string>("achievement")
+                        .HasMaxLength(8000);
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("score");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<decimal?>("score3");
+
+                    b.Property<decimal?>("score4");
+
+                    b.Property<decimal?>("sumary");
+
+                    b.Property<decimal?>("sumary2");
+
+                    b.Property<decimal?>("sumary3");
+
+                    b.Property<decimal?>("sumary4");
+
+                    b.Property<string>("target_score1")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score2")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score3")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score4")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score5")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("thefile")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.Property<decimal?>("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<int>("id");
+
+                    b.Property<int?>("achievement_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("the_file")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("achievement_id");
+
+                    b.ToTable("eva_evaluation_achievement_attach");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("behavior")
+                        .HasMaxLength(1000);
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("score");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<decimal?>("score3");
+
+                    b.Property<decimal?>("score4");
+
+                    b.Property<decimal?>("sumary");
+
+                    b.Property<decimal?>("sumary2");
+
+                    b.Property<decimal?>("sumary3");
+
+                    b.Property<decimal?>("sumary4");
+
+                    b.Property<string>("target_score1")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score2")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score3")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score4")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score5")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("updated");
+
+                    b.Property<decimal?>("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<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<int?>("main_dept_id");
+
+                    b.Property<decimal?>("percentage");
+
+                    b.Property<string>("thegroup")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_evaluation_group");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("evaluation_group_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<DateTime>("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<int>("id");
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("indicators")
+                        .HasMaxLength(4000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("mission_detail")
+                        .HasMaxLength(4000);
+
+                    b.Property<int?>("mission_no");
+
+                    b.Property<string>("target")
+                        .HasMaxLength(4000);
+
+                    b.Property<DateTime>("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<int>("id");
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("develop")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("development_method")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("end_date");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("period_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("start_date");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_idp_plan");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_level_scoreEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("detail")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("max_score");
+
+                    b.Property<decimal?>("min_score");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_level_score");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<decimal?>("cost_of_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("frame_group_guid");
+
+                    b.Property<int?>("help_org_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("monthly_remuneration");
+
+                    b.Property<int?>("order_of_data");
+
+                    b.Property<int?>("org_id");
+
+                    b.Property<decimal?>("position_allowance");
+
+                    b.Property<string>("position_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("salary");
+
+                    b.Property<DateTime>("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<Guid>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<Guid?>("frame_plan_guid");
+
+                    b.Property<Guid?>("group_guid");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit_frame_295");
+
+                    b.Property<int?>("main_dept_id");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(4000);
+
+                    b.Property<decimal?>("total_salary");
+
+                    b.Property<decimal?>("total_salary_limit");
+
+                    b.Property<decimal?>("total_salary_limit_rounded");
+
+                    b.Property<DateTime>("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<Guid>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<DateTime?>("executed_date");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit_frame_005");
+
+                    b.Property<decimal?>("limit_frame_005_total");
+
+                    b.Property<decimal?>("limit_frame_005_total_rounded");
+
+                    b.Property<Guid?>("plan_guid");
+
+                    b.Property<DateTime?>("salary_adjustment_date");
+
+                    b.Property<string>("status_chief")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_self")
+                        .HasMaxLength(1);
+
+                    b.Property<int?>("supervisor1");
+
+                    b.Property<DateTime?>("supervisor1_date");
+
+                    b.Property<string>("supervisor1_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1_result")
+                        .HasMaxLength(1);
+
+                    b.Property<decimal?>("total_salary");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("plan_guid");
+
+                    b.ToTable("eva_limit_frame_plan");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_performance_planEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<DateTime?>("end_leave");
+
+                    b.Property<int?>("fiscal_year");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("percent");
+
+                    b.Property<DateTime?>("start_leave");
+
+                    b.Property<int?>("theTime");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_performance_plan");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<DateTime?>("end_date");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<int?>("list_no");
+
+                    b.Property<Guid?>("performance_plan_id");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("start_date");
+
+                    b.Property<string>("step")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime>("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<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("detail")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<Guid?>("level_score_id");
+
+                    b.Property<decimal?>("max_score");
+
+                    b.Property<decimal?>("min_score");
+
+                    b.Property<decimal?>("promoted_percentage");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("level_score_id");
+
+                    b.ToTable("eva_promoted_percentage");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_salary_cylinderEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<decimal?>("cost_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("middle");
+
+                    b.Property<decimal?>("monthly_compensation");
+
+                    b.Property<decimal?>("position_allowance");
+
+                    b.Property<int?>("position_level");
+
+                    b.Property<int?>("position_type");
+
+                    b.Property<decimal?>("salary_max");
+
+                    b.Property<decimal?>("temporary_min");
+
+                    b.Property<decimal?>("themax");
+
+                    b.Property<decimal?>("themin");
+
+                    b.Property<DateTime>("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<DateTime>(
+                name: "end_leave",
+                table: "eva_performance_plan",
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                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<DateTime>("created");
 
+                    b.Property<DateTime?>("end_leave");
+
                     b.Property<int?>("fiscal_year");
 
                     b.Property<bool>("isActive");
 
                     b.Property<decimal?>("percent");
 
+                    b.Property<DateTime?>("start_leave");
+
                     b.Property<int?>("theTime");
 
                     b.Property<DateTime>("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<Guid>
     {
 
+
         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<Guid>
+    public class eva_performance_planViewModel : BaseViewModel2<Guid>
     {
 
         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 @@
                                 <label id="lab_eva_performance_plan_percent" for="eva_performance_plan_percent">กรอบวงเงินในส่วนที่กันไว้</label>
                                 <input class="form-control" type="number" id="eva_performance_plan_percent" iLabel="กรอบวงเงินในส่วนที่กันไว้" iRequire="true" iGroup="eva_performance_plan" />
                             </div>
+                            <div class="form-group col-md-3">
+                                <label id="lab_eva_performance_plan_start_leave" for="eva_performance_plan_start_leave">ข้อมูลการลาเริ่มต้น</label>
+                                <input class="form-control" type="text" id="eva_performance_plan_start_leave" data-provide="datepicker" data-date-language="th-th" iLabel="ข้อมูลการลาเริ่มต้น" iRequire="true" iGroup="eva_performance_plan" />
+                            </div>
+
+                            <div class="form-group col-md-3">
+                                <label id="lab_eva_performance_plan_end_leave" for="eva_performance_plan_end_leave">ข้อมูลการลาสิ้นสุด</label>
+                                <input class="form-control" type="text" id="eva_performance_plan_end_leave" data-provide="datepicker" data-date-language="th-th" iLabel="ข้อมูลการลาสิ้นสุด" iRequire="true" iGroup="eva_performance_plan" />
+                            </div>
                         </div>
 
 
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 @@
                             <label id="lab_eva_performance_plan_percent" for="eva_performance_plan_percent">กรอบวงเงินในส่วนที่กันไว้</label>
                             <input class="form-control" type="number" id="eva_performance_plan_percent" iLabel="กรอบวงเงินในส่วนที่กันไว้" iRequire="true" iGroup="eva_performance_plan" />
                         </div>
+                        <div class="form-group col-md-3">
+                            <label id="lab_eva_performance_plan_start_leave" for="eva_performance_plan_start_leave">ข้อมูลการลาเริ่มต้น</label>
+                            <input class="form-control" type="text" id="eva_performance_plan_start_leave" data-provide="datepicker" data-date-language="th-th" iLabel="ข้อมูลการลาเริ่มต้น" iRequire="true" iGroup="eva_performance_plan" />
+                        </div>
+
+                        <div class="form-group col-md-3">
+                            <label id="lab_eva_performance_plan_end_leave" for="eva_performance_plan_end_leave">ข้อมูลการลาสิ้นสุด</label>
+                            <input class="form-control" type="text" id="eva_performance_plan_end_leave" data-provide="datepicker" data-date-language="th-th" iLabel="ข้อมูลการลาสิ้นสุด" iRequire="true" iGroup="eva_performance_plan" />
+                        </div>
                     </div>
 
                 </div>
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;
 }