update code

Migrations/25640302141103_UpDateLimitFrameSchema.Designer.cs

@@ -0,0 +1,920 @@
+// <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("25640302141103_UpDateLimitFrameSchema")]
+    partial class UpDateLimitFrameSchema
+    {
+        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<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<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<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?>("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<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<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<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_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<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<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<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<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_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/25640302141103_UpDateLimitFrameSchema.cs

@@ -0,0 +1,89 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace tb320eva.Migrations
+{
+    public partial class UpDateLimitFrameSchema : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "level_id",
+                table: "eva_limit_frame_employee");
+
+            migrationBuilder.RenameColumn(
+                name: "position_id",
+                table: "eva_limit_frame_employee",
+                newName: "order_of_data");
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "limit_frame_005_total",
+                table: "eva_limit_frame_plan",
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "limit_frame_005_total_rounded",
+                table: "eva_limit_frame_plan",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "remark",
+                table: "eva_limit_frame_group",
+                maxLength: 4000,
+                nullable: true);
+
+            migrationBuilder.AddColumn<decimal>(
+                name: "cost_of_living",
+                table: "eva_limit_frame_employee",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "level_text",
+                table: "eva_limit_frame_employee",
+                maxLength: 1000,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "position_text",
+                table: "eva_limit_frame_employee",
+                maxLength: 1000,
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "limit_frame_005_total",
+                table: "eva_limit_frame_plan");
+
+            migrationBuilder.DropColumn(
+                name: "limit_frame_005_total_rounded",
+                table: "eva_limit_frame_plan");
+
+            migrationBuilder.DropColumn(
+                name: "remark",
+                table: "eva_limit_frame_group");
+
+            migrationBuilder.DropColumn(
+                name: "cost_of_living",
+                table: "eva_limit_frame_employee");
+
+            migrationBuilder.DropColumn(
+                name: "level_text",
+                table: "eva_limit_frame_employee");
+
+            migrationBuilder.DropColumn(
+                name: "position_text",
+                table: "eva_limit_frame_employee");
+
+            migrationBuilder.RenameColumn(
+                name: "order_of_data",
+                table: "eva_limit_frame_employee",
+                newName: "position_id");
+
+            migrationBuilder.AddColumn<int>(
+                name: "level_id",
+                table: "eva_limit_frame_employee",
+                nullable: true);
+        }
+    }
+}

Migrations/25640303051830_FixFrame.Designer.cs

@@ -0,0 +1,920 @@
+// <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("25640303051830_FixFrame")]
+    partial class FixFrame
+    {
+        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<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<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<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?>("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<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<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<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_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<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<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<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<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_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/25640303051830_FixFrame.cs

@@ -0,0 +1,17 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace tb320eva.Migrations
+{
+    public partial class FixFrame : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

Migrations/DataContextModelSnapshot.cs

@@ -589,6 +589,8 @@ namespace tb320eva.Migrations
                 {
                     b.Property<Guid>("id");
 
+                    b.Property<decimal?>("cost_of_living");
+
                     b.Property<DateTime>("created");
 
                     b.Property<int?>("employee_id");
@@ -597,15 +599,19 @@ namespace tb320eva.Migrations
 
                     b.Property<bool>("isActive");
 
-                    b.Property<int?>("level_id");
+                    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<int?>("position_id");
+                    b.Property<string>("position_text")
+                        .HasMaxLength(1000);
 
                     b.Property<decimal?>("salary");
 
@@ -632,6 +638,9 @@ namespace tb320eva.Migrations
 
                     b.Property<decimal?>("limit_frame_295");
 
+                    b.Property<string>("remark")
+                        .HasMaxLength(4000);
+
                     b.Property<decimal?>("total_salary");
 
                     b.Property<decimal?>("total_salary_limit");
@@ -661,6 +670,10 @@ namespace tb320eva.Migrations
 
                     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");

Models/eva_limit_frame_employee/eva_limit_frame_employeeEntity.cs

@@ -24,9 +24,11 @@ namespace TodoAPI2.Models
 
         public int? org_id { get; set; }
 
-        public int? position_id { get; set; }
+        [MaxLength(1000)]
+        public string position_text { get; set; }
 
-        public int? level_id { get; set; }
+        [MaxLength(1000)]
+        public string level_text { get; set; }
 
         public decimal? salary { get; set; }
 
@@ -34,6 +36,10 @@ namespace TodoAPI2.Models
 
         public decimal? monthly_remuneration { get; set; }
 
+        public decimal? cost_of_living { get; set; }
+
+        public int? order_of_data { get; set; }
+
 
 		public void SetAutoField(DataContext context)
         {

Models/eva_limit_frame_employee/eva_limit_frame_employeeInputModel.cs

@@ -22,9 +22,9 @@ namespace TodoAPI2.Models
 
         public int? org_id { get; set; }
 
-        public int? position_id { get; set; }
+        public string position_text { get; set; }
 
-        public int? level_id { get; set; }
+        public string level_text { get; set; }
 
         public decimal? salary { get; set; }
 
@@ -32,6 +32,10 @@ namespace TodoAPI2.Models
 
         public decimal? monthly_remuneration { get; set; }
 
+        public decimal? cost_of_living { get; set; }
+
+        public int? order_of_data { get; set; }
+
         public string active_mode { get; set; }
     }
 }

Models/eva_limit_frame_employee/eva_limit_frame_employeeService.cs

@@ -80,9 +80,7 @@ namespace TodoAPI2.Models
             var entity = _repository.Get(id);
             var i = Mapper.Map<eva_limit_frame_employeeWithSelectionViewModel>(entity);
             i.item_employee_id = (from x in emp.GetAllEmployee() select x).ToList();
-            i.item_org_id = (from x in ext.GetSortingDep() select x).ToList();
-            i.item_position_id = (from x in ext.GetPositionForReport() select x).ToList();
-            i.item_level_id = (from x in ext.Gethrm_position_levels() select x).ToList();
+            i.item_org_id = (from x in ext.GetDepartmentData() select x).ToList();
 
 
             return i;
@@ -91,9 +89,7 @@ namespace TodoAPI2.Models
         {
             var i = new eva_limit_frame_employeeWithSelectionViewModel();
             i.item_employee_id = (from x in emp.GetAllEmployee() select x).ToList();
-            i.item_org_id = (from x in ext.GetSortingDep() select x).ToList();
-            i.item_position_id = (from x in ext.GetPositionForReport() select x).ToList();
-            i.item_level_id = (from x in ext.Gethrm_position_levels() select x).ToList();
+            i.item_org_id = (from x in ext.GetDepartmentData() select x).ToList();
 
 
             return i;
@@ -119,18 +115,10 @@ namespace TodoAPI2.Models
                 into external_linkageResult2
                 from fk_external_linkageResult2 in external_linkageResult2.DefaultIfEmpty()
 
-                join fk_external_linkage3 in ext.GetSortingDep() on m_eva_limit_frame_employee.org_id equals fk_external_linkage3.id
+                join fk_external_linkage3 in ext.GetDepartmentData() on m_eva_limit_frame_employee.org_id equals fk_external_linkage3.id
                 into external_linkageResult3
                 from fk_external_linkageResult3 in external_linkageResult3.DefaultIfEmpty()
 
-                join fk_external_linkage4 in ext.GetPositionForReport() on m_eva_limit_frame_employee.position_id equals fk_external_linkage4.id
-                into external_linkageResult4
-                from fk_external_linkageResult4 in external_linkageResult4.DefaultIfEmpty()
-
-                join fk_external_linkage5 in ext.Gethrm_position_levels() on m_eva_limit_frame_employee.level_id equals fk_external_linkage5.id
-                into external_linkageResult5
-                from fk_external_linkageResult5 in external_linkageResult5.DefaultIfEmpty()
-
 
                 where
                 1 == 1
@@ -145,17 +133,17 @@ namespace TodoAPI2.Models
                     frame_group_guid = m_eva_limit_frame_employee.frame_group_guid,
                     employee_id = m_eva_limit_frame_employee.employee_id,
                     org_id = m_eva_limit_frame_employee.org_id,
-                    position_id = m_eva_limit_frame_employee.position_id,
-                    level_id = m_eva_limit_frame_employee.level_id,
+                    position_text = m_eva_limit_frame_employee.position_text,
+                    level_text = m_eva_limit_frame_employee.level_text,
                     salary = m_eva_limit_frame_employee.salary,
                     position_allowance = m_eva_limit_frame_employee.position_allowance,
                     monthly_remuneration = m_eva_limit_frame_employee.monthly_remuneration,
+                    cost_of_living = m_eva_limit_frame_employee.cost_of_living,
+                    order_of_data = m_eva_limit_frame_employee.order_of_data,
 
                     frame_group_guid_eva_limit_frame_group_group_guid = fk_eva_limit_frame_groupResult1.group_guid,
                     employee_id_external_linkage_external_name = fk_external_linkageResult2.fullname,
                     org_id_external_linkage_external_name = fk_external_linkageResult3.external_name,
-                    position_id_external_linkage_external_name = fk_external_linkageResult4.external_name,
-                    level_id_external_linkage_external_name = fk_external_linkageResult5.external_name,
 
                     isActive = m_eva_limit_frame_employee.isActive,
                     Created = m_eva_limit_frame_employee.created,
@@ -202,11 +190,13 @@ namespace TodoAPI2.Models
                 existingEntity.frame_group_guid = model.frame_group_guid;
                 existingEntity.employee_id = model.employee_id;
                 existingEntity.org_id = model.org_id;
-                existingEntity.position_id = model.position_id;
-                existingEntity.level_id = model.level_id;
+                existingEntity.position_text = model.position_text;
+                existingEntity.level_text = model.level_text;
                 existingEntity.salary = model.salary;
                 existingEntity.position_allowance = model.position_allowance;
                 existingEntity.monthly_remuneration = model.monthly_remuneration;
+                existingEntity.cost_of_living = model.cost_of_living;
+                existingEntity.order_of_data = model.order_of_data;
 
                 existingEntity.SetAutoField(_repository.Context);
 
@@ -239,11 +229,13 @@ namespace TodoAPI2.Models
                         existingEntity.frame_group_guid = i.frame_group_guid;
                         existingEntity.employee_id = i.employee_id;
                         existingEntity.org_id = i.org_id;
-                        existingEntity.position_id = i.position_id;
-                        existingEntity.level_id = i.level_id;
+                        existingEntity.position_text = i.position_text;
+                        existingEntity.level_text = i.level_text;
                         existingEntity.salary = i.salary;
                         existingEntity.position_allowance = i.position_allowance;
                         existingEntity.monthly_remuneration = i.monthly_remuneration;
+                        existingEntity.cost_of_living = i.cost_of_living;
+                        existingEntity.order_of_data = i.order_of_data;
 
                         existingEntity.SetAutoField(_repository.Context);
                         _repository.UpdateWithoutCommit(i.id.Value, existingEntity);
@@ -314,15 +306,13 @@ namespace TodoAPI2.Models
             i.Add("employee_id_external_linkage_external_name", "พนักงาน");
             i.Add("org_id", "หน่วยงาน");
             i.Add("org_id_external_linkage_external_name", "หน่วยงาน");
-            i.Add("position_id", "ตำแหน่ง");
-            i.Add("position_id_external_linkage_external_name", "ตำแหน่ง");
-            i.Add("level_id", "ระดับ");
-            i.Add("level_id_external_linkage_external_name", "ระดับ");
+            i.Add("position_text", "ตำแหน่ง");
+            i.Add("level_text", "ระดับ");
             i.Add("salary", "เงินเดือน");
             i.Add("position_allowance", "เงินประจำตำแหน่ง");
             i.Add("monthly_remuneration", "ค่าตอบแทนรายเดือน");
-            i.Add("limit_frame_group_id", "limit_frame_group_id");
-            i.Add("limit_frame_group_id_eva_limit_frame_group_group_guid", "limit_frame_group_id");
+            i.Add("cost_of_living", "ค่าครองชีพ");
+            i.Add("order_of_data", "ลำดับ");
 
             return i;
         }
@@ -335,4 +325,5 @@ namespace TodoAPI2.Models
 
         #endregion
     }
-}
+}
+

Models/eva_limit_frame_employee/eva_limit_frame_employeeViewModel.cs

@@ -20,9 +20,9 @@ namespace TodoAPI2.Models
 
         public int? org_id { get; set; }
 
-        public int? position_id { get; set; }
+        public string position_text { get; set; }
 
-        public int? level_id { get; set; }
+        public string level_text { get; set; }
 
         public decimal? salary { get; set; }
 
@@ -30,11 +30,13 @@ namespace TodoAPI2.Models
 
         public decimal? monthly_remuneration { get; set; }
 
+        public decimal? cost_of_living { get; set; }
+
+        public int? order_of_data { get; set; }
+
         public Guid? frame_group_guid_eva_limit_frame_group_group_guid { get; set; }
         public string employee_id_external_linkage_external_name { get; set; }
         public string org_id_external_linkage_external_name { get; set; }
-        public string position_id_external_linkage_external_name { get; set; }
-        public string level_id_external_linkage_external_name { get; set; }
 
     }
 }

Models/eva_limit_frame_employee/eva_limit_frame_employeeWithSelectionViewModel.cs

@@ -9,8 +9,6 @@ namespace TodoAPI2.Models
     {
         public List<external_employeeViewModel> item_employee_id { get; set; }
         public List<external_linkageViewModel> item_org_id { get; set; }
-        public List<external_linkageViewModel> item_position_id { get; set; }
-        public List<external_linkageViewModel> item_level_id { get; set; }
 
     }
 }

Models/eva_limit_frame_group/eva_limit_frame_groupEntity.cs

@@ -32,6 +32,9 @@ namespace TodoAPI2.Models
 
         public decimal? total_salary_limit_rounded { get; set; }
 
+        [MaxLength(4000)]
+        public string remark { get; set; }
+
 
 		public void SetAutoField(DataContext context)
         {

Models/eva_limit_frame_group/eva_limit_frame_groupInputModel.cs

@@ -28,6 +28,8 @@ namespace TodoAPI2.Models
 
         public decimal? total_salary_limit_rounded { get; set; }
 
+        public string remark { get; set; }
+
         public string active_mode { get; set; }
     }
 }

Models/eva_limit_frame_group/eva_limit_frame_groupService.cs

@@ -127,6 +127,7 @@ namespace TodoAPI2.Models
                     total_salary = m_eva_limit_frame_group.total_salary,
                     total_salary_limit = m_eva_limit_frame_group.total_salary_limit,
                     total_salary_limit_rounded = m_eva_limit_frame_group.total_salary_limit_rounded,
+                    remark = m_eva_limit_frame_group.remark,
 
                     frame_plan_guid_eva_limit_frame_plan_executed_date = fk_eva_limit_frame_planResult1.executed_date,
                     group_guid_eva_evaluation_group_code = fk_eva_evaluation_groupResult2.code,
@@ -179,6 +180,7 @@ namespace TodoAPI2.Models
                 existingEntity.total_salary = model.total_salary;
                 existingEntity.total_salary_limit = model.total_salary_limit;
                 existingEntity.total_salary_limit_rounded = model.total_salary_limit_rounded;
+                existingEntity.remark = model.remark;
 
 				existingEntity.SetAutoField(_repository.Context);
 
@@ -214,6 +216,7 @@ namespace TodoAPI2.Models
                 existingEntity.total_salary = i.total_salary;
                 existingEntity.total_salary_limit = i.total_salary_limit;
                 existingEntity.total_salary_limit_rounded = i.total_salary_limit_rounded;
+                existingEntity.remark = i.remark;
 
 						existingEntity.SetAutoField(_repository.Context);
                         _repository.UpdateWithoutCommit(i.id.Value, existingEntity);
@@ -285,7 +288,8 @@ namespace TodoAPI2.Models
             i.Add("limit_frame_295", "กรอบวงเงินที่กันไว้");
             i.Add("total_salary", "อัตราเงินเดือนรวม");
             i.Add("total_salary_limit", "วงเงินในการเลื่อนเงินเดือน");
-            i.Add("total_salary_limit_rounded", "วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง");           
+            i.Add("total_salary_limit_rounded", "วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง");
+            i.Add("remark", "หมายเหตุ");           
 
             return i;
         }

Models/eva_limit_frame_group/eva_limit_frame_groupViewModel.cs

@@ -26,6 +26,8 @@ namespace TodoAPI2.Models
 
         public decimal? total_salary_limit_rounded { get; set; }
 
+        public string remark { get; set; }
+
         public DateTime? frame_plan_guid_eva_limit_frame_plan_executed_date { get; set; }
         public string group_guid_eva_evaluation_group_code { get; set; }
 

Models/eva_limit_frame_plan/eva_limit_frame_planEntity.cs

@@ -42,6 +42,10 @@ namespace TodoAPI2.Models
 
         public DateTime? salary_adjustment_date { get; set; }
 
+        public decimal? limit_frame_005_total { get; set; }
+
+        public decimal? limit_frame_005_total_rounded { get; set; }
+
 
 		public void SetAutoField(DataContext context)
         {

Models/eva_limit_frame_plan/eva_limit_frame_planInputModel.cs

@@ -36,6 +36,10 @@ namespace TodoAPI2.Models
 
         public DateTime? salary_adjustment_date { get; set; }
 
+        public decimal? limit_frame_005_total { get; set; }
+
+        public decimal? limit_frame_005_total_rounded { get; set; }
+
         public string active_mode { get; set; }
     }
 }

Models/eva_limit_frame_plan/eva_limit_frame_planService.cs

@@ -77,7 +77,7 @@ namespace TodoAPI2.Models
             var entity = _repository.Get(id);
             var i = Mapper.Map<eva_limit_frame_planWithSelectionViewModel>(entity);
             i.item_plan_guid = (from x in _repository.Context.eva_performance_plan select x).ToList();
-            //i.item_supervisor1_result = (from x in ext.GetDemoItem() select x).ToList();
+            i.item_supervisor1_result = (from x in ext.GetYesNo() select x).ToList();
 
 
             return i;
