ปรับปรุงหน้าจอ migration และ เงื่อนไขการค้นหา หน้าทำแบบประเมิน

Migrations/20210406042734_AddMigrationField003.Designer.cs

@@ -0,0 +1,968 @@
+// <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("20210406042734_AddMigrationField003")]
+    partial class AddMigrationField003
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
+                .HasAnnotation("ProductVersion", "2.2.6-servicing-10079")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("command_no")
+                        .HasMaxLength(4000);
+
+                    b.Property<int?>("create_evaluation_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("fiscal_year");
+
+                    b.Property<DateTime?>("imported_date");
+
+                    b.Property<string>("imported_file")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit");
+
+                    b.Property<decimal?>("limit_frame");
+
+                    b.Property<decimal?>("limit_frame_quota");
+
+                    b.Property<decimal?>("limit_quota");
+
+                    b.Property<int?>("managed_by");
+
+                    b.Property<decimal?>("percentage");
+
+                    b.Property<string>("report_type")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("theDate");
+
+                    b.Property<int?>("theRound");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_id");
+
+                    b.ToTable("eva_adjust_postponement");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponement_detailEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<decimal?>("achievement_final");
+
+                    b.Property<int?>("adjust_postponement_id");
+
+                    b.Property<int?>("adjust_postponement_quota_id");
+
+                    b.Property<decimal?>("competency_final");
+
+                    b.Property<decimal?>("cost_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<string>("employee_no_at_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("fullname_at_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_score_final")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("middle");
+
+                    b.Property<string>("migration_eva_result")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("migration_total_score");
+
+                    b.Property<decimal?>("new_cost_living");
+
+                    b.Property<decimal?>("new_sarary");
+
+                    b.Property<decimal?>("new_sarary_with_quota");
+
+                    b.Property<int?>("order_at_this_time");
+
+                    b.Property<int?>("org_at_this_time");
+
+                    b.Property<decimal?>("other_money_at_this_time");
+
+                    b.Property<decimal?>("position_allowance_at_this_time");
+
+                    b.Property<string>("position_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("promoted_percentage");
+
+                    b.Property<decimal?>("receive_quota");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("sarary");
+
+                    b.Property<decimal?>("score_final");
+
+                    b.Property<decimal?>("total_promote");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("adjust_postponement_id");
+
+                    b.HasIndex("adjust_postponement_quota_id");
+
+                    b.ToTable("eva_adjust_postponement_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("evaluation_group_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<Guid?>("performance_plan_id");
+
+                    b.Property<decimal?>("score1");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<int?>("supervisor1_id");
+
+                    b.Property<int?>("supervisor2_id");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("evaluation_group_id");
+
+                    b.HasIndex("performance_plan_id");
+
+                    b.ToTable("eva_create_evaluation");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detailEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<decimal?>("Final_summary_chief");
+
+                    b.Property<decimal?>("Final_summary_competency_chief");
+
+                    b.Property<decimal?>("Final_summary_competency_supervisor");
+
+                    b.Property<decimal?>("Final_summary_competency_supervisor1A");
+
+                    b.Property<decimal?>("Final_summary_competency_supervisor2A");
+
+                    b.Property<decimal?>("Final_summary_supervisor");
+
+                    b.Property<decimal?>("Final_summary_supervisor1A");
+
+                    b.Property<decimal?>("Final_summary_supervisor2A");
+
+                    b.Property<decimal?>("achievement_chief");
+
+                    b.Property<decimal?>("achievement_supervisor");
+
+                    b.Property<decimal?>("achievement_supervisor1A");
+
+                    b.Property<decimal?>("achievement_supervisor2A");
+
+                    b.Property<int?>("chief");
+
+                    b.Property<int?>("chief_a");
+
+                    b.Property<DateTime?>("chief_a_date");
+
+                    b.Property<string>("chief_a_reject_reason")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("chief_a_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("chief_a_result")
+                        .HasMaxLength(1);
+
+                    b.Property<decimal?>("competency_chief");
+
+                    b.Property<decimal?>("competency_supervisor");
+
+                    b.Property<decimal?>("competency_supervisor1A");
+
+                    b.Property<decimal?>("competency_supervisor2A");
+
+                    b.Property<int?>("create_evaluation_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<int?>("eva_employee_id");
+
+                    b.Property<int?>("help_org_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_score_chief")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor1A")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("level_score_supervisor2A")
+                        .HasMaxLength(255);
+
+                    b.Property<int?>("order_of_data");
+
+                    b.Property<decimal?>("score_chief");
+
+                    b.Property<decimal?>("score_supervisor");
+
+                    b.Property<decimal?>("score_supervisor1A");
+
+                    b.Property<decimal?>("score_supervisor2A");
+
+                    b.Property<string>("status_chief")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_chief_a")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_chief_a_click_date");
+
+                    b.Property<DateTime?>("status_chief_click_date");
+
+                    b.Property<string>("status_self")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_self_a")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_self_a_click_date");
+
+                    b.Property<DateTime?>("status_self_click_date");
+
+                    b.Property<string>("status_supervisor")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_supervisor1A")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_supervisor1A_click_date");
+
+                    b.Property<string>("status_supervisor2A")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("status_supervisor2A_click_date");
+
+                    b.Property<DateTime?>("status_supervisor_click_date");
+
+                    b.Property<int?>("supervisor1");
+
+                    b.Property<int?>("supervisor1A");
+
+                    b.Property<DateTime?>("supervisor1A_date");
+
+                    b.Property<string>("supervisor1A_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1A_result")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("supervisor1_date");
+
+                    b.Property<int?>("supervisor1_id");
+
+                    b.Property<string>("supervisor1_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1_result")
+                        .HasMaxLength(1);
+
+                    b.Property<int?>("supervisor2");
+
+                    b.Property<int?>("supervisor2A");
+
+                    b.Property<DateTime?>("supervisor2A_date");
+
+                    b.Property<string>("supervisor2A_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor2A_result")
+                        .HasMaxLength(1);
+
+                    b.Property<DateTime?>("supervisor2_date");
+
+                    b.Property<int?>("supervisor2_id");
+
+                    b.Property<string>("supervisor2_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor2_result")
+                        .HasMaxLength(1);
+
+                    b.Property<decimal?>("total_summary_chief");
+
+                    b.Property<decimal?>("total_summary_competency_chief");
+
+                    b.Property<decimal?>("total_summary_competency_supervisor");
+
+                    b.Property<decimal?>("total_summary_competency_supervisor1A");
+
+                    b.Property<decimal?>("total_summary_competency_supervisor2A");
+
+                    b.Property<decimal?>("total_summary_supervisor");
+
+                    b.Property<decimal?>("total_summary_supervisor1A");
+
+                    b.Property<decimal?>("total_summary_supervisor2A");
+
+                    b.Property<DateTime>("updated");
+
+                    b.Property<decimal?>("work_period");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_id");
+
+                    b.ToTable("eva_create_evaluation_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("achievement")
+                        .HasMaxLength(8000);
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("score");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<decimal?>("score3");
+
+                    b.Property<decimal?>("score4");
+
+                    b.Property<decimal?>("sumary");
+
+                    b.Property<decimal?>("sumary2");
+
+                    b.Property<decimal?>("sumary3");
+
+                    b.Property<decimal?>("sumary4");
+
+                    b.Property<string>("target_score1")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score2")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score3")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score4")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score5")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("thefile")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.Property<decimal?>("weight");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_detail_id");
+
+                    b.ToTable("eva_evaluation_achievement");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<string>("behavior")
+                        .HasMaxLength(1000);
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("score");
+
+                    b.Property<decimal?>("score2");
+
+                    b.Property<decimal?>("score3");
+
+                    b.Property<decimal?>("score4");
+
+                    b.Property<decimal?>("sumary");
+
+                    b.Property<decimal?>("sumary2");
+
+                    b.Property<decimal?>("sumary3");
+
+                    b.Property<decimal?>("sumary4");
+
+                    b.Property<string>("target_score1")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score2")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score3")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score4")
+                        .HasMaxLength(255);
+
+                    b.Property<string>("target_score5")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("updated");
+
+                    b.Property<decimal?>("weight");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_detail_id");
+
+                    b.ToTable("eva_evaluation_behavior");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_groupEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<int?>("main_dept_id");
+
+                    b.Property<decimal?>("percentage");
+
+                    b.Property<string>("thegroup")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_evaluation_group");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("evaluation_group_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("evaluation_group_id");
+
+                    b.ToTable("eva_evaluation_group_detail");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_operating_agreementEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("indicators")
+                        .HasMaxLength(4000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("mission_detail")
+                        .HasMaxLength(4000);
+
+                    b.Property<int?>("mission_no");
+
+                    b.Property<string>("target")
+                        .HasMaxLength(4000);
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("create_evaluation_detail_id");
+
+                    b.ToTable("eva_evaluation_operating_agreement");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_idp_planEntity", b =>
+                {
+                    b.Property<int>("id");
+
+                    b.Property<int?>("create_evaluation_detail_id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("develop")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("development_method")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("end_date");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("period_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<DateTime?>("start_date");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_idp_plan");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_level_scoreEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("code")
+                        .HasMaxLength(255);
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<string>("detail")
+                        .HasMaxLength(1000);
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("max_score");
+
+                    b.Property<decimal?>("min_score");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.ToTable("eva_level_score");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<decimal?>("cost_of_living");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("employee_id");
+
+                    b.Property<Guid?>("frame_group_guid");
+
+                    b.Property<int?>("help_org_id");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<string>("level_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("monthly_remuneration");
+
+                    b.Property<int?>("order_of_data");
+
+                    b.Property<int?>("org_id");
+
+                    b.Property<decimal?>("position_allowance");
+
+                    b.Property<string>("position_text")
+                        .HasMaxLength(1000);
+
+                    b.Property<decimal?>("salary");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("frame_group_guid");
+
+                    b.ToTable("eva_limit_frame_employee");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<Guid?>("frame_plan_guid");
+
+                    b.Property<Guid?>("group_guid");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit_frame_295");
+
+                    b.Property<int?>("main_dept_id");
+
+                    b.Property<string>("remark")
+                        .HasMaxLength(4000);
+
+                    b.Property<decimal?>("total_salary");
+
+                    b.Property<decimal?>("total_salary_limit");
+
+                    b.Property<decimal?>("total_salary_limit_rounded");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("frame_plan_guid");
+
+                    b.HasIndex("group_guid");
+
+                    b.ToTable("eva_limit_frame_group");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b =>
+                {
+                    b.Property<Guid>("id");
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<DateTime?>("executed_date");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("limit_frame_005");
+
+                    b.Property<decimal?>("limit_frame_005_total");
+
+                    b.Property<decimal?>("limit_frame_005_total_rounded");
+
+                    b.Property<Guid?>("plan_guid");
+
+                    b.Property<DateTime?>("salary_adjustment_date");
+
+                    b.Property<string>("status_chief")
+                        .HasMaxLength(1);
+
+                    b.Property<string>("status_self")
+                        .HasMaxLength(1);
+
+                    b.Property<int?>("supervisor1");
+
+                    b.Property<DateTime?>("supervisor1_date");
+
+                    b.Property<string>("supervisor1_remark")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("supervisor1_result")
+                        .HasMaxLength(1);
+
+                    b.Property<decimal?>("total_salary");
+
+                    b.Property<DateTime>("updated");
+
+                    b.HasKey("id");
+
+                    b.HasIndex("plan_guid");
+
+                    b.ToTable("eva_limit_frame_plan");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_performance_planEntity", b =>
+                {
+                    b.Property<Guid>("id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("created");
+
+                    b.Property<int?>("fiscal_year");
+
+                    b.Property<bool>("isActive");
+
+                    b.Property<decimal?>("percent");
+
+                    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_create_evaluation_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluationEntity", "eva_create_evaluation_create_evaluation_id")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_detail_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_detail_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group")
+                        .WithMany()
+                        .HasForeignKey("evaluation_group_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_operating_agreementEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail_create_evaluation_detail_id")
+                        .WithMany()
+                        .HasForeignKey("create_evaluation_detail_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_limit_frame_groupEntity", "eva_limit_frame_group_frame_group_guid")
+                        .WithMany()
+                        .HasForeignKey("frame_group_guid");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_limit_frame_planEntity", "eva_limit_frame_plan_frame_plan_guid")
+                        .WithMany()
+                        .HasForeignKey("frame_plan_guid");
+
+                    b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group_group_guid")
+                        .WithMany()
+                        .HasForeignKey("group_guid");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan_plan_guid")
+                        .WithMany()
+                        .HasForeignKey("plan_guid");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan")
+                        .WithMany()
+                        .HasForeignKey("performance_plan_id");
+                });
+
+            modelBuilder.Entity("TodoAPI2.Models.eva_promoted_percentageEntity", b =>
+                {
+                    b.HasOne("TodoAPI2.Models.eva_level_scoreEntity", "eva_level_score")
+                        .WithMany()
+                        .HasForeignKey("level_score_id");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

Migrations/20210406042734_AddMigrationField003.cs

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

Migrations/DataContextModelSnapshot.cs

@@ -85,6 +85,12 @@ namespace tb320eva.Migrations
 
                     b.Property<int?>("employee_id");
 
+                    b.Property<string>("employee_no_at_this_time")
+                        .HasMaxLength(1000);
+
+                    b.Property<string>("fullname_at_this_time")
+                        .HasMaxLength(1000);
+
                     b.Property<bool>("isActive");
 
                     b.Property<string>("level_score_final")

Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs

@@ -74,6 +74,11 @@ namespace TodoAPI2.Models
 
         [MaxLength(255)]
         public string level_score_final { get; set; }
+        [MaxLength(1000)]
+        public string fullname_at_this_time { get; set; }
+
+        [MaxLength(1000)]
+        public string employee_no_at_this_time { get; set; }
     }
 }
 

Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationInputModel.cs

@@ -58,8 +58,11 @@ namespace TodoAPI2.Models
 
         public int? order_at_this_time { get; set; }
 
+        public string fullname_at_this_time { get; set; }
+
+        public string employee_no_at_this_time { get; set; }
+
         public string active_mode { get; set; }
-
     }
 }
 

Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationService.cs

@@ -158,6 +158,9 @@ namespace TodoAPI2.Models
                     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,
 
+                    fullname_at_this_time = m_eva_adjust_postponement_detail_migration.fullname_at_this_time,
+                    employee_no_at_this_time = m_eva_adjust_postponement_detail_migration.employee_no_at_this_time,
+
                     isActive = m_eva_adjust_postponement_detail_migration.isActive,
                     Created = m_eva_adjust_postponement_detail_migration.created,
                     Updated = m_eva_adjust_postponement_detail_migration.updated
@@ -227,6 +230,9 @@ namespace TodoAPI2.Models
                 existingEntity.org_at_this_time = model.org_at_this_time;
                 existingEntity.order_at_this_time = model.order_at_this_time;
 
+                existingEntity.fullname_at_this_time = model.fullname_at_this_time;
+                existingEntity.employee_no_at_this_time = model.employee_no_at_this_time;
+
                 var updated = _repository.Update(id, existingEntity);
                 return Get(updated.id);
             }
@@ -266,6 +272,9 @@ namespace TodoAPI2.Models
                         existingEntity.org_at_this_time = i.org_at_this_time;
                         existingEntity.order_at_this_time = i.order_at_this_time;
 
+                        existingEntity.fullname_at_this_time = i.fullname_at_this_time;
+                        existingEntity.employee_no_at_this_time = i.employee_no_at_this_time;
+
                         //existingEntity.SetAutoField(_repository.Context);
                         _repository.UpdateWithoutCommit(i.id.Value, existingEntity);
                     }
@@ -325,7 +334,6 @@ namespace TodoAPI2.Models
         {
             var i = new Dictionary<string, string>();
 
-
             i.Add("adjust_postponement_id", "รหัสอ้างอิงตาราง eva_adjust_postponement");
             i.Add("adjust_postponement_id_eva_adjust_postponement_fiscal_year", "รหัสอ้างอิงตาราง eva_adjust_postponement");
             i.Add("adjust_postponement_quota_id", "รหัสอ้างอิงตาราง eva_adjust_postponement");
@@ -344,6 +352,8 @@ namespace TodoAPI2.Models
             i.Add("new_sarary_with_quota", "เงินเดือนใหม่ (รวมโควต้า)");
             i.Add("position_this_time", "ตำแหน่ง (ณ วันปรับเลื่อน)");
             i.Add("level_this_time", "ระดับ (ณ วันปรับเลื่อน)");
+            i.Add("fullname_at_this_time", "ชื่อ-ชื่อสกุล (ณ วันปรับเลื่อน)");
+            i.Add("employee_no_at_this_time", "เลขที่พนักงาน  (ณ วันปรับเลื่อน)");
 
             return i;
         }

Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationViewModel.cs

@@ -51,13 +51,19 @@ namespace TodoAPI2.Models
         public decimal? migration_total_score { get; set; }
 
         public string migration_eva_result { get; set; }
+
         public int? org_at_this_time { get; set; }
 
         public int? order_at_this_time { get; set; }
 
+        public string fullname_at_this_time { get; set; }
+
+        public string employee_no_at_this_time { 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; }
+        public string org_at_this_time_external_linkage_external_name { get; set; }
 
     }
 }

Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationWithSelectionViewModel.cs

