แก้ไขเล็กๆน้อยๆหลายจุด

Migrations/25630312232847_status_supervisor1A2A.Designer.cs

@@ -0,0 +1,600 @@
+// <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("25630312232847_status_supervisor1A2A")]
+    partial class status_supervisor1A2A
+    {
+        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<int>("id");
+
+                    b.Property<string>("command_no")
+                        .HasMaxLength(100);
+
+                    b.Property<int?>("create_evaluation_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("fiscal_year");
+
+                    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<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<int?>("adjust_postponement_id");
+
+                    b.Property<int?>("adjust_postponement_quota_id");
+
+                    b.Property<decimal?>("cost_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("middle");
+
+                    b.Property<decimal?>("new_cost_living");
+
+                    b.Property<decimal?>("new_sarary");
+
+                    b.Property<decimal?>("new_sarary_with_quota");
+
+                    b.Property<decimal?>("promoted_percentage");
+
+                    b.Property<decimal?>("receive_quota");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("sarary");
+
+                    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_supervisor");
+
+                    b.Property<decimal?>("achievement_chief");
+
+                    b.Property<decimal?>("achievement_supervisor");
+
+                    b.Property<int?>("chief");
+
+                    b.Property<decimal?>("competency_chief");
+
+                    b.Property<decimal?>("competency_supervisor");
+
+                    b.Property<int?>("create_evaluation_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_score_chief")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor")
+                        .HasMaxLength(255);
+
+                    b.Property<decimal?>("score_chief");
+
+                    b.Property<decimal?>("score_supervisor");
+
+                    b.Property<string>("status_chief")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_self")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_supervisor")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_supervisor1A")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_supervisor2A")
+                        .HasMaxLength(1);
+
+                    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<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<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_supervisor");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_create_evaluation_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("achievement")
+                        .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?>("sumary");
+
+                    b.Property<decimal?>("sumary2");
+
+                    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_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?>("sumary");
+
+                    b.Property<decimal?>("sumary2");
+
+                    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<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_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_performance_planEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("fiscal_year");
+
+                    b.Property<bool>("isActive");
+
+                    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<int?>("position_level");
+
+                    b.Property<int?>("position_type");
+
+                    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_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_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
+        }
+    }
+}

Migrations/25630312232847_status_supervisor1A2A.cs

@@ -0,0 +1,33 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace tb320eva.Migrations
+{
+    public partial class status_supervisor1A2A : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "status_supervisor1A",
+                table: "eva_create_evaluation_detail",
+                maxLength: 1,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "status_supervisor2A",
+                table: "eva_create_evaluation_detail",
+                maxLength: 1,
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "status_supervisor1A",
+                table: "eva_create_evaluation_detail");
+
+            migrationBuilder.DropColumn(
+                name: "status_supervisor2A",
+                table: "eva_create_evaluation_detail");
+        }
+    }
+}

Migrations/DataContextModelSnapshot.cs

@@ -187,6 +187,12 @@ namespace tb320eva.Migrations
                     b.Property<string>("status_supervisor")
                         .HasMaxLength(1);
 
+                    b.Property<string>("status_supervisor1A")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_supervisor2A")
+                        .HasMaxLength(1);
+
                     b.Property<int?>("supervisor1");
 
                     b.Property<int?>("supervisor1A");

Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs

@@ -104,5 +104,11 @@ namespace TodoAPI2.Models
         public string supervisor2A_remark { get; set; }
 
         public DateTime? supervisor2A_date { get; set; }
+
+        [MaxLength(1)]
+        public string status_supervisor1A { get; set; }
+
+        [MaxLength(1)]
+        public string status_supervisor2A { get; set; }
     }
 }

Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs

@@ -154,6 +154,9 @@ namespace TodoAPI2.Models
                     status_chief = m_eva_create_evaluation_detail.status_chief,
                     status_supervisor = m_eva_create_evaluation_detail.status_supervisor,
 
+                    status_supervisor1A = m_eva_create_evaluation_detail.status_supervisor1A,
+                    status_supervisor2A = m_eva_create_evaluation_detail.status_supervisor2A,
+
                     employee_id_external_linkage_external_name = fk_external_linkageResult2.fullname,
                     chief_external_linkage_external_name = fk_external_linkageResult3.fullname,
                     supervisor1_result_external_linkage_external_name = fk_external_linkageResult21.external_name,

Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs

@@ -78,6 +78,10 @@ namespace TodoAPI2.Models
 
         public string status_supervisor { get; set; }
 