@@ -86,7 +86,7 @@ namespace TodoAPI2.Models
         {
             var i = new eva_limit_frame_planWithSelectionViewModel();
             i.item_plan_guid = (from x in _repository.Context.eva_performance_plan select x).ToList();
-            //i.item_supervisor1_result = (from x in ext.GetDemoItem() select x).ToList();
+            i.item_supervisor1_result = (from x in ext.GetYesNo() select x).ToList();
 
 
             return i;
@@ -108,9 +108,9 @@ namespace TodoAPI2.Models
                 into eva_performance_planResult1
                 from fk_eva_performance_planResult1 in eva_performance_planResult1.DefaultIfEmpty()
 
-                //join fk_external_linkage7 in ext.GetDemoItem() on m_eva_limit_frame_plan.supervisor1_result equals fk_external_linkage7.external_code
-                //into external_linkageResult7
-                //from fk_external_linkageResult7 in external_linkageResult7.DefaultIfEmpty()
+                join fk_external_linkage7 in ext.GetYesNo() on m_eva_limit_frame_plan.supervisor1_result equals fk_external_linkage7.external_code
+                into external_linkageResult7
+                from fk_external_linkageResult7 in external_linkageResult7.DefaultIfEmpty()
 
 
 				where
@@ -132,9 +132,11 @@ namespace TodoAPI2.Models
                     supervisor1_remark = m_eva_limit_frame_plan.supervisor1_remark,
                     supervisor1_date = m_eva_limit_frame_plan.supervisor1_date,
                     salary_adjustment_date = m_eva_limit_frame_plan.salary_adjustment_date,
+                    limit_frame_005_total = m_eva_limit_frame_plan.limit_frame_005_total,
+                    limit_frame_005_total_rounded = m_eva_limit_frame_plan.limit_frame_005_total_rounded,
 
                     plan_guid_eva_performance_plan_fiscal_year = fk_eva_performance_planResult1.fiscal_year,
-                    //supervisor1_result_external_linkage_external_name = fk_external_linkageResult7.external_name,
+                    supervisor1_result_external_linkage_external_name = fk_external_linkageResult7.external_name,
 
                     isActive = m_eva_limit_frame_plan.isActive,
                     Created = m_eva_limit_frame_plan.created,
@@ -188,8 +190,10 @@ namespace TodoAPI2.Models
                 existingEntity.supervisor1_remark = model.supervisor1_remark;
                 existingEntity.supervisor1_date = model.supervisor1_date;
                 existingEntity.salary_adjustment_date = model.salary_adjustment_date;
+                existingEntity.limit_frame_005_total = model.limit_frame_005_total;
+                existingEntity.limit_frame_005_total_rounded = model.limit_frame_005_total_rounded;
 
-                existingEntity.SetAutoField(_repository.Context);
+				existingEntity.SetAutoField(_repository.Context);
 
                 if (is_force_save)
                 {
@@ -226,9 +230,11 @@ namespace TodoAPI2.Models
                 existingEntity.supervisor1_result = i.supervisor1_result;
                 existingEntity.supervisor1_remark = i.supervisor1_remark;
                 existingEntity.supervisor1_date = i.supervisor1_date;
-                        existingEntity.salary_adjustment_date = i.salary_adjustment_date;
+                existingEntity.salary_adjustment_date = i.salary_adjustment_date;
+                existingEntity.limit_frame_005_total = i.limit_frame_005_total;
+                existingEntity.limit_frame_005_total_rounded = i.limit_frame_005_total_rounded;
 
-                        existingEntity.SetAutoField(_repository.Context);
+						existingEntity.SetAutoField(_repository.Context);
                         _repository.UpdateWithoutCommit(i.id.Value, existingEntity);
                     }
                 }
@@ -304,7 +310,10 @@ namespace TodoAPI2.Models
             i.Add("supervisor1_remark", "ความเห็นผู้ประเมิน");
             i.Add("supervisor1_date", "วันที่ประเมิน");
             i.Add("txt_supervisor1_date", "วันที่ประเมิน");
+            i.Add("salary_adjustment_date", "เลื่อนเงินเดือนวันที่");
             i.Add("txt_salary_adjustment_date", "เลื่อนเงินเดือนวันที่");
+            i.Add("limit_frame_005_total", "กันวงเงินไว้");
+            i.Add("limit_frame_005_total_rounded", "กันวงเงินใช้จริง");           
 
             return i;
         }

Models/eva_limit_frame_plan/eva_limit_frame_planViewModel.cs

@@ -40,6 +40,10 @@ namespace TodoAPI2.Models
 
         public string txt_salary_adjustment_date { get { return MyHelper.GetDateStringForReport(this.salary_adjustment_date); } }
 
+        public decimal? limit_frame_005_total { get; set; }
+
+        public decimal? limit_frame_005_total_rounded { get; set; }
+
         public int? plan_guid_eva_performance_plan_fiscal_year { get; set; }
         public string supervisor1_result_external_linkage_external_name { get; set; }
 

Views/eva_limit_frame_employeeView/eva_limit_frame_employee.cshtml

@@ -32,16 +32,21 @@
 	    <label id="lab_eva_limit_frame_employee_org_id" for="eva_limit_frame_employee_org_id">หน่วยงาน</label>
 	    <select class="form-control" id="eva_limit_frame_employee_org_id" iLabel="หน่วยงาน" iRequire="true" iGroup="eva_limit_frame_employee" ></select>
     </div>
+
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_employee_order_of_data" for="eva_limit_frame_employee_order_of_data">ลำดับ</label>
+	    <input class="form-control" type="number" id="eva_limit_frame_employee_order_of_data" iLabel="ลำดับ" iRequire="true" iGroup="eva_limit_frame_employee"  />
+    </div>
 </div>
 <div class='row'>
     <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_position_id" for="eva_limit_frame_employee_position_id">ตำแหน่ง</label>
-	    <select class="form-control" id="eva_limit_frame_employee_position_id" iLabel="ตำแหน่ง" iRequire="true" iGroup="eva_limit_frame_employee" ></select>
+	    <label id="lab_eva_limit_frame_employee_position_text" for="eva_limit_frame_employee_position_text">ตำแหน่ง</label>
+	    <input class="form-control" type="text" id="eva_limit_frame_employee_position_text" iLabel="ตำแหน่ง" iRequire="true" iGroup="eva_limit_frame_employee"  />
     </div>
 
     <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_level_id" for="eva_limit_frame_employee_level_id">ระดับ</label>
-	    <select class="form-control" id="eva_limit_frame_employee_level_id" iLabel="ระดับ" iRequire="true" iGroup="eva_limit_frame_employee" ></select>
+	    <label id="lab_eva_limit_frame_employee_level_text" for="eva_limit_frame_employee_level_text">ระดับ</label>
+	    <input class="form-control" type="text" id="eva_limit_frame_employee_level_text" iLabel="ระดับ" iRequire="true" iGroup="eva_limit_frame_employee"  />
     </div>
 </div>
 <div class='row'>
@@ -60,6 +65,12 @@
 	    <input class="form-control" type="number" id="eva_limit_frame_employee_monthly_remuneration" iLabel="ค่าตอบแทนรายเดือน" iRequire="true" iGroup="eva_limit_frame_employee"  />
     </div>
 </div>
+<div class='row'>
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_employee_cost_of_living" for="eva_limit_frame_employee_cost_of_living">ค่าครองชีพ</label>
+	    <input class="form-control" type="number" id="eva_limit_frame_employee_cost_of_living" iLabel="ค่าครองชีพ" iRequire="true" iGroup="eva_limit_frame_employee"  />
+    </div>
+</div>
 
 
                     </div>
@@ -121,11 +132,13 @@
             <th><label id='h_eva_limit_frame_employee_frame_group_guid'>frame_plan_guid</label></th>
             <th><label id='h_eva_limit_frame_employee_employee_id'>พนักงาน</label></th>
             <th><label id='h_eva_limit_frame_employee_org_id'>หน่วยงาน</label></th>
-            <th><label id='h_eva_limit_frame_employee_position_id'>ตำแหน่ง</label></th>
-            <th><label id='h_eva_limit_frame_employee_level_id'>ระดับ</label></th>
+            <th><label id='h_eva_limit_frame_employee_position_text'>ตำแหน่ง</label></th>
+            <th><label id='h_eva_limit_frame_employee_level_text'>ระดับ</label></th>
             <th><label id='h_eva_limit_frame_employee_salary'>เงินเดือน</label></th>
             <th><label id='h_eva_limit_frame_employee_position_allowance'>เงินประจำตำแหน่ง</label></th>
             <th><label id='h_eva_limit_frame_employee_monthly_remuneration'>ค่าตอบแทนรายเดือน</label></th>
+            <th><label id='h_eva_limit_frame_employee_cost_of_living'>ค่าครองชีพ</label></th>
+            <th><label id='h_eva_limit_frame_employee_order_of_data'>ลำดับ</label></th>
                 
             </tr>
         </thead>

Views/eva_limit_frame_employeeView/eva_limit_frame_employee_d.cshtml

@@ -47,16 +47,21 @@
 	    <label id="lab_eva_limit_frame_employee_org_id" for="eva_limit_frame_employee_org_id">หน่วยงาน</label>
 	    <select class="form-control" id="eva_limit_frame_employee_org_id" iLabel="หน่วยงาน" iRequire="true" iGroup="eva_limit_frame_employee" ></select>
     </div>
+
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_employee_order_of_data" for="eva_limit_frame_employee_order_of_data">ลำดับ</label>
+	    <input class="form-control" type="number" id="eva_limit_frame_employee_order_of_data" iLabel="ลำดับ" iRequire="true" iGroup="eva_limit_frame_employee"  />
+    </div>
 </div>
 <div class='row'>
     <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_position_id" for="eva_limit_frame_employee_position_id">ตำแหน่ง</label>
-	    <select class="form-control" id="eva_limit_frame_employee_position_id" iLabel="ตำแหน่ง" iRequire="true" iGroup="eva_limit_frame_employee" ></select>
+	    <label id="lab_eva_limit_frame_employee_position_text" for="eva_limit_frame_employee_position_text">ตำแหน่ง</label>
+	    <input class="form-control" type="text" id="eva_limit_frame_employee_position_text" iLabel="ตำแหน่ง" iRequire="true" iGroup="eva_limit_frame_employee"  />
     </div>
 
     <div class="form-group col-md-4">
-	    <label id="lab_eva_limit_frame_employee_level_id" for="eva_limit_frame_employee_level_id">ระดับ</label>
-	    <select class="form-control" id="eva_limit_frame_employee_level_id" iLabel="ระดับ" iRequire="true" iGroup="eva_limit_frame_employee" ></select>
+	    <label id="lab_eva_limit_frame_employee_level_text" for="eva_limit_frame_employee_level_text">ระดับ</label>
+	    <input class="form-control" type="text" id="eva_limit_frame_employee_level_text" iLabel="ระดับ" iRequire="true" iGroup="eva_limit_frame_employee"  />
     </div>
 </div>
 <div class='row'>
@@ -75,6 +80,12 @@
 	    <input class="form-control" type="number" id="eva_limit_frame_employee_monthly_remuneration" iLabel="ค่าตอบแทนรายเดือน" iRequire="true" iGroup="eva_limit_frame_employee"  />
     </div>
 </div>
+<div class='row'>
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_employee_cost_of_living" for="eva_limit_frame_employee_cost_of_living">ค่าครองชีพ</label>
+	    <input class="form-control" type="number" id="eva_limit_frame_employee_cost_of_living" iLabel="ค่าครองชีพ" iRequire="true" iGroup="eva_limit_frame_employee"  />
+    </div>
+</div>
 
 
 				</div>

Views/eva_limit_frame_employeeView/eva_limit_frame_employee_inline.cshtml

@@ -25,11 +25,13 @@
                 <th>ลำดับ</th>
 <th><label id='h_eva_limit_frame_employee_employee_id'>พนักงาน</label></th>
 <th><label id='h_eva_limit_frame_employee_org_id'>หน่วยงาน</label></th>
-<th><label id='h_eva_limit_frame_employee_position_id'>ตำแหน่ง</label></th>
-<th><label id='h_eva_limit_frame_employee_level_id'>ระดับ</label></th>
+<th><label id='h_eva_limit_frame_employee_position_text'>ตำแหน่ง</label></th>
+<th><label id='h_eva_limit_frame_employee_level_text'>ระดับ</label></th>
 <th><label id='h_eva_limit_frame_employee_salary'>เงินเดือน</label></th>
 <th><label id='h_eva_limit_frame_employee_position_allowance'>เงินประจำตำแหน่ง</label></th>
 <th><label id='h_eva_limit_frame_employee_monthly_remuneration'>ค่าตอบแทนรายเดือน</label></th>
+<th><label id='h_eva_limit_frame_employee_cost_of_living'>ค่าครองชีพ</label></th>
+<th><label id='h_eva_limit_frame_employee_order_of_data'>ลำดับ</label></th>
 
                 <th>กิจกรรม</th>
             </tr>

Views/eva_limit_frame_employeeView/eva_limit_frame_employee_report.cshtml

@@ -26,6 +26,11 @@
             <div class="col-md-12">
 				<div class="row">
 
+                        <div class="form-group col-md-3">
+                            <label id='lab_s_eva_limit_frame_employee_frame_group_guid' for='s_eva_limit_frame_employee_frame_group_guid'>frame_plan_guid</label>
+                            <input class="form-control" type="hidden" id="s_eva_limit_frame_employee_frame_group_guid" />
+                        </div>
+
                         <div class="form-group col-md-3">
                             <label id='lab_s_eva_limit_frame_employee_employee_id' for='s_eva_limit_frame_employee_employee_id'>พนักงาน</label>
                             <select class="form-control" id="s_eva_limit_frame_employee_employee_id" iLabel="พนักงาน" iRequire="true" iGroup="s_eva_limit_frame_employee" title='พนักงาน' placeholder='พนักงาน'></select>

Views/eva_limit_frame_employeeView/eva_limit_frame_employee_wizardform.cshtml

@@ -21,22 +21,31 @@
 	    </div>
     </div>
 </div>
+
+<div class="col-md-4">
+    <div class="inpt-form-group"> 
+	    <label id="lab_eva_limit_frame_employee_order_of_data" for="eva_limit_frame_employee_order_of_data">ลำดับ</label>
+	    <div class="inpt-group"> 
+		    <input class="inpt-control" type="number" id="eva_limit_frame_employee_order_of_data" iLabel="ลำดับ" iRequire="true" iGroup="eva_limit_frame_employee"  />
+	    </div>
+    </div>
+</div>
 </div>
 <div class='row'>
 <div class="col-md-4">
     <div class="inpt-form-group"> 
-	    <label id="lab_eva_limit_frame_employee_position_id" for="eva_limit_frame_employee_position_id">ตำแหน่ง</label>
+	    <label id="lab_eva_limit_frame_employee_position_text" for="eva_limit_frame_employee_position_text">ตำแหน่ง</label>
 	    <div class="inpt-group"> 
-		    <select class="inpt-control" id="eva_limit_frame_employee_position_id" iLabel="ตำแหน่ง" iRequire="true" iGroup="eva_limit_frame_employee" ></select>
+		    <input class="inpt-control" type="text" id="eva_limit_frame_employee_position_text" iLabel="ตำแหน่ง" iRequire="true" iGroup="eva_limit_frame_employee"  />
 	    </div>
     </div>
 </div>
 
 <div class="col-md-4">
     <div class="inpt-form-group"> 
-	    <label id="lab_eva_limit_frame_employee_level_id" for="eva_limit_frame_employee_level_id">ระดับ</label>
+	    <label id="lab_eva_limit_frame_employee_level_text" for="eva_limit_frame_employee_level_text">ระดับ</label>
 	    <div class="inpt-group"> 
-		    <select class="inpt-control" id="eva_limit_frame_employee_level_id" iLabel="ระดับ" iRequire="true" iGroup="eva_limit_frame_employee" ></select>
+		    <input class="inpt-control" type="text" id="eva_limit_frame_employee_level_text" iLabel="ระดับ" iRequire="true" iGroup="eva_limit_frame_employee"  />
 	    </div>
     </div>
 </div>
@@ -69,3 +78,13 @@
     </div>
 </div>
 </div>
+<div class='row'>
+<div class="col-md-4">
+    <div class="inpt-form-group"> 
+	    <label id="lab_eva_limit_frame_employee_cost_of_living" for="eva_limit_frame_employee_cost_of_living">ค่าครองชีพ</label>
+	    <div class="inpt-group"> 
+		    <input class="inpt-control" type="number" id="eva_limit_frame_employee_cost_of_living" iLabel="ค่าครองชีพ" iRequire="true" iGroup="eva_limit_frame_employee"  />
+	    </div>
+    </div>
+</div>
+</div>

Views/eva_limit_frame_groupView/eva_limit_frame_group.cshtml

@@ -49,6 +49,12 @@
 	    <input class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit_rounded" iLabel="วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง" iRequire="true" iGroup="eva_limit_frame_group"  />
     </div>
 </div>
+<div class='row'>
+    <div class="form-group col-md-12">
+	    <label id="lab_eva_limit_frame_group_remark" for="eva_limit_frame_group_remark">หมายเหตุ</label>
+	    <textarea  class="form-control" rows="4" cols="50" id="eva_limit_frame_group_remark" iLabel="หมายเหตุ" iRequire="true" iGroup="eva_limit_frame_group" ></textarea>
+    </div>
+</div>
 
 
                     </div>
@@ -113,6 +119,7 @@
             <th><label id='h_eva_limit_frame_group_total_salary'>อัตราเงินเดือนรวม</label></th>
             <th><label id='h_eva_limit_frame_group_total_salary_limit'>วงเงินในการเลื่อนเงินเดือน</label></th>
             <th><label id='h_eva_limit_frame_group_total_salary_limit_rounded'>วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง</label></th>
+            <th><label id='h_eva_limit_frame_group_remark'>หมายเหตุ</label></th>
                 
             </tr>
         </thead>

Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml

@@ -2,145 +2,9 @@
 @inject IConfiguration Configuration
 @{
     ViewData["Title"] = "eva_limit_frame_group";
-    Layout = "_LayoutDirect";
+	Layout = "_LayoutDirect";
 }
 
