From 4b98790d2e0f857daa53012d807cfb60aa275a5e Mon Sep 17 00:00:00 2001 From: nakorn Date: Mon, 15 Nov 2021 13:53:13 +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=A5=E0=B8=B2=E0=B8=A2?= =?UTF-8?q?=E0=B8=AA=E0=B9=88=E0=B8=A7=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EXCEL/eva_create_evaluation.xlsx | Bin 10610 -> 10913 bytes EXCEL/eva_create_evaluation_detail.xlsx | Bin 13592 -> 13670 bytes .../20211108074744_AddSupervisor3.Designer.cs | 1201 ++++++++++++++++ Migrations/20211108074744_AddSupervisor3.cs | 22 + Migrations/20211108081106_AddX111.Designer.cs | 1218 +++++++++++++++++ Migrations/20211108081106_AddX111.cs | 80 ++ Migrations/DataContextModelSnapshot.cs | 19 + .../eva_create_evaluationEntity.cs | 2 +- .../eva_create_evaluationInputModel.cs | 2 + .../eva_create_evaluationService.cs | 12 +- .../eva_create_evaluationViewModel.cs | 4 + ...create_evaluationWithSelectionViewModel.cs | 2 +- .../eva_create_evaluation_detailEntity.cs | 16 + .../eva_create_evaluation_detailInputModel.cs | 2 + .../eva_create_evaluation_detailService.cs | 8 + .../eva_create_evaluation_detailViewModel.cs | 7 + ...evaluation_detailWithSelectionViewModel.cs | 1 + ...create_evaluation_detail_processService.cs | 9 +- ...eate_evaluation_detail_processViewModel.cs | 9 + ...on_detail_processWithSelectionViewModel.cs | 2 + .../eva_create_evaluation.cshtml | 16 +- .../eva_create_evaluation_d.cshtml | 96 +- ...va_create_evaluation_detail_process.cshtml | 1 + .../eva_create_evaluation.js | 2 + .../eva_create_evaluation_d.js | 2 + .../eva_create_evaluation_detail.js | 2 + .../eva_create_evaluation_detail_process.js | 5 +- 27 files changed, 2690 insertions(+), 50 deletions(-) create mode 100644 Migrations/20211108074744_AddSupervisor3.Designer.cs create mode 100644 Migrations/20211108074744_AddSupervisor3.cs create mode 100644 Migrations/20211108081106_AddX111.Designer.cs create mode 100644 Migrations/20211108081106_AddX111.cs diff --git a/EXCEL/eva_create_evaluation.xlsx b/EXCEL/eva_create_evaluation.xlsx index 743267e56b5c3836af2be25525eeb2a97082997c..53305886f9b350536b7db43de05d9ea7f7092bbe 100644 GIT binary patch delta 4937 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 delta 4591 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 delta 5924 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 +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("20211108074744_AddSupervisor3")] + partial class AddSupervisor3 + { + 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.activity_log_evaEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("causer_id"); + + b.Property("causer_type") + .HasMaxLength(191); + + b.Property("created_at"); + + b.Property("description") + .HasMaxLength(32000); + + b.Property("ip_address") + .HasMaxLength(191); + + b.Property("log_name") + .HasMaxLength(191); + + b.Property("mac_address") + .HasMaxLength(191); + + b.Property("properties") + .HasMaxLength(32000); + + b.Property("subject_id"); + + b.Property("subject_type") + .HasMaxLength(191); + + b.Property("updated_at"); + + b.HasKey("id"); + + b.ToTable("activity_log_eva"); + }); + + 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("is_for_postponement"); + + 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("reward_new"); + + b.Property("reward_new2"); + + b.Property("reward_old"); + + 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("supervisor3_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("remark") + .HasMaxLength(1000); + + 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_a") + .HasMaxLength(1); + + b.Property("status_supervisor_a_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_create_evaluation_detail_historyEntity", b => + { + b.Property("id"); + + b.Property("action_detail") + .HasMaxLength(4000); + + b.Property("action_dt"); + + b.Property("action_emp_id"); + + b.Property("created"); + + b.Property("evaluation_detail_id"); + + b.Property("history_group"); + + b.Property("isActive"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("evaluation_detail_id"); + + b.ToTable("eva_create_evaluation_detail_history"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b => + { + b.Property("id"); + + b.Property("achievement") + .HasMaxLength(16000); + + b.Property("achievement_line1") + .HasMaxLength(16000); + + 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_achievement_attachEntity", b => + { + b.Property("id"); + + b.Property("achievement_id"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("the_file") + .HasMaxLength(1000); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("achievement_id"); + + b.ToTable("eva_evaluation_achievement_attach"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievement_detailEntity", b => + { + b.Property("id"); + + b.Property("achievement_detail") + .HasMaxLength(16000); + + b.Property("achievement_id"); + + b.Property("achievement_order"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("achievement_id"); + + b.ToTable("eva_evaluation_achievement_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b => + { + b.Property("id"); + + b.Property("behavior") + .HasMaxLength(16000); + + 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_level_score_detailEntity", b => + { + b.Property("id"); + + b.Property("created"); + + b.Property("group_guid"); + + b.Property("isActive"); + + b.Property("level_score_id"); + + b.Property("max_percentage"); + + b.Property("max_value"); + + b.Property("min_percentage"); + + b.Property("min_value"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("group_guid"); + + b.HasIndex("level_score_id"); + + b.ToTable("eva_level_score_detail"); + }); + + 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("remark2") + .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("end_leave"); + + b.Property("fiscal_year"); + + b.Property("isActive"); + + b.Property("percent"); + + b.Property("remark") + .HasMaxLength(500); + + b.Property("start_leave"); + + 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("monthly_compensation"); + + b.Property("position_allowance"); + + b.Property("position_level"); + + b.Property("position_type"); + + b.Property("salary_max"); + + 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_setup_permissionEntity", b => + { + b.Property("id"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("isActive"); + + b.Property("remark") + .HasMaxLength(4000); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_setup_permission"); + }); + + 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_create_evaluation_detail_historyEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail_evaluation_detail_id") + .WithMany() + .HasForeignKey("evaluation_detail_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_achievement_attachEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_evaluation_achievementEntity", "eva_evaluation_achievement_achievement_id") + .WithMany() + .HasForeignKey("achievement_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievement_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_evaluation_achievementEntity", "eva_evaluation_achievement") + .WithMany() + .HasForeignKey("achievement_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_level_score_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group_group_guid") + .WithMany() + .HasForeignKey("group_guid"); + + b.HasOne("TodoAPI2.Models.eva_level_scoreEntity", "eva_level_score_level_score_id") + .WithMany() + .HasForeignKey("level_score_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/20211108074744_AddSupervisor3.cs b/Migrations/20211108074744_AddSupervisor3.cs new file mode 100644 index 0000000..318f1f6 --- /dev/null +++ b/Migrations/20211108074744_AddSupervisor3.cs @@ -0,0 +1,22 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace tb320eva.Migrations +{ + public partial class AddSupervisor3 : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "supervisor3_id", + table: "eva_create_evaluation", + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "supervisor3_id", + table: "eva_create_evaluation"); + } + } +} diff --git a/Migrations/20211108081106_AddX111.Designer.cs b/Migrations/20211108081106_AddX111.Designer.cs new file mode 100644 index 0000000..8b19353 --- /dev/null +++ b/Migrations/20211108081106_AddX111.Designer.cs @@ -0,0 +1,1218 @@ +// +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("20211108081106_AddX111")] + partial class AddX111 + { + 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.activity_log_evaEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("causer_id"); + + b.Property("causer_type") + .HasMaxLength(191); + + b.Property("created_at"); + + b.Property("description") + .HasMaxLength(32000); + + b.Property("ip_address") + .HasMaxLength(191); + + b.Property("log_name") + .HasMaxLength(191); + + b.Property("mac_address") + .HasMaxLength(191); + + b.Property("properties") + .HasMaxLength(32000); + + b.Property("subject_id"); + + b.Property("subject_type") + .HasMaxLength(191); + + b.Property("updated_at"); + + b.HasKey("id"); + + b.ToTable("activity_log_eva"); + }); + + 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("is_for_postponement"); + + 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("reward_new"); + + b.Property("reward_new2"); + + b.Property("reward_old"); + + 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("supervisor3_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("remark") + .HasMaxLength(1000); + + 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_supervisor3A") + .HasMaxLength(1); + + b.Property("status_supervisor3A_click_date"); + + b.Property("status_supervisor_a") + .HasMaxLength(1); + + b.Property("status_supervisor_a_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("supervisor3A"); + + b.Property("supervisor3A_date"); + + b.Property("supervisor3A_remark") + .HasMaxLength(1000); + + b.Property("supervisor3A_result") + .HasMaxLength(1); + + b.Property("supervisor3_id"); + + 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_create_evaluation_detail_historyEntity", b => + { + b.Property("id"); + + b.Property("action_detail") + .HasMaxLength(4000); + + b.Property("action_dt"); + + b.Property("action_emp_id"); + + b.Property("created"); + + b.Property("evaluation_detail_id"); + + b.Property("history_group"); + + b.Property("isActive"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("evaluation_detail_id"); + + b.ToTable("eva_create_evaluation_detail_history"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b => + { + b.Property("id"); + + b.Property("achievement") + .HasMaxLength(16000); + + b.Property("achievement_line1") + .HasMaxLength(16000); + + 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_achievement_attachEntity", b => + { + b.Property("id"); + + b.Property("achievement_id"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("the_file") + .HasMaxLength(1000); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("achievement_id"); + + b.ToTable("eva_evaluation_achievement_attach"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievement_detailEntity", b => + { + b.Property("id"); + + b.Property("achievement_detail") + .HasMaxLength(16000); + + b.Property("achievement_id"); + + b.Property("achievement_order"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("achievement_id"); + + b.ToTable("eva_evaluation_achievement_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b => + { + b.Property("id"); + + b.Property("behavior") + .HasMaxLength(16000); + + 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_level_score_detailEntity", b => + { + b.Property("id"); + + b.Property("created"); + + b.Property("group_guid"); + + b.Property("isActive"); + + b.Property("level_score_id"); + + b.Property("max_percentage"); + + b.Property("max_value"); + + b.Property("min_percentage"); + + b.Property("min_value"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("group_guid"); + + b.HasIndex("level_score_id"); + + b.ToTable("eva_level_score_detail"); + }); + + 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("remark2") + .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("end_leave"); + + b.Property("fiscal_year"); + + b.Property("isActive"); + + b.Property("percent"); + + b.Property("remark") + .HasMaxLength(500); + + b.Property("start_leave"); + + 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("monthly_compensation"); + + b.Property("position_allowance"); + + b.Property("position_level"); + + b.Property("position_type"); + + b.Property("salary_max"); + + 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_setup_permissionEntity", b => + { + b.Property("id"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("isActive"); + + b.Property("remark") + .HasMaxLength(4000); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_setup_permission"); + }); + + 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_create_evaluation_detail_historyEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail_evaluation_detail_id") + .WithMany() + .HasForeignKey("evaluation_detail_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_achievement_attachEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_evaluation_achievementEntity", "eva_evaluation_achievement_achievement_id") + .WithMany() + .HasForeignKey("achievement_id"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievement_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_evaluation_achievementEntity", "eva_evaluation_achievement") + .WithMany() + .HasForeignKey("achievement_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_level_score_detailEntity", b => + { + b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group_group_guid") + .WithMany() + .HasForeignKey("group_guid"); + + b.HasOne("TodoAPI2.Models.eva_level_scoreEntity", "eva_level_score_level_score_id") + .WithMany() + .HasForeignKey("level_score_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/20211108081106_AddX111.cs b/Migrations/20211108081106_AddX111.cs new file mode 100644 index 0000000..2ef4ba8 --- /dev/null +++ b/Migrations/20211108081106_AddX111.cs @@ -0,0 +1,80 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace tb320eva.Migrations +{ + public partial class AddX111 : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "status_supervisor3A", + table: "eva_create_evaluation_detail", + maxLength: 1, + nullable: true); + + migrationBuilder.AddColumn( + name: "status_supervisor3A_click_date", + table: "eva_create_evaluation_detail", + nullable: true); + + migrationBuilder.AddColumn( + name: "supervisor3A", + table: "eva_create_evaluation_detail", + nullable: true); + + migrationBuilder.AddColumn( + name: "supervisor3A_date", + table: "eva_create_evaluation_detail", + nullable: true); + + migrationBuilder.AddColumn( + name: "supervisor3A_remark", + table: "eva_create_evaluation_detail", + maxLength: 1000, + nullable: true); + + migrationBuilder.AddColumn( + name: "supervisor3A_result", + table: "eva_create_evaluation_detail", + maxLength: 1, + nullable: true); + + migrationBuilder.AddColumn( + name: "supervisor3_id", + table: "eva_create_evaluation_detail", + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "status_supervisor3A", + table: "eva_create_evaluation_detail"); + + migrationBuilder.DropColumn( + name: "status_supervisor3A_click_date", + table: "eva_create_evaluation_detail"); + + migrationBuilder.DropColumn( + name: "supervisor3A", + table: "eva_create_evaluation_detail"); + + migrationBuilder.DropColumn( + name: "supervisor3A_date", + table: "eva_create_evaluation_detail"); + + migrationBuilder.DropColumn( + name: "supervisor3A_remark", + table: "eva_create_evaluation_detail"); + + migrationBuilder.DropColumn( + name: "supervisor3A_result", + table: "eva_create_evaluation_detail"); + + migrationBuilder.DropColumn( + name: "supervisor3_id", + table: "eva_create_evaluation_detail"); + } + } +} diff --git a/Migrations/DataContextModelSnapshot.cs b/Migrations/DataContextModelSnapshot.cs index 2504b01..5688565 100644 --- a/Migrations/DataContextModelSnapshot.cs +++ b/Migrations/DataContextModelSnapshot.cs @@ -216,6 +216,8 @@ namespace tb320eva.Migrations b.Property("supervisor2_id"); + b.Property("supervisor3_id"); + b.Property("updated"); b.HasKey("id"); @@ -348,6 +350,11 @@ namespace tb320eva.Migrations b.Property("status_supervisor2A_click_date"); + b.Property("status_supervisor3A") + .HasMaxLength(1); + + b.Property("status_supervisor3A_click_date"); + b.Property("status_supervisor_a") .HasMaxLength(1); @@ -399,6 +406,18 @@ namespace tb320eva.Migrations b.Property("supervisor2_result") .HasMaxLength(1); + b.Property("supervisor3A"); + + b.Property("supervisor3A_date"); + + b.Property("supervisor3A_remark") + .HasMaxLength(1000); + + b.Property("supervisor3A_result") + .HasMaxLength(1); + + b.Property("supervisor3_id"); + b.Property("total_summary_chief"); b.Property("total_summary_competency_chief"); diff --git a/Models/eva_create_evaluation/eva_create_evaluationEntity.cs b/Models/eva_create_evaluation/eva_create_evaluationEntity.cs index 7c7f903..ca629ca 100644 --- a/Models/eva_create_evaluation/eva_create_evaluationEntity.cs +++ b/Models/eva_create_evaluation/eva_create_evaluationEntity.cs @@ -34,6 +34,6 @@ namespace TodoAPI2.Models public int? supervisor2_id { get; set; } - + public int? supervisor3_id { get; set; } } } diff --git a/Models/eva_create_evaluation/eva_create_evaluationInputModel.cs b/Models/eva_create_evaluation/eva_create_evaluationInputModel.cs index 2ecb2cb..31500d4 100644 --- a/Models/eva_create_evaluation/eva_create_evaluationInputModel.cs +++ b/Models/eva_create_evaluation/eva_create_evaluationInputModel.cs @@ -30,6 +30,8 @@ namespace TodoAPI2.Models public int? supervisor2_id { get; set; } + public int? supervisor3_id { get; set; } + public string active_mode { get; set; } } } diff --git a/Models/eva_create_evaluation/eva_create_evaluationService.cs b/Models/eva_create_evaluation/eva_create_evaluationService.cs index dd3c502..5231b9d 100644 --- a/Models/eva_create_evaluation/eva_create_evaluationService.cs +++ b/Models/eva_create_evaluation/eva_create_evaluationService.cs @@ -76,6 +76,7 @@ namespace TodoAPI2.Models i.item_evaluation_group_id = (from x in _repository.Context.eva_evaluation_group select x).ToList(); i.item_supervisor1_id = all_emp; i.item_supervisor2_id = all_emp; + i.item_supervisor3_id = all_emp; return i; } @@ -89,6 +90,7 @@ namespace TodoAPI2.Models i.item_evaluation_group_id = (from x in _repository.Context.eva_evaluation_group select x).ToList(); i.item_supervisor1_id = all_emp; i.item_supervisor2_id = all_emp; + i.item_supervisor3_id = all_emp; return i; } @@ -127,6 +129,10 @@ namespace TodoAPI2.Models into external_linkageResult7 from fk_external_linkageResult7 in external_linkageResult7.DefaultIfEmpty() + join fk_external_linkage8 in all_emp on m_eva_create_evaluation.supervisor3_id equals fk_external_linkage8.id + into external_linkageResult8 + from fk_external_linkageResult8 in external_linkageResult8.DefaultIfEmpty() + where 1==1 && (m_eva_create_evaluation.performance_plan_id == model.performance_plan_id || !model.performance_plan_id.HasValue) && (m_eva_create_evaluation.evaluation_group_id == model.evaluation_group_id || !model.evaluation_group_id.HasValue) @@ -143,6 +149,7 @@ namespace TodoAPI2.Models evaluation_group_id = m_eva_create_evaluation.evaluation_group_id, supervisor1_id = m_eva_create_evaluation.supervisor1_id, supervisor2_id = m_eva_create_evaluation.supervisor2_id, + supervisor3_id = m_eva_create_evaluation.supervisor3_id, performance_plan_id_eva_performance_plan_fiscal_year = fk_eva_performance_planResult1.display_text, employee_id_external_linkage_external_name = fk_external_linkageResult2.fullname, @@ -150,6 +157,7 @@ namespace TodoAPI2.Models evaluation_group_id_eva_evaluation_group_name = fk_eva_evaluation_groupResult5.thegroup, supervisor1_id_external_linkage_external_name = fk_external_linkageResult6.fullname, supervisor2_id_external_linkage_external_name = fk_external_linkageResult7.fullname, + supervisor3_id_external_linkage_external_name = fk_external_linkageResult8.fullname, isActive = m_eva_create_evaluation.isActive, Created = m_eva_create_evaluation.created, @@ -209,7 +217,7 @@ namespace TodoAPI2.Models existingEntity.evaluation_group_id = model.evaluation_group_id; existingEntity.supervisor1_id = model.supervisor1_id; existingEntity.supervisor2_id = model.supervisor2_id; - + existingEntity.supervisor3_id = model.supervisor3_id; var updated = _repository.Update(id, existingEntity); return Get(updated.id); @@ -234,7 +242,7 @@ namespace TodoAPI2.Models existingEntity.evaluation_group_id = i.evaluation_group_id; existingEntity.supervisor1_id = i.supervisor1_id; existingEntity.supervisor2_id = i.supervisor2_id; - + existingEntity.supervisor3_id = i.supervisor3_id; _repository.UpdateWithoutCommit(i.id.Value, existingEntity); } diff --git a/Models/eva_create_evaluation/eva_create_evaluationViewModel.cs b/Models/eva_create_evaluation/eva_create_evaluationViewModel.cs index 5520c56..fd9c5e4 100644 --- a/Models/eva_create_evaluation/eva_create_evaluationViewModel.cs +++ b/Models/eva_create_evaluation/eva_create_evaluationViewModel.cs @@ -28,6 +28,8 @@ namespace TodoAPI2.Models public int? supervisor2_id { get; set; } + public int? supervisor3_id { get; set; } + public string performance_plan_id_eva_performance_plan_fiscal_year { get; set; } public string employee_id_external_linkage_external_name { get; set; } public string evaluation_group_id_eva_evaluation_group_code { get; set; } @@ -36,6 +38,8 @@ namespace TodoAPI2.Models public string supervisor1_id_external_linkage_external_name { get; set; } public string supervisor2_id_external_linkage_external_name { get; set; } + public string supervisor3_id_external_linkage_external_name { get; set; } + public string description { get diff --git a/Models/eva_create_evaluation/eva_create_evaluationWithSelectionViewModel.cs b/Models/eva_create_evaluation/eva_create_evaluationWithSelectionViewModel.cs index c79f2b4..897fdb9 100644 --- a/Models/eva_create_evaluation/eva_create_evaluationWithSelectionViewModel.cs +++ b/Models/eva_create_evaluation/eva_create_evaluationWithSelectionViewModel.cs @@ -12,6 +12,6 @@ namespace TodoAPI2.Models public List item_evaluation_group_id { get; set; } public List item_supervisor1_id { get; set; } public List item_supervisor2_id { get; set; } - + public List item_supervisor3_id { get; set; } } } \ No newline at end of file diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs index d8a1ce3..9946f60 100644 --- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs +++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailEntity.cs @@ -137,6 +137,8 @@ namespace TodoAPI2.Models public DateTime? status_supervisor1A_click_date { get; set; } public DateTime? status_supervisor2A_click_date { get; set; } + public DateTime? status_supervisor3A_click_date { get; set; } + public decimal? total_summary_supervisor1A { get; set; } public decimal? Final_summary_supervisor1A { get; set; } @@ -198,6 +200,20 @@ namespace TodoAPI2.Models [MaxLength(1000)] public string remark { get; set; } + + public int? supervisor3_id { get; set; } + + public int? supervisor3A { get; set; } + + [MaxLength(1)] + public string supervisor3A_result { get; set; } + + [MaxLength(1000)] + public string supervisor3A_remark { get; set; } + + public DateTime? supervisor3A_date { get; set; } + [MaxLength(1)] + public string status_supervisor3A { get; set; } } } diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailInputModel.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailInputModel.cs index 7d405c7..dab008e 100644 --- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailInputModel.cs +++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailInputModel.cs @@ -36,6 +36,8 @@ namespace TodoAPI2.Models public string remark { get; set; } + public int? supervisor3_id { get; set; } + public string active_mode { get; set; } } } diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs index 4d7f0f0..59e3394 100644 --- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs +++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs @@ -82,6 +82,7 @@ namespace TodoAPI2.Models i.item_eva_employee_id = i.item_employee_id; i.item_supervisor1_id = i.item_employee_id; i.item_supervisor2_id = i.item_employee_id; + i.item_supervisor3_id = i.item_employee_id; i.item_help_org_id = ext.GetDepartmentData(); return i; @@ -95,6 +96,7 @@ namespace TodoAPI2.Models i.item_eva_employee_id = i.item_employee_id; i.item_supervisor1_id = i.item_employee_id; i.item_supervisor2_id = i.item_employee_id; + i.item_supervisor3_id = i.item_employee_id; i.item_help_org_id = ext.GetDepartmentData(); return i; @@ -139,6 +141,10 @@ namespace TodoAPI2.Models into external_linkageResult46 from fk_external_linkageResult46 in external_linkageResult46.DefaultIfEmpty() + join fk_external_linkage48 in allemp on m_eva_create_evaluation_detail.supervisor3_id equals fk_external_linkage48.id + into external_linkageResult48 + from fk_external_linkageResult48 in external_linkageResult48.DefaultIfEmpty() + join fk_external_linkage99 in ext.GetDepartmentData() on (m_eva_create_evaluation_detail.help_org_id.HasValue ? m_eva_create_evaluation_detail.help_org_id : fk_external_linkageResult2.department_id) equals fk_external_linkage99.id into external_linkageResult99 from fk_external_linkageResult99 in external_linkageResult99.DefaultIfEmpty() @@ -197,6 +203,7 @@ namespace TodoAPI2.Models status_supervisor1A = m_eva_create_evaluation_detail.status_supervisor1A, status_supervisor2A = m_eva_create_evaluation_detail.status_supervisor2A, + status_supervisor3A = m_eva_create_evaluation_detail.status_supervisor3A, employee_id_external_linkage_external_name = fk_external_linkageResult2.fullname, chief_external_linkage_external_name = fk_external_linkageResult3.fullname, @@ -216,6 +223,7 @@ namespace TodoAPI2.Models status_supervisor_click_date = m_eva_create_evaluation_detail.status_supervisor_click_date, status_supervisor1A_click_date = m_eva_create_evaluation_detail.status_supervisor1A_click_date, status_supervisor2A_click_date = m_eva_create_evaluation_detail.status_supervisor2A_click_date, + status_supervisor3A_click_date = m_eva_create_evaluation_detail.status_supervisor3A_click_date, department_name = fk_external_linkageResult99.external_name, help_org_id_external_linkage_external_name = fk_external_linkageResult46.external_name, diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs index 690ce94..67f63bd 100644 --- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs +++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailViewModel.cs @@ -82,10 +82,13 @@ namespace TodoAPI2.Models public string status_supervisor2A { get; set; } + public string status_supervisor3A { get; set; } + public string employee_id_external_linkage_external_name { get; set; } public string chief_external_linkage_external_name { get; set; } public string supervisor1_result_external_linkage_external_name { get; set; } public string supervisor2_result_external_linkage_external_name { get; set; } + public string supervisor3_result_external_linkage_external_name { get; set; } public string position_type_text { get; set; } public string position_level_text { get; set; } @@ -103,6 +106,7 @@ namespace TodoAPI2.Models public DateTime? status_supervisor_click_date { get; set; } public DateTime? status_supervisor1A_click_date { get; set; } public DateTime? status_supervisor2A_click_date { get; set; } + public DateTime? status_supervisor3A_click_date { get; set; } public int? eva_employee_id { get; set; } @@ -110,6 +114,8 @@ namespace TodoAPI2.Models public int? supervisor2_id { get; set; } + public int? supervisor3_id { get; set; } + public decimal? work_period { get; set; } public int? order_of_data { get; set; } @@ -120,6 +126,7 @@ namespace TodoAPI2.Models public string txt_status_supervisor { get { return getStatusText(status_supervisor) + MyHelper.GetDateStringForReport(status_supervisor_click_date); } } public string txt_status_supervisor1A { get { return getStatusText(status_supervisor1A) + MyHelper.GetDateStringForReport(status_supervisor1A_click_date); } } public string txt_status_supervisor2A { get { return getStatusText(status_supervisor2A) + MyHelper.GetDateStringForReport(status_supervisor2A_click_date); } } + public string txt_status_supervisor3A { get { return getStatusText(status_supervisor3A) + MyHelper.GetDateStringForReport(status_supervisor3A_click_date); } } public string help_org_id_external_linkage_external_name { get; set; } diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailWithSelectionViewModel.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailWithSelectionViewModel.cs index 329fb6c..9981bb5 100644 --- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailWithSelectionViewModel.cs +++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailWithSelectionViewModel.cs @@ -13,6 +13,7 @@ namespace TodoAPI2.Models public List item_eva_employee_id { get; set; } public List item_supervisor1_id { get; set; } public List item_supervisor2_id { get; set; } + public List item_supervisor3_id { get; set; } public List item_help_org_id { 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 7c27821..a2f27d1 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 @@ -140,7 +140,9 @@ namespace TodoAPI2.Models into external_supervisor2AResult from fk_external_supervisor2A in external_supervisor2AResult.DefaultIfEmpty() - + join fk_external_supervisor3A in allemp on isNull(m_eva_create_evaluation_detail_process.supervisor3_id, fk_eva_create_evaluationResult10.supervisor3_id) equals fk_external_supervisor3A.id + into external_supervisor3AResult + from fk_external_supervisor3A in external_supervisor3AResult.DefaultIfEmpty() where m_eva_create_evaluation_detail_process.id == id @@ -173,6 +175,8 @@ namespace TodoAPI2.Models supervisor1A_position = fk_external_supervisor1A.position_name, supervisor2A_fullname = fk_external_supervisor2A.fullname, supervisor2A_position = fk_external_supervisor2A.position_name, + supervisor3A_fullname = fk_external_supervisor3A.fullname, + supervisor3A_position = fk_external_supervisor3A.position_name, org_id_external_linkage_external_name = fk_external_employee.department_name, @@ -185,6 +189,7 @@ namespace TodoAPI2.Models status_supervisor1A = m_eva_create_evaluation_detail_process.status_supervisor1A, status_supervisor2A = m_eva_create_evaluation_detail_process.status_supervisor2A, + status_supervisor3A = m_eva_create_evaluation_detail_process.status_supervisor3A, role_code = getRoleCode(emp_id, m_eva_create_evaluation_detail_process.chief, m_eva_create_evaluation_detail_process.chief, @@ -218,12 +223,14 @@ namespace TodoAPI2.Models supervisor2_position_type_id = fk_external_supervisor2.position_type_id, supervisor1A_position_type_id = fk_external_supervisor1A.position_type_id, supervisor2A_position_type_id = fk_external_supervisor2A.position_type_id, + supervisor3A_position_type_id = fk_external_supervisor3A.position_type_id, employee_position_type_id = fk_external_employee.position_type_id, chief_position_type_id = fk_external_chief.position_type_id, supervisor2_position_level_text = fk_external_supervisor2.position_level_text, supervisor1A_position_level_text = fk_external_supervisor1A.position_level_text, supervisor2A_position_level_text = fk_external_supervisor2A.position_level_text, + supervisor3A_position_level_text = fk_external_supervisor3A.position_level_text, employee_position_level_text = fk_external_employee.position_level_text, chief_position_level_text = fk_external_chief.position_level_text, diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs index a1cce42..bd9d95a 100644 --- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs +++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs @@ -49,6 +49,10 @@ namespace TodoAPI2.Models public string supervisor2A_position { get; set; } + public string supervisor3A_fullname { get; set; } + + public string supervisor3A_position { get; set; } + public int? create_evaluation_id { get; set; } public int? org_id { get; set; } @@ -70,6 +74,8 @@ namespace TodoAPI2.Models public string status_supervisor2A { get; set; } + public string status_supervisor3A { get; set; } + public string role_desc { get; set; } public string role_code { get; set; } @@ -87,11 +93,14 @@ namespace TodoAPI2.Models public DateTime? status_supervisor1A_click_date { get; set; } public DateTime? status_supervisor2A_click_date { get; set; } + public DateTime? status_supervisor3A_click_date { get; set; } + public string txt_status_self { get { return getStatusText(status_self) + MyHelper.GetDateStringForReport(status_self_click_date) + " " + MyHelper.GetTimeStringFromDate(status_self_click_date) + getHistoryLink(status_self); } } public string txt_status_chief { get { return getStatusText(status_chief) + MyHelper.GetDateStringForReport(status_chief_click_date) + " " + MyHelper.GetTimeStringFromDate(status_chief_click_date) + getHistoryLink(status_chief); } } public string txt_status_supervisor { get { return getStatusText(status_supervisor) + MyHelper.GetDateStringForReport(status_supervisor_click_date) + " " + MyHelper.GetTimeStringFromDate(status_supervisor_click_date) + getHistoryLink(status_supervisor); } } public string txt_status_supervisor1A { get { return getStatusText(status_supervisor1A) + MyHelper.GetDateStringForReport(status_supervisor1A_click_date) + " " + MyHelper.GetTimeStringFromDate(status_supervisor1A_click_date) + getHistoryLink(status_supervisor1A); } } public string txt_status_supervisor2A { get { return getStatusText(status_supervisor2A) + MyHelper.GetDateStringForReport(status_supervisor2A_click_date) + " " + MyHelper.GetTimeStringFromDate(status_supervisor2A_click_date) + getHistoryLink(status_supervisor2A); } } + public string txt_status_supervisor3A { get { return getStatusText(status_supervisor3A) + MyHelper.GetDateStringForReport(status_supervisor3A_click_date) + " " + MyHelper.GetTimeStringFromDate(status_supervisor3A_click_date) + getHistoryLink(status_supervisor3A); } } private string getHistoryLink(string s) { diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs index 1b069eb..0e7a267 100644 --- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs +++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs @@ -29,12 +29,14 @@ namespace TodoAPI2.Models public int? supervisor2_position_type_id { get; set; } public int? supervisor1A_position_type_id { get; set; } public int? supervisor2A_position_type_id { get; set; } + public int? supervisor3A_position_type_id { get; set; } public int? employee_position_type_id { get; set; } public int? chief_position_type_id { get; set; } public string supervisor2_position_level_text { get; set; } public string supervisor1A_position_level_text { get; set; } public string supervisor2A_position_level_text { get; set; } + public string supervisor3A_position_level_text { get; set; } public string employee_position_level_text { get; set; } public string chief_position_level_text { get; set; } diff --git a/Views/eva_create_evaluationView/eva_create_evaluation.cshtml b/Views/eva_create_evaluationView/eva_create_evaluation.cshtml index aa93003..319f6c1 100644 --- a/Views/eva_create_evaluationView/eva_create_evaluation.cshtml +++ b/Views/eva_create_evaluationView/eva_create_evaluation.cshtml @@ -45,6 +45,11 @@ + +
+ + +
@@ -123,12 +128,12 @@ -
+ @section FooterPlaceHolder{ - - + + } diff --git a/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml b/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml index 014bd3c..b1f9445 100644 --- a/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml +++ b/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml @@ -50,8 +50,16 @@ + +
+ + +
+ + +
@@ -159,6 +167,11 @@
+ +
+ + +
@@ -238,50 +251,55 @@ @section FooterPlaceHolder{ - - - + + + $("#eva_create_evaluation_detail_employee_id").select2({ + dropdownParent: $('#eva_create_evaluation_detailModel') + }); + $("#eva_create_evaluation_detail_chief").select2({ + dropdownParent: $('#eva_create_evaluation_detailModel') + }); + $("#eva_create_evaluation_detail_eva_employee_id").select2({ + dropdownParent: $('#eva_create_evaluation_detailModel') + }); + $("#eva_create_evaluation_detail_supervisor1_id").select2({ + dropdownParent: $('#eva_create_evaluation_detailModel') + }); + $("#eva_create_evaluation_detail_supervisor2_id").select2({ + dropdownParent: $('#eva_create_evaluation_detailModel') + }); + $("#eva_create_evaluation_detail_supervisor3_id").select2({ + dropdownParent: $('#eva_create_evaluation_detailModel') + }); + }); + + function go_next() { + var id = getUrlParameter("id"); + window.location = "eva_create_evaluation_d_summary?id=" + id; + } + + } @section HeadPlaceHolder{ - + } diff --git a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process.cshtml b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process.cshtml index b6f88fb..66e0ff1 100644 --- a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process.cshtml +++ b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process.cshtml @@ -79,6 +79,7 @@ + diff --git a/wwwroot/js/eva_create_evaluation/eva_create_evaluation.js b/wwwroot/js/eva_create_evaluation/eva_create_evaluation.js index f700472..a0d18a1 100644 --- a/wwwroot/js/eva_create_evaluation/eva_create_evaluation.js +++ b/wwwroot/js/eva_create_evaluation/eva_create_evaluation.js @@ -28,6 +28,7 @@ function eva_create_evaluation_FeedDataToForm(data) { DropDownClearFormAndFeedWithData($("#eva_create_evaluation_evaluation_group_id"), data, "id", "thegroup", "item_evaluation_group_id", data.evaluation_group_id); DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor1_id"), data, "id", "fullname", "item_supervisor1_id", data.supervisor1_id); DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor2_id"), data, "id", "fullname", "item_supervisor2_id", data.supervisor2_id); + DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor3_id"), data, "id", "fullname", "item_supervisor3_id", data.supervisor3_id); } @@ -41,6 +42,7 @@ function eva_create_evaluation_GetFromForm() { eva_create_evaluationObject.evaluation_group_id = $("#eva_create_evaluation_evaluation_group_id").val(); eva_create_evaluationObject.supervisor1_id = $("#eva_create_evaluation_supervisor1_id").val(); eva_create_evaluationObject.supervisor2_id = $("#eva_create_evaluation_supervisor2_id").val(); + eva_create_evaluationObject.supervisor3_id = $("#eva_create_evaluation_supervisor3_id").val(); return eva_create_evaluationObject; } diff --git a/wwwroot/js/eva_create_evaluation/eva_create_evaluation_d.js b/wwwroot/js/eva_create_evaluation/eva_create_evaluation_d.js index 07005e6..a9a3e5d 100644 --- a/wwwroot/js/eva_create_evaluation/eva_create_evaluation_d.js +++ b/wwwroot/js/eva_create_evaluation/eva_create_evaluation_d.js @@ -12,6 +12,7 @@ function eva_create_evaluation_FeedDataToForm(data) { DropDownClearFormAndFeedWithData($("#eva_create_evaluation_evaluation_group_id"), data, "id", "thegroup", "item_evaluation_group_id", data.evaluation_group_id); DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor1_id"), data, "id", "fullname", "item_supervisor1_id", data.supervisor1_id); DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor2_id"), data, "id", "fullname", "item_supervisor2_id", data.supervisor2_id); + DropDownClearFormAndFeedWithData($("#eva_create_evaluation_supervisor3_id"), data, "id", "fullname", "item_supervisor3_id", data.supervisor3_id); } @@ -25,6 +26,7 @@ function eva_create_evaluation_GetFromForm() { eva_create_evaluationObject.evaluation_group_id = $("#eva_create_evaluation_evaluation_group_id").val(); eva_create_evaluationObject.supervisor1_id = $("#eva_create_evaluation_supervisor1_id").val(); eva_create_evaluationObject.supervisor2_id = $("#eva_create_evaluation_supervisor2_id").val(); + eva_create_evaluationObject.supervisor3_id = $("#eva_create_evaluation_supervisor3_id").val(); return eva_create_evaluationObject; } diff --git a/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js b/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js index fa01752..f783816 100644 --- a/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js +++ b/wwwroot/js/eva_create_evaluation_detail/eva_create_evaluation_detail.js @@ -29,6 +29,7 @@ function eva_create_evaluation_detail_FeedDataToForm(data) { $("#eva_create_evaluation_detail_order_of_data").val(data.order_of_data); DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_help_org_id"), data, "id", "external_name", "item_help_org_id", data.help_org_id); $("#eva_create_evaluation_detail_remark").val(data.remark); + DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_supervisor3_id"), data, "id", "fullname", "item_supervisor3_id", data.supervisor3_id); } function eva_create_evaluation_detail_GetFromForm() { @@ -44,6 +45,7 @@ function eva_create_evaluation_detail_GetFromForm() { eva_create_evaluation_detailObject.order_of_data = $("#eva_create_evaluation_detail_order_of_data").val(); eva_create_evaluation_detailObject.help_org_id = $("#eva_create_evaluation_detail_help_org_id").val(); eva_create_evaluation_detailObject.remark = $("#eva_create_evaluation_detail_remark").val(); + eva_create_evaluation_detailObject.supervisor3_id = $("#eva_create_evaluation_detail_supervisor3_id").val(); return eva_create_evaluation_detailObject; } diff --git a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js index fde15fa..3217ce1 100644 --- a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js +++ b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js @@ -206,7 +206,8 @@ var eva_create_evaluation_detail_process_setupTable = function (result) { { "data": "txt_status_chief" }, { "data": "txt_status_supervisor" }, { "data": "txt_status_supervisor1A" }, - { "data": "txt_status_supervisor2A" } + { "data": "txt_status_supervisor2A" }, + { "data": "txt_status_supervisor3A" } ], "columnDefs": [ { @@ -230,7 +231,7 @@ var eva_create_evaluation_detail_process_setupTable = function (result) { api.column(groupColumn, { page: 'current' }).data().each(function (group, i) { if (last !== group) { $(rows).eq(i).before( - '' + group + '' + '' + group + '' ); last = group;