@@ -9,5 +9,6 @@ namespace TodoAPI2.Models
     {
         public List<external_employeeViewModel> item_employee_id { get; set; }
         public List<external_linkageViewModel> item_org_at_this_time { get; set; }
+
     }
 }

Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs

@@ -198,7 +198,7 @@ namespace TodoAPI2.Models
             item.item_level_score = (from i in _repository.Context.eva_level_score
                                     orderby i.min_score
                                     select Mapper.Map<eva_level_scoreViewModel>(i)).ToList();
-            item.item_employee_id = (from x in emp.GetListByemployee_type(null,null) select x).ToList();
+            item.item_employee_id = (from x in emp.GetAllEmployee() where x.count_resigns == 0 select x).ToList();
 
             return item;
         }
@@ -206,7 +206,7 @@ namespace TodoAPI2.Models
         {
             var i = new eva_create_evaluation_detail_processWithSelectionViewModel();
             i.item_org_id = ext.GetDepartmentData();
-            i.item_employee_id = (from x in emp.GetListByemployee_type(null, null) select x).ToList();
+            i.item_employee_id = (from x in emp.GetAllEmployee() where x.count_resigns == 0 select x).ToList();
             //i.item_level_score = (from j in _repository.Context.eva_level_score
             //                         orderby j.min_score
             //                         select Mapper.Map<eva_level_scoreViewModel>(i)).ToList();

Models/external_employee/external_employeeService.cs

@@ -95,7 +95,8 @@ hpt.position_type_name,he.packing_date,he.cost_of_living,
    LIMIT 1) IS NOT null THEN 'ช่วยปฎิบัติหน้าที่'
 ELSE null END) as remark_hrm_work_record,
 
