From 4844a0ad44a245221886b0d24b20d24c664a8d17 Mon Sep 17 00:00:00 2001 From: "LAPTOP-KB8JC2K2\\acer" Date: Tue, 6 Apr 2021 11:34:25 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B8=E0=B8=87=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2?= =?UTF-8?q?=E0=B8=88=E0=B8=AD=20migration=20=E0=B9=81=E0=B8=A5=E0=B8=B0=20?= =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99=E0=B9=84?= =?UTF-8?q?=E0=B8=82=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=84=E0=B9=89=E0=B8=99?= =?UTF-8?q?=E0=B8=AB=E0=B8=B2=20=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2?= =?UTF-8?q?=E0=B8=97=E0=B8=B3=E0=B9=81=E0=B8=9A=E0=B8=9A=E0=B8=9B=E0=B8=A3?= =?UTF-8?q?=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4=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 11473 -> 12094 bytes ..._adjust_postponement_detail_migration.xlsx | Bin 11736 -> 12077 bytes ...406042734_AddMigrationField003.Designer.cs | 968 ++++++++++++++++++ .../20210406042734_AddMigrationField003.cs | 33 + Migrations/DataContextModelSnapshot.cs | 6 + .../eva_adjust_postponement_detailEntity.cs | 5 + ...postponement_detail_migrationInputModel.cs | 5 +- ...st_postponement_detail_migrationService.cs | 12 +- ..._postponement_detail_migrationViewModel.cs | 6 + ..._detail_migrationWithSelectionViewModel.cs | 1 + ...create_evaluation_detail_processService.cs | 4 +- .../external_employeeService.cs | 37 +- .../external_employeeViewModel.cs | 1 + ...eva_adjust_postponement_migration_d.cshtml | 294 +++--- Views/home/index2.cshtml | 5 +- ...va_adjust_postponement_detail_migration.js | 10 +- 16 files changed, 1237 insertions(+), 150 deletions(-) create mode 100644 Migrations/20210406042734_AddMigrationField003.Designer.cs create mode 100644 Migrations/20210406042734_AddMigrationField003.cs diff --git a/EXCEL/eva_adjust_postponement_detail.xlsx b/EXCEL/eva_adjust_postponement_detail.xlsx index 01eb6ddd6b5db245e194fbbaa30a48ccb0e54888..ea1254f357c62e20a22b9909f454272b1e60aab5 100644 GIT binary patch delta 6192 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 T9K^sWCIks59acQ^KO6o7^cHgl 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 11b3716b5d8bf957f3f18233996d0887a58adbb3..ab69b66f9634cb1d51b48a1c7ba039bcbe808806 100644 GIT binary patch delta 6058 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 diff --git a/Migrations/20210406042734_AddMigrationField003.Designer.cs b/Migrations/20210406042734_AddMigrationField003.Designer.cs new file mode 100644 index 0000000..7174543 --- /dev/null +++ b/Migrations/20210406042734_AddMigrationField003.Designer.cs @@ -0,0 +1,968 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using TTSW.EF; + +namespace tb320eva.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20210406042734_AddMigrationField003")] + partial class AddMigrationField003 + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn) + .HasAnnotation("ProductVersion", "2.2.6-servicing-10079") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b => + { + b.Property("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("achievement_final"); + + b.Property("adjust_postponement_id"); + + b.Property("adjust_postponement_quota_id"); + + b.Property("competency_final"); + + b.Property("cost_living"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("employee_no_at_this_time") + .HasMaxLength(1000); + + b.Property("fullname_at_this_time") + .HasMaxLength(1000); + + b.Property("isActive"); + + b.Property("level_score_final") + .HasMaxLength(255); + + 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("score_final"); + + 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("chief_a"); + + b.Property("chief_a_date"); + + b.Property("chief_a_reject_reason") + .HasMaxLength(1000); + + b.Property("chief_a_remark") + .HasMaxLength(1000); + + b.Property("chief_a_result") + .HasMaxLength(1); + + 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("eva_employee_id"); + + b.Property("help_org_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("order_of_data"); + + 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_a") + .HasMaxLength(1); + + b.Property("status_chief_a_click_date"); + + b.Property("status_chief_click_date"); + + b.Property("status_self") + .HasMaxLength(1); + + b.Property("status_self_a") + .HasMaxLength(1); + + b.Property("status_self_a_click_date"); + + 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_id"); + + 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_id"); + + 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.Property("work_period"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_id"); + + b.ToTable("eva_create_evaluation_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b => + { + b.Property("id"); + + b.Property("achievement") + .HasMaxLength(8000); + + 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("main_dept_id"); + + b.Property("percentage"); + + 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_evaluation_operating_agreementEntity", b => + { + b.Property("id"); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("indicators") + .HasMaxLength(4000); + + b.Property("isActive"); + + b.Property("mission_detail") + .HasMaxLength(4000); + + b.Property("mission_no"); + + b.Property("target") + .HasMaxLength(4000); + + b.Property("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("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_limit_frame_employeeEntity", b => + { + b.Property("id"); + + b.Property("cost_of_living"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("frame_group_guid"); + + b.Property("help_org_id"); + + b.Property("isActive"); + + b.Property("level_text") + .HasMaxLength(1000); + + b.Property("monthly_remuneration"); + + b.Property("order_of_data"); + + b.Property("org_id"); + + b.Property("position_allowance"); + + b.Property("position_text") + .HasMaxLength(1000); + + b.Property("salary"); + + b.Property("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("id"); + + b.Property("created"); + + b.Property("frame_plan_guid"); + + b.Property("group_guid"); + + b.Property("isActive"); + + b.Property("limit_frame_295"); + + b.Property("main_dept_id"); + + b.Property("remark") + .HasMaxLength(4000); + + b.Property("total_salary"); + + b.Property("total_salary_limit"); + + b.Property("total_salary_limit_rounded"); + + b.Property("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("id"); + + b.Property("created"); + + b.Property("executed_date"); + + b.Property("isActive"); + + b.Property("limit_frame_005"); + + b.Property("limit_frame_005_total"); + + b.Property("limit_frame_005_total_rounded"); + + b.Property("plan_guid"); + + b.Property("salary_adjustment_date"); + + b.Property("status_chief") + .HasMaxLength(1); + + b.Property("status_self") + .HasMaxLength(1); + + b.Property("supervisor1"); + + b.Property("supervisor1_date"); + + b.Property("supervisor1_remark") + .HasMaxLength(1000); + + b.Property("supervisor1_result") + .HasMaxLength(1); + + b.Property("total_salary"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("plan_guid"); + + b.ToTable("eva_limit_frame_plan"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_performance_planEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("created"); + + b.Property("fiscal_year"); + + b.Property("isActive"); + + b.Property("percent"); + + 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_create_evaluation_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluationEntity", "eva_create_evaluation_create_evaluation_id") + .WithMany() + .HasForeignKey("create_evaluation_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail") + .WithMany() + .HasForeignKey("create_evaluation_detail_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail") + .WithMany() + .HasForeignKey("create_evaluation_detail_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group") + .WithMany() + .HasForeignKey("evaluation_group_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_operating_agreementEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail_create_evaluation_detail_id") + .WithMany() + .HasForeignKey("create_evaluation_detail_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_limit_frame_groupEntity", "eva_limit_frame_group_frame_group_guid") + .WithMany() + .HasForeignKey("frame_group_guid"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_limit_frame_planEntity", "eva_limit_frame_plan_frame_plan_guid") + .WithMany() + .HasForeignKey("frame_plan_guid"); + + b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group_group_guid") + .WithMany() + .HasForeignKey("group_guid"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan_plan_guid") + .WithMany() + .HasForeignKey("plan_guid"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan") + .WithMany() + .HasForeignKey("performance_plan_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_promoted_percentageEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_level_scoreEntity", "eva_level_score") + .WithMany() + .HasForeignKey("level_score_id"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Migrations/20210406042734_AddMigrationField003.cs b/Migrations/20210406042734_AddMigrationField003.cs new file mode 100644 index 0000000..32964d8 --- /dev/null +++ b/Migrations/20210406042734_AddMigrationField003.cs @@ -0,0 +1,33 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace tb320eva.Migrations +{ + public partial class AddMigrationField003 : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "employee_no_at_this_time", + table: "eva_adjust_postponement_detail", + maxLength: 1000, + nullable: true); + + migrationBuilder.AddColumn( + name: "fullname_at_this_time", + table: "eva_adjust_postponement_detail", + maxLength: 1000, + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "employee_no_at_this_time", + table: "eva_adjust_postponement_detail"); + + migrationBuilder.DropColumn( + name: "fullname_at_this_time", + table: "eva_adjust_postponement_detail"); + } + } +} diff --git a/Migrations/DataContextModelSnapshot.cs b/Migrations/DataContextModelSnapshot.cs index f23c1f2..e97cdc4 100644 --- a/Migrations/DataContextModelSnapshot.cs +++ b/Migrations/DataContextModelSnapshot.cs @@ -85,6 +85,12 @@ namespace tb320eva.Migrations b.Property("employee_id"); + b.Property("employee_no_at_this_time") + .HasMaxLength(1000); + + b.Property("fullname_at_this_time") + .HasMaxLength(1000); + b.Property("isActive"); b.Property("level_score_final") 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 af984b3..1b0e773 100644 --- a/Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs +++ b/Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs @@ -74,6 +74,11 @@ namespace TodoAPI2.Models [MaxLength(255)] public string level_score_final { get; set; } + [MaxLength(1000)] + public string fullname_at_this_time { get; set; } + + [MaxLength(1000)] + public string employee_no_at_this_time { get; set; } } } 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 ba77dc4..6ce122f 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 @@ -58,8 +58,11 @@ namespace TodoAPI2.Models public int? order_at_this_time { get; set; } - public string active_mode { get; set; } + public string fullname_at_this_time { get; set; } + public string employee_no_at_this_time { get; set; } + + public string active_mode { get; set; } } } 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 5b03e72..116f57e 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 @@ -158,6 +158,9 @@ namespace TodoAPI2.Models adjust_postponement_quota_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult2.fiscal_year, employee_id_external_linkage_external_name = fk_external_linkageResult3.fullname, + fullname_at_this_time = m_eva_adjust_postponement_detail_migration.fullname_at_this_time, + employee_no_at_this_time = m_eva_adjust_postponement_detail_migration.employee_no_at_this_time, + isActive = m_eva_adjust_postponement_detail_migration.isActive, Created = m_eva_adjust_postponement_detail_migration.created, Updated = m_eva_adjust_postponement_detail_migration.updated @@ -227,6 +230,9 @@ namespace TodoAPI2.Models existingEntity.org_at_this_time = model.org_at_this_time; existingEntity.order_at_this_time = model.order_at_this_time; + existingEntity.fullname_at_this_time = model.fullname_at_this_time; + existingEntity.employee_no_at_this_time = model.employee_no_at_this_time; + var updated = _repository.Update(id, existingEntity); return Get(updated.id); } @@ -266,6 +272,9 @@ namespace TodoAPI2.Models existingEntity.org_at_this_time = i.org_at_this_time; existingEntity.order_at_this_time = i.order_at_this_time; + existingEntity.fullname_at_this_time = i.fullname_at_this_time; + existingEntity.employee_no_at_this_time = i.employee_no_at_this_time; + //existingEntity.SetAutoField(_repository.Context); _repository.UpdateWithoutCommit(i.id.Value, existingEntity); } @@ -325,7 +334,6 @@ namespace TodoAPI2.Models { var i = new Dictionary(); - i.Add("adjust_postponement_id", "รหัสอ้างอิงตาราง eva_adjust_postponement"); i.Add("adjust_postponement_id_eva_adjust_postponement_fiscal_year", "รหัสอ้างอิงตาราง eva_adjust_postponement"); i.Add("adjust_postponement_quota_id", "รหัสอ้างอิงตาราง eva_adjust_postponement"); @@ -344,6 +352,8 @@ namespace TodoAPI2.Models i.Add("new_sarary_with_quota", "เงินเดือนใหม่ (รวมโควต้า)"); i.Add("position_this_time", "ตำแหน่ง (ณ วันปรับเลื่อน)"); i.Add("level_this_time", "ระดับ (ณ วันปรับเลื่อน)"); + i.Add("fullname_at_this_time", "ชื่อ-ชื่อสกุล (ณ วันปรับเลื่อน)"); + i.Add("employee_no_at_this_time", "เลขที่พนักงาน (ณ วันปรับเลื่อน)"); return i; } 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 9b27d4e..02c2fe4 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,13 +51,19 @@ namespace TodoAPI2.Models public decimal? migration_total_score { get; set; } public string migration_eva_result { get; set; } + public int? org_at_this_time { get; set; } public int? order_at_this_time { get; set; } + public string fullname_at_this_time { get; set; } + + public string employee_no_at_this_time { get; set; } + public int? adjust_postponement_id_eva_adjust_postponement_fiscal_year { get; set; } public int? adjust_postponement_quota_id_eva_adjust_postponement_fiscal_year { get; set; } public string employee_id_external_linkage_external_name { get; set; } + public string org_at_this_time_external_linkage_external_name { get; set; } } } \ No newline at end of file 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 6110db5..497e94e 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 @@ -9,5 +9,6 @@ namespace TodoAPI2.Models { 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/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs index d132d9d..6812c8c 100644 --- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs +++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs @@ -198,7 +198,7 @@ namespace TodoAPI2.Models item.item_level_score = (from i in _repository.Context.eva_level_score orderby i.min_score select Mapper.Map(i)).ToList(); - item.item_employee_id = (from x in emp.GetListByemployee_type(null,null) select x).ToList(); + item.item_employee_id = (from x in emp.GetAllEmployee() where x.count_resigns == 0 select x).ToList(); return item; } @@ -206,7 +206,7 @@ namespace TodoAPI2.Models { var i = new eva_create_evaluation_detail_processWithSelectionViewModel(); i.item_org_id = ext.GetDepartmentData(); - i.item_employee_id = (from x in emp.GetListByemployee_type(null, null) select x).ToList(); + i.item_employee_id = (from x in emp.GetAllEmployee() where x.count_resigns == 0 select x).ToList(); //i.item_level_score = (from j in _repository.Context.eva_level_score // orderby j.min_score // select Mapper.Map(i)).ToList(); diff --git a/Models/external_employee/external_employeeService.cs b/Models/external_employee/external_employeeService.cs index 54ea988..356faf3 100644 --- a/Models/external_employee/external_employeeService.cs +++ b/Models/external_employee/external_employeeService.cs @@ -95,7 +95,8 @@ hpt.position_type_name,he.packing_date,he.cost_of_living, LIMIT 1) IS NOT null THEN 'ช่วยปฎิบัติหน้าที่' ELSE null END) as remark_hrm_work_record, -org_type_depart.department_degree_id, he.timerecorder_id +org_type_depart.department_degree_id, he.timerecorder_id, +(select count(*) from hrm_resigns where hrm_resigns.employee_id = he.employee_id) as count_resigns from public.hrm_employees as he left join public.hrm_position_types as hpt on he.position_type_id=hpt.id @@ -108,6 +109,30 @@ left join public.hrm_employee_types as het on het.id = he.employee_type_id left join public.users as u on u.employee_id = he.employee_id left join public.org_type_departments as org_type_depart on orgdata.department_type_id = org_type_depart.id left join public.org_type_department_colors as org_depart_color on org_type_depart.department_degree_id = org_depart_color.id +left join (select orgdata.id,orgdata2.id as id2, +case when orgdata2.department_name is not null then +concat(orgdata2.department_name,' - ',orgdata.department_name) +else orgdata.department_name end as full_dep, +orgdata.department_name, +orgdata.department_code,detail.parent_department_id, +case +when org_type_depart.department_degree_id = 1 then orgdata.department_code::int*1000 +when detail.parent_department_id is not null and detail.parent_department_id>0 +then orgdata2.department_code::int*1000+orgdata.department_code::int +else orgdata.department_code::int*100000 end as sort_order,org_type_depart.department_degree_id +from public.{0}DepartmentData{0} orgdata +left join org_organization_chart_details detail on orgdata.id = detail.department_id +left join public.{0}DepartmentData{0} orgdata2 on orgdata2.id = detail.parent_department_id +left join public.org_type_departments as org_type_depart on orgdata.department_type_id = org_type_depart.id +left join public.org_type_department_colors as org_depart_color +on org_type_depart.department_degree_id = org_depart_color.id +where orgdata.department_name is not null +order by case +when org_type_depart.department_degree_id = 1 then orgdata.department_code::int*1000 +when detail.parent_department_id is not null and detail.parent_department_id>0 +then orgdata2.department_code::int*1000+orgdata.department_code::int +else orgdata.department_code::int*100000 end) as sorting_dep +on sorting_dep.id = he.department_id where he.deleted_at is null and hpt.deleted_at is null and hpl.deleted_at is null @@ -119,7 +144,7 @@ and het.deleted_at is null and u.deleted_at is null and org_type_depart.deleted_at is null and org_depart_color.deleted_at is null -order by he.firstname, he.lastname; +order by sorting_dep.sort_order, hpt.position_type_id, hpl.position_level_id, employee_no desc; ", '"'.ToString()); var para = db.GetParameterListNpgsql(); DataTable dt = db.ExecuteDataTableNpgsql(sql, para); @@ -210,6 +235,14 @@ order by he.firstname, he.lastname; { i.timerecorder_id = ""; } + if (dr["count_resigns"] != DBNull.Value) + { + i.count_resigns = Convert.ToInt32(dr["count_resigns"]); + } + else + { + i.count_resigns = 0; + } result.Add(i); } diff --git a/Models/external_employee/external_employeeViewModel.cs b/Models/external_employee/external_employeeViewModel.cs index 3c0e4fc..00bb673 100644 --- a/Models/external_employee/external_employeeViewModel.cs +++ b/Models/external_employee/external_employeeViewModel.cs @@ -69,6 +69,7 @@ namespace TodoAPI2.Models public string profile_picture { get; set; } public string timerecorder_id { get; set; } + public int count_resigns { get; set; } public int? worked_month // ทำงานมาแล้วกี่เดือน { 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 f1c25e9..4ceca7b 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 @@ -5,6 +5,154 @@ Layout = "_LayoutDirect"; } +
@@ -172,145 +320,7 @@
-
-
บันทึกรายละเอียด
-
-
- -
-
- - - - - -
-
- - -
- -
- - -
- -
- - -
- -
-
- -
- - -
- -
- - -
-
-
- -
- - -
- - - -
- - -
- -
- - -
-
-
-
- - -
- -
- - -
- -
- - -
-
-
- - -
- - -
- -
- - -
-
- -
-
- - -
- -
- - -
-
-
-
- - -
- -
- - -
- -
- - -
-
- -
-
- - -
-
-
-
-
-
- -
-
- -
-
- -
- -
@section FooterPlaceHolder{ @@ -328,8 +338,12 @@ } $("#eva_adjust_postponement_migration_managed_by").select2(); - $("#eva_adjust_postponement_detail_migration_employee_id").select2(); - $("#eva_adjust_postponement_detail_migration_org_at_this_time").select2(); + $("#eva_adjust_postponement_detail_migration_employee_id").select2({ + dropdownParent: $('#eva_adjust_postponement_detail_migrationModel') + }); + $("#eva_adjust_postponement_detail_migration_org_at_this_time").select2({ + dropdownParent: $('#eva_adjust_postponement_detail_migrationModel') + }); SetupValidationRemark("eva_adjust_postponement_migration"); SetupValidationRemark("eva_adjust_postponement_detail_migration"); diff --git a/Views/home/index2.cshtml b/Views/home/index2.cshtml index 893c8c9..7a2fd7e 100644 --- a/Views/home/index2.cshtml +++ b/Views/home/index2.cshtml @@ -86,7 +86,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 3cf8656..47f4b84 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 @@ -42,7 +42,8 @@ function eva_adjust_postponement_detail_migration_FeedDataToForm(data) { $("#eva_adjust_postponement_detail_migration_migration_eva_result").val(data.migration_eva_result); DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_detail_migration_org_at_this_time"), data, "id", "external_name", "item_org_at_this_time", data.org_at_this_time); $("#eva_adjust_postponement_detail_migration_order_at_this_time").val(data.order_at_this_time); - + $("#eva_adjust_postponement_detail_migration_fullname_at_this_time").val(data.fullname_at_this_time); + $("#eva_adjust_postponement_detail_migration_employee_no_at_this_time").val(data.employee_no_at_this_time); } function eva_adjust_postponement_detail_migration_GetFromForm() { @@ -69,6 +70,9 @@ function eva_adjust_postponement_detail_migration_GetFromForm() { eva_adjust_postponement_detail_migrationObject.migration_eva_result = $("#eva_adjust_postponement_detail_migration_migration_eva_result").val(); eva_adjust_postponement_detail_migrationObject.org_at_this_time = $("#eva_adjust_postponement_detail_migration_org_at_this_time").val(); eva_adjust_postponement_detail_migrationObject.order_at_this_time = $("#eva_adjust_postponement_detail_migration_order_at_this_time").val(); + eva_adjust_postponement_detail_migrationObject.fullname_at_this_time = $("#eva_adjust_postponement_detail_migration_fullname_at_this_time").val(); + eva_adjust_postponement_detail_migrationObject.employee_no_at_this_time = $("#eva_adjust_postponement_detail_migration_employee_no_at_this_time").val(); + return eva_adjust_postponement_detail_migrationObject; } @@ -100,7 +104,7 @@ function eva_adjust_postponement_detail_migration_GoCreate() { function eva_adjust_postponement_detail_migration_GoEdit(a) { // Incase model popup - alert("กรุณาเลื่อนจอ ไปด้านล่างสุด เพื่อกรอกแบบฟอร์มแก้ไขข้อมูล"); + //alert("กรุณาเลื่อนจอ ไปด้านล่างสุด เพื่อกรอกแบบฟอร์มแก้ไขข้อมูล"); eva_adjust_postponement_detail_migration_SetEditForm(a); // Incase open new page @@ -111,7 +115,7 @@ function eva_adjust_postponement_detail_migration_SetEditForm(a) { var successFunc = function (result) { eva_adjust_postponement_detail_migration_editMode = "UPDATE"; eva_adjust_postponement_detail_migration_FeedDataToForm(result); - //$("#eva_adjust_postponement_detail_migrationModel").modal("show"); + $("#eva_adjust_postponement_detail_migrationModel").modal("show"); endLoad(); }; startLoad();