เพิ่มฟิล ตามที่เพลงขอ และเติมที่จำเป็น

Migrations/25631211121721_AddMoreMigrationsField.Designer.cs

@@ -0,0 +1,710 @@
+// <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("25631211121721_AddMoreMigrationsField")]
+    partial class AddMoreMigrationsField
+    {
+        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(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<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<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<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?>("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<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<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<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<DateTime?>("status_chief_click_date");
+
+                    b.Property<string>("status_self")
+                        .HasMaxLength(1);
+
+                    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<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_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.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?>("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_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<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_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_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/25631211121721_AddMoreMigrationsField.cs

@@ -0,0 +1,50 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace tb320eva.Migrations
+{
+    public partial class AddMoreMigrationsField : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "migration_eva_result",
+                table: "eva_adjust_postponement_detail",
+                maxLength: 1000,
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "migration_total_score",
+                table: "eva_adjust_postponement_detail",
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "other_money_at_this_time",
+                table: "eva_adjust_postponement_detail",
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "position_allowance_at_this_time",
+                table: "eva_adjust_postponement_detail",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "migration_eva_result",
+                table: "eva_adjust_postponement_detail");
+
+            migrationBuilder.DropColumn(
+                name: "migration_total_score",
+                table: "eva_adjust_postponement_detail");
+
+            migrationBuilder.DropColumn(
+                name: "other_money_at_this_time",
+                table: "eva_adjust_postponement_detail");
+
+            migrationBuilder.DropColumn(
+                name: "position_allowance_at_this_time",
+                table: "eva_adjust_postponement_detail");
+        }
+    }
+}

Migrations/DataContextModelSnapshot.cs

@@ -85,12 +85,21 @@ namespace tb320eva.Migrations
 
                     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<decimal?>("other_money_at_this_time");
+
+                    b.Property<decimal?>("position_allowance_at_this_time");
+
                     b.Property<string>("position_this_time")
                         .HasMaxLength(1000);
 

Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs

@@ -52,5 +52,14 @@ namespace TodoAPI2.Models
 
         [MaxLength(1000)]
         public string level_this_time { get; set; }
+
+        public decimal? position_allowance_at_this_time { get; set; }
+
+        public decimal? other_money_at_this_time { get; set; }
+
+        public decimal? migration_total_score { get; set; }
+
+        [MaxLength(1000)]
+        public string migration_eva_result { get; set; }
     }
 }

Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationInputModel.cs

@@ -46,7 +46,16 @@ namespace TodoAPI2.Models
 
         public string level_this_time { get; set; }
 
+        public decimal? position_allowance_at_this_time { get; set; }
+
+        public decimal? other_money_at_this_time { get; set; }
+
+        public decimal? migration_total_score { get; set; }
+
+        public string migration_eva_result { get; set; }
+
         public string active_mode { get; set; }
+
     }
 }
 

Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationService.cs

@@ -146,6 +146,11 @@ namespace TodoAPI2.Models
                     position_this_time = m_eva_adjust_postponement_detail_migration.position_this_time,
                     level_this_time = m_eva_adjust_postponement_detail_migration.level_this_time,
 
+                    position_allowance_at_this_time = m_eva_adjust_postponement_detail_migration.position_allowance_at_this_time,
+                    other_money_at_this_time = m_eva_adjust_postponement_detail_migration.other_money_at_this_time,
+                    migration_total_score = m_eva_adjust_postponement_detail_migration.migration_total_score,
+                    migration_eva_result = m_eva_adjust_postponement_detail_migration.migration_eva_result,
+
                     adjust_postponement_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult1.fiscal_year,
                     adjust_postponement_quota_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult2.fiscal_year,
                     employee_id_external_linkage_external_name = fk_external_linkageResult3.fullname,
@@ -212,6 +217,11 @@ namespace TodoAPI2.Models
                 existingEntity.position_this_time = model.position_this_time;
                 existingEntity.level_this_time = model.level_this_time;
 
+                existingEntity.position_allowance_at_this_time = model.position_allowance_at_this_time;
+                existingEntity.other_money_at_this_time = model.other_money_at_this_time;
+                existingEntity.migration_total_score = model.migration_total_score;
+                existingEntity.migration_eva_result = model.migration_eva_result;
+
                 var updated = _repository.Update(id, existingEntity);
                 return Get(updated.id);
             }
@@ -244,6 +254,11 @@ namespace TodoAPI2.Models
                         existingEntity.position_this_time = i.position_this_time;
                         existingEntity.level_this_time = i.level_this_time;
 
+                        existingEntity.position_allowance_at_this_time = i.position_allowance_at_this_time;
+                        existingEntity.other_money_at_this_time = i.other_money_at_this_time;
+                        existingEntity.migration_total_score = i.migration_total_score;
+                        existingEntity.migration_eva_result = i.migration_eva_result;
+
                         //existingEntity.SetAutoField(_repository.Context);
                         _repository.UpdateWithoutCommit(i.id.Value, existingEntity);
                     }

Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationViewModel.cs

@@ -44,6 +44,14 @@ namespace TodoAPI2.Models
 
         public string level_this_time { get; set; }
 
+        public decimal? position_allowance_at_this_time { get; set; }
+
+        public decimal? other_money_at_this_time { get; set; }
+
+        public decimal? migration_total_score { get; set; }
+
+        public string migration_eva_result { get; set; }
+
         public int? adjust_postponement_id_eva_adjust_postponement_fiscal_year { get; set; }
         public int? adjust_postponement_quota_id_eva_adjust_postponement_fiscal_year { get; set; }
         public string employee_id_external_linkage_external_name { get; set; }

Views/eva_adjust_postponement_detail_migrationView/eva_adjust_postponement_detail_migration.cshtml

@@ -17,83 +17,83 @@
                 <div class="row">
                     <div class="col-md-12">
 
-<input class="form-control" type="hidden" id="eva_adjust_postponement_detail_migration_id" />
-<input class="form-control" type="hidden" id="eva_adjust_postponement_detail_migration_adjust_postponement_id" />
-<input class="form-control" type="hidden" id="eva_adjust_postponement_detail_migration_adjust_postponement_quota_id" />
+                        <input class="form-control" type="hidden" id="eva_adjust_postponement_detail_migration_id" />
+                        <input class="form-control" type="hidden" id="eva_adjust_postponement_detail_migration_adjust_postponement_id" />
+                        <input class="form-control" type="hidden" id="eva_adjust_postponement_detail_migration_adjust_postponement_quota_id" />
 