-org_type_depart.department_degree_id, he.timerecorder_id
+org_type_depart.department_degree_id, he.timerecorder_id,
+(select count(*) from hrm_resigns where hrm_resigns.employee_id = he.employee_id) as count_resigns
 
 from public.hrm_employees as he
 left join public.hrm_position_types as hpt on he.position_type_id=hpt.id
@@ -108,6 +109,30 @@ left join public.hrm_employee_types as het on het.id = he.employee_type_id
 left join public.users as u on u.employee_id = he.employee_id
 left join public.org_type_departments as org_type_depart on orgdata.department_type_id = org_type_depart.id
 left join public.org_type_department_colors as org_depart_color on org_type_depart.department_degree_id = org_depart_color.id
+left join (select orgdata.id,orgdata2.id as id2,
+case when orgdata2.department_name is not null then 
+concat(orgdata2.department_name,' - ',orgdata.department_name)
+else orgdata.department_name end as full_dep,
+orgdata.department_name,
+orgdata.department_code,detail.parent_department_id,
+case 
+when org_type_depart.department_degree_id = 1 then orgdata.department_code::int*1000
+when detail.parent_department_id is not null and detail.parent_department_id>0
+then orgdata2.department_code::int*1000+orgdata.department_code::int
+else orgdata.department_code::int*100000 end as sort_order,org_type_depart.department_degree_id
+from public.{0}DepartmentData{0} orgdata
+left join org_organization_chart_details detail on orgdata.id = detail.department_id
+left join public.{0}DepartmentData{0} orgdata2 on orgdata2.id = detail.parent_department_id
+left join public.org_type_departments as org_type_depart on orgdata.department_type_id = org_type_depart.id
+left join public.org_type_department_colors as org_depart_color
+on org_type_depart.department_degree_id = org_depart_color.id
+where orgdata.department_name is not null
+order by case 
+when org_type_depart.department_degree_id = 1 then orgdata.department_code::int*1000
+when detail.parent_department_id is not null and detail.parent_department_id>0
+then orgdata2.department_code::int*1000+orgdata.department_code::int
+else orgdata.department_code::int*100000 end) as sorting_dep
+on sorting_dep.id = he.department_id
 where he.deleted_at is null
 and hpt.deleted_at is null
 and hpl.deleted_at is null