-<div class="modal fade" id="eva_limit_frame_employeeModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_limit_frame_employeeModelLabel" 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_limit_frame_employeeModelLabel">บันทึกข้อมูล eva_limit_frame_employee</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_limit_frame_employee_id" />
-                        <input class="form-control" type="hidden" id="eva_limit_frame_employee_frame_group_guid" />
-
-                        <div class='row'>
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_employee_id" for="eva_limit_frame_employee_employee_id">พนักงาน</label>
-                                <select class="form-control" id="eva_limit_frame_employee_employee_id" iLabel="พนักงาน" iRequire="false" iGroup="eva_limit_frame_employee"></select>
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_org_id" for="eva_limit_frame_employee_org_id">หน่วยงาน</label>
-                                <select class="form-control" id="eva_limit_frame_employee_org_id" iLabel="หน่วยงาน" iRequire="false" iGroup="eva_limit_frame_employee"></select>
-                            </div>
-                        </div>
-                        <div class='row'>
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_position_id" for="eva_limit_frame_employee_position_id">ตำแหน่ง</label>
-                                <select class="form-control" id="eva_limit_frame_employee_position_id" iLabel="ตำแหน่ง" iRequire="false" iGroup="eva_limit_frame_employee"></select>
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_level_id" for="eva_limit_frame_employee_level_id">ระดับ</label>
-                                <select class="form-control" id="eva_limit_frame_employee_level_id" iLabel="ระดับ" iRequire="false" iGroup="eva_limit_frame_employee"></select>
-                            </div>
-                        </div>
-                        <div class='row'>
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_salary" for="eva_limit_frame_employee_salary">เงินเดือน</label>
-                                <input class="form-control" type="number" id="eva_limit_frame_employee_salary" iLabel="เงินเดือน" iRequire="false" iGroup="eva_limit_frame_employee" />
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_position_allowance" for="eva_limit_frame_employee_position_allowance">เงินประจำตำแหน่ง</label>
-                                <input class="form-control" type="number" id="eva_limit_frame_employee_position_allowance" iLabel="เงินประจำตำแหน่ง" iRequire="false" iGroup="eva_limit_frame_employee" />
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_monthly_remuneration" for="eva_limit_frame_employee_monthly_remuneration">ค่าตอบแทนรายเดือน</label>
-                                <input class="form-control" type="number" id="eva_limit_frame_employee_monthly_remuneration" iLabel="ค่าตอบแทนรายเดือน" iRequire="false" iGroup="eva_limit_frame_employee" />
-                            </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_limit_frame_employee_PutUpdate()">บันทึก</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="modal fade" id="eva_limit_frame_employeeModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_limit_frame_employeeModelLabel" 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_limit_frame_employeeModelLabel">บันทึกข้อมูล eva_limit_frame_employee</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_limit_frame_employee_id" />
-                        <input class="form-control" type="hidden" id="eva_limit_frame_employee_frame_group_guid" />
-
-                        <div class='row'></div>
-                        <div class='row'></div>
-                        <div class='row'>
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_employee_id" for="eva_limit_frame_employee_employee_id">พนักงาน</label>
-                                <select class="form-control" id="eva_limit_frame_employee_employee_id" iLabel="พนักงาน" iRequire="false" iGroup="eva_limit_frame_employee"></select>
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_org_id" for="eva_limit_frame_employee_org_id">หน่วยงาน</label>
-                                <select class="form-control" id="eva_limit_frame_employee_org_id" iLabel="หน่วยงาน" iRequire="false" iGroup="eva_limit_frame_employee"></select>
-                            </div>
-                        </div>
-                        <div class='row'>
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_position_id" for="eva_limit_frame_employee_position_id">ตำแหน่ง</label>
-                                <select class="form-control" id="eva_limit_frame_employee_position_id" iLabel="ตำแหน่ง" iRequire="false" iGroup="eva_limit_frame_employee"></select>
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_level_id" for="eva_limit_frame_employee_level_id">ระดับ</label>
-                                <select class="form-control" id="eva_limit_frame_employee_level_id" iLabel="ระดับ" iRequire="false" iGroup="eva_limit_frame_employee"></select>
-                            </div>
-                        </div>
-                        <div class='row'>
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_salary" for="eva_limit_frame_employee_salary">เงินเดือน</label>
-                                <input class="form-control" type="number" id="eva_limit_frame_employee_salary" iLabel="เงินเดือน" iRequire="false" iGroup="eva_limit_frame_employee" />
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_position_allowance" for="eva_limit_frame_employee_position_allowance">เงินประจำตำแหน่ง</label>
-                                <input class="form-control" type="number" id="eva_limit_frame_employee_position_allowance" iLabel="เงินประจำตำแหน่ง" iRequire="false" iGroup="eva_limit_frame_employee" />
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_employee_monthly_remuneration" for="eva_limit_frame_employee_monthly_remuneration">ค่าตอบแทนรายเดือน</label>
-                                <input class="form-control" type="number" id="eva_limit_frame_employee_monthly_remuneration" iLabel="ค่าตอบแทนรายเดือน" iRequire="false" iGroup="eva_limit_frame_employee" />
-                            </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_limit_frame_employee_PutUpdate()">บันทึก</button>
-            </div>
-        </div>
-    </div>
-</div>
-
 <div class="row page-title">
     <div class="col-md-5">
         <div class="page-title">
@@ -152,135 +16,88 @@
             <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_limit_frame_group</li>
-        </ol>
+        </ol>        
     </div>
 </div>
 
 <section class="wrapper">
-    <div class="title col-md-12"><div class="line"></div>บันทึกข้อมูล eva_limit_frame_group</div>
+	<div class="title col-md-12"><div class="line"></div>บันทึกข้อมูล eva_limit_frame_group</div>
 
     <section class="card no-border">
-        <header class="card-header">
+            <header class="card-header">
             กรุณากรอกข้อมูลลงในแบบฟอร์ม
         </header>
         <div class="card-body" style="">
 
-            <div class="row">
-                <div class="col-md-12">
+			<div class="row">
+				<div class="col-md-12">
 
-                    <input class="form-control" type="hidden" id="eva_limit_frame_group_id" />
-                    <input class="form-control" type="hidden" id="eva_limit_frame_group_frame_plan_guid" />
+	<input class="form-control" type="hidden" id="eva_limit_frame_group_id" />
+<input class="form-control" type="hidden" id="eva_limit_frame_group_frame_plan_guid" />
 
-                    <div class='row'></div>
-                    <div class='row'></div>
-                    <div class='row'>
-                        <div class="form-group col-md-4">
-                            <label id="lab_eva_limit_frame_group_group_guid" for="eva_limit_frame_group_group_guid">กลุ่มการประเมิน</label>
-                            <select class="form-control" id="eva_limit_frame_group_group_guid" iLabel="กลุ่มการประเมิน" iRequire="false" iGroup="eva_limit_frame_group"></select>
-                        </div>
-
-                        <div class="form-group col-md-4">
-                            <label id="lab_eva_limit_frame_group_limit_frame_295" for="eva_limit_frame_group_limit_frame_295">กรอบวงเงินที่กันไว้</label>
-                            <input class="form-control" type="number" id="eva_limit_frame_group_limit_frame_295" iLabel="กรอบวงเงินที่กันไว้" iRequire="false" iGroup="eva_limit_frame_group" />
-                        </div>
-                    </div>
-                    <div class='row'>
-                        <div class="form-group col-md-4">
-                            <label id="lab_eva_limit_frame_group_total_salary" for="eva_limit_frame_group_total_salary">อัตราเงินเดือนรวม</label>
-                            <input class="form-control" type="number" id="eva_limit_frame_group_total_salary" iLabel="อัตราเงินเดือนรวม" iRequire="false" iGroup="eva_limit_frame_group" />
-                        </div>
-
-                        <div class="form-group col-md-4">
-                            <label id="lab_eva_limit_frame_group_total_salary_limit" for="eva_limit_frame_group_total_salary_limit">วงเงินในการเลื่อนเงินเดือน</label>
-                            <input class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit" iLabel="วงเงินในการเลื่อนเงินเดือน" iRequire="false" iGroup="eva_limit_frame_group" />
-                        </div>
-
-                        <div class="form-group col-md-4">
-                            <label id="lab_eva_limit_frame_group_total_salary_limit_rounded" for="eva_limit_frame_group_total_salary_limit_rounded">วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง</label>
-                            <input class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit_rounded" iLabel="วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง" iRequire="false" iGroup="eva_limit_frame_group" />
-                        </div>
-                    </div>
-
-
-                </div>
-            </div>
-        </div>
-    </section>
-
-    <div class="row">
-        <div class="form-group col-md-12">
-            <button type="button" class="btn btn-outline" onclick="javascript:window_close()" style="background-color: #fff;">ยกเลิก</button>
-            <button type="button" class="btn btn-submit" onclick="javascript:eva_limit_frame_group_PutUpdate()">บันทึก</button>
-        </div>
+<div class='row'></div>
+<div class='row'></div>
+<div class='row'>
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_group_group_guid" for="eva_limit_frame_group_group_guid">กลุ่มการประเมิน</label>
+	    <select class="form-control" id="eva_limit_frame_group_group_guid" iLabel="กลุ่มการประเมิน" iRequire="true" iGroup="eva_limit_frame_group" ></select>
     </div>
 
-</section>
-
-<br />
-
-
-<section class="wrapper">
-    <div class="title"><div class="line"></div>ค้นหา eva_limit_frame_employee</div>
-    <div class="tools">
-        <div class="row">
-
-            <div class="form-group col-md-3">
-                <label id='lab_s_eva_limit_frame_employee_frame_group_guid' for='s_eva_limit_frame_employee_frame_group_guid'>frame_plan_guid</label>
-                <input class="form-control" type="hidden" id="s_eva_limit_frame_employee_frame_group_guid" />
-            </div>
-
-            <div class="form-group col-md-3">
-                <label id='lab_s_eva_limit_frame_employee_employee_id' for='s_eva_limit_frame_employee_employee_id'>พนักงาน</label>
-                <select class="form-control" id="s_eva_limit_frame_employee_employee_id" iLabel="พนักงาน" iRequire="true" iGroup="s_eva_limit_frame_employee" title='พนักงาน' placeholder='พนักงาน'></select>
-            </div>
-
-            <div class="col-md-6">
-                <button class="btn btn-info" onclick="javascript:eva_limit_frame_employee_DoSearch();">ค้นหา</button>
-                <button class="btn btn-info" onclick="javascript:eva_limit_frame_employee_GoCreate();"><i class="fa fa-plus" style="font-size: 14px;"></i> เพิ่มรายการ</button>
-                <button style="display:none;" class="btn btn-info" onclick="javascript:eva_limit_frame_employee_GetSelect('id');">ดึงตัวเลือก</button>
-            </div>
-
-        </div>
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_group_limit_frame_295" for="eva_limit_frame_group_limit_frame_295">กรอบวงเงินที่กันไว้</label>
+	    <input class="form-control" type="number" id="eva_limit_frame_group_limit_frame_295" iLabel="กรอบวงเงินที่กันไว้" iRequire="true" iGroup="eva_limit_frame_group"  />
+    </div>
+</div>
+<div class='row'>
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_group_total_salary" for="eva_limit_frame_group_total_salary">อัตราเงินเดือนรวม</label>
+	    <input class="form-control" type="number" id="eva_limit_frame_group_total_salary" iLabel="อัตราเงินเดือนรวม" iRequire="true" iGroup="eva_limit_frame_group"  />
     </div>
 
-    <table id="eva_limit_frame_employeeTable" class="display table table-bordered table-striped">
-        <thead>
-            <tr>
-                <!--<th>เลือก</th>-->
-                <th>เครื่องมือ</th>
-                <th><label id='h_eva_limit_frame_employee_id'>id</label></th>
-                <th><label id='h_eva_limit_frame_employee_frame_group_guid'>frame_plan_guid</label></th>
-                <th><label id='h_eva_limit_frame_employee_employee_id'>พนักงาน</label></th>
-                <th><label id='h_eva_limit_frame_employee_org_id'>หน่วยงาน</label></th>
-                <th><label id='h_eva_limit_frame_employee_position_id'>ตำแหน่ง</label></th>
-                <th><label id='h_eva_limit_frame_employee_level_id'>ระดับ</label></th>
-                <th><label id='h_eva_limit_frame_employee_salary'>เงินเดือน</label></th>
-                <th><label id='h_eva_limit_frame_employee_position_allowance'>เงินประจำตำแหน่ง</label></th>
-                <th><label id='h_eva_limit_frame_employee_monthly_remuneration'>ค่าตอบแทนรายเดือน</label></th>
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_group_total_salary_limit" for="eva_limit_frame_group_total_salary_limit">วงเงินในการเลื่อนเงินเดือน</label>
+	    <input class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit" iLabel="วงเงินในการเลื่อนเงินเดือน" iRequire="true" iGroup="eva_limit_frame_group"  />
+    </div>
+
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_group_total_salary_limit_rounded" for="eva_limit_frame_group_total_salary_limit_rounded">วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง</label>
+	    <input class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit_rounded" iLabel="วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง" iRequire="true" iGroup="eva_limit_frame_group"  />
+    </div>
+</div>
+<div class='row'>
+    <div class="form-group col-md-12">
+	    <label id="lab_eva_limit_frame_group_remark" for="eva_limit_frame_group_remark">หมายเหตุ</label>
+	    <textarea  class="form-control" rows="4" cols="50" id="eva_limit_frame_group_remark" iLabel="หมายเหตุ" iRequire="true" iGroup="eva_limit_frame_group" ></textarea>
+    </div>
+</div>
+
+
+				</div>
+			</div>
+		</div>
+	</section>
+
+	<div class="row">
+		<div class="form-group col-md-12">
+			<button type="button" class="btn btn-outline" onclick="javascript:window_close()" style="background-color: #fff;">ยกเลิก</button>
+			<button type="button" class="btn btn-submit" onclick="javascript:eva_limit_frame_group_PutUpdate()">บันทึก</button>
+		</div>
+	</div>
 
-            </tr>
-        </thead>
-        <tbody></tbody>
-    </table>
 </section>
 
-
 @section FooterPlaceHolder{
-    <script src="~/js/eva_limit_frame_group/eva_limit_frame_group_d.js"></script>
-    <script src="~/js/eva_limit_frame_employee/eva_limit_frame_employee.js"></script>
-    <script>
-        $(document).ready(function () {
-            var id = getUrlParameter("id");
-            if (id) {
-                eva_limit_frame_group_SetEditForm(id);
-                eva_limit_frame_employee_InitiateDataTable();
-                eva_limit_frame_employee_InitialForm();
-            } else {
-                eva_limit_frame_group_SetCreateForm();
-            }
-            SetupValidationRemark("eva_limit_frame_group");
-            SetupValidationRemark("eva_limit_frame_employee");
-        });
-    </script>
+<script src="~/js/eva_limit_frame_group/eva_limit_frame_group_d.js"></script>
+<script>
+    $(document).ready(function () {
+        var id = getUrlParameter("id");
+        if (id) {
+            eva_limit_frame_group_SetEditForm(id);
+        } else {
+            eva_limit_frame_group_SetCreateForm();
+        }
+        SetupValidationRemark("eva_limit_frame_group");
+    });
+</script>
 }
 

Views/eva_limit_frame_groupView/eva_limit_frame_group_inline.cshtml

@@ -28,6 +28,7 @@
 <th><label id='h_eva_limit_frame_group_total_salary'>อัตราเงินเดือนรวม</label></th>
 <th><label id='h_eva_limit_frame_group_total_salary_limit'>วงเงินในการเลื่อนเงินเดือน</label></th>
 <th><label id='h_eva_limit_frame_group_total_salary_limit_rounded'>วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง</label></th>
+<th><label id='h_eva_limit_frame_group_remark'>หมายเหตุ</label></th>
 
                 <th>กิจกรรม</th>
             </tr>

Views/eva_limit_frame_groupView/eva_limit_frame_group_wizardform.cshtml

@@ -50,3 +50,13 @@
     </div>
 </div>
 </div>
+<div class='row'>
+<div class="col-md-12">
+    <div class="inpt-form-group"> 
+	    <label id="lab_eva_limit_frame_group_remark" for="eva_limit_frame_group_remark">หมายเหตุ</label>
+	    <div class="inpt-group"> 
+		    <textarea  class="inpt-control" rows="4" cols="50" id="eva_limit_frame_group_remark" iLabel="หมายเหตุ" iRequire="true" iGroup="eva_limit_frame_group" ></textarea>
+	    </div>
+    </div>
+</div>
+</div>

Views/eva_limit_frame_planView/eva_limit_frame_plan.cshtml

@@ -4,7 +4,6 @@
     ViewData["Title"] = "eva_limit_frame_plan";
 }
 
-
 <div class="modal fade" id="eva_limit_frame_planModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_limit_frame_planModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
@@ -18,52 +17,63 @@
                 <div class="row">
                     <div class="col-md-12">
 
-                        <input class="form-control" type="hidden" id="eva_limit_frame_plan_id" />
-                        <input class="form-control" type="hidden" id="eva_limit_frame_plan_status_self" />
-                        <input class="form-control" type="hidden" id="eva_limit_frame_plan_status_chief" />
-                        <input class="form-control" type="hidden" id="eva_limit_frame_plan_supervisor1" />
+<input class="form-control" type="hidden" id="eva_limit_frame_plan_id" />
+<input class="form-control" type="hidden" id="eva_limit_frame_plan_status_self" />
+<input class="form-control" type="hidden" id="eva_limit_frame_plan_status_chief" />
+<input class="form-control" type="hidden" id="eva_limit_frame_plan_supervisor1" />
 