-<div class='row'></div>
-<div class='row'></div>
-<div class='row'>
-    <div class="form-group col-md-6">
-	    <label id="lab_eva_adjust_postponement_detail_migration_employee_id" for="eva_adjust_postponement_detail_migration_employee_id">ผู้รับการประเมิน</label>
-	    <select class="form-control" id="eva_adjust_postponement_detail_migration_employee_id" iLabel="ผู้รับการประเมิน" iRequire="true" iGroup="eva_adjust_postponement_detail_migration" ></select>
-    </div>
+                        <div class='row'></div>
+                        <div class='row'></div>
+                        <div class='row'>
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_adjust_postponement_detail_migration_employee_id" for="eva_adjust_postponement_detail_migration_employee_id">ผู้รับการประเมิน</label>
+                                <select class="form-control" id="eva_adjust_postponement_detail_migration_employee_id" iLabel="ผู้รับการประเมิน" iRequire="true" iGroup="eva_adjust_postponement_detail_migration"></select>
+                            </div>
 
-    <div class="form-group col-md-6">
-	    <label id="lab_eva_adjust_postponement_detail_migration_sarary" for="eva_adjust_postponement_detail_migration_sarary">เงินเดือน ก่อนปรับเลื่อน</label>
-	    <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_sarary" iLabel="เงินเดือน ก่อนปรับเลื่อน" iRequire="true" iGroup="eva_adjust_postponement_detail_migration"  />
-    </div>
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_adjust_postponement_detail_migration_sarary" for="eva_adjust_postponement_detail_migration_sarary">เงินเดือน ก่อนปรับเลื่อน</label>
+                                <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_sarary" iLabel="เงินเดือน ก่อนปรับเลื่อน" iRequire="true" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
 
-    <div class="form-group col-md-6">
-	    <label id="lab_eva_adjust_postponement_detail_migration_cost_living" for="eva_adjust_postponement_detail_migration_cost_living">ค่าครองชีพ ก่อนปรับเลื่อน</label>
-	    <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_cost_living" iLabel="ค่าครองชีพ ก่อนปรับเลื่อน" iRequire="true" iGroup="eva_adjust_postponement_detail_migration"  />
-    </div>
-</div>
-<div class='row'>
-    <div class="form-group col-md-6">
-	    <label id="lab_eva_adjust_postponement_detail_migration_middle" for="eva_adjust_postponement_detail_migration_middle">ค่ากลางฐานในการคำนวณ</label>
-	    <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_middle" iLabel="ค่ากลางฐานในการคำนวณ" iRequire="true" iGroup="eva_adjust_postponement_detail_migration"  />
-    </div>
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_adjust_postponement_detail_migration_cost_living" for="eva_adjust_postponement_detail_migration_cost_living">ค่าครองชีพ ก่อนปรับเลื่อน</label>
+                                <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_cost_living" iLabel="ค่าครองชีพ ก่อนปรับเลื่อน" iRequire="true" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
+                        </div>
+                        <div class='row'>
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_adjust_postponement_detail_migration_middle" for="eva_adjust_postponement_detail_migration_middle">ค่ากลางฐานในการคำนวณ</label>
+                                <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_middle" iLabel="ค่ากลางฐานในการคำนวณ" iRequire="true" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
 
-    <div class="form-group col-md-6">
-	    <label id="lab_eva_adjust_postponement_detail_migration_promoted_percentage" for="eva_adjust_postponement_detail_migration_promoted_percentage">ร้อยละที่ได้เลื่อน</label>
-	    <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_promoted_percentage" iLabel="ร้อยละที่ได้เลื่อน" iRequire="true" iGroup="eva_adjust_postponement_detail_migration"  />
-    </div>
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_adjust_postponement_detail_migration_promoted_percentage" for="eva_adjust_postponement_detail_migration_promoted_percentage">ร้อยละที่ได้เลื่อน</label>
+                                <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_promoted_percentage" iLabel="ร้อยละที่ได้เลื่อน" iRequire="true" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
 
-    <div class="form-group col-md-6">
-	    <label id="lab_eva_adjust_postponement_detail_migration_total_promote" for="eva_adjust_postponement_detail_migration_total_promote">จำนวนเงินที่ได้เลื่อน</label>
-	    <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_total_promote" iLabel="จำนวนเงินที่ได้เลื่อน" iRequire="true" iGroup="eva_adjust_postponement_detail_migration"  />
-    </div>
-</div>
-<div class='row'>
-    <div class="form-group col-md-6">
-	    <label id="lab_eva_adjust_postponement_detail_migration_new_sarary" for="eva_adjust_postponement_detail_migration_new_sarary">เงินเดือนใหม่</label>
-	    <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_new_sarary" iLabel="เงินเดือนใหม่" iRequire="true" iGroup="eva_adjust_postponement_detail_migration"  />
-    </div>
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_adjust_postponement_detail_migration_total_promote" for="eva_adjust_postponement_detail_migration_total_promote">จำนวนเงินที่ได้เลื่อน</label>
+                                <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_total_promote" iLabel="จำนวนเงินที่ได้เลื่อน" iRequire="true" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
+                        </div>
+                        <div class='row'>
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_adjust_postponement_detail_migration_new_sarary" for="eva_adjust_postponement_detail_migration_new_sarary">เงินเดือนใหม่</label>
+                                <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_new_sarary" iLabel="เงินเดือนใหม่" iRequire="true" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
 
-    <div class="form-group col-md-6">
-	    <label id="lab_eva_adjust_postponement_detail_migration_new_cost_living" for="eva_adjust_postponement_detail_migration_new_cost_living">ค่าครองชีพใหม่</label>
-	    <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_new_cost_living" iLabel="ค่าครองชีพใหม่" iRequire="true" iGroup="eva_adjust_postponement_detail_migration"  />
-    </div>
-</div>
-<div class='row'>
-    <div class="form-group col-md-6">
-	    <label id="lab_eva_adjust_postponement_detail_migration_receive_quota" for="eva_adjust_postponement_detail_migration_receive_quota">ได้รับเงินโควต้าพิเศษ</label>
-	    <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_receive_quota" iLabel="ได้รับเงินโควต้าพิเศษ" iRequire="true" iGroup="eva_adjust_postponement_detail_migration"  />
-    </div>
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_adjust_postponement_detail_migration_new_cost_living" for="eva_adjust_postponement_detail_migration_new_cost_living">ค่าครองชีพใหม่</label>
+                                <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_new_cost_living" iLabel="ค่าครองชีพใหม่" iRequire="true" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
+                        </div>
+                        <div class='row'>
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_adjust_postponement_detail_migration_receive_quota" for="eva_adjust_postponement_detail_migration_receive_quota">ได้รับเงินโควต้าพิเศษ</label>
+                                <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_receive_quota" iLabel="ได้รับเงินโควต้าพิเศษ" iRequire="true" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
 