@@ -119,7 +144,7 @@ and het.deleted_at is null
 and u.deleted_at is null
 and org_type_depart.deleted_at is null
 and org_depart_color.deleted_at is null
-order by he.firstname, he.lastname;
+order by sorting_dep.sort_order, hpt.position_type_id, hpl.position_level_id, employee_no desc;
 ", '"'.ToString());
             var para = db.GetParameterListNpgsql();
             DataTable dt = db.ExecuteDataTableNpgsql(sql, para);
@@ -210,6 +235,14 @@ order by he.firstname, he.lastname;
                 {
                     i.timerecorder_id = "";
                 }
+                if (dr["count_resigns"] != DBNull.Value)
+                {
+                    i.count_resigns = Convert.ToInt32(dr["count_resigns"]);
+                }
+                else
+                {
+                    i.count_resigns = 0;
+                }
 
                 result.Add(i);
             }

Models/external_employee/external_employeeViewModel.cs

@@ -69,6 +69,7 @@ namespace TodoAPI2.Models
         public string profile_picture { get; set; }
 
         public string timerecorder_id { get; set; }
+        public int count_resigns { get; set; }
 
         public int? worked_month // ทำงานมาแล้วกี่เดือน
         {

Views/eva_adjust_postponement_migrationView/eva_adjust_postponement_migration_d.cshtml

@@ -5,6 +5,154 @@
     Layout = "_LayoutDirect";
 }
 