+        public string status_supervisor1A { get; set; }
+
+        public string status_supervisor2A { get; set; }
+
         public string employee_id_external_linkage_external_name { get; set; }
         public string chief_external_linkage_external_name { get; set; }
         public string supervisor1_result_external_linkage_external_name { get; set; }

Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs

@@ -85,8 +85,8 @@ namespace TodoAPI2.Models
                     employee_code = fk_external_employee.employee_no,
                     employee_fullname = fk_external_employee.fullname,
                     employee_position = fk_external_employee.position_name,
-                    employee_position_type = null,
+                    employee_position_type = fk_external_employee.employee_type_name,
-                    employee_position_level = null,
+                    employee_position_level = fk_external_employee.position_level_text,
                     employee_org = fk_external_employee.department_name,
                     chief_fullname = fk_external_chief.fullname,
                     chief_position = fk_external_chief.position_name,

Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal.cshtml

@@ -37,7 +37,7 @@
 
                             <div class="form-group col-md-6">
                                 <label id="lab_eva_adjust_postponement_normal_managed_by" for="eva_adjust_postponement_normal_managed_by">ผู้จัดทำข้อมูล</label>
-                                <select class="form-control" id="eva_adjust_postponement_normal_managed_by" iLabel="ผู้จัดทำข้อมูล" iRequire="true" iGroup="eva_adjust_postponement_normal"></select>
+                                <select disabled class="form-control" id="eva_adjust_postponement_normal_managed_by" iLabel="ผู้จัดทำข้อมูล" iRequire="true" iGroup="eva_adjust_postponement_normal"></select>
                             </div>
                         </div>
                         <div class='row'>

Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota.cshtml

@@ -40,7 +40,7 @@
 
                             <div class="form-group col-md-6">
                                 <label id="lab_eva_adjust_postponement_quota_managed_by" for="eva_adjust_postponement_quota_managed_by">ผู้จัดทำข้อมูล</label>
-                                <select class="form-control" id="eva_adjust_postponement_quota_managed_by" iLabel="ผู้จัดทำข้อมูล" iRequire="true" iGroup="eva_adjust_postponement_quota"></select>
+                                <select disabled class="form-control" id="eva_adjust_postponement_quota_managed_by" iLabel="ผู้จัดทำข้อมูล" iRequire="true" iGroup="eva_adjust_postponement_quota"></select>
                             </div>
                         </div>
                         <div class='row'>

Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota_d.cshtml

@@ -51,7 +51,7 @@
 
                         <div class="form-group col-md-6">
                             <label id="lab_eva_adjust_postponement_quota_managed_by" for="eva_adjust_postponement_quota_managed_by">ผู้จัดทำข้อมูล</label>
-                            <select class="form-control" id="eva_adjust_postponement_quota_managed_by" iLabel="ผู้จัดทำข้อมูล" iRequire="true" iGroup="eva_adjust_postponement_quota"></select>
+                            <select disabled class="form-control" id="eva_adjust_postponement_quota_managed_by" iLabel="ผู้จัดทำข้อมูล" iRequire="true" iGroup="eva_adjust_postponement_quota"></select>
                         </div>
                     </div>
                     <div class='row'>

Views/eva_create_evaluationView/eva_create_evaluation_d_summary.cshtml

@@ -71,6 +71,17 @@
                             <select disabled class="form-control" id="eva_create_evaluation_employee_id" iLabel="ผู้ประเมินสูงสุด" iRequire="true" iGroup="eva_create_evaluation"></select>
                         </div>
                     </div>
+                    <div class='row'>
+                        <div class="form-group col-md-4">
+                            <label id="lab_eva_create_evaluation_supervisor1_id" for="eva_create_evaluation_supervisor1_id">ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง </label>
+                            <select disabled class="form-control" id="eva_create_evaluation_supervisor1_id" iLabel="ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง " iRequire="true" iGroup="eva_create_evaluation"></select>
+                        </div>
+
+                        <div class="form-group col-md-4">
+                            <label id="lab_eva_create_evaluation_supervisor2_id" for="eva_create_evaluation_supervisor2_id">ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด)</label>
+                            <select disabled class="form-control" id="eva_create_evaluation_supervisor2_id" iLabel="ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด)" iRequire="true" iGroup="eva_create_evaluation"></select>
+                        </div>
+                    </div>
                     <div class='row'>
                         <div class="form-group col-md-4">
                             <label id="lab_eva_create_evaluation_score1" for="eva_create_evaluation_score1">คะเเนนส่วนที่1 ผลสำเร็จของงาน</label>