-    <div class="form-group col-md-6">
-	    <label id="lab_eva_adjust_postponement_detail_migration_new_sarary_with_quota" for="eva_adjust_postponement_detail_migration_new_sarary_with_quota">เงินเดือนใหม่ (รวมโควต้า)</label>
-	    <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_new_sarary_with_quota" iLabel="เงินเดือนใหม่ (รวมโควต้า)" iRequire="true" iGroup="eva_adjust_postponement_detail_migration"  />
-    </div>
-</div>
-<div class='row'>
-    <div class="form-group col-md-6">
-	    <label id="lab_eva_adjust_postponement_detail_migration_remark" for="eva_adjust_postponement_detail_migration_remark">หมายเหตุ</label>
-	    <textarea  class="form-control" rows="4" cols="50" id="eva_adjust_postponement_detail_migration_remark" iLabel="หมายเหตุ" iRequire="true" iGroup="eva_adjust_postponement_detail_migration" ></textarea>
-    </div>
-</div>
-<div class='row'>
-    <div class="form-group col-md-6">
-	    <label id="lab_eva_adjust_postponement_detail_migration_position_this_time" for="eva_adjust_postponement_detail_migration_position_this_time">ตำแหน่ง (ณ วันปรับเลื่อน)</label>
-	    <input class="form-control" type="text" id="eva_adjust_postponement_detail_migration_position_this_time" iLabel="ตำแหน่ง (ณ วันปรับเลื่อน)" iRequire="true" iGroup="eva_adjust_postponement_detail_migration"  />
-    </div>
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_adjust_postponement_detail_migration_new_sarary_with_quota" for="eva_adjust_postponement_detail_migration_new_sarary_with_quota">เงินเดือนใหม่ (รวมโควต้า)</label>
+                                <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_new_sarary_with_quota" iLabel="เงินเดือนใหม่ (รวมโควต้า)" iRequire="true" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
+                        </div>
+                        <div class='row'>
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_adjust_postponement_detail_migration_remark" for="eva_adjust_postponement_detail_migration_remark">หมายเหตุ</label>
+                                <textarea class="form-control" rows="4" cols="50" id="eva_adjust_postponement_detail_migration_remark" iLabel="หมายเหตุ" iRequire="true" iGroup="eva_adjust_postponement_detail_migration"></textarea>
+                            </div>
+                        </div>
+                        <div class='row'>
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_adjust_postponement_detail_migration_position_this_time" for="eva_adjust_postponement_detail_migration_position_this_time">ตำแหน่ง (ณ วันปรับเลื่อน)</label>
+                                <input class="form-control" type="text" id="eva_adjust_postponement_detail_migration_position_this_time" iLabel="ตำแหน่ง (ณ วันปรับเลื่อน)" iRequire="true" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
 
-    <div class="form-group col-md-6">
-	    <label id="lab_eva_adjust_postponement_detail_migration_level_this_time" for="eva_adjust_postponement_detail_migration_level_this_time">ระดับ (ณ วันปรับเลื่อน)</label>
-	    <input class="form-control" type="text" id="eva_adjust_postponement_detail_migration_level_this_time" iLabel="ระดับ (ณ วันปรับเลื่อน)" iRequire="true" iGroup="eva_adjust_postponement_detail_migration"  />
-    </div>
-</div>
+                            <div class="form-group col-md-6">
+                                <label id="lab_eva_adjust_postponement_detail_migration_level_this_time" for="eva_adjust_postponement_detail_migration_level_this_time">ระดับ (ณ วันปรับเลื่อน)</label>
+                                <input class="form-control" type="text" id="eva_adjust_postponement_detail_migration_level_this_time" iLabel="ระดับ (ณ วันปรับเลื่อน)" iRequire="true" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
+                        </div>
 
 
                     </div>
@@ -118,56 +118,56 @@
             <li class="breadcrumb-item "><a href="@Configuration["SiteInformation:mainsite"]">หน้าแรก</a></li>
             <li class="breadcrumb-item "><a href="@Configuration["SiteInformation:mainsite"]@Configuration["SiteInformation:appsite"]">@Configuration["SiteInformation:modulename"]</a></li>
             <li class="breadcrumb-item active">eva_adjust_postponement_detail_migration</li>
-        </ol>        
+        </ol>
     </div>
 </div>
 
 <section class="wrapper">
-	<div class="title"><div class="line"></div>ค้นหา eva_adjust_postponement_detail_migration</div>
-	<div class="tools">
-		<div class="row">
-	
-                        <div class="form-group col-md-3">
-                            <label id='lab_s_eva_adjust_postponement_detail_migration_adjust_postponement_id' for='s_eva_adjust_postponement_detail_migration_adjust_postponement_id'>รหัสอ้างอิงตาราง eva_adjust_postponement</label>
-                            <input class="form-control" type="hidden" id="s_eva_adjust_postponement_detail_migration_adjust_postponement_id" />
-                        </div>
+    <div class="title"><div class="line"></div>ค้นหา eva_adjust_postponement_detail_migration</div>
+    <div class="tools">
+        <div class="row">
 
-                        <div class="form-group col-md-3">
-                            <label id='lab_s_eva_adjust_postponement_detail_migration_adjust_postponement_quota_id' for='s_eva_adjust_postponement_detail_migration_adjust_postponement_quota_id'>รหัสอ้างอิงตาราง eva_adjust_postponement</label>
-                            <input class="form-control" type="hidden" id="s_eva_adjust_postponement_detail_migration_adjust_postponement_quota_id" />
-                        </div>
+            <div class="form-group col-md-3">
+                <label id='lab_s_eva_adjust_postponement_detail_migration_adjust_postponement_id' for='s_eva_adjust_postponement_detail_migration_adjust_postponement_id'>รหัสอ้างอิงตาราง eva_adjust_postponement</label>
+                <input class="form-control" type="hidden" id="s_eva_adjust_postponement_detail_migration_adjust_postponement_id" />
+            </div>
 
-			<div class="col-md-6">
-				<button class="btn btn-info" onclick="javascript:eva_adjust_postponement_detail_migration_DoSearch();">ค้นหา</button>
-				<button class="btn btn-info" onclick="javascript:eva_adjust_postponement_detail_migration_GoCreate();"><i class="fa fa-plus" style="font-size: 14px;"></i> เพิ่มรายการ</button>
-				<button style="display:none;" class="btn btn-info" onclick="javascript:eva_adjust_postponement_detail_migration_GetSelect('id');">ดึงตัวเลือก</button>
-			</div>
+            <div class="form-group col-md-3">
+                <label id='lab_s_eva_adjust_postponement_detail_migration_adjust_postponement_quota_id' for='s_eva_adjust_postponement_detail_migration_adjust_postponement_quota_id'>รหัสอ้างอิงตาราง eva_adjust_postponement</label>
+                <input class="form-control" type="hidden" id="s_eva_adjust_postponement_detail_migration_adjust_postponement_quota_id" />
+            </div>
 