+<div class="modal fade" id="eva_adjust_postponement_detail_migrationModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_adjust_postponement_detail_migrationModelLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="eva_adjust_postponement_detail_migrationModelLabel">บันทึกข้อมูล eva_adjust_postponement_detail_migration</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <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" />
+
+                        <div class='row'>
+                            <div class="form-group col-md-4">
+                                <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="false" iGroup="eva_adjust_postponement_detail_migration"></select>
+                            </div>
+
+                            <div class="form-group col-md-4">
+                                <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="false" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
+
+                            <div class="form-group col-md-4">
+                                <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="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_sarary" for="eva_adjust_postponement_detail_migration_sarary">เงินเดือน ก่อนปรับเลื่อน</label>
+                                <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_sarary" 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_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="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_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="false" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
+
+
+
+                            <div class="form-group col-md-4">
+                                <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="false" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
+
+                            <div class="form-group col-md-4">
+                                <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="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_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="false" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
+
+                            <div class="form-group col-md-4">
+                                <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="false" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
+
+                            <div class="form-group col-md-4">
+                                <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="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_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="false" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
+
+                            <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">
+                            </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 class="form-group col-md-4">
+                                <label id="lab_eva_adjust_postponement_detail_migration_org_at_this_time" for="eva_adjust_postponement_detail_migration_org_at_this_time">หน่วยงานที่สังกัด (ณ วันปรับเลื่อน)</label>
+                                <select class="form-control" id="eva_adjust_postponement_detail_migration_org_at_this_time" iLabel="หน่วยงานที่สังกัด (ณ วันปรับเลื่อน)" iRequire="false" iGroup="eva_adjust_postponement_detail_migration"></select>
+                            </div>
+                        </div>
+
+                        <div class='row'>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_adjust_postponement_detail_migration_order_at_this_time" for="eva_adjust_postponement_detail_migration_order_at_this_time">ลำดับ (ณ วันปรับเลื่อน)</label>
+                                <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_order_at_this_time" iLabel="ลำดับ (ณ วันปรับเลื่อน)" iRequire="true" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
+                            <div class="form-group col-md-4">
+                                <label id="lab_eva_adjust_postponement_detail_migration_fullname_at_this_time" for="eva_adjust_postponement_detail_migration_fullname_at_this_time">ชื่อ-ชื่อสกุล (ณ วันปรับเลื่อน)</label>
+                                <input class="form-control" type="text" id="eva_adjust_postponement_detail_migration_fullname_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_employee_no_at_this_time" for="eva_adjust_postponement_detail_migration_employee_no_at_this_time">เลขที่พนักงาน  (ณ วันปรับเลื่อน)</label>
+                                <input class="form-control" type="text" id="eva_adjust_postponement_detail_migration_employee_no_at_this_time" iLabel="เลขที่พนักงาน  (ณ วันปรับเลื่อน)" iRequire="false" iGroup="eva_adjust_postponement_detail_migration" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">ยกเลิก</button>
+                <button type="button" class="btn btn-primary" onclick="javascript:eva_adjust_postponement_detail_migration_PutUpdate()">บันทึก</button>
+            </div>
+        </div>
+    </div>
+</div>
 
 
 <div class="row page-title">