-                        <div class='row'></div>
-                        <div class='row'>
-                            <div class="form-group col-md-8">
-                                <label id="lab_eva_limit_frame_plan_plan_guid" for="eva_limit_frame_plan_plan_guid">แผนการประเมิน</label>
-                                <select class="form-control" id="eva_limit_frame_plan_plan_guid" iLabel="แผนการประเมิน" iRequire="false" iGroup="eva_limit_frame_plan"></select>
-                            </div>
-                        </div>
-                        <div class='row'>
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_plan_executed_date" for="eva_limit_frame_plan_executed_date">วันที่ตั้งกรอบวงเงิน</label>
-                                <input class="form-control" type="text" id="eva_limit_frame_plan_executed_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ตั้งกรอบวงเงิน" iRequire="false" iGroup="eva_limit_frame_plan" />
-                            </div>
+<div class='row'></div>
+<div class='row'>
+    <div class="form-group col-md-8">
+	    <label id="lab_eva_limit_frame_plan_plan_guid" for="eva_limit_frame_plan_plan_guid">แผนการประเมิน</label>
+	    <select class="form-control" id="eva_limit_frame_plan_plan_guid" iLabel="แผนการประเมิน" iRequire="true" iGroup="eva_limit_frame_plan" ></select>
+    </div>
+</div>
+<div class='row'>
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_plan_executed_date" for="eva_limit_frame_plan_executed_date">วันที่ตั้งกรอบวงเงิน</label>
+	    <input class="form-control" type="text" id="eva_limit_frame_plan_executed_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ตั้งกรอบวงเงิน" iRequire="true" iGroup="eva_limit_frame_plan"  />
+    </div>
 
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_plan_limit_frame_005" for="eva_limit_frame_plan_limit_frame_005">กรอบวงเงินที่กันไว้</label>
-                                <input class="form-control" type="number" id="eva_limit_frame_plan_limit_frame_005" iLabel="กรอบวงเงินที่กันไว้" iRequire="false" iGroup="eva_limit_frame_plan" />
-                            </div>
-                        </div>
-                        <div class='row'>
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_plan_supervisor1_result" for="eva_limit_frame_plan_supervisor1_result">ผลการตรวจ</label>
-                                <select class="form-control" id="eva_limit_frame_plan_supervisor1_result" iLabel="ผลการตรวจ" iRequire="false" iGroup="eva_limit_frame_plan"></select>
-                            </div>
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_plan_limit_frame_005" for="eva_limit_frame_plan_limit_frame_005">กรอบวงเงินที่กันไว้</label>
+	    <input class="form-control" type="number" id="eva_limit_frame_plan_limit_frame_005" iLabel="กรอบวงเงินที่กันไว้" iRequire="true" iGroup="eva_limit_frame_plan"  />
+    </div>
+</div>
+<div class='row'>
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_plan_supervisor1_result" for="eva_limit_frame_plan_supervisor1_result">ผลการตรวจ</label>
+	    <select class="form-control" id="eva_limit_frame_plan_supervisor1_result" iLabel="ผลการตรวจ" iRequire="true" iGroup="eva_limit_frame_plan" ></select>
+    </div>
+
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_plan_supervisor1_date" for="eva_limit_frame_plan_supervisor1_date">วันที่ประเมิน</label>
+	    <input class="form-control" type="text" id="eva_limit_frame_plan_supervisor1_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ประเมิน" iRequire="true" iGroup="eva_limit_frame_plan"  />
+    </div>
+</div>
+<div class='row'>
+    <div class="form-group col-md-12">
+	    <label id="lab_eva_limit_frame_plan_supervisor1_remark" for="eva_limit_frame_plan_supervisor1_remark">ความเห็นผู้ประเมิน</label>
+	    <textarea  class="form-control" rows="4" cols="50" id="eva_limit_frame_plan_supervisor1_remark" iLabel="ความเห็นผู้ประเมิน" iRequire="true" iGroup="eva_limit_frame_plan" ></textarea>
+    </div>
+</div>
+<div class='row'>
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_plan_salary_adjustment_date" for="eva_limit_frame_plan_salary_adjustment_date">เลื่อนเงินเดือนวันที่</label>
+	    <input class="form-control" type="text" id="eva_limit_frame_plan_salary_adjustment_date" data-provide="datepicker" data-date-language="th-th" iLabel="เลื่อนเงินเดือนวันที่" iRequire="true" iGroup="eva_limit_frame_plan"  />
+    </div>
+
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_plan_limit_frame_005_total" for="eva_limit_frame_plan_limit_frame_005_total">กันวงเงินไว้</label>
+	    <input class="form-control" type="number" id="eva_limit_frame_plan_limit_frame_005_total" iLabel="กันวงเงินไว้" iRequire="true" iGroup="eva_limit_frame_plan"  />
+    </div>
+
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_plan_limit_frame_005_total_rounded" for="eva_limit_frame_plan_limit_frame_005_total_rounded">กันวงเงินใช้จริง</label>
+	    <input class="form-control" type="number" id="eva_limit_frame_plan_limit_frame_005_total_rounded" iLabel="กันวงเงินใช้จริง" iRequire="true" iGroup="eva_limit_frame_plan"  />
+    </div>
+</div>
 
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_plan_supervisor1_date" for="eva_limit_frame_plan_supervisor1_date">วันที่ประเมิน</label>
-                                <input class="form-control" type="text" id="eva_limit_frame_plan_supervisor1_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ประเมิน" iRequire="false" iGroup="eva_limit_frame_plan" />
-                            </div>
-                        </div>
-                        <div class='row'>
-                            <div class="form-group col-md-12">
-                                <label id="lab_eva_limit_frame_plan_supervisor1_remark" for="eva_limit_frame_plan_supervisor1_remark">ความเห็นผู้ประเมิน</label>
-                                <textarea class="form-control" rows="4" cols="50" id="eva_limit_frame_plan_supervisor1_remark" iLabel="ความเห็นผู้ประเมิน" iRequire="false" iGroup="eva_limit_frame_plan"></textarea>
-                            </div>
-                        </div>
-                        <div class='row'>
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_plan_salary_adjustment_date" for="eva_limit_frame_plan_salary_adjustment_date">เลื่อนเงินเดือนวันที่</label>
-                                <input class="form-control" type="text" id="eva_limit_frame_plan_salary_adjustment_date" data-provide="datepicker" data-date-language="th-th" iLabel="เลื่อนเงินเดือนวันที่" iRequire="false" iGroup="eva_limit_frame_plan" />
-                            </div>
-                        </div>
 
                     </div>
                 </div>
@@ -87,45 +97,48 @@
             <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_limit_frame_plan</li>
-        </ol>
+        </ol>        
     </div>
 </div>
 
 <section class="wrapper">
-    <div class="title"><div class="line"></div>ค้นหา eva_limit_frame_plan</div>
-    <div class="tools">
-        <div class="row">
+	<div class="title"><div class="line"></div>ค้นหา eva_limit_frame_plan</div>
+	<div class="tools">
+		<div class="row">
+	
+                        <div class="form-group col-md-3">
+                            <label id='lab_s_eva_limit_frame_plan_executed_date' for='s_eva_limit_frame_plan_executed_date'>วันที่ตั้งกรอบวงเงิน</label>
+                            <input class="form-control" type="text" id="s_eva_limit_frame_plan_executed_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ตั้งกรอบวงเงิน" iRequire="true" iGroup="s_eva_limit_frame_plan" title='วันที่ตั้งกรอบวงเงิน' placeholder='วันที่ตั้งกรอบวงเงิน' />
+                        </div>
 
-            <div class="form-group col-md-3">
-                <label id='lab_s_eva_limit_frame_plan_executed_date' for='s_eva_limit_frame_plan_executed_date'>วันที่ตั้งกรอบวงเงิน</label>
-                <input class="form-control" type="text" id="s_eva_limit_frame_plan_executed_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ตั้งกรอบวงเงิน" iRequire="false" iGroup="s_eva_limit_frame_plan" title='วันที่ตั้งกรอบวงเงิน' placeholder='วันที่ตั้งกรอบวงเงิน' />
-            </div>
+			<div class="col-md-6">
+				<button class="btn btn-info" onclick="javascript:eva_limit_frame_plan_DoSearch();">ค้นหา</button>
+				<button class="btn btn-info" onclick="javascript:eva_limit_frame_plan_GoCreate();"><i class="fa fa-plus" style="font-size: 14px;"></i> เพิ่มรายการ</button>
+				<button style="display:none;" class="btn btn-info" onclick="javascript:eva_limit_frame_plan_GetSelect('id');">ดึงตัวเลือก</button>
+			</div>
 
-            <div class="col-md-6">
-                <button class="btn btn-info" onclick="javascript:eva_limit_frame_plan_DoSearch();">ค้นหา</button>
-                <button class="btn btn-info" onclick="javascript:eva_limit_frame_plan_GoCreate();"><i class="fa fa-plus" style="font-size: 14px;"></i> เพิ่มรายการ</button>
-                <button style="display:none;" class="btn btn-info" onclick="javascript:eva_limit_frame_plan_GetSelect('id');">ดึงตัวเลือก</button>
-            </div>
+		</div>
+	</div>
 
-        </div>
-    </div>
-
-    <table id="eva_limit_frame_planTable" class="display table table-bordered table-striped">
+	<table id="eva_limit_frame_planTable" class="display table table-bordered table-striped">
         <thead>
             <tr>
-                <!--<th>เลือก</th>-->
-                <th>เครื่องมือ</th>
-                <th><label id='h_eva_limit_frame_plan_id'>รหัสอ้างอิง</label></th>
-                <th><label id='h_eva_limit_frame_plan_plan_guid'>แผนการประเมิน</label></th>
-                <th><label id='h_eva_limit_frame_plan_executed_date'>วันที่ตั้งกรอบวงเงิน</label></th>
-                <th><label id='h_eva_limit_frame_plan_limit_frame_005'>กรอบวงเงินที่กันไว้</label></th>
-                <th><label id='h_eva_limit_frame_plan_status_self'>สถานะการส่ง กรอบวงเงิน</label></th>
-                <th><label id='h_eva_limit_frame_plan_status_chief'>สถานะการตรวจ กรอบวงเงิน</label></th>
-                <th><label id='h_eva_limit_frame_plan_supervisor1'>ผู้ตรวจกรอบวงเงิน</label></th>
-                <th><label id='h_eva_limit_frame_plan_supervisor1_result'>ผลการตรวจ</label></th>
-                <th><label id='h_eva_limit_frame_plan_supervisor1_remark'>ความเห็นผู้ประเมิน</label></th>
-                <th><label id='h_eva_limit_frame_plan_supervisor1_date'>วันที่ประเมิน</label></th>
-
+				<!--<th>เลือก</th>-->
+				<th>เครื่องมือ</th>
+            <th><label id='h_eva_limit_frame_plan_id'>รหัสอ้างอิง</label></th>
+            <th><label id='h_eva_limit_frame_plan_plan_guid'>แผนการประเมิน</label></th>
+            <th><label id='h_eva_limit_frame_plan_executed_date'>วันที่ตั้งกรอบวงเงิน</label></th>
+            <th><label id='h_eva_limit_frame_plan_limit_frame_005'>กรอบวงเงินที่กันไว้</label></th>
+            <th><label id='h_eva_limit_frame_plan_status_self'>สถานะการส่ง กรอบวงเงิน</label></th>
+            <th><label id='h_eva_limit_frame_plan_status_chief'>สถานะการตรวจ กรอบวงเงิน</label></th>
+            <th><label id='h_eva_limit_frame_plan_supervisor1'>ผู้ตรวจกรอบวงเงิน</label></th>
+            <th><label id='h_eva_limit_frame_plan_supervisor1_result'>ผลการตรวจ</label></th>
+            <th><label id='h_eva_limit_frame_plan_supervisor1_remark'>ความเห็นผู้ประเมิน</label></th>
+            <th><label id='h_eva_limit_frame_plan_supervisor1_date'>วันที่ประเมิน</label></th>
+            <th><label id='h_eva_limit_frame_plan_salary_adjustment_date'>เลื่อนเงินเดือนวันที่</label></th>
+            <th><label id='h_eva_limit_frame_plan_limit_frame_005_total'>กันวงเงินไว้</label></th>
+            <th><label id='h_eva_limit_frame_plan_limit_frame_005_total_rounded'>กันวงเงินใช้จริง</label></th>
+                
             </tr>
         </thead>
         <tbody></tbody>
@@ -133,13 +146,13 @@
 </section>
 
 @section FooterPlaceHolder{
-    <script src="~/js/eva_limit_frame_plan/eva_limit_frame_plan.js"></script>
-    <script>
-        $(document).ready(function () {
-            eva_limit_frame_plan_InitiateDataTable();
-            eva_limit_frame_plan_InitialForm();
-            SetupValidationRemark("eva_limit_frame_plan");
-        });
-    </script>
+<script src="~/js/eva_limit_frame_plan/eva_limit_frame_plan.js"></script>
+<script>
+    $(document).ready(function () {
+        eva_limit_frame_plan_InitiateDataTable();
+        eva_limit_frame_plan_InitialForm();
+        SetupValidationRemark("eva_limit_frame_plan");
+    });
+</script>
 }
 

Views/eva_limit_frame_planView/eva_limit_frame_plan_d.cshtml

@@ -2,66 +2,9 @@
 @inject IConfiguration Configuration
 @{
     ViewData["Title"] = "eva_limit_frame_plan";
-    Layout = "_LayoutDirect";
+	Layout = "_LayoutDirect";
 }
 
-<div class="modal fade" id="eva_limit_frame_groupModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_limit_frame_groupModelLabel" 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_limit_frame_groupModelLabel">บันทึกข้อมูล eva_limit_frame_group</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_limit_frame_group_id" />
-                        <input class="form-control" type="hidden" id="eva_limit_frame_group_frame_plan_guid" />
-
-                        <div class='row'>
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_group_group_guid" for="eva_limit_frame_group_group_guid">กลุ่มการประเมิน</label>
-                                <select class="form-control" id="eva_limit_frame_group_group_guid" iLabel="กลุ่มการประเมิน" iRequire="false" iGroup="eva_limit_frame_group"></select>
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_group_limit_frame_295" for="eva_limit_frame_group_limit_frame_295">กรอบวงเงินที่กันไว้</label>
-                                <input class="form-control" type="number" id="eva_limit_frame_group_limit_frame_295" iLabel="กรอบวงเงินที่กันไว้" iRequire="false" iGroup="eva_limit_frame_group" />
-                            </div>
-                        </div>
-                        <div class='row'>
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_group_total_salary" for="eva_limit_frame_group_total_salary">อัตราเงินเดือนรวม</label>
-                                <input class="form-control" type="number" id="eva_limit_frame_group_total_salary" iLabel="อัตราเงินเดือนรวม" iRequire="false" iGroup="eva_limit_frame_group" />
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_group_total_salary_limit" for="eva_limit_frame_group_total_salary_limit">วงเงินในการเลื่อนเงินเดือน</label>
-                                <input class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit" iLabel="วงเงินในการเลื่อนเงินเดือน" iRequire="false" iGroup="eva_limit_frame_group" />
-                            </div>
-
-                            <div class="form-group col-md-4">
-                                <label id="lab_eva_limit_frame_group_total_salary_limit_rounded" for="eva_limit_frame_group_total_salary_limit_rounded">วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง</label>
-                                <input class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit_rounded" iLabel="วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง" iRequire="false" iGroup="eva_limit_frame_group" />
-                            </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_limit_frame_group_PutUpdate()">บันทึก</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-
 <div class="row page-title">
     <div class="col-md-5">
         <div class="page-title">
@@ -73,149 +16,106 @@
             <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_limit_frame_plan</li>
-        </ol>
+        </ol>        
     </div>
 </div>
 
 <section class="wrapper">
-    <div class="title col-md-12"><div class="line"></div>บันทึกข้อมูล eva_limit_frame_plan</div>
+	<div class="title col-md-12"><div class="line"></div>บันทึกข้อมูล eva_limit_frame_plan</div>
 
     <section class="card no-border">
-        <header class="card-header">
+            <header class="card-header">
             กรุณากรอกข้อมูลลงในแบบฟอร์ม
         </header>
         <div class="card-body" style="">
 
-            <div class="row">
-                <div class="col-md-12">
+			<div class="row">
+				<div class="col-md-12">
 
-                    <input class="form-control" type="hidden" id="eva_limit_frame_plan_id" />
-                    <input class="form-control" type="hidden" id="eva_limit_frame_plan_status_self" />
-                    <input class="form-control" type="hidden" id="eva_limit_frame_plan_status_chief" />
-                    <input class="form-control" type="hidden" id="eva_limit_frame_plan_supervisor1" />
+	<input class="form-control" type="hidden" id="eva_limit_frame_plan_id" />
+<input class="form-control" type="hidden" id="eva_limit_frame_plan_status_self" />
+<input class="form-control" type="hidden" id="eva_limit_frame_plan_status_chief" />
+<input class="form-control" type="hidden" id="eva_limit_frame_plan_supervisor1" />
 
-                    <div class='row'></div>
-                    <div class='row'>
-                        <div class="form-group col-md-8">
-                            <label id="lab_eva_limit_frame_plan_plan_guid" for="eva_limit_frame_plan_plan_guid">แผนการประเมิน</label>
-                            <select class="form-control" id="eva_limit_frame_plan_plan_guid" iLabel="แผนการประเมิน" iRequire="false" iGroup="eva_limit_frame_plan"></select>
-                        </div>
-                    </div>
-                    <div class='row'>
-                        <div class="form-group col-md-4">
-                            <label id="lab_eva_limit_frame_plan_executed_date" for="eva_limit_frame_plan_executed_date">วันที่ตั้งกรอบวงเงิน</label>
-                            <input class="form-control" type="text" id="eva_limit_frame_plan_executed_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ตั้งกรอบวงเงิน" iRequire="false" iGroup="eva_limit_frame_plan" />
-                        </div>
-
-                        <div class="form-group col-md-4">
-                            <label id="lab_eva_limit_frame_plan_limit_frame_005" for="eva_limit_frame_plan_limit_frame_005">กรอบวงเงินที่กันไว้</label>
-                            <input class="form-control" type="number" id="eva_limit_frame_plan_limit_frame_005" iLabel="กรอบวงเงินที่กันไว้" iRequire="false" iGroup="eva_limit_frame_plan" />
-                        </div>
-                    </div>
-                    <div class='row'>
-                        <div class="form-group col-md-4">
-                            <label id="lab_eva_limit_frame_plan_supervisor1_result" for="eva_limit_frame_plan_supervisor1_result">ผลการตรวจ</label>
-                            <select class="form-control" id="eva_limit_frame_plan_supervisor1_result" iLabel="ผลการตรวจ" iRequire="false" iGroup="eva_limit_frame_plan"></select>
-                        </div>
-
-                        <div class="form-group col-md-4">
-                            <label id="lab_eva_limit_frame_plan_supervisor1_date" for="eva_limit_frame_plan_supervisor1_date">วันที่ประเมิน</label>
-                            <input class="form-control" type="text" id="eva_limit_frame_plan_supervisor1_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ประเมิน" iRequire="false" iGroup="eva_limit_frame_plan" />
-                        </div>
-                    </div>
-                    <div class='row'>
-                        <div class="form-group col-md-12">
-                            <label id="lab_eva_limit_frame_plan_supervisor1_remark" for="eva_limit_frame_plan_supervisor1_remark">ความเห็นผู้ประเมิน</label>
-                            <textarea class="form-control" rows="4" cols="50" id="eva_limit_frame_plan_supervisor1_remark" iLabel="ความเห็นผู้ประเมิน" iRequire="false" iGroup="eva_limit_frame_plan"></textarea>
-                        </div>
-                    </div>
-                    <div class='row'>
-                        <div class="form-group col-md-4">
-                            <label id="lab_eva_limit_frame_plan_salary_adjustment_date" for="eva_limit_frame_plan_salary_adjustment_date">เลื่อนเงินเดือนวันที่</label>
-                            <input class="form-control" type="text" id="eva_limit_frame_plan_salary_adjustment_date" data-provide="datepicker" data-date-language="th-th" iLabel="เลื่อนเงินเดือนวันที่" iRequire="false" iGroup="eva_limit_frame_plan" />
-                        </div>
-                    </div>
-
-                </div>
-            </div>
-        </div>
-    </section>
-
-    <div class="row">
-        <div class="form-group col-md-12">
-            <button type="button" class="btn btn-outline" onclick="javascript:window_close()" style="background-color: #fff;">ยกเลิก</button>
-            <button type="button" class="btn btn-submit" onclick="javascript:eva_limit_frame_plan_PutUpdate()">บันทึก</button>
-        </div>
+<div class='row'></div>
+<div class='row'>
+    <div class="form-group col-md-8">
+	    <label id="lab_eva_limit_frame_plan_plan_guid" for="eva_limit_frame_plan_plan_guid">แผนการประเมิน</label>
+	    <select class="form-control" id="eva_limit_frame_plan_plan_guid" iLabel="แผนการประเมิน" iRequire="true" iGroup="eva_limit_frame_plan" ></select>
+    </div>
+</div>
+<div class='row'>
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_plan_executed_date" for="eva_limit_frame_plan_executed_date">วันที่ตั้งกรอบวงเงิน</label>
+	    <input class="form-control" type="text" id="eva_limit_frame_plan_executed_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ตั้งกรอบวงเงิน" iRequire="true" iGroup="eva_limit_frame_plan"  />
     </div>
 