-		</div>
-	</div>
+            <div class="col-md-6">
+                <button class="btn btn-info" onclick="javascript:eva_adjust_postponement_detail_migration_DoSearch();">ค้นหา</button>
+                <button class="btn btn-info" onclick="javascript:eva_adjust_postponement_detail_migration_GoCreate();"><i class="fa fa-plus" style="font-size: 14px;"></i> เพิ่มรายการ</button>
+                <button style="display:none;" class="btn btn-info" onclick="javascript:eva_adjust_postponement_detail_migration_GetSelect('id');">ดึงตัวเลือก</button>
+            </div>
 
-	<table id="eva_adjust_postponement_detail_migrationTable" class="display table table-bordered table-striped">
+        </div>
+    </div>
+
+    <table id="eva_adjust_postponement_detail_migrationTable" class="display table table-bordered table-striped">
         <thead>
             <tr>
-				<!--<th>เลือก</th>-->
-				<th>เครื่องมือ</th>
-            <th><label id='h_eva_adjust_postponement_detail_migration_id'>รหัสอ้างอิง</label></th>
-            <th><label id='h_eva_adjust_postponement_detail_migration_adjust_postponement_id'>รหัสอ้างอิงตาราง eva_adjust_postponement</label></th>
-            <th><label id='h_eva_adjust_postponement_detail_migration_adjust_postponement_quota_id'>รหัสอ้างอิงตาราง eva_adjust_postponement</label></th>
-            <th><label id='h_eva_adjust_postponement_detail_migration_employee_id'>ผู้รับการประเมิน</label></th>
-            <th><label id='h_eva_adjust_postponement_detail_migration_sarary'>เงินเดือน ก่อนปรับเลื่อน</label></th>
-            <th><label id='h_eva_adjust_postponement_detail_migration_cost_living'>ค่าครองชีพ ก่อนปรับเลื่อน</label></th>
-            <th><label id='h_eva_adjust_postponement_detail_migration_middle'>ค่ากลางฐานในการคำนวณ</label></th>
-            <th><label id='h_eva_adjust_postponement_detail_migration_promoted_percentage'>ร้อยละที่ได้เลื่อน</label></th>
-            <th><label id='h_eva_adjust_postponement_detail_migration_total_promote'>จำนวนเงินที่ได้เลื่อน</label></th>
-            <th><label id='h_eva_adjust_postponement_detail_migration_new_sarary'>เงินเดือนใหม่</label></th>
-            <th><label id='h_eva_adjust_postponement_detail_migration_new_cost_living'>ค่าครองชีพใหม่</label></th>
-            <th><label id='h_eva_adjust_postponement_detail_migration_remark'>หมายเหตุ</label></th>
-            <th><label id='h_eva_adjust_postponement_detail_migration_receive_quota'>ได้รับเงินโควต้าพิเศษ</label></th>
-            <th><label id='h_eva_adjust_postponement_detail_migration_new_sarary_with_quota'>เงินเดือนใหม่ (รวมโควต้า)</label></th>
-            <th><label id='h_eva_adjust_postponement_detail_migration_position_this_time'>ตำแหน่ง (ณ วันปรับเลื่อน)</label></th>
-            <th><label id='h_eva_adjust_postponement_detail_migration_level_this_time'>ระดับ (ณ วันปรับเลื่อน)</label></th>
-                
+                <!--<th>เลือก</th>-->
+                <th>เครื่องมือ</th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_id'>รหัสอ้างอิง</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_adjust_postponement_id'>รหัสอ้างอิงตาราง eva_adjust_postponement</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_adjust_postponement_quota_id'>รหัสอ้างอิงตาราง eva_adjust_postponement</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_employee_id'>ผู้รับการประเมิน</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_sarary'>เงินเดือน ก่อนปรับเลื่อน</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_cost_living'>ค่าครองชีพ ก่อนปรับเลื่อน</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_middle'>ค่ากลางฐานในการคำนวณ</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_promoted_percentage'>ร้อยละที่ได้เลื่อน</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_total_promote'>จำนวนเงินที่ได้เลื่อน</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_new_sarary'>เงินเดือนใหม่</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_new_cost_living'>ค่าครองชีพใหม่</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_remark'>หมายเหตุ</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_receive_quota'>ได้รับเงินโควต้าพิเศษ</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_new_sarary_with_quota'>เงินเดือนใหม่ (รวมโควต้า)</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_position_this_time'>ตำแหน่ง (ณ วันปรับเลื่อน)</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_level_this_time'>ระดับ (ณ วันปรับเลื่อน)</label></th>
+
             </tr>
         </thead>
         <tbody></tbody>
@@ -175,13 +175,13 @@
 </section>
 
 @section FooterPlaceHolder{
-<script src="~/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js"></script>
-<script>
-    $(document).ready(function () {
-        eva_adjust_postponement_detail_migration_InitiateDataTable();
-        eva_adjust_postponement_detail_migration_InitialForm();
-        SetupValidationRemark("eva_adjust_postponement_detail_migration");
-    });
-</script>
+    <script src="~/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js"></script>
+    <script>
+        $(document).ready(function () {
+            eva_adjust_postponement_detail_migration_InitiateDataTable();
+            eva_adjust_postponement_detail_migration_InitialForm();
+            SetupValidationRemark("eva_adjust_postponement_detail_migration");
+        });
+    </script>
 }
 

Views/eva_adjust_postponement_migrationView/eva_adjust_postponement_migration_d.cshtml

@@ -153,7 +153,10 @@
                 <th><label id='h_eva_adjust_postponement_detail_migration_receive_quota'>ได้รับเงินโควต้าพิเศษ</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_migration_new_sarary_with_quota'>เงินเดือนใหม่ (รวมโควต้า)</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_migration_remark'>หมายเหตุ</label></th>
-
+                <th><label id='h_eva_adjust_postponement_detail_migration_position_allowance_at_this_time'>เงินประจำแหน่ง (ณ วันปรับเลื่อน)</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_other_money_at_this_time'>ค่าตอบแทนรายเดือน (ณ วันปรับเลื่อน)</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_migration_total_score'>คะแนนรวม (ณ วันปรับเลื่อน)</label></th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_migration_eva_result'>ผลการประเมิน (ณ วันปรับเลื่อน)</label></th>
             </tr>
         </thead>
         <tbody></tbody>
@@ -249,9 +252,33 @@
 
                         <div class="form-group col-md-4">
                             <label id="lab_eva_adjust_postponement_detail_migration_remark" for="eva_adjust_postponement_detail_migration_remark">หมายเหตุ</label>