@@ -172,145 +320,7 @@
 
 <br />
 
-<section class="wrapper">
-    <div class="title col-md-12"><div class="line"></div>บันทึกรายละเอียด</div>
 
-    <section class="card no-border">
-        <div class="card-body" style="">
-
-            <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" />
-
-                    <div class='row'>
-                        <div class="form-group col-md-4">
-                            <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="false" iGroup="eva_adjust_postponement_detail_migration"></select>
-                        </div>
-
-                        <div class="form-group col-md-4">
-                            <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="false" iGroup="eva_adjust_postponement_detail_migration" />
-                        </div>
-
-                        <div class="form-group col-md-4">
-                            <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="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_sarary" for="eva_adjust_postponement_detail_migration_sarary">เงินเดือน ก่อนปรับเลื่อน</label>
-                            <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_sarary" 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_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="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_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="false" iGroup="eva_adjust_postponement_detail_migration" />
-                        </div>
-
-
-
-                        <div class="form-group col-md-4">
-                            <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="false" iGroup="eva_adjust_postponement_detail_migration" />
-                        </div>
-
-                        <div class="form-group col-md-4">
-                            <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="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_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="false" iGroup="eva_adjust_postponement_detail_migration" />
-                        </div>
-
-                        <div class="form-group col-md-4">
-                            <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="false" iGroup="eva_adjust_postponement_detail_migration" />
-                        </div>
-
-                        <div class="form-group col-md-4">
-                            <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="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_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="false" iGroup="eva_adjust_postponement_detail_migration" />
-                        </div>
-
-                        <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">
-                        </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 class="form-group col-md-4">
-                            <label id="lab_eva_adjust_postponement_detail_migration_org_at_this_time" for="eva_adjust_postponement_detail_migration_org_at_this_time">หน่วยงานที่สังกัด (ณ วันปรับเลื่อน)</label>
-                            <select class="form-control" id="eva_adjust_postponement_detail_migration_org_at_this_time" iLabel="หน่วยงานที่สังกัด (ณ วันปรับเลื่อน)" iRequire="false" iGroup="eva_adjust_postponement_detail_migration"></select>
-                        </div>
-                    </div>
-
-                    <div class='row'>
-                        <div class="form-group col-md-4">
-                            <label id="lab_eva_adjust_postponement_detail_migration_order_at_this_time" for="eva_adjust_postponement_detail_migration_order_at_this_time">ลำดับ (ณ วันปรับเลื่อน)</label>
-                            <input class="form-control" type="number" id="eva_adjust_postponement_detail_migration_order_at_this_time" iLabel="ลำดับ (ณ วันปรับเลื่อน)" iRequire="true" iGroup="eva_adjust_postponement_detail_migration" />
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
-
-    <div class="row">
-        <div class="form-group col-md-12">
-            <button type="button" class="btn btn-primary" onclick="javascript:eva_adjust_postponement_detail_migration_PutUpdate()">บันทึก</button>
-        </div>
-    </div>
-
-</section>
-
-<br />
 
 @section FooterPlaceHolder{
     <script src="~/js/eva_adjust_postponement_migration/eva_adjust_postponement_migration_d.js?version=@MyHelper.GetDummyText()"></script>
@@ -328,8 +338,12 @@
             }
 
             $("#eva_adjust_postponement_migration_managed_by").select2();