-</section>
-
-<br />
-
-
-<section class="wrapper">
-    <div class="title"><div class="line"></div>ค้นหา eva_limit_frame_group</div>
-    <div class="tools">
-        <div class="row">
-
-            <div class="form-group col-md-3">
-                <label id='lab_s_eva_limit_frame_group_frame_plan_guid' for='s_eva_limit_frame_group_frame_plan_guid'>frame_plan_guid</label>
-                <input class="form-control" type="hidden" id="s_eva_limit_frame_group_frame_plan_guid" />
-            </div>
-
-            <div class="form-group col-md-3">
-                <label id='lab_s_eva_limit_frame_group_group_guid' for='s_eva_limit_frame_group_group_guid'>กลุ่มการประเมิน</label>
-                <select class="form-control" id="s_eva_limit_frame_group_group_guid" iLabel="กลุ่มการประเมิน" iRequire="false" iGroup="s_eva_limit_frame_group" title='กลุ่มการประเมิน' placeholder='กลุ่มการประเมิน'></select>
-            </div>
-
-            <div class="col-md-6">
-                <button class="btn btn-info" onclick="javascript:eva_limit_frame_group_DoSearch();">ค้นหา</button>
-                <button class="btn btn-info" onclick="javascript:eva_limit_frame_group_GoCreate();"><i class="fa fa-plus" style="font-size: 14px;"></i> เพิ่มรายการ</button>
-                <button style="display:none;" class="btn btn-info" onclick="javascript:eva_limit_frame_group_GetSelect('id');">ดึงตัวเลือก</button>
-            </div>
-
-        </div>
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_plan_limit_frame_005" for="eva_limit_frame_plan_limit_frame_005">กรอบวงเงินที่กันไว้</label>
+	    <input class="form-control" type="number" id="eva_limit_frame_plan_limit_frame_005" iLabel="กรอบวงเงินที่กันไว้" iRequire="true" iGroup="eva_limit_frame_plan"  />
+    </div>
+</div>
+<div class='row'>
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_plan_supervisor1_result" for="eva_limit_frame_plan_supervisor1_result">ผลการตรวจ</label>
+	    <select class="form-control" id="eva_limit_frame_plan_supervisor1_result" iLabel="ผลการตรวจ" iRequire="true" iGroup="eva_limit_frame_plan" ></select>
     </div>
 
-    <table id="eva_limit_frame_groupTable" class="display table table-bordered table-striped">
-        <thead>
-            <tr>
-                <!--<th>เลือก</th>-->
-                <th>เครื่องมือ</th>
-                <th><label id='h_eva_limit_frame_group_id'>รหัสอ้างอิง</label></th>
-                <th><label id='h_eva_limit_frame_group_frame_plan_guid'>frame_plan_guid</label></th>
-                <th><label id='h_eva_limit_frame_group_group_guid'>กลุ่มการประเมิน</label></th>
-                <th><label id='h_eva_limit_frame_group_limit_frame_295'>กรอบวงเงินที่กันไว้</label></th>
-                <th><label id='h_eva_limit_frame_group_total_salary'>อัตราเงินเดือนรวม</label></th>
-                <th><label id='h_eva_limit_frame_group_total_salary_limit'>วงเงินในการเลื่อนเงินเดือน</label></th>
-                <th><label id='h_eva_limit_frame_group_total_salary_limit_rounded'>วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง</label></th>
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_plan_supervisor1_date" for="eva_limit_frame_plan_supervisor1_date">วันที่ประเมิน</label>
+	    <input class="form-control" type="text" id="eva_limit_frame_plan_supervisor1_date" data-provide="datepicker" data-date-language="th-th" iLabel="วันที่ประเมิน" iRequire="true" iGroup="eva_limit_frame_plan"  />
+    </div>
+</div>
+<div class='row'>
+    <div class="form-group col-md-12">
+	    <label id="lab_eva_limit_frame_plan_supervisor1_remark" for="eva_limit_frame_plan_supervisor1_remark">ความเห็นผู้ประเมิน</label>
+	    <textarea  class="form-control" rows="4" cols="50" id="eva_limit_frame_plan_supervisor1_remark" iLabel="ความเห็นผู้ประเมิน" iRequire="true" iGroup="eva_limit_frame_plan" ></textarea>
+    </div>
+</div>
+<div class='row'>
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_plan_salary_adjustment_date" for="eva_limit_frame_plan_salary_adjustment_date">เลื่อนเงินเดือนวันที่</label>
+	    <input class="form-control" type="text" id="eva_limit_frame_plan_salary_adjustment_date" data-provide="datepicker" data-date-language="th-th" iLabel="เลื่อนเงินเดือนวันที่" iRequire="true" iGroup="eva_limit_frame_plan"  />
+    </div>
+
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_plan_limit_frame_005_total" for="eva_limit_frame_plan_limit_frame_005_total">กันวงเงินไว้</label>
+	    <input class="form-control" type="number" id="eva_limit_frame_plan_limit_frame_005_total" iLabel="กันวงเงินไว้" iRequire="true" iGroup="eva_limit_frame_plan"  />
+    </div>
+
+    <div class="form-group col-md-4">
+	    <label id="lab_eva_limit_frame_plan_limit_frame_005_total_rounded" for="eva_limit_frame_plan_limit_frame_005_total_rounded">กันวงเงินใช้จริง</label>
+	    <input class="form-control" type="number" id="eva_limit_frame_plan_limit_frame_005_total_rounded" iLabel="กันวงเงินใช้จริง" iRequire="true" iGroup="eva_limit_frame_plan"  />
+    </div>
+</div>
+
+
+				</div>
+			</div>
+		</div>
+	</section>
+
+	<div class="row">
+		<div class="form-group col-md-12">
+			<button type="button" class="btn btn-outline" onclick="javascript:window_close()" style="background-color: #fff;">ยกเลิก</button>
+			<button type="button" class="btn btn-submit" onclick="javascript:eva_limit_frame_plan_PutUpdate()">บันทึก</button>
+		</div>
+	</div>
 
-            </tr>
-        </thead>
-        <tbody></tbody>
-    </table>
 </section>
 
-<br />
-
 @section FooterPlaceHolder{
-    <script src="~/js/eva_limit_frame_plan/eva_limit_frame_plan_d.js"></script>
-    <script src="~/js/eva_limit_frame_group/eva_limit_frame_group.js"></script>
-    <script>
-        $(document).ready(function () {
-            var id = getUrlParameter("id");
-            if (id) {
-                eva_limit_frame_plan_SetEditForm(id);
-
-                eva_limit_frame_group_InitiateDataTable();
-                eva_limit_frame_group_InitialForm();
-
-            } else {
-                eva_limit_frame_plan_SetCreateForm();
-            }
-            SetupValidationRemark("eva_limit_frame_plan");            
-            SetupValidationRemark("eva_limit_frame_group");
-        });
-    </script>
+<script src="~/js/eva_limit_frame_plan/eva_limit_frame_plan_d.js"></script>
+<script>
+    $(document).ready(function () {
+        var id = getUrlParameter("id");
+        if (id) {
+            eva_limit_frame_plan_SetEditForm(id);
+        } else {
+            eva_limit_frame_plan_SetCreateForm();
+        }
+        SetupValidationRemark("eva_limit_frame_plan");
+    });
+</script>
 }
 

Views/eva_limit_frame_planView/eva_limit_frame_plan_inline.cshtml

@@ -29,6 +29,9 @@
 <th><label id='h_eva_limit_frame_plan_supervisor1_result'>ผลการตรวจ</label></th>
 <th><label id='h_eva_limit_frame_plan_supervisor1_remark'>ความเห็นผู้ประเมิน</label></th>
 <th><label id='h_eva_limit_frame_plan_supervisor1_date'>วันที่ประเมิน</label></th>
+<th><label id='h_eva_limit_frame_plan_salary_adjustment_date'>เลื่อนเงินเดือนวันที่</label></th>
+<th><label id='h_eva_limit_frame_plan_limit_frame_005_total'>กันวงเงินไว้</label></th>
+<th><label id='h_eva_limit_frame_plan_limit_frame_005_total_rounded'>กันวงเงินใช้จริง</label></th>
 
                 <th>กิจกรรม</th>
             </tr>

Views/eva_limit_frame_planView/eva_limit_frame_plan_wizardform.cshtml

@@ -62,3 +62,31 @@
     </div>
 </div>
 </div>
+<div class='row'>
+<div class="col-md-4">
+    <div class="inpt-form-group"> 
+	    <label id="lab_eva_limit_frame_plan_salary_adjustment_date" for="eva_limit_frame_plan_salary_adjustment_date">เลื่อนเงินเดือนวันที่</label>
+	    <div class="inpt-group"> 
+		    <input class="inpt-control" type="text" id="eva_limit_frame_plan_salary_adjustment_date" data-provide="datepicker" data-date-language="th-th" iLabel="เลื่อนเงินเดือนวันที่" iRequire="true" iGroup="eva_limit_frame_plan"  />
+	    </div>
+    </div>
+</div>
+
+<div class="col-md-4">
+    <div class="inpt-form-group"> 
+	    <label id="lab_eva_limit_frame_plan_limit_frame_005_total" for="eva_limit_frame_plan_limit_frame_005_total">กันวงเงินไว้</label>
+	    <div class="inpt-group"> 
+		    <input class="inpt-control" type="number" id="eva_limit_frame_plan_limit_frame_005_total" iLabel="กันวงเงินไว้" iRequire="true" iGroup="eva_limit_frame_plan"  />
+	    </div>
+    </div>
+</div>
+
+<div class="col-md-4">
+    <div class="inpt-form-group"> 
+	    <label id="lab_eva_limit_frame_plan_limit_frame_005_total_rounded" for="eva_limit_frame_plan_limit_frame_005_total_rounded">กันวงเงินใช้จริง</label>
+	    <div class="inpt-group"> 
+		    <input class="inpt-control" type="number" id="eva_limit_frame_plan_limit_frame_005_total_rounded" iLabel="กันวงเงินใช้จริง" iRequire="true" iGroup="eva_limit_frame_plan"  />
+	    </div>
+    </div>
+</div>
+</div>

wwwroot/js/eva_create_evaluation/eva_create_evaluation.js