-                            <input class="form-control" id="eva_adjust_postponement_detail_migration_remark" iLabel="หมายเหตุ" iRequire="false" iGroup="eva_adjust_postponement_detail_migration"></textarea>
+                            <input class="form-control" id="eva_adjust_postponement_detail_migration_remark" iLabel="หมายเหตุ" iRequire="false" iGroup="eva_adjust_postponement_detail_migration">
                         </div>
                     </div>
+
+                    <div class='row'>
+                        <div class="form-group col-md-4">
+                            <label id="lab_eva_adjust_postponement_detail_migration_position_allowance_at_this_time" for="eva_adjust_postponement_detail_migration_position_allowance_at_this_time">เงินประจำแหน่ง (ณ วันปรับเลื่อน)</label>
+                            <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_position_allowance_at_this_time" iLabel="เงินประจำแหน่ง (ณ วันปรับเลื่อน)" iRequire="false" iGroup="eva_adjust_postponement_detail_migration" />
+                        </div>
+
+                        <div class="form-group col-md-4">
+                            <label id="lab_eva_adjust_postponement_detail_migration_other_money_at_this_time" for="eva_adjust_postponement_detail_migration_other_money_at_this_time">ค่าตอบแทนรายเดือน (ณ วันปรับเลื่อน)</label>
+                            <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_other_money_at_this_time" iLabel="ค่าตอบแทนรายเดือน (ณ วันปรับเลื่อน)" iRequire="false" iGroup="eva_adjust_postponement_detail_migration" />
+                        </div>
+                    </div>
+                    <div class='row'>
+                        <div class="form-group col-md-4">
+                            <label id="lab_eva_adjust_postponement_detail_migration_migration_total_score" for="eva_adjust_postponement_detail_migration_migration_total_score">คะแนนรวม (ณ วันปรับเลื่อน)</label>
+                            <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_migration_total_score" iLabel="คะแนนรวม (ณ วันปรับเลื่อน)" iRequire="false" iGroup="eva_adjust_postponement_detail_migration" />
+                        </div>
+
+                        <div class="form-group col-md-4">
+                            <label id="lab_eva_adjust_postponement_detail_migration_migration_eva_result" for="eva_adjust_postponement_detail_migration_migration_eva_result">ผลการประเมิน (ณ วันปรับเลื่อน)</label>
+                            <input class="form-control" type="text" id="eva_adjust_postponement_detail_migration_migration_eva_result" iLabel="ผลการประเมิน (ณ วันปรับเลื่อน)" iRequire="false" iGroup="eva_adjust_postponement_detail_migration" />
+                        </div>
+                    </div>
+
                     <div class='row'>
 
                     </div>

wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js

@@ -36,6 +36,10 @@ function eva_adjust_postponement_detail_migration_FeedDataToForm(data) {
     $("#eva_adjust_postponement_detail_migration_new_sarary_with_quota").val(data.new_sarary_with_quota);
     $("#eva_adjust_postponement_detail_migration_position_this_time").val(data.position_this_time);
     $("#eva_adjust_postponement_detail_migration_level_this_time").val(data.level_this_time);
+    $("#eva_adjust_postponement_detail_migration_position_allowance_at_this_time").val(data.position_allowance_at_this_time);
+    $("#eva_adjust_postponement_detail_migration_other_money_at_this_time").val(data.other_money_at_this_time);
+    $("#eva_adjust_postponement_detail_migration_migration_total_score").val(data.migration_total_score);
+    $("#eva_adjust_postponement_detail_migration_migration_eva_result").val(data.migration_eva_result);
 
 }
 
@@ -57,7 +61,10 @@ function eva_adjust_postponement_detail_migration_GetFromForm() {
     eva_adjust_postponement_detail_migrationObject.new_sarary_with_quota = $("#eva_adjust_postponement_detail_migration_new_sarary_with_quota").val();
     eva_adjust_postponement_detail_migrationObject.position_this_time = $("#eva_adjust_postponement_detail_migration_position_this_time").val();
     eva_adjust_postponement_detail_migrationObject.level_this_time = $("#eva_adjust_postponement_detail_migration_level_this_time").val();
-
+    eva_adjust_postponement_detail_migrationObject.position_allowance_at_this_time = $("#eva_adjust_postponement_detail_migration_position_allowance_at_this_time").val();
+    eva_adjust_postponement_detail_migrationObject.other_money_at_this_time = $("#eva_adjust_postponement_detail_migration_other_money_at_this_time").val();
+    eva_adjust_postponement_detail_migrationObject.migration_total_score = $("#eva_adjust_postponement_detail_migration_migration_total_score").val();
+    eva_adjust_postponement_detail_migrationObject.migration_eva_result = $("#eva_adjust_postponement_detail_migration_migration_eva_result").val();
 
     return eva_adjust_postponement_detail_migrationObject;
 }