-            $("#eva_adjust_postponement_detail_migration_employee_id").select2();
-            $("#eva_adjust_postponement_detail_migration_org_at_this_time").select2();
+            $("#eva_adjust_postponement_detail_migration_employee_id").select2({
+                dropdownParent: $('#eva_adjust_postponement_detail_migrationModel')
+            });
+            $("#eva_adjust_postponement_detail_migration_org_at_this_time").select2({
+                dropdownParent: $('#eva_adjust_postponement_detail_migrationModel')
+            });
 
             SetupValidationRemark("eva_adjust_postponement_migration");
             SetupValidationRemark("eva_adjust_postponement_detail_migration");

Views/home/index2.cshtml

@@ -86,7 +86,10 @@
                             <li><a href="~/rpt_payroll_summaryView/rpt_payroll_summary_report"><div style="display: flex;align-items: center;"><span class="menu-dot">&middot;</span>รายงานเงินเดือน</div></a>
                         </ul>
                         <ul>
-                            <li><a href="~/eva/eva_self_reviewView/eva_self_review"><div style="display: flex;align-items: center;"><span class="menu-dot">&middot;</span>ประวัติการเลื่อนเงินเดือนรายบุคคล</div></a>
+                            <li><a href="~/eva_self_reviewView/eva_self_review"><div style="display: flex;align-items: center;"><span class="menu-dot">&middot;</span>ประวัติการเลื่อนเงินเดือนรายบุคคล</div></a>
+                        </ul>
+                        <ul>
+                            <li><a href="~/eva_adjust_postponement_migrationView/eva_adjust_postponement_migration"><div style="display: flex;align-items: center;"><span class="menu-dot">&middot;</span>หน้าจอ migration</div></a>
                         </ul>
                     </nav>                    
                 </div>

wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js

@@ -42,7 +42,8 @@ function eva_adjust_postponement_detail_migration_FeedDataToForm(data) {
     $("#eva_adjust_postponement_detail_migration_migration_eva_result").val(data.migration_eva_result);
     DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_detail_migration_org_at_this_time"), data, "id", "external_name", "item_org_at_this_time", data.org_at_this_time);
     $("#eva_adjust_postponement_detail_migration_order_at_this_time").val(data.order_at_this_time);
-
+    $("#eva_adjust_postponement_detail_migration_fullname_at_this_time").val(data.fullname_at_this_time);
+    $("#eva_adjust_postponement_detail_migration_employee_no_at_this_time").val(data.employee_no_at_this_time);
 }
 
 function eva_adjust_postponement_detail_migration_GetFromForm() {
@@ -69,6 +70,9 @@ function eva_adjust_postponement_detail_migration_GetFromForm() {
     eva_adjust_postponement_detail_migrationObject.migration_eva_result = $("#eva_adjust_postponement_detail_migration_migration_eva_result").val();
     eva_adjust_postponement_detail_migrationObject.org_at_this_time = $("#eva_adjust_postponement_detail_migration_org_at_this_time").val();
     eva_adjust_postponement_detail_migrationObject.order_at_this_time = $("#eva_adjust_postponement_detail_migration_order_at_this_time").val();
+    eva_adjust_postponement_detail_migrationObject.fullname_at_this_time = $("#eva_adjust_postponement_detail_migration_fullname_at_this_time").val();
+    eva_adjust_postponement_detail_migrationObject.employee_no_at_this_time = $("#eva_adjust_postponement_detail_migration_employee_no_at_this_time").val();
+
 
     return eva_adjust_postponement_detail_migrationObject;
 }
@@ -100,7 +104,7 @@ function eva_adjust_postponement_detail_migration_GoCreate() {
 
 function eva_adjust_postponement_detail_migration_GoEdit(a) {
     // Incase model popup
-    alert("กรุณาเลื่อนจอ ไปด้านล่างสุด เพื่อกรอกแบบฟอร์มแก้ไขข้อมูล");
+    //alert("กรุณาเลื่อนจอ ไปด้านล่างสุด เพื่อกรอกแบบฟอร์มแก้ไขข้อมูล");
     eva_adjust_postponement_detail_migration_SetEditForm(a);
 
     // Incase open new page
@@ -111,7 +115,7 @@ function eva_adjust_postponement_detail_migration_SetEditForm(a) {
     var successFunc = function (result) {
         eva_adjust_postponement_detail_migration_editMode = "UPDATE";
         eva_adjust_postponement_detail_migration_FeedDataToForm(result);
-        //$("#eva_adjust_postponement_detail_migrationModel").modal("show");
+        $("#eva_adjust_postponement_detail_migrationModel").modal("show");
         endLoad();
     };
     startLoad();