From 7baab533653b549557ac7bf023c3527f57823eb3 Mon Sep 17 00:00:00 2001 From: nakorn Date: Sat, 30 Oct 2021 11:53:07 +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=AA=E0=B9=88=E0=B8=A7=E0=B8=99?= =?UTF-8?q?=20=E0=B8=95=E0=B8=B2=E0=B8=A3=E0=B8=B2=E0=B8=87=E0=B8=81?= =?UTF-8?q?=E0=B8=B3=E0=B8=AB=E0=B8=99=E0=B8=94=E0=B8=8A=E0=B9=88=E0=B8=A7?= =?UTF-8?q?=E0=B8=87=E0=B8=A3=E0=B9=89=E0=B8=AD=E0=B8=A2=E0=B8=A5=E0=B8=B0?= =?UTF-8?q?=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B9=84=E0=B8=94=E0=B9=89=E0=B9=80?= =?UTF-8?q?=E0=B8=A5=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EXCEL/eva_evaluation_group.xlsx | Bin 10492 -> 10435 bytes EXCEL/eva_level_score_detail.xlsx | Bin 10414 -> 10581 bytes ...0034925_AddLevelScoreForGroup2.Designer.cs | 1165 +++++++++++++++++ .../20211030034925_AddLevelScoreForGroup2.cs | 153 +++ Migrations/DataContextModelSnapshot.cs | 13 +- ...st_postponement_detail_normal_02Service.cs | 40 +- .../eva_level_score_detailEntity.cs | 8 +- .../eva_level_score_detailInputModel.cs | 4 +- .../eva_level_score_detailSearchModel.cs | 4 +- .../eva_level_score_detailService.cs | 78 +- .../eva_level_score_detailViewModel.cs | 5 +- ...evel_score_detailWithSelectionViewModel.cs | 2 +- .../eva_evaluation_group_d.cshtml | 133 +- .../eva_level_score_d.cshtml | 87 -- .../eva_level_score_detail.js | 18 +- 15 files changed, 1539 insertions(+), 171 deletions(-) create mode 100644 Migrations/20211030034925_AddLevelScoreForGroup2.Designer.cs create mode 100644 Migrations/20211030034925_AddLevelScoreForGroup2.cs diff --git a/EXCEL/eva_evaluation_group.xlsx b/EXCEL/eva_evaluation_group.xlsx index 0d3ec2ba3850ee1bf2721a521a9642c1d4773206..40fafb178dc423a61fbc4a1f4f4d816a8c1adc23 100644 GIT binary patch delta 3979 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 delta 4034 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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("20211030034925_AddLevelScoreForGroup2")] + partial class AddLevelScoreForGroup2 + { + 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("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("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_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_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/20211030034925_AddLevelScoreForGroup2.cs b/Migrations/20211030034925_AddLevelScoreForGroup2.cs new file mode 100644 index 0000000..6a7b17b --- /dev/null +++ b/Migrations/20211030034925_AddLevelScoreForGroup2.cs @@ -0,0 +1,153 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +namespace tb320eva.Migrations +{ + public partial class AddLevelScoreForGroup2 : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_eva_level_score_detail_eva_level_score_level_score_id", + table: "eva_level_score_detail"); + + migrationBuilder.AlterColumn( + name: "level_score_id", + table: "eva_level_score_detail", + nullable: true, + oldClrType: typeof(Guid)); + + migrationBuilder.AddColumn( + name: "group_guid", + table: "eva_level_score_detail", + nullable: true); + + migrationBuilder.AlterColumn( + name: "behavior", + table: "eva_evaluation_behavior", + maxLength: 16000, + nullable: true, + oldClrType: typeof(string), + oldMaxLength: 1000, + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "achievement", + table: "eva_evaluation_achievement", + maxLength: 16000, + nullable: true, + oldClrType: typeof(string), + oldMaxLength: 8000, + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "properties", + table: "activity_log_eva", + maxLength: 32000, + nullable: true, + oldClrType: typeof(string), + oldMaxLength: 8000, + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "description", + table: "activity_log_eva", + maxLength: 32000, + nullable: true, + oldClrType: typeof(string), + oldMaxLength: 4000, + oldNullable: true); + + migrationBuilder.CreateIndex( + name: "IX_eva_level_score_detail_group_guid", + table: "eva_level_score_detail", + column: "group_guid"); + + migrationBuilder.AddForeignKey( + name: "FK_eva_level_score_detail_eva_evaluation_group_group_guid", + table: "eva_level_score_detail", + column: "group_guid", + principalTable: "eva_evaluation_group", + principalColumn: "id", + onDelete: ReferentialAction.Restrict); + + migrationBuilder.AddForeignKey( + name: "FK_eva_level_score_detail_eva_level_score_level_score_id", + table: "eva_level_score_detail", + column: "level_score_id", + principalTable: "eva_level_score", + principalColumn: "id", + onDelete: ReferentialAction.Restrict); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_eva_level_score_detail_eva_evaluation_group_group_guid", + table: "eva_level_score_detail"); + + migrationBuilder.DropForeignKey( + name: "FK_eva_level_score_detail_eva_level_score_level_score_id", + table: "eva_level_score_detail"); + + migrationBuilder.DropIndex( + name: "IX_eva_level_score_detail_group_guid", + table: "eva_level_score_detail"); + + migrationBuilder.DropColumn( + name: "group_guid", + table: "eva_level_score_detail"); + + migrationBuilder.AlterColumn( + name: "level_score_id", + table: "eva_level_score_detail", + nullable: false, + oldClrType: typeof(Guid), + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "behavior", + table: "eva_evaluation_behavior", + maxLength: 1000, + nullable: true, + oldClrType: typeof(string), + oldMaxLength: 16000, + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "achievement", + table: "eva_evaluation_achievement", + maxLength: 8000, + nullable: true, + oldClrType: typeof(string), + oldMaxLength: 16000, + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "properties", + table: "activity_log_eva", + maxLength: 8000, + nullable: true, + oldClrType: typeof(string), + oldMaxLength: 32000, + oldNullable: true); + + migrationBuilder.AlterColumn( + name: "description", + table: "activity_log_eva", + maxLength: 4000, + nullable: true, + oldClrType: typeof(string), + oldMaxLength: 32000, + oldNullable: true); + + migrationBuilder.AddForeignKey( + name: "FK_eva_level_score_detail_eva_level_score_level_score_id", + table: "eva_level_score_detail", + column: "level_score_id", + principalTable: "eva_level_score", + principalColumn: "id", + onDelete: ReferentialAction.Cascade); + } + } +} diff --git a/Migrations/DataContextModelSnapshot.cs b/Migrations/DataContextModelSnapshot.cs index 0c5b438..b2e3d6a 100644 --- a/Migrations/DataContextModelSnapshot.cs +++ b/Migrations/DataContextModelSnapshot.cs @@ -729,9 +729,11 @@ namespace tb320eva.Migrations b.Property("created"); + b.Property("group_guid"); + b.Property("isActive"); - b.Property("level_score_id"); + b.Property("level_score_id"); b.Property("max_percentage"); @@ -745,6 +747,8 @@ namespace tb320eva.Migrations b.HasKey("id"); + b.HasIndex("group_guid"); + b.HasIndex("level_score_id"); b.ToTable("eva_level_score_detail"); @@ -1106,10 +1110,13 @@ namespace tb320eva.Migrations 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") - .OnDelete(DeleteBehavior.Cascade); + .HasForeignKey("level_score_id"); }); modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b => diff --git a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs index 0067fd3..434890f 100644 --- a/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs +++ b/Models/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02Service.cs @@ -105,22 +105,22 @@ namespace TodoAPI2.Models private void ReloadPostponement(int? adjust_postponement_id) { var rawData = from i in _repository.Context.eva_adjust_postponement_detail - where i.adjust_postponement_id == adjust_postponement_id - select i; + where i.adjust_postponement_id == adjust_postponement_id + select i; var baseScore = from i in _repository.Context.eva_adjust_postponement_detail - join j in _repository.Context.eva_adjust_postponement on i.adjust_postponement_id equals j.id - join k in _repository.Context.eva_create_evaluation on j.create_evaluation_id equals k.id - join m in _repository.Context.eva_create_evaluation_detail on k.id equals m.create_evaluation_id - where i.adjust_postponement_id == adjust_postponement_id - && m.employee_id == i.employee_id - select m; + join j in _repository.Context.eva_adjust_postponement on i.adjust_postponement_id equals j.id + join k in _repository.Context.eva_create_evaluation on j.create_evaluation_id equals k.id + join m in _repository.Context.eva_create_evaluation_detail on k.id equals m.create_evaluation_id + where i.adjust_postponement_id == adjust_postponement_id + && m.employee_id == i.employee_id + select m; - foreach(var x in rawData) + foreach (var x in rawData) { var y = (from i in baseScore - where i.employee_id == x.employee_id - select getData(i)).FirstOrDefault(); + where i.employee_id == x.employee_id + select getData(i)).FirstOrDefault(); x.level_score_final = y.Item2; x.score_final = y.Item1; } @@ -154,7 +154,7 @@ namespace TodoAPI2.Models var item = (from i in level_detail where i.min_value <= score && i.max_value >= score select i).FirstOrDefault(); - if(item != null) + if (item != null) { return (item.min_percentage, item.max_percentage); } @@ -163,8 +163,14 @@ namespace TodoAPI2.Models public List GetListBySearch(eva_adjust_postponement_detail_normal_02SearchModel model) { + var theGroup = (from i in _repository.Context.eva_adjust_postponement + join j in _repository.Context.eva_create_evaluation on i.create_evaluation_id equals j.id + where i.id == model.adjust_postponement_id + select j.evaluation_group_id).FirstOrDefault(); + var level_detail = (from i in _repository.Context.eva_level_score_detail - select i).ToList(); + where i.group_guid == theGroup + select i).ToList(); var all_emp = emp.GetListByemployee_type(null, null); @@ -174,10 +180,10 @@ namespace TodoAPI2.Models into eva_adjust_postponementResult1 from fk_eva_adjust_postponementResult1 in eva_adjust_postponementResult1.DefaultIfEmpty() - //join create_detail in _repository.Context.eva_create_evaluation_detail - // on fk_eva_adjust_postponementResult1.create_evaluation_id equals create_detail.create_evaluation_id - // into create_detailResult - //from fk_create_detailResult in create_detailResult.DefaultIfEmpty() + //join create_detail in _repository.Context.eva_create_evaluation_detail + // on fk_eva_adjust_postponementResult1.create_evaluation_id equals create_detail.create_evaluation_id + // into create_detailResult + //from fk_create_detailResult in create_detailResult.DefaultIfEmpty() join create_data in _repository.Context.eva_create_evaluation on fk_eva_adjust_postponementResult1.create_evaluation_id equals create_data.id diff --git a/Models/eva_level_score_detail/eva_level_score_detailEntity.cs b/Models/eva_level_score_detail/eva_level_score_detailEntity.cs index 12e8345..923c78a 100644 --- a/Models/eva_level_score_detail/eva_level_score_detailEntity.cs +++ b/Models/eva_level_score_detail/eva_level_score_detailEntity.cs @@ -18,7 +18,7 @@ namespace TodoAPI2.Models [ForeignKey("level_score_id")] public eva_level_scoreEntity eva_level_score_level_score_id { get; set; } - public Guid level_score_id { get; set; } + public Guid? level_score_id { get; set; } public decimal? min_value { get; set; } @@ -28,8 +28,10 @@ namespace TodoAPI2.Models public decimal? max_percentage { get; set; } - - public void SetAutoField(DataContext context) + [ForeignKey("group_guid")] + public eva_evaluation_groupEntity eva_evaluation_group_group_guid { get; set; } + public Guid? group_guid { get; set; } + public void SetAutoField(DataContext context) { } diff --git a/Models/eva_level_score_detail/eva_level_score_detailInputModel.cs b/Models/eva_level_score_detail/eva_level_score_detailInputModel.cs index e628bfb..9baace1 100644 --- a/Models/eva_level_score_detail/eva_level_score_detailInputModel.cs +++ b/Models/eva_level_score_detail/eva_level_score_detailInputModel.cs @@ -16,7 +16,7 @@ namespace TodoAPI2.Models public Guid? id { get; set; } - public Guid level_score_id { get; set; } + public Guid? level_score_id { get; set; } public decimal? min_value { get; set; } @@ -26,6 +26,8 @@ namespace TodoAPI2.Models public decimal? max_percentage { get; set; } + public Guid? group_guid { get; set; } + public string active_mode { get; set; } } } diff --git a/Models/eva_level_score_detail/eva_level_score_detailSearchModel.cs b/Models/eva_level_score_detail/eva_level_score_detailSearchModel.cs index d6970b8..50d78be 100644 --- a/Models/eva_level_score_detail/eva_level_score_detailSearchModel.cs +++ b/Models/eva_level_score_detail/eva_level_score_detailSearchModel.cs @@ -16,7 +16,9 @@ namespace TodoAPI2.Models public Guid id { get; set; } - public Guid level_score_id { get; set; } + public Guid? level_score_id { get; set; } + + public Guid? group_guid { get; set; } } } diff --git a/Models/eva_level_score_detail/eva_level_score_detailService.cs b/Models/eva_level_score_detail/eva_level_score_detailService.cs index 6753c86..e400d18 100644 --- a/Models/eva_level_score_detail/eva_level_score_detailService.cs +++ b/Models/eva_level_score_detail/eva_level_score_detailService.cs @@ -20,14 +20,14 @@ namespace TodoAPI2.Models public class eva_level_score_detailService : Ieva_level_score_detailService { private IBaseRepository2 _repository; - private IMyDatabase db; - private Iexternal_linkageService ext; + private IMyDatabase db; + private Iexternal_linkageService ext; public eva_level_score_detailService(IBaseRepository2 repository, IMyDatabase mydb, Iexternal_linkageService inext) { _repository = repository; - db = mydb; - ext = inext; + db = mydb; + ext = inext; } #region Private Functions @@ -47,7 +47,7 @@ namespace TodoAPI2.Models { return Mapper.Map>(entities); } - + #endregion #region Public Functions @@ -76,26 +76,26 @@ namespace TodoAPI2.Models { var entity = _repository.Get(id); var i = Mapper.Map(entity); - + i.item_level_score_id = (from x in _repository.Context.eva_level_score select x).ToList(); return i; } public eva_level_score_detailWithSelectionViewModel GetBlankItem() { var i = new eva_level_score_detailWithSelectionViewModel(); - + i.item_level_score_id = (from x in _repository.Context.eva_level_score select x).ToList(); return i; } public List GetListBylevel_score_id(Guid level_score_id) { - var model = new eva_level_score_detailSearchModel(); + var model = new eva_level_score_detailSearchModel(); model.level_score_id = level_score_id; return GetListBySearch(model); } - public List GetListBySearch(eva_level_score_detailSearchModel model) + public List GetListBySearch(eva_level_score_detailSearchModel model) { var data = ( from m_eva_level_score_detail in _repository.Context.eva_level_score_detail @@ -104,11 +104,14 @@ namespace TodoAPI2.Models into eva_level_scoreResult1 from fk_eva_level_scoreResult1 in eva_level_scoreResult1.DefaultIfEmpty() + join fk_eva_evaluation_group6 in _repository.Context.eva_evaluation_group on m_eva_level_score_detail.group_guid equals fk_eva_evaluation_group6.id + into eva_evaluation_groupResult6 + from fk_eva_evaluation_groupResult6 in eva_evaluation_groupResult6.DefaultIfEmpty() - where - 1 == 1 - && (m_eva_level_score_detail.level_score_id == model.level_score_id) - + where + 1 == 1 + && (!model.level_score_id.HasValue || m_eva_level_score_detail.level_score_id == model.level_score_id) + && (m_eva_level_score_detail.group_guid == model.group_guid) orderby m_eva_level_score_detail.min_value descending select new eva_level_score_detailViewModel() @@ -119,8 +122,10 @@ namespace TodoAPI2.Models max_value = m_eva_level_score_detail.max_value, min_percentage = m_eva_level_score_detail.min_percentage, max_percentage = m_eva_level_score_detail.max_percentage, + group_guid = m_eva_level_score_detail.group_guid, - level_score_id_eva_level_score_code = fk_eva_level_scoreResult1.code, + level_score_id_eva_level_score_code = fk_eva_level_scoreResult1.detail, + group_guid_eva_evaluation_group_code = fk_eva_evaluation_groupResult6.thegroup, isActive = m_eva_level_score_detail.isActive, Created = m_eva_level_score_detail.created, @@ -143,8 +148,8 @@ namespace TodoAPI2.Models entity.id = Guid.NewGuid(); - entity.SetAutoField(_repository.Context); - + entity.SetAutoField(_repository.Context); + if (is_force_save) { var inserted = _repository.Insert(entity); @@ -169,8 +174,9 @@ namespace TodoAPI2.Models existingEntity.max_value = model.max_value; existingEntity.min_percentage = model.min_percentage; existingEntity.max_percentage = model.max_percentage; + existingEntity.group_guid = model.group_guid; - existingEntity.SetAutoField(_repository.Context); + existingEntity.SetAutoField(_repository.Context); if (is_force_save) { @@ -186,25 +192,26 @@ namespace TodoAPI2.Models } } else - throw new NotificationException("No data to update"); + throw new NotificationException("No data to update"); } - public string UpdateMultiple(List model, bool is_force_save) + public string UpdateMultiple(List model, bool is_force_save) { - foreach(var i in model) + foreach (var i in model) { if (i.active_mode == "1" && i.id.HasValue) // update - { + { var existingEntity = _repository.Get(i.id.Value); if (existingEntity != null) { - existingEntity.level_score_id = i.level_score_id; - existingEntity.min_value = i.min_value; - existingEntity.max_value = i.max_value; - existingEntity.min_percentage = i.min_percentage; - existingEntity.max_percentage = i.max_percentage; + existingEntity.level_score_id = i.level_score_id; + existingEntity.min_value = i.min_value; + existingEntity.max_value = i.max_value; + existingEntity.min_percentage = i.min_percentage; + existingEntity.max_percentage = i.max_percentage; + existingEntity.group_guid = i.group_guid; - existingEntity.SetAutoField(_repository.Context); + existingEntity.SetAutoField(_repository.Context); _repository.UpdateWithoutCommit(i.id.Value, existingEntity); } } @@ -212,22 +219,22 @@ namespace TodoAPI2.Models { var entity = GetEntity(i); entity.id = Guid.NewGuid(); - entity.SetAutoField(_repository.Context); + entity.SetAutoField(_repository.Context); _repository.InsertWithoutCommit(entity); } else if (i.active_mode == "0" && i.id.HasValue) // remove - { + { _repository.DeleteWithoutCommit(i.id.Value); } else if (i.active_mode == "0" && !i.id.HasValue) { // nothing to do - } + } } if (is_force_save) { _repository.Context.SaveChanges(); - } + } return model.Count().ToString(); } @@ -251,7 +258,7 @@ namespace TodoAPI2.Models return; } - public void RefreshAutoFieldOfAllData() + public void RefreshAutoFieldOfAllData() { var all_items = from i in _repository.Context.eva_level_score_detail select i; @@ -262,17 +269,18 @@ namespace TodoAPI2.Models _repository.Context.SaveChanges(); } - private Dictionary GetLookupForLog() + private Dictionary GetLookupForLog() { var i = new Dictionary(); - i.Add("level_score_id", "level_score_id"); i.Add("level_score_id_eva_level_score_code", "level_score_id"); i.Add("min_value", "ช่วงคะแนนต่ำสุด"); i.Add("max_value", "ช่วงคะแนนสูงสุด"); i.Add("min_percentage", "ร้อยละที่ได้เลื่อนต่ำสุด"); - i.Add("max_percentage", "ร้อยละที่ได้เลื่อนสูงสุด"); + i.Add("max_percentage", "ร้อยละที่ได้เลื่อนสูงสุด"); + i.Add("group_guid", "กลุ่มการประเมิน"); + i.Add("group_guid_eva_evaluation_group_code", "กลุ่มการประเมิน"); return i; } diff --git a/Models/eva_level_score_detail/eva_level_score_detailViewModel.cs b/Models/eva_level_score_detail/eva_level_score_detailViewModel.cs index 00c6daa..af77b4f 100644 --- a/Models/eva_level_score_detail/eva_level_score_detailViewModel.cs +++ b/Models/eva_level_score_detail/eva_level_score_detailViewModel.cs @@ -14,7 +14,7 @@ namespace TodoAPI2.Models public class eva_level_score_detailViewModel : BaseViewModel2 { - public Guid level_score_id { get; set; } + public Guid? level_score_id { get; set; } public decimal? min_value { get; set; } @@ -24,7 +24,10 @@ namespace TodoAPI2.Models public decimal? max_percentage { get; set; } + public Guid? group_guid { get; set; } + public string level_score_id_eva_level_score_code { get; set; } + public string group_guid_eva_evaluation_group_code { get; set; } } } \ No newline at end of file diff --git a/Models/eva_level_score_detail/eva_level_score_detailWithSelectionViewModel.cs b/Models/eva_level_score_detail/eva_level_score_detailWithSelectionViewModel.cs index ccc6296..0e84c91 100644 --- a/Models/eva_level_score_detail/eva_level_score_detailWithSelectionViewModel.cs +++ b/Models/eva_level_score_detail/eva_level_score_detailWithSelectionViewModel.cs @@ -7,6 +7,6 @@ namespace TodoAPI2.Models { public class eva_level_score_detailWithSelectionViewModel: eva_level_score_detailViewModel { - + public List item_level_score_id { get; set; } } } \ No newline at end of file diff --git a/Views/eva_evaluation_groupView/eva_evaluation_group_d.cshtml b/Views/eva_evaluation_groupView/eva_evaluation_group_d.cshtml index de3de84..002d40a 100644 --- a/Views/eva_evaluation_groupView/eva_evaluation_group_d.cshtml +++ b/Views/eva_evaluation_groupView/eva_evaluation_group_d.cshtml @@ -2,9 +2,67 @@ @inject IConfiguration Configuration @{ ViewData["Title"] = "eva_evaluation_group"; - Layout = "_LayoutDirect"; + Layout = "_LayoutDirect"; } + +
@@ -16,7 +74,7 @@
  • หน้าแรก
  • @Environment.GetEnvironmentVariable("SiteInformation_modulename")
  • กำหนดกลุ่มการประเมิน
    • - +
    @@ -24,12 +82,12 @@
    กำหนดกลุ่มการประเมิน
    -
    +
    กรุณากรอกข้อมูลลงในแบบฟอร์ม
    -
    +
    @@ -57,20 +115,20 @@
    -
    -
    -
    +
    + + -
    -
    - - -
    -
    +
    +
    + + +
    +
    -
    +
    รายชื่อบุคลากร
    @@ -100,19 +158,64 @@
    +
    + + + +
    +
    ตารางกำหนดช่วงร้อยละที่ได้เลื่อน
    +
    +
    + +
    + + +
    + +
    + + +
    + +
    +
    + + + + + + + + + + + + + + + + +
    เครื่องมือ
    +
    + @section FooterPlaceHolder{ + } diff --git a/Views/eva_level_scoreView/eva_level_score_d.cshtml b/Views/eva_level_scoreView/eva_level_score_d.cshtml index b3806fc..38787c1 100644 --- a/Views/eva_level_scoreView/eva_level_score_d.cshtml +++ b/Views/eva_level_scoreView/eva_level_score_d.cshtml @@ -5,59 +5,6 @@ Layout = "_LayoutDirect"; } - -