diff --git a/EXCEL/eva_adjust_postponement.xlsx b/EXCEL/eva_adjust_postponement.xlsx index 0af7c64..8a53ec8 100644 Binary files a/EXCEL/eva_adjust_postponement.xlsx and b/EXCEL/eva_adjust_postponement.xlsx differ diff --git a/EXCEL/eva_adjust_postponement@eva_adjust_postponement_migration.xlsx b/EXCEL/eva_adjust_postponement@eva_adjust_postponement_migration.xlsx index 0af7c64..8c678c1 100644 Binary files a/EXCEL/eva_adjust_postponement@eva_adjust_postponement_migration.xlsx and b/EXCEL/eva_adjust_postponement@eva_adjust_postponement_migration.xlsx differ diff --git a/EXCEL/eva_adjust_postponement_detail.xlsx b/EXCEL/eva_adjust_postponement_detail.xlsx index a24f9f7..3a7ce7f 100644 Binary files a/EXCEL/eva_adjust_postponement_detail.xlsx and b/EXCEL/eva_adjust_postponement_detail.xlsx differ 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 878be15..11b3716 100644 Binary files a/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_migration.xlsx and b/EXCEL/eva_adjust_postponement_detail@eva_adjust_postponement_detail_migration.xlsx differ diff --git a/Migrations/25631221144003_AddNewColumn01.Designer.cs b/Migrations/25631221144003_AddNewColumn01.Designer.cs new file mode 100644 index 0000000..8af4bff --- /dev/null +++ b/Migrations/25631221144003_AddNewColumn01.Designer.cs @@ -0,0 +1,717 @@ +// +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; }