@@ -101,8 +112,11 @@
             <tr>
                 <th><label id='h_eva_create_evaluation_detail_employee_id'>ผู้รับการประเมิน</label></th>
                 <th><label id='h_eva_create_evaluation_detail_chief'>ผู้ประเมิน </label></th>
+                <th><label>สถานะการส่งแบบประเมิน<br />(ผู้รับการประเมิน)</label></th>
                 <th><label>สถานะทำแบบประเมิน<br />(ผู้ประเมิน)</label></th>
                 <th><label>สถานะทำแบบประเมิน<br />(ผู้ประเมินสูงสุด)</label></th>
+                <th><label>สถานะตรวจสอบ<br />(ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง)</label></th>
+                <th><label>สถานะตรวจสอบ<br />(ผู้บังคับบัญชาเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด))</label></th>
             </tr>
         </thead>
         <tbody></tbody>

wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal.js

@@ -23,7 +23,7 @@ DropDownClearFormAndFeedWithData($("#s_eva_adjust_postponement_normal_org_id"),
 
 function eva_adjust_postponement_normal_FeedDataToForm(data) {
 
-console.log(data);
+//console.log(data);
 
 $("#eva_adjust_postponement_normal_id").val(data.id);
 $("#eva_adjust_postponement_normal_fiscal_year").val(data.fiscal_year);
@@ -34,7 +34,7 @@ $("#eva_adjust_postponement_normal_limit").val(data.limit);
 $("#eva_adjust_postponement_normal_limit_frame").val(data.limit_frame);
 $("#eva_adjust_postponement_normal_limit_quota").val(data.limit_quota);
 $("#eva_adjust_postponement_normal_percentage").val(data.percentage);
-DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by"), data, "id", "fullname", "item_managed_by", data.managed_by);
+DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
 //DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
 
 }

wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js

@@ -13,7 +13,7 @@ $("#eva_adjust_postponement_normal_limit").val(data.limit);
 $("#eva_adjust_postponement_normal_limit_frame").val(data.limit_frame);
 $("#eva_adjust_postponement_normal_limit_quota").val(data.limit_quota);
 $("#eva_adjust_postponement_normal_percentage").val(data.percentage);
-DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by"), data, "id", "fullname", "item_managed_by", data.managed_by);
+DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
 //DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
 
 }

wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota.js

@@ -27,7 +27,7 @@ $("#eva_adjust_postponement_quota_theRound").val(data.theRound);
 $("#eva_adjust_postponement_quota_limit_quota").val(data.limit_quota);
 $("#eva_adjust_postponement_quota_limit_frame_quota").val(data.limit_frame_quota);
 $("#eva_adjust_postponement_quota_command_no").val(data.command_no);
-DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_quota_managed_by"), data, "id", "fullname", "item_managed_by", data.managed_by);
+DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_quota_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
 
 }
 

wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js

@@ -12,7 +12,7 @@ $("#eva_adjust_postponement_quota_limit_quota").val(data.limit_quota);
 $("#eva_adjust_postponement_quota_limit_frame_quota").val(data.limit_frame_quota);
 $("#eva_adjust_postponement_quota_command_no").val(data.command_no);
 $("#eva_adjust_postponement_quota_limit").val(data.limit);
-DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_quota_managed_by"), data, "id", "fullname", "item_managed_by", data.managed_by);
+DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_quota_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
 console.log($("#eva_adjust_postponement_quota_limit").val());
 }
 

wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail_summary.js

@@ -151,6 +151,7 @@ function eva_create_evaluation_detail_GoDelete(a) {
 var eva_create_evaluation_detailTableV;
 
 var eva_create_evaluation_detail_setupTable = function (result) {
+    console.log(result);
 	tmp = '"';
     eva_create_evaluation_detailTableV = $('#eva_create_evaluation_detailTable').DataTable({
         "processing": true,
@@ -159,9 +160,12 @@ var eva_create_evaluation_detail_setupTable = function (result) {
 		"select": false,
         "columns": [
                 { "data": "employee_id_external_linkage_external_name" },
-                { "data": "chief_external_linkage_external_name" },         
+                { "data": "chief_external_linkage_external_name" },     
+{ "data": "status_self" },       
 { "data": "status_chief" },    
-{ "data": "status_supervisor" }   
+{ "data": "status_supervisor" },  
+{ "data": "status_supervisor1A" },
+{ "data": "status_supervisor2A" }
         ],
         "columnDefs": [
             ],