@@ -177,7 +177,7 @@ var eva_create_evaluation_setupTable = function (result) {
                 "targets": 0,
                 "data": "id",
                 "render": function (data, type, row, meta) {
-                    return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_create_evaluation_GoEdit(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button> <button type='button' class='btn btn-danger btn-sm' onclick='javascript:eva_create_evaluation_GoDelete(" + tmp + data + tmp + ")'><i class='fa fa-trash-o '></i></button> ";
+                    return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_create_evaluation_GoEdit(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button> <button type='button' style='display:none;' class='btn btn-danger btn-sm' onclick='javascript:eva_create_evaluation_GoDelete(" + tmp + data + tmp + ")'><i class='fa fa-trash-o '></i></button> ";
                 }
             }],
         "language": {

wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee.js

@@ -5,44 +5,48 @@ var eva_limit_frame_employee_API = "/api/eva_limit_frame_employee/";
 
 function eva_limit_frame_employee_GetSearchParameter() {
     var eva_limit_frame_employeeSearchObject = new Object();
-    eva_limit_frame_employeeSearchObject.frame_group_guid = getUrlParameter("id");
-    eva_limit_frame_employeeSearchObject.employee_id = $("#s_eva_limit_frame_employee_employee_id").val();
+eva_limit_frame_employeeSearchObject.frame_group_guid = $("#s_eva_limit_frame_employee_frame_group_guid").val();
+eva_limit_frame_employeeSearchObject.employee_id = $("#s_eva_limit_frame_employee_employee_id").val();
 
     return eva_limit_frame_employeeSearchObject;
 }
 
 function eva_limit_frame_employee_FeedDataToSearchForm(data) {
-    $("#s_eva_limit_frame_employee_frame_group_guid").val(data.frame_group_guid);
-    DropDownClearFormAndFeedWithData($("#s_eva_limit_frame_employee_employee_id"), data, "id", "external_name", "item_employee_id", data.employee_id);
+$("#s_eva_limit_frame_employee_frame_group_guid").val(data.frame_group_guid);
+DropDownClearFormAndFeedWithData($("#s_eva_limit_frame_employee_employee_id"), data, "id", "external_name", "item_employee_id", data.employee_id);
 
 }
 
 //================= Form Data Customizaiton =========================================
 
 function eva_limit_frame_employee_FeedDataToForm(data) {
-    $("#eva_limit_frame_employee_id").val(data.id);
-    $("#eva_limit_frame_employee_frame_group_guid").val(data.frame_group_guid);
-    DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_employee_id"), data, "id", "external_name", "item_employee_id", data.employee_id);
-    DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
-    DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_position_id"), data, "id", "external_name", "item_position_id", data.position_id);
-    DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_level_id"), data, "id", "external_name", "item_level_id", data.level_id);
-    $("#eva_limit_frame_employee_salary").val(data.salary);
-    $("#eva_limit_frame_employee_position_allowance").val(data.position_allowance);
-    $("#eva_limit_frame_employee_monthly_remuneration").val(data.monthly_remuneration);
+$("#eva_limit_frame_employee_id").val(data.id);
+$("#eva_limit_frame_employee_frame_group_guid").val(data.frame_group_guid);
+DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_employee_id"), data, "id", "external_name", "item_employee_id", data.employee_id);
+DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
+$("#eva_limit_frame_employee_position_text").val(data.position_text);
+$("#eva_limit_frame_employee_level_text").val(data.level_text);
+$("#eva_limit_frame_employee_salary").val(data.salary);
+$("#eva_limit_frame_employee_position_allowance").val(data.position_allowance);
+$("#eva_limit_frame_employee_monthly_remuneration").val(data.monthly_remuneration);
+$("#eva_limit_frame_employee_cost_of_living").val(data.cost_of_living);
+$("#eva_limit_frame_employee_order_of_data").val(data.order_of_data);
 
 }
 
 function eva_limit_frame_employee_GetFromForm() {
     var eva_limit_frame_employeeObject = new Object();
-    eva_limit_frame_employeeObject.id = $("#eva_limit_frame_employee_id").val();
-    eva_limit_frame_employeeObject.frame_group_guid = getUrlParameter("id");
-    eva_limit_frame_employeeObject.employee_id = $("#eva_limit_frame_employee_employee_id").val();
-    eva_limit_frame_employeeObject.org_id = $("#eva_limit_frame_employee_org_id").val();
-    eva_limit_frame_employeeObject.position_id = $("#eva_limit_frame_employee_position_id").val();
-    eva_limit_frame_employeeObject.level_id = $("#eva_limit_frame_employee_level_id").val();
-    eva_limit_frame_employeeObject.salary = $("#eva_limit_frame_employee_salary").val();
-    eva_limit_frame_employeeObject.position_allowance = $("#eva_limit_frame_employee_position_allowance").val();
-    eva_limit_frame_employeeObject.monthly_remuneration = $("#eva_limit_frame_employee_monthly_remuneration").val();
+eva_limit_frame_employeeObject.id = $("#eva_limit_frame_employee_id").val();
+eva_limit_frame_employeeObject.frame_group_guid = $("#eva_limit_frame_employee_frame_group_guid").val();
+eva_limit_frame_employeeObject.employee_id = $("#eva_limit_frame_employee_employee_id").val();
+eva_limit_frame_employeeObject.org_id = $("#eva_limit_frame_employee_org_id").val();
+eva_limit_frame_employeeObject.position_text = $("#eva_limit_frame_employee_position_text").val();
+eva_limit_frame_employeeObject.level_text = $("#eva_limit_frame_employee_level_text").val();
+eva_limit_frame_employeeObject.salary = $("#eva_limit_frame_employee_salary").val();
+eva_limit_frame_employeeObject.position_allowance = $("#eva_limit_frame_employee_position_allowance").val();
+eva_limit_frame_employeeObject.monthly_remuneration = $("#eva_limit_frame_employee_monthly_remuneration").val();
+eva_limit_frame_employeeObject.cost_of_living = $("#eva_limit_frame_employee_cost_of_living").val();
+eva_limit_frame_employeeObject.order_of_data = $("#eva_limit_frame_employee_order_of_data").val();
 
 
     return eva_limit_frame_employeeObject;
@@ -51,14 +55,14 @@ function eva_limit_frame_employee_GetFromForm() {
 function eva_limit_frame_employee_InitialForm(s) {
     var successFunc = function (result) {
         eva_limit_frame_employee_FeedDataToForm(result);
-        eva_limit_frame_employee_FeedDataToSearchForm(result);
+		eva_limit_frame_employee_FeedDataToSearchForm(result);
         if (s) {
             // Incase model popup
             $("#eva_limit_frame_employeeModel").modal("show");
         }
-        endLoad();
+		endLoad();
     };
-    startLoad();
+	startLoad();
     AjaxGetRequest(apisite + eva_limit_frame_employee_API + "GetBlankItem", successFunc, AlertDanger);
 }
 
@@ -85,15 +89,15 @@ function eva_limit_frame_employee_SetEditForm(a) {
         eva_limit_frame_employee_editMode = "UPDATE";
         eva_limit_frame_employee_FeedDataToForm(result);
         $("#eva_limit_frame_employeeModel").modal("show");
-        endLoad();
+		endLoad();
     };
-    startLoad();
+	startLoad();
     AjaxGetRequest(apisite + eva_limit_frame_employee_API + a, successFunc, AlertDanger);
 }
 
 function eva_limit_frame_employee_SetCreateForm(s) {
     eva_limit_frame_employee_editMode = "CREATE";
-    eva_limit_frame_employee_InitialForm(s);
+	eva_limit_frame_employee_InitialForm(s);
 }
 
 function eva_limit_frame_employee_RefreshTable() {
@@ -111,7 +115,8 @@ var eva_limit_frame_employee_customValidation = function (group) {
 };
 
 function eva_limit_frame_employee_PutUpdate() {
-    if (!ValidateForm('eva_limit_frame_employee', eva_limit_frame_employee_customValidation)) {
+	if (!ValidateForm('eva_limit_frame_employee', eva_limit_frame_employee_customValidation))
+    {
         return;
     }
 
@@ -121,22 +126,22 @@ function eva_limit_frame_employee_PutUpdate() {
     if (eva_limit_frame_employee_editMode === "UPDATE") {
         var successFunc1 = function (result) {
             $("#eva_limit_frame_employeeModel").modal("hide");
-            AlertSuccess(result.code + " " + result.message);
+            AlertSuccess(result.code+" "+result.message);
             eva_limit_frame_employee_RefreshTable();
-            endLoad();
+			endLoad();
         };
-        startLoad();
+		startLoad();
         AjaxPutRequest(apisite + eva_limit_frame_employee_API + data.id, data, successFunc1, AlertDanger);
     }
     // Create mode
     else {
         var successFunc2 = function (result) {
             $("#eva_limit_frame_employeeModel").modal("hide");
-            AlertSuccess(result.code + " " + result.message);
+            AlertSuccess(result.code+" "+result.message);
             eva_limit_frame_employee_RefreshTable();
-            endLoad();
+			endLoad();
         };
-        startLoad();
+		startLoad();
         AjaxPostRequest(apisite + eva_limit_frame_employee_API, data, successFunc2, AlertDanger);
     }
 }
@@ -145,11 +150,11 @@ function eva_limit_frame_employee_GoDelete(a) {
     if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) {
         var successFunc = function (result) {
             $("#eva_limit_frame_employeeModel").modal("hide");
-            AlertSuccess(result.code + " " + result.message);
+            AlertSuccess(result.code+" "+result.message);
             eva_limit_frame_employee_RefreshTable();
-            endLoad();
+			endLoad();
         };
-        startLoad();
+		startLoad();
         AjaxDeleteRequest(apisite + eva_limit_frame_employee_API + a, null, successFunc, AlertDanger);
     }
 }
@@ -159,26 +164,28 @@ function eva_limit_frame_employee_GoDelete(a) {
 var eva_limit_frame_employeeTableV;
 
 var eva_limit_frame_employee_setupTable = function (result) {
-    tmp = '"';
+	tmp = '"';
     eva_limit_frame_employeeTableV = $('#eva_limit_frame_employeeTable').DataTable({
         "processing": true,
         "serverSide": false,
         "data": result,
-        //"select": {
+		//"select": {
         //    "style": 'multi'
         //},
         "columns": [
-            //{ "data": "" },
-            { "data": "id" },
-            { "data": "id" },
-            { "data": "frame_group_guid_eva_limit_frame_group_group_guid" },
-            { "data": "employee_id_external_linkage_external_name" },
-            { "data": "org_id_external_linkage_external_name" },
-            { "data": "position_id_external_linkage_external_name" },
-            { "data": "level_id_external_linkage_external_name" },
-            { "data": "salary" },
-            { "data": "position_allowance" },
-            { "data": "monthly_remuneration" },
+		//{ "data": "" },
+		{ "data": "id" },
+                { "data": "id" },
+                { "data": "frame_group_guid_eva_limit_frame_group_group_guid" },
+                { "data": "employee_id_external_linkage_external_name" },
+                { "data": "org_id_external_linkage_external_name" },
+                { "data": "position_text" },
+                { "data": "level_text" },
+                { "data": "salary" },
+                { "data": "position_allowance" },
+                { "data": "monthly_remuneration" },
+                { "data": "cost_of_living" },
+                { "data": "order_of_data" },            
         ],
         "columnDefs": [
             {
@@ -195,20 +202,20 @@ var eva_limit_frame_employee_setupTable = function (result) {
             //    orderable: false,
             //    className: 'select-checkbox'
             //}
-        ],
+            ],
         "language": {
             "url": appsite + "/DataTables-1.10.16/thai.json"
         },
         "paging": true,
-        "searching": false
+		"searching": false
     });
-    endLoad();
+	endLoad();
 };
 
 function eva_limit_frame_employee_InitiateDataTable() {
-    startLoad();
-    var p = $.param(eva_limit_frame_employee_GetSearchParameter());
-    AjaxGetRequest(apisite + "/api/eva_limit_frame_employee/GetListBySearch?" + p, eva_limit_frame_employee_setupTable, AlertDanger);
+	startLoad();
+	var p = $.param(eva_limit_frame_employee_GetSearchParameter());
+    AjaxGetRequest(apisite + "/api/eva_limit_frame_employee/GetListBySearch?"+p, eva_limit_frame_employee_setupTable, AlertDanger);
 }
 
 function eva_limit_frame_employee_DoSearch() {
@@ -216,10 +223,10 @@ function eva_limit_frame_employee_DoSearch() {
     var eva_limit_frame_employee_reload = function (result) {
         eva_limit_frame_employeeTableV.destroy();
         eva_limit_frame_employee_setupTable(result);
-        endLoad();
+		endLoad();
     };
-    startLoad();
-    AjaxGetRequest(apisite + "/api/eva_limit_frame_employee/GetListBySearch?" + p, eva_limit_frame_employee_reload, AlertDanger);
+	startLoad();
+    AjaxGetRequest(apisite + "/api/eva_limit_frame_employee/GetListBySearch?"+p, eva_limit_frame_employee_reload, AlertDanger);
 }
 
 function eva_limit_frame_employee_GetSelect(f) {

wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_d.js

@@ -8,11 +8,13 @@ $("#eva_limit_frame_employee_id").val(data.id);
 $("#eva_limit_frame_employee_frame_group_guid").val(data.frame_group_guid);
 DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_employee_id"), data, "id", "external_name", "item_employee_id", data.employee_id);
 DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
-DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_position_id"), data, "id", "external_name", "item_position_id", data.position_id);
-DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_level_id"), data, "id", "external_name", "item_level_id", data.level_id);
+$("#eva_limit_frame_employee_position_text").val(data.position_text);
+$("#eva_limit_frame_employee_level_text").val(data.level_text);
 $("#eva_limit_frame_employee_salary").val(data.salary);
 $("#eva_limit_frame_employee_position_allowance").val(data.position_allowance);
 $("#eva_limit_frame_employee_monthly_remuneration").val(data.monthly_remuneration);
+$("#eva_limit_frame_employee_cost_of_living").val(data.cost_of_living);
+$("#eva_limit_frame_employee_order_of_data").val(data.order_of_data);
 
 }
 
@@ -22,11 +24,13 @@ eva_limit_frame_employeeObject.id = $("#eva_limit_frame_employee_id").val();
 eva_limit_frame_employeeObject.frame_group_guid = $("#eva_limit_frame_employee_frame_group_guid").val();
 eva_limit_frame_employeeObject.employee_id = $("#eva_limit_frame_employee_employee_id").val();
 eva_limit_frame_employeeObject.org_id = $("#eva_limit_frame_employee_org_id").val();
-eva_limit_frame_employeeObject.position_id = $("#eva_limit_frame_employee_position_id").val();
-eva_limit_frame_employeeObject.level_id = $("#eva_limit_frame_employee_level_id").val();
+eva_limit_frame_employeeObject.position_text = $("#eva_limit_frame_employee_position_text").val();
+eva_limit_frame_employeeObject.level_text = $("#eva_limit_frame_employee_level_text").val();
 eva_limit_frame_employeeObject.salary = $("#eva_limit_frame_employee_salary").val();
 eva_limit_frame_employeeObject.position_allowance = $("#eva_limit_frame_employee_position_allowance").val();
 eva_limit_frame_employeeObject.monthly_remuneration = $("#eva_limit_frame_employee_monthly_remuneration").val();
+eva_limit_frame_employeeObject.cost_of_living = $("#eva_limit_frame_employee_cost_of_living").val();
+eva_limit_frame_employeeObject.order_of_data = $("#eva_limit_frame_employee_order_of_data").val();
 
 
     return eva_limit_frame_employeeObject;

wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee_inline.js

@@ -4,11 +4,13 @@ $("#eva_limit_frame_employee_id_" + i).val("");
 $("#eva_limit_frame_employee_frame_group_guid_" + i).val("");
 DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_employee_id_" + i), blankItem, "id", "external_name", "item_employee_id", data.employee_id);
 DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_org_id_" + i), blankItem, "id", "external_name", "item_org_id", data.org_id);
-DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_position_id_" + i), blankItem, "id", "external_name", "item_position_id", data.position_id);
-DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_level_id_" + i), blankItem, "id", "external_name", "item_level_id", data.level_id);
+$("#eva_limit_frame_employee_position_text_" + i).val("");
+$("#eva_limit_frame_employee_level_text_" + i).val("");
 $("#eva_limit_frame_employee_salary_" + i).val("");
 $("#eva_limit_frame_employee_position_allowance_" + i).val("");
 $("#eva_limit_frame_employee_monthly_remuneration_" + i).val("");
+$("#eva_limit_frame_employee_cost_of_living_" + i).val("");
+$("#eva_limit_frame_employee_order_of_data_" + i).val("");
 
 }
 
@@ -17,11 +19,13 @@ $("#eva_limit_frame_employee_id_" + i).val(data.id);
 $("#eva_limit_frame_employee_frame_group_guid_" + i).val(data.frame_group_guid);
 DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_employee_id_" + i), blankItem, "id", "external_name", "item_employee_id", data.employee_id);
 DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_org_id_" + i), blankItem, "id", "external_name", "item_org_id", data.org_id);
-DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_position_id_" + i), blankItem, "id", "external_name", "item_position_id", data.position_id);
-DropDownClearFormAndFeedWithData($("#eva_limit_frame_employee_level_id_" + i), blankItem, "id", "external_name", "item_level_id", data.level_id);
+$("#eva_limit_frame_employee_position_text_" + i).val(data.position_text);
+$("#eva_limit_frame_employee_level_text_" + i).val(data.level_text);
 $("#eva_limit_frame_employee_salary_" + i).val(data.salary);
 $("#eva_limit_frame_employee_position_allowance_" + i).val(data.position_allowance);
 $("#eva_limit_frame_employee_monthly_remuneration_" + i).val(data.monthly_remuneration);
+$("#eva_limit_frame_employee_cost_of_living_" + i).val(data.cost_of_living);
+$("#eva_limit_frame_employee_order_of_data_" + i).val(data.order_of_data);
 
 }
 
@@ -31,11 +35,13 @@ eva_limit_frame_employeeObject.id = obj.find("#eva_limit_frame_employee_id_" + i
 eva_limit_frame_employeeObject.frame_group_guid = obj.find("#eva_limit_frame_employee_frame_group_guid_" + i).val();
 eva_limit_frame_employeeObject.employee_id = obj.find("#eva_limit_frame_employee_employee_id_" + i).val();
 eva_limit_frame_employeeObject.org_id = obj.find("#eva_limit_frame_employee_org_id_" + i).val();
-eva_limit_frame_employeeObject.position_id = obj.find("#eva_limit_frame_employee_position_id_" + i).val();
-eva_limit_frame_employeeObject.level_id = obj.find("#eva_limit_frame_employee_level_id_" + i).val();
+eva_limit_frame_employeeObject.position_text = obj.find("#eva_limit_frame_employee_position_text_" + i).val();
+eva_limit_frame_employeeObject.level_text = obj.find("#eva_limit_frame_employee_level_text_" + i).val();
 eva_limit_frame_employeeObject.salary = obj.find("#eva_limit_frame_employee_salary_" + i).val();
 eva_limit_frame_employeeObject.position_allowance = obj.find("#eva_limit_frame_employee_position_allowance_" + i).val();
 eva_limit_frame_employeeObject.monthly_remuneration = obj.find("#eva_limit_frame_employee_monthly_remuneration_" + i).val();
+eva_limit_frame_employeeObject.cost_of_living = obj.find("#eva_limit_frame_employee_cost_of_living_" + i).val();
+eva_limit_frame_employeeObject.order_of_data = obj.find("#eva_limit_frame_employee_order_of_data_" + i).val();
 
     eva_limit_frame_employeeObject.active_mode = obj.find("#isActive_" + i + "_eva_limit_frame_employee").val();
     return eva_limit_frame_employeeObject;
@@ -75,11 +81,13 @@ function eva_limit_frame_employee_Get(id, blankItem) {
             tag += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_limit_frame_employee" value="1" /><input class="form-control" type="hidden" id="eva_limit_frame_employee_id_' + (i + 1)+'" /><input class="form-control" type="hidden" id="eva_limit_frame_employee_frame_group_guid_' + (i + 1)+'" /></td>';
  tag += '<td><select class="form-control" id="eva_limit_frame_employee_employee_id_' + (i + 1) +'"></select></td>';
  tag += '<td><select class="form-control" id="eva_limit_frame_employee_org_id_' + (i + 1) +'"></select></td>';
- tag += '<td><select class="form-control" id="eva_limit_frame_employee_position_id_' + (i + 1) +'"></select></td>';
- tag += '<td><select class="form-control" id="eva_limit_frame_employee_level_id_' + (i + 1) +'"></select></td>';
+ tag += '<td><input class="form-control" type="text" id="eva_limit_frame_employee_position_text_' + (i + 1)+'" /></td>';
+ tag += '<td><input class="form-control" type="text" id="eva_limit_frame_employee_level_text_' + (i + 1)+'" /></td>';
  tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_salary_' + (i + 1)+'" /></td>';
  tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_position_allowance_' + (i + 1)+'" /></td>';
  tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_monthly_remuneration_' + (i + 1)+'" /></td>';
+ tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_cost_of_living_' + (i + 1)+'" /></td>';
+ tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_order_of_data_' + (i + 1)+'" /></td>';
 
 			tag += '<td><a href="javascript:;" class="btn btn-danger btn-sm" onclick="javascript:eva_limit_frame_employee_Removeeva_limit_frame_employee(this)" id="removeBtn"><i class="fa fa-trash-o" style="color:white;"></i></a><a href="javascript:;" class="btn btn-primary btn-sm" onclick="javascript:eva_limit_frame_employee_Restoreeva_limit_frame_employee(this)" style="display: none;" id="restoreBtn"><i class="fa fa-upload" style="color:white;"></i></a></td>';
 			tag += '</tr>';
@@ -94,8 +102,6 @@ function eva_limit_frame_employee_Get(id, blankItem) {
 			//AjaxGetRequest(apisite + '/api/eva_limit_frame_employee/GetListByframe_group_guid/' + a, successFunc, AlertDanger);
 		//AjaxGetRequest(apisite + '/api/eva_limit_frame_employee/GetListByemployee_id/' + a, successFunc, AlertDanger);
 		//AjaxGetRequest(apisite + '/api/eva_limit_frame_employee/GetListByorg_id/' + a, successFunc, AlertDanger);
-		//AjaxGetRequest(apisite + '/api/eva_limit_frame_employee/GetListByposition_id/' + a, successFunc, AlertDanger);
-		//AjaxGetRequest(apisite + '/api/eva_limit_frame_employee/GetListBylevel_id/' + a, successFunc, AlertDanger);
 
 }
 
@@ -106,11 +112,13 @@ function eva_limit_frame_employee_Add() {
 		tag += '<td><label id="rowCount">' + (i + 1) + '</label><input type="hidden" id="isActive_' + (i + 1) + '_eva_limit_frame_employee" value="1" /><input class="form-control" type="hidden" id="eva_limit_frame_employee_id_' + (i + 1)+'" /><input class="form-control" type="hidden" id="eva_limit_frame_employee_frame_group_guid_' + (i + 1)+'" /></td>';
 	 tag += '<td><select class="form-control" id="eva_limit_frame_employee_employee_id_' + (i + 1) +'"></select></td>';
  tag += '<td><select class="form-control" id="eva_limit_frame_employee_org_id_' + (i + 1) +'"></select></td>';
- tag += '<td><select class="form-control" id="eva_limit_frame_employee_position_id_' + (i + 1) +'"></select></td>';
- tag += '<td><select class="form-control" id="eva_limit_frame_employee_level_id_' + (i + 1) +'"></select></td>';
+ tag += '<td><input class="form-control" type="text" id="eva_limit_frame_employee_position_text_' + (i + 1)+'" /></td>';
+ tag += '<td><input class="form-control" type="text" id="eva_limit_frame_employee_level_text_' + (i + 1)+'" /></td>';
  tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_salary_' + (i + 1)+'" /></td>';
  tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_position_allowance_' + (i + 1)+'" /></td>';
  tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_monthly_remuneration_' + (i + 1)+'" /></td>';
+ tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_cost_of_living_' + (i + 1)+'" /></td>';
+ tag += '<td><input class="form-control" type="number" id="eva_limit_frame_employee_order_of_data_' + (i + 1)+'" /></td>';
 
 		tag += '<td><a href="javascript:;" class="btn btn-danger btn-sm" onclick="javascript:eva_limit_frame_employee_Removeeva_limit_frame_employee(this)" id="removeBtn"><i class="fa fa-trash-o" style="color:white;"></i></a><a href="javascript:;" class="btn btn-primary btn-sm" onclick="javascript:eva_limit_frame_employee_Restoreeva_limit_frame_employee(this)" style="display: none;" id="restoreBtn"><i class="fa fa-upload" style="color:white;"></i></a></td>';
 		tag += '</tr>';

wwwroot/js/eva_limit_frame_group/eva_limit_frame_group.js

@@ -5,40 +5,42 @@ var eva_limit_frame_group_API = "/api/eva_limit_frame_group/";
 
 function eva_limit_frame_group_GetSearchParameter() {
     var eva_limit_frame_groupSearchObject = new Object();
-    eva_limit_frame_groupSearchObject.frame_plan_guid = getUrlParameter("id");
-    eva_limit_frame_groupSearchObject.group_guid = $("#s_eva_limit_frame_group_group_guid").val();
+eva_limit_frame_groupSearchObject.frame_plan_guid = $("#s_eva_limit_frame_group_frame_plan_guid").val();
+eva_limit_frame_groupSearchObject.group_guid = $("#s_eva_limit_frame_group_group_guid").val();
 
     return eva_limit_frame_groupSearchObject;
 }
 
 function eva_limit_frame_group_FeedDataToSearchForm(data) {
-    $("#s_eva_limit_frame_group_frame_plan_guid").val(data.frame_plan_guid);
-    DropDownClearFormAndFeedWithData($("#s_eva_limit_frame_group_group_guid"), data, "id", "code", "item_group_guid", data.group_guid);
+$("#s_eva_limit_frame_group_frame_plan_guid").val(data.frame_plan_guid);
+DropDownClearFormAndFeedWithData($("#s_eva_limit_frame_group_group_guid"), data, "id", "code", "item_group_guid", data.group_guid);
 
 }
 
 //================= Form Data Customizaiton =========================================
 
 function eva_limit_frame_group_FeedDataToForm(data) {
-    $("#eva_limit_frame_group_id").val(data.id);
-    $("#eva_limit_frame_group_frame_plan_guid").val(data.frame_plan_guid);
-    DropDownClearFormAndFeedWithData($("#eva_limit_frame_group_group_guid"), data, "id", "code", "item_group_guid", data.group_guid);
-    $("#eva_limit_frame_group_limit_frame_295").val(data.limit_frame_295);
-    $("#eva_limit_frame_group_total_salary").val(data.total_salary);
-    $("#eva_limit_frame_group_total_salary_limit").val(data.total_salary_limit);
-    $("#eva_limit_frame_group_total_salary_limit_rounded").val(data.total_salary_limit_rounded);
+$("#eva_limit_frame_group_id").val(data.id);
+$("#eva_limit_frame_group_frame_plan_guid").val(data.frame_plan_guid);
+DropDownClearFormAndFeedWithData($("#eva_limit_frame_group_group_guid"), data, "id", "code", "item_group_guid", data.group_guid);
+$("#eva_limit_frame_group_limit_frame_295").val(data.limit_frame_295);
+$("#eva_limit_frame_group_total_salary").val(data.total_salary);
+$("#eva_limit_frame_group_total_salary_limit").val(data.total_salary_limit);
+$("#eva_limit_frame_group_total_salary_limit_rounded").val(data.total_salary_limit_rounded);
+$("#eva_limit_frame_group_remark").val(data.remark);
 
 }
 
 function eva_limit_frame_group_GetFromForm() {
     var eva_limit_frame_groupObject = new Object();
-    eva_limit_frame_groupObject.id = $("#eva_limit_frame_group_id").val();
-    eva_limit_frame_groupObject.frame_plan_guid = getUrlParameter("id");
-    eva_limit_frame_groupObject.group_guid = $("#eva_limit_frame_group_group_guid").val();
-    eva_limit_frame_groupObject.limit_frame_295 = $("#eva_limit_frame_group_limit_frame_295").val();
-    eva_limit_frame_groupObject.total_salary = $("#eva_limit_frame_group_total_salary").val();
-    eva_limit_frame_groupObject.total_salary_limit = $("#eva_limit_frame_group_total_salary_limit").val();
-    eva_limit_frame_groupObject.total_salary_limit_rounded = $("#eva_limit_frame_group_total_salary_limit_rounded").val();
+eva_limit_frame_groupObject.id = $("#eva_limit_frame_group_id").val();
+eva_limit_frame_groupObject.frame_plan_guid = $("#eva_limit_frame_group_frame_plan_guid").val();
+eva_limit_frame_groupObject.group_guid = $("#eva_limit_frame_group_group_guid").val();
+eva_limit_frame_groupObject.limit_frame_295 = $("#eva_limit_frame_group_limit_frame_295").val();
+eva_limit_frame_groupObject.total_salary = $("#eva_limit_frame_group_total_salary").val();
+eva_limit_frame_groupObject.total_salary_limit = $("#eva_limit_frame_group_total_salary_limit").val();
+eva_limit_frame_groupObject.total_salary_limit_rounded = $("#eva_limit_frame_group_total_salary_limit_rounded").val();
+eva_limit_frame_groupObject.remark = $("#eva_limit_frame_group_remark").val();
 
 
     return eva_limit_frame_groupObject;
@@ -47,14 +49,14 @@ function eva_limit_frame_group_GetFromForm() {
 function eva_limit_frame_group_InitialForm(s) {
     var successFunc = function (result) {
         eva_limit_frame_group_FeedDataToForm(result);
-        eva_limit_frame_group_FeedDataToSearchForm(result);
+		eva_limit_frame_group_FeedDataToSearchForm(result);
         if (s) {
             // Incase model popup
             $("#eva_limit_frame_groupModel").modal("show");
         }
-        endLoad();
+		endLoad();
     };
-    startLoad();
+	startLoad();
     AjaxGetRequest(apisite + eva_limit_frame_group_API + "GetBlankItem", successFunc, AlertDanger);
 }
 
@@ -70,10 +72,10 @@ function eva_limit_frame_group_GoCreate() {
 
 function eva_limit_frame_group_GoEdit(a) {
     // Incase model popup
-    //eva_limit_frame_group_SetEditForm(a);
+    eva_limit_frame_group_SetEditForm(a);
 
     // Incase open new page
-    window_open(appsite + "/eva_limit_frame_groupView/eva_limit_frame_group_d?id=" + a);
+    //window_open(appsite + "/eva_limit_frame_groupView/eva_limit_frame_group_d?id=" + a);
 }
 
 function eva_limit_frame_group_SetEditForm(a) {
@@ -81,15 +83,15 @@ function eva_limit_frame_group_SetEditForm(a) {
         eva_limit_frame_group_editMode = "UPDATE";
         eva_limit_frame_group_FeedDataToForm(result);
         $("#eva_limit_frame_groupModel").modal("show");
-        endLoad();
+		endLoad();
     };
-    startLoad();
+	startLoad();
     AjaxGetRequest(apisite + eva_limit_frame_group_API + a, successFunc, AlertDanger);
 }
 
 function eva_limit_frame_group_SetCreateForm(s) {
     eva_limit_frame_group_editMode = "CREATE";
-    eva_limit_frame_group_InitialForm(s);
+	eva_limit_frame_group_InitialForm(s);
 }
 
 function eva_limit_frame_group_RefreshTable() {
@@ -107,7 +109,8 @@ var eva_limit_frame_group_customValidation = function (group) {
 };
 
 function eva_limit_frame_group_PutUpdate() {
-    if (!ValidateForm('eva_limit_frame_group', eva_limit_frame_group_customValidation)) {
+	if (!ValidateForm('eva_limit_frame_group', eva_limit_frame_group_customValidation))
+    {
         return;
     }
 
@@ -117,22 +120,22 @@ function eva_limit_frame_group_PutUpdate() {
     if (eva_limit_frame_group_editMode === "UPDATE") {
         var successFunc1 = function (result) {
             $("#eva_limit_frame_groupModel").modal("hide");
-            AlertSuccess(result.code + " " + result.message);
+            AlertSuccess(result.code+" "+result.message);
             eva_limit_frame_group_RefreshTable();
-            endLoad();
+			endLoad();
         };
-        startLoad();
+		startLoad();
         AjaxPutRequest(apisite + eva_limit_frame_group_API + data.id, data, successFunc1, AlertDanger);
     }
     // Create mode
     else {
         var successFunc2 = function (result) {
             $("#eva_limit_frame_groupModel").modal("hide");
-            AlertSuccess(result.code + " " + result.message);
+            AlertSuccess(result.code+" "+result.message);
             eva_limit_frame_group_RefreshTable();
-            endLoad();
+			endLoad();
         };
-        startLoad();
+		startLoad();
         AjaxPostRequest(apisite + eva_limit_frame_group_API, data, successFunc2, AlertDanger);
     }
 }
@@ -141,11 +144,11 @@ function eva_limit_frame_group_GoDelete(a) {
     if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) {
         var successFunc = function (result) {
             $("#eva_limit_frame_groupModel").modal("hide");
-            AlertSuccess(result.code + " " + result.message);
+            AlertSuccess(result.code+" "+result.message);
             eva_limit_frame_group_RefreshTable();
-            endLoad();
+			endLoad();
         };
-        startLoad();
+		startLoad();
         AjaxDeleteRequest(apisite + eva_limit_frame_group_API + a, null, successFunc, AlertDanger);
     }
 }
@@ -155,24 +158,25 @@ function eva_limit_frame_group_GoDelete(a) {
 var eva_limit_frame_groupTableV;
 
 var eva_limit_frame_group_setupTable = function (result) {
-    tmp = '"';
+	tmp = '"';
     eva_limit_frame_groupTableV = $('#eva_limit_frame_groupTable').DataTable({
         "processing": true,
         "serverSide": false,
         "data": result,
-        //"select": {
+		//"select": {
         //    "style": 'multi'
         //},
         "columns": [
-            //{ "data": "" },
-            { "data": "id" },
-            { "data": "id" },
-            { "data": "frame_plan_guid_eva_limit_frame_plan_executed_date" },
-            { "data": "group_guid_eva_evaluation_group_code" },
-            { "data": "limit_frame_295" },
-            { "data": "total_salary" },
-            { "data": "total_salary_limit" },
-            { "data": "total_salary_limit_rounded" },
+		//{ "data": "" },
+		{ "data": "id" },
+                { "data": "id" },
+                { "data": "frame_plan_guid_eva_limit_frame_plan_executed_date" },
+                { "data": "group_guid_eva_evaluation_group_code" },
+                { "data": "limit_frame_295" },
+                { "data": "total_salary" },
+                { "data": "total_salary_limit" },
+                { "data": "total_salary_limit_rounded" },
+                { "data": "remark" },            
         ],
         "columnDefs": [
             {
@@ -189,20 +193,20 @@ var eva_limit_frame_group_setupTable = function (result) {
             //    orderable: false,
             //    className: 'select-checkbox'
             //}
-        ],
+            ],
         "language": {
             "url": appsite + "/DataTables-1.10.16/thai.json"
         },
         "paging": true,
-        "searching": false
+		"searching": false
     });
-    endLoad();
+	endLoad();
 };
 
 function eva_limit_frame_group_InitiateDataTable() {
-    startLoad();
-    var p = $.param(eva_limit_frame_group_GetSearchParameter());
-    AjaxGetRequest(apisite + "/api/eva_limit_frame_group/GetListBySearch?" + p, eva_limit_frame_group_setupTable, AlertDanger);
+	startLoad();
+	var p = $.param(eva_limit_frame_group_GetSearchParameter());
+    AjaxGetRequest(apisite + "/api/eva_limit_frame_group/GetListBySearch?"+p, eva_limit_frame_group_setupTable, AlertDanger);
 }
 
 function eva_limit_frame_group_DoSearch() {
@@ -210,10 +214,10 @@ function eva_limit_frame_group_DoSearch() {
     var eva_limit_frame_group_reload = function (result) {
         eva_limit_frame_groupTableV.destroy();
         eva_limit_frame_group_setupTable(result);
-        endLoad();
+		endLoad();
     };
-    startLoad();
-    AjaxGetRequest(apisite + "/api/eva_limit_frame_group/GetListBySearch?" + p, eva_limit_frame_group_reload, AlertDanger);
+	startLoad();
+    AjaxGetRequest(apisite + "/api/eva_limit_frame_group/GetListBySearch?"+p, eva_limit_frame_group_reload, AlertDanger);
 }
 
 function eva_limit_frame_group_GetSelect(f) {

wwwroot/js/eva_limit_frame_group/eva_limit_frame_group_d.js

@@ -11,6 +11,7 @@ $("#eva_limit_frame_group_limit_frame_295").val(data.limit_frame_295);
 $("#eva_limit_frame_group_total_salary").val(data.total_salary);
 $("#eva_limit_frame_group_total_salary_limit").val(data.total_salary_limit);
 $("#eva_limit_frame_group_total_salary_limit_rounded").val(data.total_salary_limit_rounded);
+$("#eva_limit_frame_group_remark").val(data.remark);
 
 }
 
@@ -23,6 +24,7 @@ eva_limit_frame_groupObject.limit_frame_295 = $("#eva_limit_frame_group_limit_fr
 eva_limit_frame_groupObject.total_salary = $("#eva_limit_frame_group_total_salary").val();
 eva_limit_frame_groupObject.total_salary_limit = $("#eva_limit_frame_group_total_salary_limit").val();
 eva_limit_frame_groupObject.total_salary_limit_rounded = $("#eva_limit_frame_group_total_salary_limit_rounded").val();
+eva_limit_frame_groupObject.remark = $("#eva_limit_frame_group_remark").val();
 
 
     return eva_limit_frame_groupObject;

wwwroot/js/eva_limit_frame_group/eva_limit_frame_group_inline.js

@@ -7,6 +7,7 @@ $("#eva_limit_frame_group_limit_frame_295_" + i).val("");
 $("#eva_limit_frame_group_total_salary_" + i).val("");
 $("#eva_limit_frame_group_total_salary_limit_" + i).val("");
 $("#eva_limit_frame_group_total_salary_limit_rounded_" + i).val("");
+$("#eva_limit_frame_group_remark_" + i).val("");
 
 }
 
@@ -18,6 +19,7 @@ $("#eva_limit_frame_group_limit_frame_295_" + i).val(data.limit_frame_295);
 $("#eva_limit_frame_group_total_salary_" + i).val(data.total_salary);
 $("#eva_limit_frame_group_total_salary_limit_" + i).val(data.total_salary_limit);
 $("#eva_limit_frame_group_total_salary_limit_rounded_" + i).val(data.total_salary_limit_rounded);
+$("#eva_limit_frame_group_remark_" + i).val(data.remark);
 
 }
 
@@ -30,6 +32,7 @@ eva_limit_frame_groupObject.limit_frame_295 = obj.find("#eva_limit_frame_group_l
 eva_limit_frame_groupObject.total_salary = obj.find("#eva_limit_frame_group_total_salary_" + i).val();
 eva_limit_frame_groupObject.total_salary_limit = obj.find("#eva_limit_frame_group_total_salary_limit_" + i).val();
 eva_limit_frame_groupObject.total_salary_limit_rounded = obj.find("#eva_limit_frame_group_total_salary_limit_rounded_" + i).val();
+eva_limit_frame_groupObject.remark = obj.find("#eva_limit_frame_group_remark_" + i).val();
 
     eva_limit_frame_groupObject.active_mode = obj.find("#isActive_" + i + "_eva_limit_frame_group").val();
     return eva_limit_frame_groupObject;
@@ -72,6 +75,7 @@ function eva_limit_frame_group_Get(id, blankItem) {
  tag += '<td><input class="form-control" type="number" id="eva_limit_frame_group_total_salary_' + (i + 1)+'" /></td>';
  tag += '<td><input class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit_' + (i + 1)+'" /></td>';
  tag += '<td><input class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit_rounded_' + (i + 1)+'" /></td>';
+ tag += '<td><textarea class="form-control" rows="2" cols="25" id="eva_limit_frame_group_remark_' + (i + 1)+'" ></textarea></td>';
 
 			tag += '<td><a href="javascript:;" class="btn btn-danger btn-sm" onclick="javascript:eva_limit_frame_group_Removeeva_limit_frame_group(this)" id="removeBtn"><i class="fa fa-trash-o" style="color:white;"></i></a><a href="javascript:;" class="btn btn-primary btn-sm" onclick="javascript:eva_limit_frame_group_Restoreeva_limit_frame_group(this)" style="display: none;" id="restoreBtn"><i class="fa fa-upload" style="color:white;"></i></a></td>';
 			tag += '</tr>';
@@ -98,6 +102,7 @@ function eva_limit_frame_group_Add() {
  tag += '<td><input class="form-control" type="number" id="eva_limit_frame_group_total_salary_' + (i + 1)+'" /></td>';
  tag += '<td><input class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit_' + (i + 1)+'" /></td>';
  tag += '<td><input class="form-control" type="number" id="eva_limit_frame_group_total_salary_limit_rounded_' + (i + 1)+'" /></td>';
+ tag += '<td><textarea class="form-control" rows="2" cols="25" id="eva_limit_frame_group_remark_' + (i + 1)+'" ></textarea></td>';
 
 		tag += '<td><a href="javascript:;" class="btn btn-danger btn-sm" onclick="javascript:eva_limit_frame_group_Removeeva_limit_frame_group(this)" id="removeBtn"><i class="fa fa-trash-o" style="color:white;"></i></a><a href="javascript:;" class="btn btn-primary btn-sm" onclick="javascript:eva_limit_frame_group_Restoreeva_limit_frame_group(this)" style="display: none;" id="restoreBtn"><i class="fa fa-upload" style="color:white;"></i></a></td>';
 		tag += '</tr>';

wwwroot/js/eva_limit_frame_plan/eva_limit_frame_plan.js

@@ -5,46 +5,50 @@ var eva_limit_frame_plan_API = "/api/eva_limit_frame_plan/";
 
 function eva_limit_frame_plan_GetSearchParameter() {
     var eva_limit_frame_planSearchObject = new Object();
-    eva_limit_frame_planSearchObject.executed_date = formatDateForGetParameter(getDate($("#s_eva_limit_frame_plan_executed_date").val()));
+eva_limit_frame_planSearchObject.executed_date = formatDateForGetParameter(getDate($("#s_eva_limit_frame_plan_executed_date").val()));
 
     return eva_limit_frame_planSearchObject;
 }
 
 function eva_limit_frame_plan_FeedDataToSearchForm(data) {
-    $("#s_eva_limit_frame_plan_executed_date").val(formatDate(data.executed_date));
+$("#s_eva_limit_frame_plan_executed_date").val(formatDate(data.executed_date));
 
 }
 
 //================= Form Data Customizaiton =========================================
 
 function eva_limit_frame_plan_FeedDataToForm(data) {
-    $("#eva_limit_frame_plan_id").val(data.id);
-    DropDownClearFormAndFeedWithData($("#eva_limit_frame_plan_plan_guid"), data, "id", "fiscal_year", "item_plan_guid", data.plan_guid);
-    $("#eva_limit_frame_plan_executed_date").val(formatDate(data.executed_date));
-    $("#eva_limit_frame_plan_limit_frame_005").val(data.limit_frame_005);
-    $("#eva_limit_frame_plan_status_self").val(data.status_self);
-    $("#eva_limit_frame_plan_status_chief").val(data.status_chief);
-    $("#eva_limit_frame_plan_supervisor1").val(data.supervisor1);
-    DropDownClearFormAndFeedWithData($("#eva_limit_frame_plan_supervisor1_result"), data, "id", "external_name", "item_supervisor1_result", data.supervisor1_result);
-    $("#eva_limit_frame_plan_supervisor1_remark").val(data.supervisor1_remark);
-    $("#eva_limit_frame_plan_supervisor1_date").val(formatDate(data.supervisor1_date));
-    $("#eva_limit_frame_plan_salary_adjustment_date").val(formatDate(data.salary_adjustment_date));
+$("#eva_limit_frame_plan_id").val(data.id);
+DropDownClearFormAndFeedWithData($("#eva_limit_frame_plan_plan_guid"), data, "id", "fiscal_year", "item_plan_guid", data.plan_guid);
+$("#eva_limit_frame_plan_executed_date").val(formatDate(data.executed_date));
+$("#eva_limit_frame_plan_limit_frame_005").val(data.limit_frame_005);
+$("#eva_limit_frame_plan_status_self").val(data.status_self);
+$("#eva_limit_frame_plan_status_chief").val(data.status_chief);
+$("#eva_limit_frame_plan_supervisor1").val(data.supervisor1);
+DropDownClearFormAndFeedWithData($("#eva_limit_frame_plan_supervisor1_result"), data, "id", "external_name", "item_supervisor1_result", data.supervisor1_result);
+$("#eva_limit_frame_plan_supervisor1_remark").val(data.supervisor1_remark);
+$("#eva_limit_frame_plan_supervisor1_date").val(formatDate(data.supervisor1_date));
+$("#eva_limit_frame_plan_salary_adjustment_date").val(formatDate(data.salary_adjustment_date));
+$("#eva_limit_frame_plan_limit_frame_005_total").val(data.limit_frame_005_total);
+$("#eva_limit_frame_plan_limit_frame_005_total_rounded").val(data.limit_frame_005_total_rounded);
 
 }
 
 function eva_limit_frame_plan_GetFromForm() {
     var eva_limit_frame_planObject = new Object();
-    eva_limit_frame_planObject.id = $("#eva_limit_frame_plan_id").val();
-    eva_limit_frame_planObject.plan_guid = $("#eva_limit_frame_plan_plan_guid").val();
-    eva_limit_frame_planObject.executed_date = getDate($("#eva_limit_frame_plan_executed_date").val());
-    eva_limit_frame_planObject.limit_frame_005 = $("#eva_limit_frame_plan_limit_frame_005").val();
-    eva_limit_frame_planObject.status_self = $("#eva_limit_frame_plan_status_self").val();
-    eva_limit_frame_planObject.status_chief = $("#eva_limit_frame_plan_status_chief").val();
-    eva_limit_frame_planObject.supervisor1 = $("#eva_limit_frame_plan_supervisor1").val();
-    eva_limit_frame_planObject.supervisor1_result = $("#eva_limit_frame_plan_supervisor1_result").val();
-    eva_limit_frame_planObject.supervisor1_remark = $("#eva_limit_frame_plan_supervisor1_remark").val();
-    eva_limit_frame_planObject.supervisor1_date = getDate($("#eva_limit_frame_plan_supervisor1_date").val());
-    eva_limit_frame_planObject.salary_adjustment_date = getDate($("#eva_limit_frame_plan_salary_adjustment_date").val());
+eva_limit_frame_planObject.id = $("#eva_limit_frame_plan_id").val();
+eva_limit_frame_planObject.plan_guid = $("#eva_limit_frame_plan_plan_guid").val();
+eva_limit_frame_planObject.executed_date = getDate($("#eva_limit_frame_plan_executed_date").val());
+eva_limit_frame_planObject.limit_frame_005 = $("#eva_limit_frame_plan_limit_frame_005").val();
+eva_limit_frame_planObject.status_self = $("#eva_limit_frame_plan_status_self").val();
+eva_limit_frame_planObject.status_chief = $("#eva_limit_frame_plan_status_chief").val();
+eva_limit_frame_planObject.supervisor1 = $("#eva_limit_frame_plan_supervisor1").val();
+eva_limit_frame_planObject.supervisor1_result = $("#eva_limit_frame_plan_supervisor1_result").val();
+eva_limit_frame_planObject.supervisor1_remark = $("#eva_limit_frame_plan_supervisor1_remark").val();
+eva_limit_frame_planObject.supervisor1_date = getDate($("#eva_limit_frame_plan_supervisor1_date").val());
+eva_limit_frame_planObject.salary_adjustment_date = getDate($("#eva_limit_frame_plan_salary_adjustment_date").val());
+eva_limit_frame_planObject.limit_frame_005_total = $("#eva_limit_frame_plan_limit_frame_005_total").val();
+eva_limit_frame_planObject.limit_frame_005_total_rounded = $("#eva_limit_frame_plan_limit_frame_005_total_rounded").val();
 
 
     return eva_limit_frame_planObject;
@@ -53,14 +57,14 @@ function eva_limit_frame_plan_GetFromForm() {
 function eva_limit_frame_plan_InitialForm(s) {
     var successFunc = function (result) {
         eva_limit_frame_plan_FeedDataToForm(result);
-        eva_limit_frame_plan_FeedDataToSearchForm(result);
+		eva_limit_frame_plan_FeedDataToSearchForm(result);
         if (s) {
             // Incase model popup
             $("#eva_limit_frame_planModel").modal("show");
         }
-        endLoad();
+		endLoad();
     };
-    startLoad();
+	startLoad();
     AjaxGetRequest(apisite + eva_limit_frame_plan_API + "GetBlankItem", successFunc, AlertDanger);
 }
 
@@ -76,10 +80,10 @@ function eva_limit_frame_plan_GoCreate() {
 
 function eva_limit_frame_plan_GoEdit(a) {
     // Incase model popup
-    //eva_limit_frame_plan_SetEditForm(a);
+    eva_limit_frame_plan_SetEditForm(a);
 
     // Incase open new page
-    window_open(appsite + "/eva_limit_frame_planView/eva_limit_frame_plan_d?id=" + a);
+    //window_open(appsite + "/eva_limit_frame_planView/eva_limit_frame_plan_d?id=" + a);
 }
 
 function eva_limit_frame_plan_SetEditForm(a) {
@@ -87,15 +91,15 @@ function eva_limit_frame_plan_SetEditForm(a) {
         eva_limit_frame_plan_editMode = "UPDATE";
         eva_limit_frame_plan_FeedDataToForm(result);
         $("#eva_limit_frame_planModel").modal("show");
-        endLoad();
+		endLoad();
     };
-    startLoad();
+	startLoad();
     AjaxGetRequest(apisite + eva_limit_frame_plan_API + a, successFunc, AlertDanger);
 }
 
 function eva_limit_frame_plan_SetCreateForm(s) {
     eva_limit_frame_plan_editMode = "CREATE";
-    eva_limit_frame_plan_InitialForm(s);
+	eva_limit_frame_plan_InitialForm(s);
 }
 
 function eva_limit_frame_plan_RefreshTable() {
@@ -113,7 +117,8 @@ var eva_limit_frame_plan_customValidation = function (group) {
 };
 
 function eva_limit_frame_plan_PutUpdate() {
-    if (!ValidateForm('eva_limit_frame_plan', eva_limit_frame_plan_customValidation)) {
+	if (!ValidateForm('eva_limit_frame_plan', eva_limit_frame_plan_customValidation))
+    {
         return;
     }
 
@@ -123,22 +128,22 @@ function eva_limit_frame_plan_PutUpdate() {
     if (eva_limit_frame_plan_editMode === "UPDATE") {
         var successFunc1 = function (result) {
             $("#eva_limit_frame_planModel").modal("hide");
-            AlertSuccess(result.code + " " + result.message);
+            AlertSuccess(result.code+" "+result.message);
             eva_limit_frame_plan_RefreshTable();
-            endLoad();
+			endLoad();
         };
-        startLoad();
+		startLoad();
         AjaxPutRequest(apisite + eva_limit_frame_plan_API + data.id, data, successFunc1, AlertDanger);
     }
     // Create mode
     else {
         var successFunc2 = function (result) {
             $("#eva_limit_frame_planModel").modal("hide");
-            AlertSuccess(result.code + " " + result.message);
+            AlertSuccess(result.code+" "+result.message);
             eva_limit_frame_plan_RefreshTable();
-            endLoad();
+			endLoad();
         };
-        startLoad();
+		startLoad();
         AjaxPostRequest(apisite + eva_limit_frame_plan_API, data, successFunc2, AlertDanger);
     }
 }
@@ -147,11 +152,11 @@ function eva_limit_frame_plan_GoDelete(a) {
     if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) {
         var successFunc = function (result) {
             $("#eva_limit_frame_planModel").modal("hide");
-            AlertSuccess(result.code + " " + result.message);
+            AlertSuccess(result.code+" "+result.message);
             eva_limit_frame_plan_RefreshTable();
-            endLoad();
+			endLoad();
         };
-        startLoad();
+		startLoad();
         AjaxDeleteRequest(apisite + eva_limit_frame_plan_API + a, null, successFunc, AlertDanger);
     }
 }
@@ -161,27 +166,30 @@ function eva_limit_frame_plan_GoDelete(a) {
 var eva_limit_frame_planTableV;
 
 var eva_limit_frame_plan_setupTable = function (result) {
-    tmp = '"';
+	tmp = '"';
     eva_limit_frame_planTableV = $('#eva_limit_frame_planTable').DataTable({
         "processing": true,
         "serverSide": false,
         "data": result,
-        //"select": {
+		//"select": {
         //    "style": 'multi'
         //},
         "columns": [
-            //{ "data": "" },
-            { "data": "id" },
-            { "data": "plan_guid_eva_performance_plan_fiscal_year" },
-            { "data": "txt_executed_date" },
-            { "data": "limit_frame_005" },
-            { "data": "status_self" },
-            { "data": "status_chief" },
-            { "data": "supervisor1" },
-            { "data": "supervisor1_result_external_linkage_external_name" },
-            { "data": "supervisor1_remark" },
-            { "data": "txt_supervisor1_date" },
-            { "data": "txt_salary_adjustment_date" },
+		//{ "data": "" },
+		{ "data": "id" },
+                { "data": "id" },
+                { "data": "plan_guid_eva_performance_plan_fiscal_year" },
+                { "data": "txt_executed_date" },
+                { "data": "limit_frame_005" },
+                { "data": "status_self" },
+                { "data": "status_chief" },
+                { "data": "supervisor1" },
+                { "data": "supervisor1_result_external_linkage_external_name" },
+                { "data": "supervisor1_remark" },
+                { "data": "txt_supervisor1_date" },
+                { "data": "txt_salary_adjustment_date" },
+                { "data": "limit_frame_005_total" },
+                { "data": "limit_frame_005_total_rounded" },            
         ],
         "columnDefs": [
             {
@@ -198,20 +206,20 @@ var eva_limit_frame_plan_setupTable = function (result) {
             //    orderable: false,
             //    className: 'select-checkbox'
             //}
-        ],
+            ],
         "language": {
             "url": appsite + "/DataTables-1.10.16/thai.json"
         },
         "paging": true,
-        "searching": false
+		"searching": false
     });
-    endLoad();
+	endLoad();
 };
 
 function eva_limit_frame_plan_InitiateDataTable() {
-    startLoad();
-    var p = $.param(eva_limit_frame_plan_GetSearchParameter());
-    AjaxGetRequest(apisite + "/api/eva_limit_frame_plan/GetListBySearch?" + p, eva_limit_frame_plan_setupTable, AlertDanger);
+	startLoad();
+	var p = $.param(eva_limit_frame_plan_GetSearchParameter());
+    AjaxGetRequest(apisite + "/api/eva_limit_frame_plan/GetListBySearch?"+p, eva_limit_frame_plan_setupTable, AlertDanger);
 }
 
 function eva_limit_frame_plan_DoSearch() {
@@ -219,10 +227,10 @@ function eva_limit_frame_plan_DoSearch() {
     var eva_limit_frame_plan_reload = function (result) {
         eva_limit_frame_planTableV.destroy();
         eva_limit_frame_plan_setupTable(result);
-        endLoad();
+		endLoad();
     };
-    startLoad();
-    AjaxGetRequest(apisite + "/api/eva_limit_frame_plan/GetListBySearch?" + p, eva_limit_frame_plan_reload, AlertDanger);
+	startLoad();
+    AjaxGetRequest(apisite + "/api/eva_limit_frame_plan/GetListBySearch?"+p, eva_limit_frame_plan_reload, AlertDanger);
 }
 
 function eva_limit_frame_plan_GetSelect(f) {

wwwroot/js/eva_limit_frame_plan/eva_limit_frame_plan_d.js

@@ -15,6 +15,8 @@ DropDownClearFormAndFeedWithData($("#eva_limit_frame_plan_supervisor1_result"),
 $("#eva_limit_frame_plan_supervisor1_remark").val(data.supervisor1_remark);
 $("#eva_limit_frame_plan_supervisor1_date").val(formatDate(data.supervisor1_date));
 $("#eva_limit_frame_plan_salary_adjustment_date").val(formatDate(data.salary_adjustment_date));
+$("#eva_limit_frame_plan_limit_frame_005_total").val(data.limit_frame_005_total);
+$("#eva_limit_frame_plan_limit_frame_005_total_rounded").val(data.limit_frame_005_total_rounded);
 
 }
 
@@ -31,6 +33,8 @@ eva_limit_frame_planObject.supervisor1_result = $("#eva_limit_frame_plan_supervi
 eva_limit_frame_planObject.supervisor1_remark = $("#eva_limit_frame_plan_supervisor1_remark").val();
 eva_limit_frame_planObject.supervisor1_date = getDate($("#eva_limit_frame_plan_supervisor1_date").val());
 eva_limit_frame_planObject.salary_adjustment_date = getDate($("#eva_limit_frame_plan_salary_adjustment_date").val());
+eva_limit_frame_planObject.limit_frame_005_total = $("#eva_limit_frame_plan_limit_frame_005_total").val();
+eva_limit_frame_planObject.limit_frame_005_total_rounded = $("#eva_limit_frame_plan_limit_frame_005_total_rounded").val();
 
 
     return eva_limit_frame_planObject;

wwwroot/js/eva_limit_frame_plan/eva_limit_frame_plan_inline.js

@@ -11,6 +11,8 @@ DropDownClearFormAndFeedWithData($("#eva_limit_frame_plan_supervisor1_result_" +
 $("#eva_limit_frame_plan_supervisor1_remark_" + i).val("");
 $("#eva_limit_frame_plan_supervisor1_date_" + i).val("");
 $("#eva_limit_frame_plan_salary_adjustment_date_" + i).val("");
+$("#eva_limit_frame_plan_limit_frame_005_total_" + i).val("");
+$("#eva_limit_frame_plan_limit_frame_005_total_rounded_" + i).val("");
 
 }
 
@@ -26,6 +28,8 @@ DropDownClearFormAndFeedWithData($("#eva_limit_frame_plan_supervisor1_result_" +
 $("#eva_limit_frame_plan_supervisor1_remark_" + i).val(data.supervisor1_remark);
 $("#eva_limit_frame_plan_supervisor1_date_" + i).val(formatDate(data.supervisor1_date));
 $("#eva_limit_frame_plan_salary_adjustment_date_" + i).val(formatDate(data.salary_adjustment_date));
+$("#eva_limit_frame_plan_limit_frame_005_total_" + i).val(data.limit_frame_005_total);
+$("#eva_limit_frame_plan_limit_frame_005_total_rounded_" + i).val(data.limit_frame_005_total_rounded);
 
 }
 
@@ -42,6 +46,8 @@ eva_limit_frame_planObject.supervisor1_result = obj.find("#eva_limit_frame_plan_
 eva_limit_frame_planObject.supervisor1_remark = obj.find("#eva_limit_frame_plan_supervisor1_remark_" + i).val();
 eva_limit_frame_planObject.supervisor1_date = getDate(obj.find("#eva_limit_frame_plan_supervisor1_date_" + i).val());
 eva_limit_frame_planObject.salary_adjustment_date = getDate(obj.find("#eva_limit_frame_plan_salary_adjustment_date_" + i).val());
+eva_limit_frame_planObject.limit_frame_005_total = obj.find("#eva_limit_frame_plan_limit_frame_005_total_" + i).val();
+eva_limit_frame_planObject.limit_frame_005_total_rounded = obj.find("#eva_limit_frame_plan_limit_frame_005_total_rounded_" + i).val();
 
     eva_limit_frame_planObject.active_mode = obj.find("#isActive_" + i + "_eva_limit_frame_plan").val();
     return eva_limit_frame_planObject;
@@ -86,6 +92,8 @@ function eva_limit_frame_plan_Get(id, blankItem) {
  tag += '<td><textarea class="form-control" rows="2" cols="25" id="eva_limit_frame_plan_supervisor1_remark_' + (i + 1)+'" ></textarea></td>';
  tag += '<td><input class="form-control" type="text" id="eva_limit_frame_plan_supervisor1_date_' + (i + 1)+'" /></td>';
  tag += '<td><input class="form-control" type="text" id="eva_limit_frame_plan_salary_adjustment_date_' + (i + 1)+'" /></td>';
+ tag += '<td><input class="form-control" type="number" id="eva_limit_frame_plan_limit_frame_005_total_' + (i + 1)+'" /></td>';
+ tag += '<td><input class="form-control" type="number" id="eva_limit_frame_plan_limit_frame_005_total_rounded_' + (i + 1)+'" /></td>';
 
 			tag += '<td><a href="javascript:;" class="btn btn-danger btn-sm" onclick="javascript:eva_limit_frame_plan_Removeeva_limit_frame_plan(this)" id="removeBtn"><i class="fa fa-trash-o" style="color:white;"></i></a><a href="javascript:;" class="btn btn-primary btn-sm" onclick="javascript:eva_limit_frame_plan_Restoreeva_limit_frame_plan(this)" style="display: none;" id="restoreBtn"><i class="fa fa-upload" style="color:white;"></i></a></td>';
 			tag += '</tr>';
@@ -114,6 +122,8 @@ function eva_limit_frame_plan_Add() {
  tag += '<td><textarea class="form-control" rows="2" cols="25" id="eva_limit_frame_plan_supervisor1_remark_' + (i + 1)+'" ></textarea></td>';
  tag += '<td><input class="form-control" type="text" id="eva_limit_frame_plan_supervisor1_date_' + (i + 1)+'" /></td>';
  tag += '<td><input class="form-control" type="text" id="eva_limit_frame_plan_salary_adjustment_date_' + (i + 1)+'" /></td>';
+ tag += '<td><input class="form-control" type="number" id="eva_limit_frame_plan_limit_frame_005_total_' + (i + 1)+'" /></td>';
+ tag += '<td><input class="form-control" type="number" id="eva_limit_frame_plan_limit_frame_005_total_rounded_' + (i + 1)+'" /></td>';
 
 		tag += '<td><a href="javascript:;" class="btn btn-danger btn-sm" onclick="javascript:eva_limit_frame_plan_Removeeva_limit_frame_plan(this)" id="removeBtn"><i class="fa fa-trash-o" style="color:white;"></i></a><a href="javascript:;" class="btn btn-primary btn-sm" onclick="javascript:eva_limit_frame_plan_Restoreeva_limit_frame_plan(this)" style="display: none;" id="restoreBtn"><i class="fa fa-upload" style="color:white;"></i></a></td>';
 		tag += '</tr>';