From 6302e828f260a7180be800a70d1fc720e76f59de Mon Sep 17 00:00:00 2001 From: Nakorn Rientrakrunchai Date: Sun, 13 Dec 2020 08:45:52 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=E0=B8=9F=E0=B8=B4=E0=B8=A5=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=A7?= =?UTF-8?q?=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=20=E0=B8=93=20=E0=B8=A7?= =?UTF-8?q?=E0=B8=B1=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B9=80?= =?UTF-8?q?=E0=B8=A5=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EXCEL/eva_adjust_postponement_detail.xlsx | Bin 11336 -> 11421 bytes ..._adjust_postponement_detail_migration.xlsx | Bin 11348 -> 11408 bytes .../25631213013735_AddOrgField.Designer.cs | 712 ++++++++++++++++++ Migrations/25631213013735_AddOrgField.cs | 22 + Migrations/DataContextModelSnapshot.cs | 2 + .../eva_adjust_postponement_detailEntity.cs | 2 + ...postponement_detail_migrationInputModel.cs | 2 + ...st_postponement_detail_migrationService.cs | 8 +- ..._postponement_detail_migrationViewModel.cs | 1 + ..._detail_migrationWithSelectionViewModel.cs | 2 +- ...eva_adjust_postponement_migration_d.cshtml | 6 + ...va_adjust_postponement_detail_migration.js | 4 + 12 files changed, 758 insertions(+), 3 deletions(-) create mode 100644 Migrations/25631213013735_AddOrgField.Designer.cs create mode 100644 Migrations/25631213013735_AddOrgField.cs diff --git a/EXCEL/eva_adjust_postponement_detail.xlsx b/EXCEL/eva_adjust_postponement_detail.xlsx index e665b607842a995653ce9118e6fad8e48de98d5a..a24f9f7727edba5544c6727abea212c90348ad2c 100644 GIT binary patch delta 3238 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 YD?I^^lgcYp0ily0EF%VCDF6Tf0N$h=zyJUM delta 3163 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 B0`C9- diff --git a/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_migration.xlsx b/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_migration.xlsx index ab2e2b847a423a5ff338a01d0bb7cc19a483758d..878be15e4d0ae8fed0f63ebf54910062e4a6c2fd 100644 GIT binary patch delta 3193 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 fD-{9)Ba@gbJpqD~)+ delta 3165 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 DH<1=a diff --git a/Migrations/25631213013735_AddOrgField.Designer.cs b/Migrations/25631213013735_AddOrgField.Designer.cs new file mode 100644 index 0000000..296aeaf --- /dev/null +++ b/Migrations/25631213013735_AddOrgField.Designer.cs @@ -0,0 +1,712 @@ +// +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("25631213013735_AddOrgField")] + partial class AddOrgField + { + 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("id"); + + b.Property("command_no") + .HasMaxLength(4000); + + b.Property("create_evaluation_id"); + + b.Property("created"); + + b.Property("fiscal_year"); + + b.Property("imported_date"); + + b.Property("imported_file") + .HasMaxLength(1000); + + b.Property("isActive"); + + b.Property("limit"); + + b.Property("limit_frame"); + + b.Property("limit_frame_quota"); + + b.Property("limit_quota"); + + b.Property("managed_by"); + + b.Property("percentage"); + + b.Property("theDate"); + + b.Property("theRound"); + + b.Property("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("id"); + + b.Property("adjust_postponement_id"); + + b.Property("adjust_postponement_quota_id"); + + b.Property("cost_living"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("isActive"); + + b.Property("level_this_time") + .HasMaxLength(1000); + + b.Property("middle"); + + b.Property("migration_eva_result") + .HasMaxLength(1000); + + b.Property("migration_total_score"); + + b.Property("new_cost_living"); + + b.Property("new_sarary"); + + b.Property("new_sarary_with_quota"); + + b.Property("org_at_this_time"); + + b.Property("other_money_at_this_time"); + + b.Property("position_allowance_at_this_time"); + + b.Property("position_this_time") + .HasMaxLength(1000); + + b.Property("promoted_percentage"); + + b.Property("receive_quota"); + + b.Property("remark") + .HasMaxLength(1000); + + b.Property("sarary"); + + b.Property("total_promote"); + + b.Property("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("id"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("evaluation_group_id"); + + b.Property("isActive"); + + b.Property("performance_plan_id"); + + b.Property("score1"); + + b.Property("score2"); + + b.Property("supervisor1_id"); + + b.Property("supervisor2_id"); + + b.Property("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("id"); + + b.Property("Final_summary_chief"); + + b.Property("Final_summary_competency_chief"); + + b.Property("Final_summary_competency_supervisor"); + + b.Property("Final_summary_competency_supervisor1A"); + + b.Property("Final_summary_competency_supervisor2A"); + + b.Property("Final_summary_supervisor"); + + b.Property("Final_summary_supervisor1A"); + + b.Property("Final_summary_supervisor2A"); + + b.Property("achievement_chief"); + + b.Property("achievement_supervisor"); + + b.Property("achievement_supervisor1A"); + + b.Property("achievement_supervisor2A"); + + b.Property("chief"); + + b.Property("competency_chief"); + + b.Property("competency_supervisor"); + + b.Property("competency_supervisor1A"); + + b.Property("competency_supervisor2A"); + + b.Property("create_evaluation_id"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("isActive"); + + b.Property("level_score_chief") + .HasMaxLength(255); + + b.Property("level_score_supervisor") + .HasMaxLength(255); + + b.Property("level_score_supervisor1A") + .HasMaxLength(255); + + b.Property("level_score_supervisor2A") + .HasMaxLength(255); + + b.Property("score_chief"); + + b.Property("score_supervisor"); + + b.Property("score_supervisor1A"); + + b.Property("score_supervisor2A"); + + b.Property("status_chief") + .HasMaxLength(1); + + b.Property("status_chief_click_date"); + + b.Property("status_self") + .HasMaxLength(1); + + b.Property("status_self_click_date"); + + b.Property("status_supervisor") + .HasMaxLength(1); + + b.Property("status_supervisor1A") + .HasMaxLength(1); + + b.Property("status_supervisor1A_click_date"); + + b.Property("status_supervisor2A") + .HasMaxLength(1); + + b.Property("status_supervisor2A_click_date"); + + b.Property("status_supervisor_click_date"); + + b.Property("supervisor1"); + + b.Property("supervisor1A"); + + b.Property("supervisor1A_date"); + + b.Property("supervisor1A_remark") + .HasMaxLength(1000); + + b.Property("supervisor1A_result") + .HasMaxLength(1); + + b.Property("supervisor1_date"); + + b.Property("supervisor1_remark") + .HasMaxLength(1000); + + b.Property("supervisor1_result") + .HasMaxLength(1); + + b.Property("supervisor2"); + + b.Property("supervisor2A"); + + b.Property("supervisor2A_date"); + + b.Property("supervisor2A_remark") + .HasMaxLength(1000); + + b.Property("supervisor2A_result") + .HasMaxLength(1); + + b.Property("supervisor2_date"); + + b.Property("supervisor2_remark") + .HasMaxLength(1000); + + b.Property("supervisor2_result") + .HasMaxLength(1); + + b.Property("total_summary_chief"); + + b.Property("total_summary_competency_chief"); + + b.Property("total_summary_competency_supervisor"); + + b.Property("total_summary_competency_supervisor1A"); + + b.Property("total_summary_competency_supervisor2A"); + + b.Property("total_summary_supervisor"); + + b.Property("total_summary_supervisor1A"); + + b.Property("total_summary_supervisor2A"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_create_evaluation_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b => + { + b.Property("id"); + + b.Property("achievement") + .HasMaxLength(1000); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("score"); + + b.Property("score2"); + + b.Property("score3"); + + b.Property("score4"); + + b.Property("sumary"); + + b.Property("sumary2"); + + b.Property("sumary3"); + + b.Property("sumary4"); + + b.Property("target_score1") + .HasMaxLength(255); + + b.Property("target_score2") + .HasMaxLength(255); + + b.Property("target_score3") + .HasMaxLength(255); + + b.Property("target_score4") + .HasMaxLength(255); + + b.Property("target_score5") + .HasMaxLength(255); + + b.Property("thefile") + .HasMaxLength(1000); + + b.Property("updated"); + + b.Property("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("id"); + + b.Property("behavior") + .HasMaxLength(1000); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("score"); + + b.Property("score2"); + + b.Property("score3"); + + b.Property("score4"); + + b.Property("sumary"); + + b.Property("sumary2"); + + b.Property("sumary3"); + + b.Property("sumary4"); + + b.Property("target_score1") + .HasMaxLength(255); + + b.Property("target_score2") + .HasMaxLength(255); + + b.Property("target_score3") + .HasMaxLength(255); + + b.Property("target_score4") + .HasMaxLength(255); + + b.Property("target_score5") + .HasMaxLength(255); + + b.Property("updated"); + + b.Property("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("id") + .ValueGeneratedOnAdd(); + + b.Property("code") + .HasMaxLength(255); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("thegroup") + .HasMaxLength(255); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_evaluation_group"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("evaluation_group_id"); + + b.Property("isActive"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("evaluation_group_id"); + + b.ToTable("eva_evaluation_group_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_idp_planEntity", b => + { + b.Property("id"); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("develop") + .HasMaxLength(1000); + + b.Property("development_method") + .HasMaxLength(1000); + + b.Property("end_date"); + + b.Property("isActive"); + + b.Property("period_text") + .HasMaxLength(1000); + + b.Property("start_date"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_idp_plan"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_level_scoreEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("code") + .HasMaxLength(255); + + b.Property("created"); + + b.Property("detail") + .HasMaxLength(1000); + + b.Property("isActive"); + + b.Property("max_score"); + + b.Property("min_score"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_level_score"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_performance_planEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("created"); + + b.Property("fiscal_year"); + + b.Property("isActive"); + + b.Property("theTime"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_performance_plan"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("created"); + + b.Property("end_date"); + + b.Property("isActive"); + + b.Property("list_no"); + + b.Property("performance_plan_id"); + + b.Property("remark") + .HasMaxLength(1000); + + b.Property("start_date"); + + b.Property("step") + .HasMaxLength(1000); + + b.Property("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("id") + .ValueGeneratedOnAdd(); + + b.Property("code") + .HasMaxLength(255); + + b.Property("created"); + + b.Property("detail") + .HasMaxLength(1000); + + b.Property("isActive"); + + b.Property("level_score_id"); + + b.Property("max_score"); + + b.Property("min_score"); + + b.Property("promoted_percentage"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("level_score_id"); + + b.ToTable("eva_promoted_percentage"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_salary_cylinderEntity", b => + { + b.Property("id"); + + b.Property("cost_living"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("middle"); + + b.Property("position_level"); + + b.Property("position_type"); + + b.Property("temporary_min"); + + b.Property("themax"); + + b.Property("themin"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_salary_cylinder"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluationEntity", "eva_create_evaluation") + .WithMany() + .HasForeignKey("create_evaluation_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponement_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement") + .WithMany() + .HasForeignKey("adjust_postponement_id"); + + b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement_quota") + .WithMany() + .HasForeignKey("adjust_postponement_quota_id") + .HasConstraintName("FK_eva_adjust_postponement_detail_eva_adjust_postponement_adj~1"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group") + .WithMany() + .HasForeignKey("evaluation_group_id"); + + b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan") + .WithMany() + .HasForeignKey("performance_plan_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail") + .WithMany() + .HasForeignKey("create_evaluation_detail_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail") + .WithMany() + .HasForeignKey("create_evaluation_detail_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group") + .WithMany() + .HasForeignKey("evaluation_group_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan") + .WithMany() + .HasForeignKey("performance_plan_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_promoted_percentageEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_level_scoreEntity", "eva_level_score") + .WithMany() + .HasForeignKey("level_score_id"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Migrations/25631213013735_AddOrgField.cs b/Migrations/25631213013735_AddOrgField.cs new file mode 100644 index 0000000..0783934 --- /dev/null +++ b/Migrations/25631213013735_AddOrgField.cs @@ -0,0 +1,22 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace tb320eva.Migrations +{ + public partial class AddOrgField : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "org_at_this_time", + table: "eva_adjust_postponement_detail", + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "org_at_this_time", + table: "eva_adjust_postponement_detail"); + } + } +} diff --git a/Migrations/DataContextModelSnapshot.cs b/Migrations/DataContextModelSnapshot.cs index a14fc68..4ea9337 100644 --- a/Migrations/DataContextModelSnapshot.cs +++ b/Migrations/DataContextModelSnapshot.cs @@ -96,6 +96,8 @@ namespace tb320eva.Migrations b.Property("new_sarary_with_quota"); + b.Property("org_at_this_time"); + b.Property("other_money_at_this_time"); b.Property("position_allowance_at_this_time"); diff --git a/Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs b/Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs index f592423..c9c9687 100644 --- a/Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs +++ b/Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs @@ -61,5 +61,7 @@ namespace TodoAPI2.Models [MaxLength(1000)] public string migration_eva_result { get; set; } + + public int? org_at_this_time { get; set; } } } diff --git a/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationInputModel.cs b/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationInputModel.cs index c593f77..6950892 100644 --- a/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationInputModel.cs +++ b/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationInputModel.cs @@ -54,6 +54,8 @@ namespace TodoAPI2.Models public string migration_eva_result { get; set; } + public int? org_at_this_time { get; set; } + public string active_mode { get; set; } } diff --git a/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationService.cs b/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationService.cs index 5f4b806..a25358c 100644 --- a/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationService.cs +++ b/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationService.cs @@ -24,7 +24,7 @@ namespace TodoAPI2.Models private Iexternal_linkageService ext; private Iexternal_employeeService emp; - public eva_adjust_postponement_detail_migrationService(IBaseRepository2 repository, + public eva_adjust_postponement_detail_migrationService(IBaseRepository2 repository, IMyDatabase mydb, Iexternal_linkageService inext, Iexternal_employeeService inemp) { _repository = repository; @@ -81,6 +81,7 @@ namespace TodoAPI2.Models var i = Mapper.Map(entity); var all_emp = emp.GetAllEmployee(); i.item_employee_id = all_emp.ToList(); + i.item_org_at_this_time = (from x in ext.GetDepartmentData() select x).ToList(); return i; @@ -90,7 +91,7 @@ namespace TodoAPI2.Models var i = new eva_adjust_postponement_detail_migrationWithSelectionViewModel(); var all_emp = emp.GetAllEmployee(); i.item_employee_id = all_emp.ToList(); - + i.item_org_at_this_time = (from x in ext.GetDepartmentData() select x).ToList(); return i; } @@ -150,6 +151,7 @@ namespace TodoAPI2.Models other_money_at_this_time = m_eva_adjust_postponement_detail_migration.other_money_at_this_time, migration_total_score = m_eva_adjust_postponement_detail_migration.migration_total_score, migration_eva_result = m_eva_adjust_postponement_detail_migration.migration_eva_result, + org_at_this_time = m_eva_adjust_postponement_detail_migration.org_at_this_time, adjust_postponement_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult1.fiscal_year, adjust_postponement_quota_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult2.fiscal_year, @@ -221,6 +223,7 @@ namespace TodoAPI2.Models existingEntity.other_money_at_this_time = model.other_money_at_this_time; existingEntity.migration_total_score = model.migration_total_score; existingEntity.migration_eva_result = model.migration_eva_result; + existingEntity.org_at_this_time = model.org_at_this_time; var updated = _repository.Update(id, existingEntity); return Get(updated.id); @@ -258,6 +261,7 @@ namespace TodoAPI2.Models existingEntity.other_money_at_this_time = i.other_money_at_this_time; existingEntity.migration_total_score = i.migration_total_score; existingEntity.migration_eva_result = i.migration_eva_result; + existingEntity.org_at_this_time = i.org_at_this_time; //existingEntity.SetAutoField(_repository.Context); _repository.UpdateWithoutCommit(i.id.Value, existingEntity); diff --git a/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationViewModel.cs b/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationViewModel.cs index a3ebf74..d902395 100644 --- a/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationViewModel.cs +++ b/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationViewModel.cs @@ -51,6 +51,7 @@ namespace TodoAPI2.Models public decimal? migration_total_score { get; set; } public string migration_eva_result { get; set; } + public int? org_at_this_time { get; set; } public int? adjust_postponement_id_eva_adjust_postponement_fiscal_year { get; set; } public int? adjust_postponement_quota_id_eva_adjust_postponement_fiscal_year { get; set; } diff --git a/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationWithSelectionViewModel.cs b/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationWithSelectionViewModel.cs index e55d6f9..6110db5 100644 --- a/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationWithSelectionViewModel.cs +++ b/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationWithSelectionViewModel.cs @@ -8,6 +8,6 @@ namespace TodoAPI2.Models public class eva_adjust_postponement_detail_migrationWithSelectionViewModel: eva_adjust_postponement_detail_migrationViewModel { public List item_employee_id { get; set; } - + public List item_org_at_this_time { get; set; } } } \ No newline at end of file diff --git a/Views/eva_adjust_postponement_migrationView/eva_adjust_postponement_migration_d.cshtml b/Views/eva_adjust_postponement_migrationView/eva_adjust_postponement_migration_d.cshtml index 78b5019..32d2ca0 100644 --- a/Views/eva_adjust_postponement_migrationView/eva_adjust_postponement_migration_d.cshtml +++ b/Views/eva_adjust_postponement_migrationView/eva_adjust_postponement_migration_d.cshtml @@ -277,6 +277,11 @@ + +
+ + +
@@ -314,6 +319,7 @@ $("#eva_adjust_postponement_migration_managed_by").select2(); $("#eva_adjust_postponement_detail_migration_employee_id").select2(); + $("#eva_adjust_postponement_detail_migration_org_at_this_time").select2(); SetupValidationRemark("eva_adjust_postponement_migration"); SetupValidationRemark("eva_adjust_postponement_detail_migration"); diff --git a/wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js b/wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js index 4b9ae67..7a84d1b 100644 --- a/wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js +++ b/wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js @@ -40,6 +40,8 @@ function eva_adjust_postponement_detail_migration_FeedDataToForm(data) { $("#eva_adjust_postponement_detail_migration_other_money_at_this_time").val(data.other_money_at_this_time); $("#eva_adjust_postponement_detail_migration_migration_total_score").val(data.migration_total_score); $("#eva_adjust_postponement_detail_migration_migration_eva_result").val(data.migration_eva_result); + DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_detail_migration_org_at_this_time"), data, "id", "external_name", "item_org_at_this_time", data.org_at_this_time); + } @@ -65,6 +67,8 @@ function eva_adjust_postponement_detail_migration_GetFromForm() { eva_adjust_postponement_detail_migrationObject.other_money_at_this_time = $("#eva_adjust_postponement_detail_migration_other_money_at_this_time").val(); eva_adjust_postponement_detail_migrationObject.migration_total_score = $("#eva_adjust_postponement_detail_migration_migration_total_score").val(); eva_adjust_postponement_detail_migrationObject.migration_eva_result = $("#eva_adjust_postponement_detail_migration_migration_eva_result").val(); + eva_adjust_postponement_detail_migrationObject.org_at_this_time = $("#eva_adjust_postponement_detail_migration_org_at_this_time").val(); + return eva_adjust_postponement_detail_migrationObject; }