@@ -197,6 +204,11 @@ var eva_adjust_postponement_detail_migration_setupTable = function (result) {
             { "data": "receive_quota" },
             { "data": "new_sarary_with_quota" },
             { "data": "remark" },
+            { "data": "position_allowance_at_this_time" },
+            { "data": "other_money_at_this_time" },
+            { "data": "migration_total_score" },
+            { "data": "migration_eva_result" },      
+
         ],
         "columnDefs": [
             {

wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js

@@ -1,202 +1,202 @@
 function eva_adjust_postponement_detail_quota_02_ClearForm(i, blankItem) {
-	var data = blankItem;
-$("#eva_adjust_postponement_detail_quota_02_id_" + i).val("");
-$("#eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_" + i).val("");
-$("#eva_adjust_postponement_detail_quota_02_employee_id_" + i).val("");
-$("#eva_adjust_postponement_detail_quota_02_sarary_" + i).text("");
-$("#eva_adjust_postponement_detail_quota_02_cost_living_" + i).text("");
-$("#eva_adjust_postponement_detail_quota_02_middle_" + i).text("");
-$("#eva_adjust_postponement_detail_quota_02_promoted_percentage_" + i).text("");
-$("#eva_adjust_postponement_detail_quota_02_total_promote_" + i).text("");
-$("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text("");
-$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text("");
-$("#eva_adjust_postponement_detail_quota_02_remark_" + i).text("");
-$("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val("");
-$("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text("");
-$("#eva_adjust_postponement_detail_quota_02_emp_code_" + i).text("");
-$("#eva_adjust_postponement_detail_quota_02_emp_fullname_" + i).text("");
-$("#eva_adjust_postponement_detail_quota_02_emp_position_" + i).text("");
-$("#eva_adjust_postponement_detail_quota_02_emp_level_" + i).text("");
-$("#eva_adjust_postponement_detail_quota_02_total_score_" + i).text("");
-$("#eva_adjust_postponement_detail_quota_02_eva_result_" + i).text("");
+    var data = blankItem;
+    $("#eva_adjust_postponement_detail_quota_02_id_" + i).val("");
+    $("#eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_" + i).val("");
+    $("#eva_adjust_postponement_detail_quota_02_employee_id_" + i).val("");
+    $("#eva_adjust_postponement_detail_quota_02_sarary_" + i).text("");
+    $("#eva_adjust_postponement_detail_quota_02_cost_living_" + i).text("");
+    $("#eva_adjust_postponement_detail_quota_02_middle_" + i).text("");
+    $("#eva_adjust_postponement_detail_quota_02_promoted_percentage_" + i).text("");
+    $("#eva_adjust_postponement_detail_quota_02_total_promote_" + i).text("");
+    $("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text("");
+    $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text("");
+    $("#eva_adjust_postponement_detail_quota_02_remark_" + i).text("");
+    $("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val("");
+    $("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text("");
+    $("#eva_adjust_postponement_detail_quota_02_emp_code_" + i).text("");
+    $("#eva_adjust_postponement_detail_quota_02_emp_fullname_" + i).text("");
+    $("#eva_adjust_postponement_detail_quota_02_emp_position_" + i).text("");
+    $("#eva_adjust_postponement_detail_quota_02_emp_level_" + i).text("");
+    $("#eva_adjust_postponement_detail_quota_02_total_score_" + i).text("");
+    $("#eva_adjust_postponement_detail_quota_02_eva_result_" + i).text("");
 
 }
 
 function eva_adjust_postponement_detail_quota_02_FeedDataToForm(data, i, blankItem) {
-$("#eva_adjust_postponement_detail_quota_02_id_" + i).val(data.id);
-$("#eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_" + i).val(data.adjust_postponement_quota_id);
-$("#eva_adjust_postponement_detail_quota_02_employee_id_" + i).val(data.employee_id);
-$("#eva_adjust_postponement_detail_quota_02_sarary_" + i).text(formatNumber(data.sarary));
-$("#eva_adjust_postponement_detail_quota_02_cost_living_" + i).text(formatNumber(data.cost_living));
-$("#eva_adjust_postponement_detail_quota_02_middle_" + i).text(formatNumber(data.middle));
-$("#eva_adjust_postponement_detail_quota_02_promoted_percentage_" + i).text(formatNumberTemp(data.promoted_percentage));
-$("#eva_adjust_postponement_detail_quota_02_total_promote_" + i).text(formatNumber(data.total_promote));
-$("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text(formatNumberTemp(data.new_sarary));
-$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(formatNumber(data.new_cost_living));
-$("#eva_adjust_postponement_detail_quota_02_remark_" + i).text(data.remark);
-$("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val(data.receive_quota);
-$("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text(formatNumber(data.new_sarary_with_quota));
-$("#eva_adjust_postponement_detail_quota_02_emp_code_" + i).text(data.emp_code);
-$("#eva_adjust_postponement_detail_quota_02_emp_fullname_" + i).text(data.emp_fullname);
-$("#eva_adjust_postponement_detail_quota_02_emp_position_" + i).text(data.emp_position);
-$("#eva_adjust_postponement_detail_quota_02_emp_level_" + i).text(data.emp_level);
-$("#eva_adjust_postponement_detail_quota_02_total_score_" + i).text(data.total_score);
-$("#eva_adjust_postponement_detail_quota_02_eva_result_" + i).text(data.eva_result);
+    $("#eva_adjust_postponement_detail_quota_02_id_" + i).val(data.id);
+    $("#eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_" + i).val(data.adjust_postponement_quota_id);
+    $("#eva_adjust_postponement_detail_quota_02_employee_id_" + i).val(data.employee_id);
+    $("#eva_adjust_postponement_detail_quota_02_sarary_" + i).text(formatNumber(data.sarary));
+    $("#eva_adjust_postponement_detail_quota_02_cost_living_" + i).text(formatNumber(data.cost_living));
+    $("#eva_adjust_postponement_detail_quota_02_middle_" + i).text(formatNumber(data.middle));
+    $("#eva_adjust_postponement_detail_quota_02_promoted_percentage_" + i).text(formatNumberTemp(data.promoted_percentage));
+    $("#eva_adjust_postponement_detail_quota_02_total_promote_" + i).text(formatNumber(data.total_promote));
+    $("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text(formatNumberTemp(data.new_sarary));
+    $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(formatNumber(data.new_cost_living));
+    $("#eva_adjust_postponement_detail_quota_02_remark_" + i).text(data.remark);
+    $("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val(data.receive_quota);
+    $("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text(formatNumber(data.new_sarary_with_quota));
+    $("#eva_adjust_postponement_detail_quota_02_emp_code_" + i).text(data.emp_code);
+    $("#eva_adjust_postponement_detail_quota_02_emp_fullname_" + i).text(data.emp_fullname);
+    $("#eva_adjust_postponement_detail_quota_02_emp_position_" + i).text(data.emp_position);
+    $("#eva_adjust_postponement_detail_quota_02_emp_level_" + i).text(data.emp_level);
+    $("#eva_adjust_postponement_detail_quota_02_total_score_" + i).text(data.total_score);
+    $("#eva_adjust_postponement_detail_quota_02_eva_result_" + i).text(data.eva_result);
 
 }
 
 function eva_adjust_postponement_detail_quota_02_GetFromForm(obj, i) {
     var eva_adjust_postponement_detail_quota_02Object = new Object();
-eva_adjust_postponement_detail_quota_02Object.id = obj.find("#eva_adjust_postponement_detail_quota_02_id_" + i).val();
-eva_adjust_postponement_detail_quota_02Object.adjust_postponement_quota_id = obj.find("#eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_" + i).val();
-eva_adjust_postponement_detail_quota_02Object.employee_id = obj.find("#eva_adjust_postponement_detail_quota_02_employee_id_" + i).val();
-eva_adjust_postponement_detail_quota_02Object.sarary = obj.find("#eva_adjust_postponement_detail_quota_02_sarary_" + i).text();
-eva_adjust_postponement_detail_quota_02Object.cost_living = obj.find("#eva_adjust_postponement_detail_quota_02_cost_living_" + i).text();
-eva_adjust_postponement_detail_quota_02Object.middle = obj.find("#eva_adjust_postponement_detail_quota_02_middle_" + i).text();
-eva_adjust_postponement_detail_quota_02Object.promoted_percentage = obj.find("#eva_adjust_postponement_detail_quota_02_promoted_percentage_" + i).text();
-eva_adjust_postponement_detail_quota_02Object.total_promote = obj.find("#eva_adjust_postponement_detail_quota_02_total_promote_" + i).text();
-eva_adjust_postponement_detail_quota_02Object.new_sarary = obj.find("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text();
-eva_adjust_postponement_detail_quota_02Object.new_cost_living = obj.find("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text();
-eva_adjust_postponement_detail_quota_02Object.remark = obj.find("#eva_adjust_postponement_detail_quota_02_remark_" + i).text();
-eva_adjust_postponement_detail_quota_02Object.receive_quota = obj.find("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val();
-eva_adjust_postponement_detail_quota_02Object.new_sarary_with_quota = obj.find("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text();
-eva_adjust_postponement_detail_quota_02Object.emp_code = obj.find("#eva_adjust_postponement_detail_quota_02_emp_code_" + i).text();
-eva_adjust_postponement_detail_quota_02Object.emp_fullname = obj.find("#eva_adjust_postponement_detail_quota_02_emp_fullname_" + i).text();
-eva_adjust_postponement_detail_quota_02Object.emp_position = obj.find("#eva_adjust_postponement_detail_quota_02_emp_position_" + i).text();
-eva_adjust_postponement_detail_quota_02Object.emp_level = obj.find("#eva_adjust_postponement_detail_quota_02_emp_level_" + i).text();
-eva_adjust_postponement_detail_quota_02Object.total_score = obj.find("#eva_adjust_postponement_detail_quota_02_total_score_" + i).text();
-eva_adjust_postponement_detail_quota_02Object.eva_result = obj.find("#eva_adjust_postponement_detail_quota_02_eva_result_" + i).text();
+    eva_adjust_postponement_detail_quota_02Object.id = obj.find("#eva_adjust_postponement_detail_quota_02_id_" + i).val();
+    eva_adjust_postponement_detail_quota_02Object.adjust_postponement_quota_id = obj.find("#eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_" + i).val();
+    eva_adjust_postponement_detail_quota_02Object.employee_id = obj.find("#eva_adjust_postponement_detail_quota_02_employee_id_" + i).val();
+    eva_adjust_postponement_detail_quota_02Object.sarary = obj.find("#eva_adjust_postponement_detail_quota_02_sarary_" + i).text();
+    eva_adjust_postponement_detail_quota_02Object.cost_living = obj.find("#eva_adjust_postponement_detail_quota_02_cost_living_" + i).text();
+    eva_adjust_postponement_detail_quota_02Object.middle = obj.find("#eva_adjust_postponement_detail_quota_02_middle_" + i).text();
+    eva_adjust_postponement_detail_quota_02Object.promoted_percentage = obj.find("#eva_adjust_postponement_detail_quota_02_promoted_percentage_" + i).text();
+    eva_adjust_postponement_detail_quota_02Object.total_promote = obj.find("#eva_adjust_postponement_detail_quota_02_total_promote_" + i).text();
+    eva_adjust_postponement_detail_quota_02Object.new_sarary = obj.find("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text();
+    eva_adjust_postponement_detail_quota_02Object.new_cost_living = obj.find("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text();
+    eva_adjust_postponement_detail_quota_02Object.remark = obj.find("#eva_adjust_postponement_detail_quota_02_remark_" + i).text();
+    eva_adjust_postponement_detail_quota_02Object.receive_quota = obj.find("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val();
+    eva_adjust_postponement_detail_quota_02Object.new_sarary_with_quota = obj.find("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text();
+    eva_adjust_postponement_detail_quota_02Object.emp_code = obj.find("#eva_adjust_postponement_detail_quota_02_emp_code_" + i).text();
+    eva_adjust_postponement_detail_quota_02Object.emp_fullname = obj.find("#eva_adjust_postponement_detail_quota_02_emp_fullname_" + i).text();
+    eva_adjust_postponement_detail_quota_02Object.emp_position = obj.find("#eva_adjust_postponement_detail_quota_02_emp_position_" + i).text();
+    eva_adjust_postponement_detail_quota_02Object.emp_level = obj.find("#eva_adjust_postponement_detail_quota_02_emp_level_" + i).text();
+    eva_adjust_postponement_detail_quota_02Object.total_score = obj.find("#eva_adjust_postponement_detail_quota_02_total_score_" + i).text();
+    eva_adjust_postponement_detail_quota_02Object.eva_result = obj.find("#eva_adjust_postponement_detail_quota_02_eva_result_" + i).text();
 
     eva_adjust_postponement_detail_quota_02Object.active_mode = obj.find("#isActive_" + i + "_eva_adjust_postponement_detail_quota_02").val();
     return eva_adjust_postponement_detail_quota_02Object;
 }
 
 function eva_adjust_postponement_detail_quota_02_Save(id) {
-	//Insert eva_adjust_postponement_detail_quota_02 List
-	var eva_adjust_postponement_detail_quota_02 = [];
+    //Insert eva_adjust_postponement_detail_quota_02 List
+    var eva_adjust_postponement_detail_quota_02 = [];
     $('#eva_adjust_postponement_detail_quota_02Body tr').each(function () {
         var i = $(this).find("#rowCount").text();
-        if(i){
-var eacheva_adjust_postponement_detail_quota_02 = eva_adjust_postponement_detail_quota_02_GetFromForm($(this), i);
-		eva_adjust_postponement_detail_quota_02.push(eacheva_adjust_postponement_detail_quota_02);
-}
-		
-	});
+        if (i) {
+            var eacheva_adjust_postponement_detail_quota_02 = eva_adjust_postponement_detail_quota_02_GetFromForm($(this), i);
+            eva_adjust_postponement_detail_quota_02.push(eacheva_adjust_postponement_detail_quota_02);
+        }
+
+    });
 
     var successFunc = function (result) {
         AlertSuccess("ปรับปรุงข้อมูลเรียบร้อยแล้ว");
-		endLoad();
+        endLoad();
     };
-	startLoad();
-	AjaxPutRequest(apisite + '/api/eva_adjust_postponement_detail_quota_02/UpdateMultiple', eva_adjust_postponement_detail_quota_02, successFunc, AlertDanger);
+    startLoad();
+    AjaxPutRequest(apisite + '/api/eva_adjust_postponement_detail_quota_02/UpdateMultiple', eva_adjust_postponement_detail_quota_02, successFunc, AlertDanger);
 }
 
 function eva_adjust_postponement_detail_quota_02_Get(a, blankItem) {
 
-	$('#eva_adjust_postponement_detail_quota_02Body').empty();
+    $('#eva_adjust_postponement_detail_quota_02Body').empty();
 
-var cur_dep = "";
+    var cur_dep = "";
 
-	var successFunc = function (response) {
-//console.log(response);
+    var successFunc = function (response) {
+        //console.log(response);
         var sum_current_salary = 0;
 
-		$.each(response, function (i, data) {
+        $.each(response, function (i, data) {
 
-        sum_current_salary += data.sarary;
+            sum_current_salary += data.sarary;
 
-var tag = "";
-if(cur_dep !== data.emp_department_name){
-    tag += '<tr><td colspan="16">'+data.emp_department_name+'</td></tr>';
-    cur_dep = data.emp_department_name;
-}
+            var tag = "";
+            if (cur_dep !== data.emp_department_name) {
+                tag += '<tr><td colspan="16">' + data.emp_department_name + '</td></tr>';
+                cur_dep = data.emp_department_name;
+            }
 
-			tag += '<tr>';
-            tag += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_adjust_postponement_detail_quota_02" value="1" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_id_' + (i + 1)+'" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_' + (i + 1)+'" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_employee_id_' + (i + 1)+'" /></td>';
+            tag += '<tr>';
+            tag += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_adjust_postponement_detail_quota_02" value="1" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_' + (i + 1) + '" /><input class="form-control" type="hidden" id="eva_adjust_postponement_detail_quota_02_employee_id_' + (i + 1) + '" /></td>';
 
- tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_emp_code_' + (i + 1)+'" /></td>';
- tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_emp_fullname_' + (i + 1)+'" /></td>';
- tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_emp_position_' + (i + 1)+'" /></td>';
- tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_emp_level_' + (i + 1)+'" /></td>';
+            tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_emp_code_' + (i + 1) + '" /></td>';
+            tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_emp_fullname_' + (i + 1) + '" /></td>';
+            tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_emp_position_' + (i + 1) + '" /></td>';
+            tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_emp_level_' + (i + 1) + '" /></td>';
 
- tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_sarary_' + (i + 1)+'" /></td>';
- tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_cost_living_' + (i + 1)+'" /></td>';
+            tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_sarary_' + (i + 1) + '" /></td>';
+            tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_cost_living_' + (i + 1) + '" /></td>';
 
- tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_total_score_' + (i + 1)+'" /></td>';
- tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_eva_result_' + (i + 1)+'" /></td>';
+            tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_total_score_' + (i + 1) + '" /></td>';
+            tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_eva_result_' + (i + 1) + '" /></td>';
 
- tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_middle_' + (i + 1)+'" /></td>';
- tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_promoted_percentage_' + (i + 1)+'" /></td>';
- tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_total_promote_' + (i + 1)+'" /><p style="display:none;" id="eva_adjust_postponement_detail_quota_02_new_sarary_' + (i + 1)+'" /></td>';
+            tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_middle_' + (i + 1) + '" /></td>';
+            tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_promoted_percentage_' + (i + 1) + '" /></td>';
+            tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_total_promote_' + (i + 1) + '" /><p style="display:none;" id="eva_adjust_postponement_detail_quota_02_new_sarary_' + (i + 1) + '" /></td>';
 
- tag += '<td><input onchange="CalculateRemainQuota();" class="form-control" type="number" id="eva_adjust_postponement_detail_quota_02_receive_quota_' + (i + 1)+'" /></td>';
- tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_' + (i + 1)+'" /></td>';
- tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_new_cost_living_' + (i + 1)+'" /></td>';
- tag += '<td><p id="eva_adjust_postponement_detail_quota_02_remark_' + (i + 1)+'" /></td>';
+            tag += '<td><input onchange="CalculateRemainQuota();" class="form-control" type="number" id="eva_adjust_postponement_detail_quota_02_receive_quota_' + (i + 1) + '" /></td>';
+            tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_' + (i + 1) + '" /></td>';
+            tag += '<td><p  id="eva_adjust_postponement_detail_quota_02_new_cost_living_' + (i + 1) + '" /></td>';
+            tag += '<td><p id="eva_adjust_postponement_detail_quota_02_remark_' + (i + 1) + '" /></td>';
 
 
-			tag += '</tr>';
+            tag += '</tr>';
 
-            if(data.position_allowance > 0){
+            if (data.position_allowance > 0) {
                 tag += '<tr>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td>เงินประจำตำแหน่ง</td>';
                 tag += '<td></td>';
-                tag += '<td>'+formatNumber(data.position_allowance)+'</td>';
-                tag += '<td></td>';
-                tag += '<td></td>';                
+                tag += '<td>' + formatNumber(data.position_allowance) + '</td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
-                tag += '<td></td>';                
                 tag += '<td></td>';
-                tag += '<td>'+formatNumber(data.position_allowance)+'</td>';
+                tag += '<td></td>';
+                tag += '<td></td>';
+                tag += '<td></td>';
+                tag += '<td>' + formatNumber(data.position_allowance) + '</td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '</tr>';
             }
 
-            if(data.other_money > 0){
+            if (data.other_money > 0) {
                 tag += '<tr>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td>ค่าตอบแทนรายเดือน</td>';
                 tag += '<td></td>';
-                tag += '<td>'+formatNumber(data.other_money)+'</td>';
-                tag += '<td></td>';
-                tag += '<td></td>';                
+                tag += '<td>' + formatNumber(data.other_money) + '</td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
-                tag += '<td></td>';                
                 tag += '<td></td>';
-                tag += '<td>'+formatNumber(data.other_money)+'</td>';
+                tag += '<td></td>';
+                tag += '<td></td>';
+                tag += '<td></td>';
+                tag += '<td>' + formatNumber(data.other_money) + '</td>';
                 tag += '<td></td>';
                 tag += '<td></td>';
                 tag += '</tr>';
             }
 
-			$('#eva_adjust_postponement_detail_quota_02Body').append($(tag));
-			eva_adjust_postponement_detail_quota_02_FeedDataToForm(data, (i + 1), blankItem);
+            $('#eva_adjust_postponement_detail_quota_02Body').append($(tag));
+            eva_adjust_postponement_detail_quota_02_FeedDataToForm(data, (i + 1), blankItem);
+
+        });
 
-		});
-        
         $("#eva_adjust_postponement_quota_limit").val(sum_current_salary);
         console.log(sum_current_salary);
-        
-        $("#sum_current_salary").maskMoney('mask', sum_current_salary);             
+
+        $("#sum_current_salary").maskMoney('mask', sum_current_salary);
 
         Oneva_adjust_postponement_quota_limit_frame_quotaChange();
 
         //CalculateRemainQuota();
-		endLoad();
-	};
-	startLoad();
-	//AjaxGetRequest(apisite + "/api/eva_adjust_postponement_detail_quota_02", successFunc, AlertDanger);
-	AjaxGetRequest(apisite + '/api/eva_adjust_postponement_detail_quota_02/?adjust_postponement_quota_id=' + a, successFunc, AlertDanger);
+        endLoad();
+    };
+    startLoad();
+    //AjaxGetRequest(apisite + "/api/eva_adjust_postponement_detail_quota_02", successFunc, AlertDanger);
+    AjaxGetRequest(apisite + '/api/eva_adjust_postponement_detail_quota_02/?adjust_postponement_quota_id=' + a, successFunc, AlertDanger);
 
 }