From 1b60be523618b707aa07d27849c9916a579d6da2 Mon Sep 17 00:00:00 2001 From: Nakorn Rientrakrunchai Date: Mon, 21 Dec 2020 21:44:54 +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=B9=80=E0=B8=9E=E0=B8=B7=E0=B9=88?= =?UTF-8?q?=E0=B8=AD=E0=B8=A3=E0=B8=AD=E0=B8=87=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=88=E0=B8=B1=E0=B8=94=E0=B8=82?= =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B9=80=E0=B8=81?= =?UTF-8?q?=E0=B9=88=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EXCEL/eva_adjust_postponement.xlsx | Bin 11145 -> 11206 bytes ...ent@eva_adjust_postponement_migration.xlsx | Bin 11145 -> 11208 bytes EXCEL/eva_adjust_postponement_detail.xlsx | Bin 11421 -> 11730 bytes ..._adjust_postponement_detail_migration.xlsx | Bin 11408 -> 11736 bytes .../25631221144003_AddNewColumn01.Designer.cs | 717 ++++++++++++++++++ Migrations/25631221144003_AddNewColumn01.cs | 32 + Migrations/DataContextModelSnapshot.cs | 5 + .../eva_adjust_postponementEntity.cs | 3 + .../eva_adjust_postponement_detailEntity.cs | 2 + ...postponement_detail_migrationInputModel.cs | 2 + ..._postponement_detail_migrationViewModel.cs | 2 + ...adjust_postponement_migrationInputModel.cs | 2 + ...va_adjust_postponement_migrationService.cs | 5 +- ..._adjust_postponement_migrationViewModel.cs | 2 + ...onement_migrationWithSelectionViewModel.cs | 5 +- .../Iexternal_linkageService.cs | 2 + .../external_linkageService.cs | 18 + .../eva_adjust_postponement_migration.cshtml | 6 + ...eva_adjust_postponement_migration_d.cshtml | 11 +- ...va_adjust_postponement_detail_migration.js | 4 +- .../eva_adjust_postponement_migration_d.js | 4 +- 21 files changed, 813 insertions(+), 9 deletions(-) create mode 100644 Migrations/25631221144003_AddNewColumn01.Designer.cs create mode 100644 Migrations/25631221144003_AddNewColumn01.cs diff --git a/EXCEL/eva_adjust_postponement.xlsx b/EXCEL/eva_adjust_postponement.xlsx index 0af7c6425a9a432d9ec937fe90701cd24785b05e..8a53ec884a99fd9e66615266223c52539d407b4b 100644 GIT binary patch delta 2749 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 diff --git a/EXCEL/eva_adjust_postponement@eva_adjust_postponement_migration.xlsx b/EXCEL/eva_adjust_postponement@eva_adjust_postponement_migration.xlsx index 0af7c6425a9a432d9ec937fe90701cd24785b05e..8c678c1d7f199319169ca498fe48b2400ee47ff2 100644 GIT binary patch delta 2750 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 delta 4301 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 y4Je2w$w~|U=cE(>0D=+#VEZov +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("25631221144003_AddNewColumn01")] + partial class AddNewColumn01 + { + 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("report_type") + .HasMaxLength(1000); + + 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("order_at_this_time"); + + 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/25631221144003_AddNewColumn01.cs b/Migrations/25631221144003_AddNewColumn01.cs new file mode 100644 index 0000000..efc2e7b --- /dev/null +++ b/Migrations/25631221144003_AddNewColumn01.cs @@ -0,0 +1,32 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace tb320eva.Migrations +{ + public partial class AddNewColumn01 : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "order_at_this_time", + table: "eva_adjust_postponement_detail", + nullable: true); + + migrationBuilder.AddColumn( + name: "report_type", + table: "eva_adjust_postponement", + maxLength: 1000, + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "order_at_this_time", + table: "eva_adjust_postponement_detail"); + + migrationBuilder.DropColumn( + name: "report_type", + table: "eva_adjust_postponement"); + } + } +} diff --git a/Migrations/DataContextModelSnapshot.cs b/Migrations/DataContextModelSnapshot.cs index 4ea9337..9c0013a 100644 --- a/Migrations/DataContextModelSnapshot.cs +++ b/Migrations/DataContextModelSnapshot.cs @@ -51,6 +51,9 @@ namespace tb320eva.Migrations b.Property("percentage"); + b.Property("report_type") + .HasMaxLength(1000); + b.Property("theDate"); b.Property("theRound"); @@ -96,6 +99,8 @@ namespace tb320eva.Migrations b.Property("new_sarary_with_quota"); + b.Property("order_at_this_time"); + b.Property("org_at_this_time"); b.Property("other_money_at_this_time"); diff --git a/Models/eva_adjust_postponement/eva_adjust_postponementEntity.cs b/Models/eva_adjust_postponement/eva_adjust_postponementEntity.cs index 95fd5fa..e14bee5 100644 --- a/Models/eva_adjust_postponement/eva_adjust_postponementEntity.cs +++ b/Models/eva_adjust_postponement/eva_adjust_postponementEntity.cs @@ -54,6 +54,9 @@ namespace TodoAPI2.Models } } + [MaxLength(1000)] + public string report_type { get; set; } + public DateTime? imported_date { get; set; } } } 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 c9c9687..f9a03e8 100644 --- a/Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs +++ b/Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs @@ -63,5 +63,7 @@ namespace TodoAPI2.Models public string migration_eva_result { get; set; } public int? org_at_this_time { get; set; } + + public int? order_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 6950892..ba77dc4 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 @@ -56,6 +56,8 @@ namespace TodoAPI2.Models public int? org_at_this_time { get; set; } + public int? order_at_this_time { get; set; } + public string active_mode { get; set; } } 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 d902395..9b27d4e 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 @@ -53,6 +53,8 @@ namespace TodoAPI2.Models public string migration_eva_result { get; set; } public int? org_at_this_time { get; set; } + public int? order_at_this_time { get; set; } + public int? adjust_postponement_id_eva_adjust_postponement_fiscal_year { get; set; } public int? adjust_postponement_quota_id_eva_adjust_postponement_fiscal_year { get; set; } public string employee_id_external_linkage_external_name { get; set; } diff --git a/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationInputModel.cs b/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationInputModel.cs index dd5f6dd..82018dd 100644 --- a/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationInputModel.cs +++ b/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationInputModel.cs @@ -40,6 +40,8 @@ namespace TodoAPI2.Models public string imported_file { get; set; } + public string report_type { get; set; } + public string active_mode { get; set; } } } diff --git a/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationService.cs b/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationService.cs index 8ae0da3..6d967d7 100644 --- a/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationService.cs +++ b/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationService.cs @@ -85,7 +85,7 @@ namespace TodoAPI2.Models i.item_create_evaluation_id = (from x in _repository.Context.eva_create_evaluation select x).ToList(); var all_emp = emp.GetAllEmployee(); i.item_managed_by = all_emp.ToList(); - + i.item_report_type = (from x in ext.GetSalaryReportType() select x).ToList(); return i; } @@ -95,7 +95,7 @@ namespace TodoAPI2.Models i.item_create_evaluation_id = (from x in _repository.Context.eva_create_evaluation select x).ToList(); var all_emp = emp.GetAllEmployee(); i.item_managed_by = all_emp.ToList(); - + i.item_report_type = (from x in ext.GetSalaryReportType() select x).ToList(); return i; } @@ -144,6 +144,7 @@ namespace TodoAPI2.Models managed_by = m_eva_adjust_postponement_migration.managed_by, imported_file = m_eva_adjust_postponement_migration.imported_file, imported_fileDisplay = m_eva_adjust_postponement_migration.imported_fileDisplay, + report_type = m_eva_adjust_postponement_migration.report_type, create_evaluation_id_eva_create_evaluation_performance_plan_id = fk_eva_create_evaluationResult4.performance_plan_id, managed_by_external_linkage_external_name = fk_external_linkageResult11.fullname, diff --git a/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationViewModel.cs b/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationViewModel.cs index 7f173fd..07a86ae 100644 --- a/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationViewModel.cs +++ b/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationViewModel.cs @@ -53,5 +53,7 @@ namespace TodoAPI2.Models public Guid? create_evaluation_id_eva_create_evaluation_performance_plan_id { get; set; } public string managed_by_external_linkage_external_name { get; set; } + public string report_type { get; set; } + } } \ No newline at end of file diff --git a/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationWithSelectionViewModel.cs b/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationWithSelectionViewModel.cs index a0c15d7..cd66581 100644 --- a/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationWithSelectionViewModel.cs +++ b/Models/eva_adjust_postponement_migration/eva_adjust_postponement_migrationWithSelectionViewModel.cs @@ -9,6 +9,7 @@ namespace TodoAPI2.Models { public List item_create_evaluation_id { get; set; } public List item_managed_by { get; set; } - + public List item_report_type { get; set; } } -} \ No newline at end of file +} + diff --git a/Models/external_linkage/Iexternal_linkageService.cs b/Models/external_linkage/Iexternal_linkageService.cs index 134e754..115953c 100644 --- a/Models/external_linkage/Iexternal_linkageService.cs +++ b/Models/external_linkage/Iexternal_linkageService.cs @@ -36,6 +36,8 @@ namespace TodoAPI2.Models List GetFiscalYear2(); List GetThaiMonth(); string GetMainDept(int? dep_id); + + List GetSalaryReportType(); } } diff --git a/Models/external_linkage/external_linkageService.cs b/Models/external_linkage/external_linkageService.cs index 8b26bc6..d6a8a89 100644 --- a/Models/external_linkage/external_linkageService.cs +++ b/Models/external_linkage/external_linkageService.cs @@ -113,6 +113,24 @@ namespace TodoAPI2.Models return result; } + public List GetSalaryReportType() + { + var result = new List(); + var i = new external_linkageViewModel(); + i.external_id = 1; + i.external_code = "1"; + i.external_name = "รายงานเพื่อดูย้อนหลัง"; + result.Add(i); + + var j = new external_linkageViewModel(); + j.external_id = 2; + j.external_code = "2"; + j.external_name = "รายงานปกติ"; + result.Add(j); + + return result; + } + public List GetChoice(int start, int end) { var result = new List(); diff --git a/Views/eva_adjust_postponement_migrationView/eva_adjust_postponement_migration.cshtml b/Views/eva_adjust_postponement_migrationView/eva_adjust_postponement_migration.cshtml index a1e07de..247aa45 100644 --- a/Views/eva_adjust_postponement_migrationView/eva_adjust_postponement_migration.cshtml +++ b/Views/eva_adjust_postponement_migrationView/eva_adjust_postponement_migration.cshtml @@ -85,6 +85,12 @@ +
+
+ + +
+
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 32d2ca0..2ec3471 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 @@ -102,6 +102,12 @@

ในการแก้ไข จะไม่อนุญาตให้นำเข้าไฟล์ใหม่ หากต้องการนำเข้าใหม่ ให้ลบรอบการปรับเงินเดือนออก และสร้างรอบการปรับเงินเดือน ใหม่อีกครั้ง

+
+
+ + +
+
@@ -285,7 +291,10 @@
- +
+ + +
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 7a84d1b..1c9da8e 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 @@ -41,7 +41,7 @@ function eva_adjust_postponement_detail_migration_FeedDataToForm(data) { $("#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); - + $("#eva_adjust_postponement_detail_migration_order_at_this_time").val(data.order_at_this_time); } @@ -68,7 +68,7 @@ function eva_adjust_postponement_detail_migration_GetFromForm() { 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(); - + eva_adjust_postponement_detail_migrationObject.order_at_this_time = $("#eva_adjust_postponement_detail_migration_order_at_this_time").val(); return eva_adjust_postponement_detail_migrationObject; } diff --git a/wwwroot/js/eva_adjust_postponement_migration/eva_adjust_postponement_migration_d.js b/wwwroot/js/eva_adjust_postponement_migration/eva_adjust_postponement_migration_d.js index 0dd90cf..e5c13cf 100644 --- a/wwwroot/js/eva_adjust_postponement_migration/eva_adjust_postponement_migration_d.js +++ b/wwwroot/js/eva_adjust_postponement_migration/eva_adjust_postponement_migration_d.js @@ -17,7 +17,7 @@ function eva_adjust_postponement_migration_FeedDataToForm(data) { $("#eva_adjust_postponement_migration_command_no").val(data.command_no); DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_migration_managed_by"), data, "id", "fullname", "item_managed_by", data.managed_by); feedFileToControl(data.imported_file, data.imported_fileDisplay, "eva_adjust_postponement_migration_imported_file", "file"); - //console.log(data.item_managed_by); + DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_migration_report_type"), data, "id", "external_name", "item_report_type", data.report_type); } function eva_adjust_postponement_migration_GetFromForm() { @@ -39,7 +39,7 @@ function eva_adjust_postponement_migration_GetFromForm() { } else { eva_adjust_postponement_migrationObject.imported_file = ""; } - + eva_adjust_postponement_migrationObject.report_type = $("#eva_adjust_postponement_migration_report_type").val(); return eva_adjust_postponement_migrationObject; }