From 1c01a326b2ba94146d8c5c7fde32bc9d1308a77f Mon Sep 17 00:00:00 2001 From: "LAPTOP-KB8JC2K2\\acer" Date: Tue, 24 Aug 2021 10:41:39 +0700 Subject: [PATCH] =?UTF-8?q?https://app.clickup.com/t/cqr5xv=20=E0=B9=80?= =?UTF-8?q?=E0=B8=A1=E0=B8=99=E0=B8=B9=E0=B8=9A=E0=B8=B1=E0=B8=8D=E0=B8=8A?= =?UTF-8?q?=E0=B8=B5=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94?= =?UTF-8?q?=E0=B8=B7=E0=B8=AD=E0=B8=99=E0=B8=82=E0=B8=B1=E0=B9=89=E0=B8=99?= =?UTF-8?q?=E0=B8=95=E0=B9=88=E0=B8=B3=E0=B8=82=E0=B8=B1=E0=B9=89=E0=B8=99?= =?UTF-8?q?=E0=B8=AA=E0=B8=B9=E0=B8=87=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=9E?= =?UTF-8?q?=E0=B8=99=E0=B8=B1=E0=B8=81=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B9=80?= =?UTF-8?q?=E0=B8=99=E0=B8=95=E0=B8=B4=E0=B8=9A=E0=B8=B1=E0=B8=93=E0=B8=91?= =?UTF-8?q?=E0=B8=B4=E0=B8=95=E0=B8=A2=E0=B8=AA=E0=B8=A0=E0=B8=B2=20-=20?= =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B8=9F=E0=B8=B4?= =?UTF-8?q?=E0=B8=A5=E0=B8=A5=E0=B9=8C=E0=B9=83=E0=B8=99=E0=B8=81=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3=E0=B9=80=E0=B8=81=E0=B9=87=E0=B8=9A=E0=B8=81=E0=B8=A3?= =?UTF-8?q?=E0=B8=AD=E0=B8=9A=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80?= =?UTF-8?q?=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99=E0=B8=AA=E0=B8=B9=E0=B8=87?= =?UTF-8?q?=E0=B8=AA=E0=B8=B8=E0=B8=94(1=20=E0=B8=82=E0=B8=B1=E0=B9=89?= =?UTF-8?q?=E0=B8=99)=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=81=E0=B8=A3?= =?UTF-8?q?=E0=B8=AD=E0=B8=9A=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80?= =?UTF-8?q?=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EXCEL/eva_salary_cylinder.xlsx | Bin 10914 -> 11009 bytes .../20210824033819_UpdateCylindar.Designer.cs | 1077 +++++++++++++++++ Migrations/20210824033819_UpdateCylindar.cs | 22 + Migrations/DataContextModelSnapshot.cs | 2 + .../eva_salary_cylinderEntity.cs | 2 + .../eva_salary_cylinderInputModel.cs | 2 + .../eva_salary_cylinderService.cs | 4 + .../eva_salary_cylinderViewModel.cs | 2 + .../eva_salary_cylinder.cshtml | 18 +- .../eva_salary_cylinder.js | 5 +- 10 files changed, 1127 insertions(+), 7 deletions(-) create mode 100644 Migrations/20210824033819_UpdateCylindar.Designer.cs create mode 100644 Migrations/20210824033819_UpdateCylindar.cs diff --git a/EXCEL/eva_salary_cylinder.xlsx b/EXCEL/eva_salary_cylinder.xlsx index ef60e9c876bafd656bcf39489ceb921a86e2cb3a..a6212201d70c0ae55cff3a88b4864c1e429a375c 100644 GIT binary patch delta 3407 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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("20210824033819_UpdateCylindar")] + partial class UpdateCylindar + { + 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(4000); + + b.Property("ip_address") + .HasMaxLength(191); + + b.Property("log_name") + .HasMaxLength(191); + + b.Property("mac_address") + .HasMaxLength(191); + + b.Property("properties") + .HasMaxLength(8000); + + 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("sarary"); + + b.Property("score_final"); + + b.Property("total_promote"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("adjust_postponement_id"); + + b.HasIndex("adjust_postponement_quota_id"); + + b.ToTable("eva_adjust_postponement_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b => + { + b.Property("id"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("evaluation_group_id"); + + b.Property("isActive"); + + b.Property("performance_plan_id"); + + b.Property("score1"); + + b.Property("score2"); + + b.Property("supervisor1_id"); + + b.Property("supervisor2_id"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("evaluation_group_id"); + + b.HasIndex("performance_plan_id"); + + b.ToTable("eva_create_evaluation"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluation_detailEntity", b => + { + b.Property("id"); + + b.Property("Final_summary_chief"); + + b.Property("Final_summary_competency_chief"); + + b.Property("Final_summary_competency_supervisor"); + + b.Property("Final_summary_competency_supervisor1A"); + + b.Property("Final_summary_competency_supervisor2A"); + + b.Property("Final_summary_supervisor"); + + b.Property("Final_summary_supervisor1A"); + + b.Property("Final_summary_supervisor2A"); + + b.Property("achievement_chief"); + + b.Property("achievement_supervisor"); + + b.Property("achievement_supervisor1A"); + + b.Property("achievement_supervisor2A"); + + b.Property("chief"); + + b.Property("chief_a"); + + b.Property("chief_a_date"); + + b.Property("chief_a_reject_reason") + .HasMaxLength(1000); + + b.Property("chief_a_remark") + .HasMaxLength(1000); + + b.Property("chief_a_result") + .HasMaxLength(1); + + b.Property("competency_chief"); + + b.Property("competency_supervisor"); + + b.Property("competency_supervisor1A"); + + b.Property("competency_supervisor2A"); + + b.Property("create_evaluation_id"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("eva_employee_id"); + + b.Property("help_org_id"); + + b.Property("isActive"); + + b.Property("level_score_chief") + .HasMaxLength(255); + + b.Property("level_score_supervisor") + .HasMaxLength(255); + + b.Property("level_score_supervisor1A") + .HasMaxLength(255); + + b.Property("level_score_supervisor2A") + .HasMaxLength(255); + + b.Property("order_of_data"); + + b.Property("score_chief"); + + b.Property("score_supervisor"); + + b.Property("score_supervisor1A"); + + b.Property("score_supervisor2A"); + + b.Property("status_chief") + .HasMaxLength(1); + + b.Property("status_chief_a") + .HasMaxLength(1); + + b.Property("status_chief_a_click_date"); + + b.Property("status_chief_click_date"); + + b.Property("status_self") + .HasMaxLength(1); + + b.Property("status_self_a") + .HasMaxLength(1); + + b.Property("status_self_a_click_date"); + + b.Property("status_self_click_date"); + + b.Property("status_supervisor") + .HasMaxLength(1); + + b.Property("status_supervisor1A") + .HasMaxLength(1); + + b.Property("status_supervisor1A_click_date"); + + b.Property("status_supervisor2A") + .HasMaxLength(1); + + b.Property("status_supervisor2A_click_date"); + + b.Property("status_supervisor_click_date"); + + b.Property("supervisor1"); + + b.Property("supervisor1A"); + + b.Property("supervisor1A_date"); + + b.Property("supervisor1A_remark") + .HasMaxLength(1000); + + b.Property("supervisor1A_result") + .HasMaxLength(1); + + b.Property("supervisor1_date"); + + b.Property("supervisor1_id"); + + b.Property("supervisor1_remark") + .HasMaxLength(1000); + + b.Property("supervisor1_result") + .HasMaxLength(1); + + b.Property("supervisor2"); + + b.Property("supervisor2A"); + + b.Property("supervisor2A_date"); + + b.Property("supervisor2A_remark") + .HasMaxLength(1000); + + b.Property("supervisor2A_result") + .HasMaxLength(1); + + b.Property("supervisor2_date"); + + b.Property("supervisor2_id"); + + b.Property("supervisor2_remark") + .HasMaxLength(1000); + + b.Property("supervisor2_result") + .HasMaxLength(1); + + b.Property("total_summary_chief"); + + b.Property("total_summary_competency_chief"); + + b.Property("total_summary_competency_supervisor"); + + b.Property("total_summary_competency_supervisor1A"); + + b.Property("total_summary_competency_supervisor2A"); + + b.Property("total_summary_supervisor"); + + b.Property("total_summary_supervisor1A"); + + b.Property("total_summary_supervisor2A"); + + b.Property("updated"); + + b.Property("work_period"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_id"); + + b.ToTable("eva_create_evaluation_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_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("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(8000); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("score"); + + b.Property("score2"); + + b.Property("score3"); + + b.Property("score4"); + + b.Property("sumary"); + + b.Property("sumary2"); + + b.Property("sumary3"); + + b.Property("sumary4"); + + b.Property("target_score1") + .HasMaxLength(255); + + b.Property("target_score2") + .HasMaxLength(255); + + b.Property("target_score3") + .HasMaxLength(255); + + b.Property("target_score4") + .HasMaxLength(255); + + b.Property("target_score5") + .HasMaxLength(255); + + b.Property("thefile") + .HasMaxLength(1000); + + b.Property("updated"); + + b.Property("weight"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_detail_id"); + + b.ToTable("eva_evaluation_achievement"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_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(1000); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("score"); + + b.Property("score2"); + + b.Property("score3"); + + b.Property("score4"); + + b.Property("sumary"); + + b.Property("sumary2"); + + b.Property("sumary3"); + + b.Property("sumary4"); + + b.Property("target_score1") + .HasMaxLength(255); + + b.Property("target_score2") + .HasMaxLength(255); + + b.Property("target_score3") + .HasMaxLength(255); + + b.Property("target_score4") + .HasMaxLength(255); + + b.Property("target_score5") + .HasMaxLength(255); + + b.Property("updated"); + + b.Property("weight"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_detail_id"); + + b.ToTable("eva_evaluation_behavior"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_groupEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("code") + .HasMaxLength(255); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("main_dept_id"); + + b.Property("percentage"); + + b.Property("thegroup") + .HasMaxLength(255); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_evaluation_group"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("evaluation_group_id"); + + b.Property("isActive"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("evaluation_group_id"); + + b.ToTable("eva_evaluation_group_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_operating_agreementEntity", b => + { + b.Property("id"); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("indicators") + .HasMaxLength(4000); + + b.Property("isActive"); + + b.Property("mission_detail") + .HasMaxLength(4000); + + b.Property("mission_no"); + + b.Property("target") + .HasMaxLength(4000); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("create_evaluation_detail_id"); + + b.ToTable("eva_evaluation_operating_agreement"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_idp_planEntity", b => + { + b.Property("id"); + + b.Property("create_evaluation_detail_id"); + + b.Property("created"); + + b.Property("develop") + .HasMaxLength(1000); + + b.Property("development_method") + .HasMaxLength(1000); + + b.Property("end_date"); + + b.Property("isActive"); + + b.Property("period_text") + .HasMaxLength(1000); + + b.Property("start_date"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_idp_plan"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_level_scoreEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("code") + .HasMaxLength(255); + + b.Property("created"); + + b.Property("detail") + .HasMaxLength(1000); + + b.Property("isActive"); + + b.Property("max_score"); + + b.Property("min_score"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_level_score"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_employeeEntity", b => + { + b.Property("id"); + + b.Property("cost_of_living"); + + b.Property("created"); + + b.Property("employee_id"); + + b.Property("frame_group_guid"); + + b.Property("help_org_id"); + + b.Property("isActive"); + + b.Property("level_text") + .HasMaxLength(1000); + + b.Property("monthly_remuneration"); + + b.Property("order_of_data"); + + b.Property("org_id"); + + b.Property("position_allowance"); + + b.Property("position_text") + .HasMaxLength(1000); + + b.Property("salary"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("frame_group_guid"); + + b.ToTable("eva_limit_frame_employee"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_groupEntity", b => + { + b.Property("id"); + + b.Property("created"); + + b.Property("frame_plan_guid"); + + b.Property("group_guid"); + + b.Property("isActive"); + + b.Property("limit_frame_295"); + + b.Property("main_dept_id"); + + b.Property("remark") + .HasMaxLength(4000); + + b.Property("total_salary"); + + b.Property("total_salary_limit"); + + b.Property("total_salary_limit_rounded"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("frame_plan_guid"); + + b.HasIndex("group_guid"); + + b.ToTable("eva_limit_frame_group"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_limit_frame_planEntity", b => + { + b.Property("id"); + + b.Property("created"); + + b.Property("executed_date"); + + b.Property("isActive"); + + b.Property("limit_frame_005"); + + b.Property("limit_frame_005_total"); + + b.Property("limit_frame_005_total_rounded"); + + b.Property("plan_guid"); + + b.Property("salary_adjustment_date"); + + b.Property("status_chief") + .HasMaxLength(1); + + b.Property("status_self") + .HasMaxLength(1); + + b.Property("supervisor1"); + + b.Property("supervisor1_date"); + + b.Property("supervisor1_remark") + .HasMaxLength(1000); + + b.Property("supervisor1_result") + .HasMaxLength(1); + + b.Property("total_salary"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("plan_guid"); + + b.ToTable("eva_limit_frame_plan"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_performance_planEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("created"); + + b.Property("fiscal_year"); + + b.Property("isActive"); + + b.Property("percent"); + + b.Property("theTime"); + + b.Property("updated"); + + b.HasKey("id"); + + b.ToTable("eva_performance_plan"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("created"); + + b.Property("end_date"); + + b.Property("isActive"); + + b.Property("list_no"); + + b.Property("performance_plan_id"); + + b.Property("remark") + .HasMaxLength(1000); + + b.Property("start_date"); + + b.Property("step") + .HasMaxLength(1000); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("performance_plan_id"); + + b.ToTable("eva_performance_plan_detail"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_promoted_percentageEntity", b => + { + b.Property("id") + .ValueGeneratedOnAdd(); + + b.Property("code") + .HasMaxLength(255); + + b.Property("created"); + + b.Property("detail") + .HasMaxLength(1000); + + b.Property("isActive"); + + b.Property("level_score_id"); + + b.Property("max_score"); + + b.Property("min_score"); + + b.Property("promoted_percentage"); + + b.Property("updated"); + + b.HasKey("id"); + + b.HasIndex("level_score_id"); + + b.ToTable("eva_promoted_percentage"); + }); + + modelBuilder.Entity("TodoAPI2.Models.eva_salary_cylinderEntity", b => + { + b.Property("id"); + + b.Property("cost_living"); + + b.Property("created"); + + b.Property("isActive"); + + b.Property("middle"); + + b.Property("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_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_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/20210824033819_UpdateCylindar.cs b/Migrations/20210824033819_UpdateCylindar.cs new file mode 100644 index 0000000..27291a0 --- /dev/null +++ b/Migrations/20210824033819_UpdateCylindar.cs @@ -0,0 +1,22 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +namespace tb320eva.Migrations +{ + public partial class UpdateCylindar : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "salary_max", + table: "eva_salary_cylinder", + nullable: true); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "salary_max", + table: "eva_salary_cylinder"); + } + } +} diff --git a/Migrations/DataContextModelSnapshot.cs b/Migrations/DataContextModelSnapshot.cs index 907deae..a26f068 100644 --- a/Migrations/DataContextModelSnapshot.cs +++ b/Migrations/DataContextModelSnapshot.cs @@ -937,6 +937,8 @@ namespace tb320eva.Migrations b.Property("position_type"); + b.Property("salary_max"); + b.Property("temporary_min"); b.Property("themax"); diff --git a/Models/eva_salary_cylinder/eva_salary_cylinderEntity.cs b/Models/eva_salary_cylinder/eva_salary_cylinderEntity.cs index 3cfdf6c..c019c56 100644 --- a/Models/eva_salary_cylinder/eva_salary_cylinderEntity.cs +++ b/Models/eva_salary_cylinder/eva_salary_cylinderEntity.cs @@ -33,5 +33,7 @@ namespace TodoAPI2.Models public decimal? position_allowance { get; set; } public decimal? monthly_compensation { get; set; } + + public decimal? salary_max { get; set; } } } diff --git a/Models/eva_salary_cylinder/eva_salary_cylinderInputModel.cs b/Models/eva_salary_cylinder/eva_salary_cylinderInputModel.cs index 679d5ab..76e0d67 100644 --- a/Models/eva_salary_cylinder/eva_salary_cylinderInputModel.cs +++ b/Models/eva_salary_cylinder/eva_salary_cylinderInputModel.cs @@ -34,6 +34,8 @@ namespace TodoAPI2.Models public decimal? monthly_compensation { get; set; } + public decimal? salary_max { get; set; } + public string active_mode { get; set; } } } diff --git a/Models/eva_salary_cylinder/eva_salary_cylinderService.cs b/Models/eva_salary_cylinder/eva_salary_cylinderService.cs index 5e17e6c..0facec8 100644 --- a/Models/eva_salary_cylinder/eva_salary_cylinderService.cs +++ b/Models/eva_salary_cylinder/eva_salary_cylinderService.cs @@ -108,6 +108,7 @@ namespace TodoAPI2.Models cost_living = m_eva_salary_cylinder.cost_living, position_allowance = m_eva_salary_cylinder.position_allowance, monthly_compensation = m_eva_salary_cylinder.monthly_compensation, + salary_max = m_eva_salary_cylinder.salary_max, position_type_external_linkage_external_name = fk_external_linkageResult1.external_name, position_level_external_linkage_external_name = fk_external_linkageResult2.external_name, @@ -152,6 +153,7 @@ namespace TodoAPI2.Models cost_living = m_eva_salary_cylinder.cost_living, position_allowance = m_eva_salary_cylinder.position_allowance, monthly_compensation = m_eva_salary_cylinder.monthly_compensation, + salary_max = m_eva_salary_cylinder.salary_max, position_type_external_linkage_external_name = fk_external_linkageResult1.external_name, position_level_external_linkage_external_name = fk_external_linkageResult2.external_name, @@ -212,6 +214,7 @@ namespace TodoAPI2.Models existingEntity.cost_living = model.cost_living; existingEntity.position_allowance = model.position_allowance; existingEntity.monthly_compensation = model.monthly_compensation; + existingEntity.salary_max = model.salary_max; var updated = _repository.Update(id, existingEntity); return Get(updated.id); @@ -238,6 +241,7 @@ namespace TodoAPI2.Models existingEntity.cost_living = i.cost_living; existingEntity.position_allowance = i.position_allowance; existingEntity.monthly_compensation = i.monthly_compensation; + existingEntity.salary_max = i.salary_max; _repository.UpdateWithoutCommit(i.id.Value, existingEntity); } diff --git a/Models/eva_salary_cylinder/eva_salary_cylinderViewModel.cs b/Models/eva_salary_cylinder/eva_salary_cylinderViewModel.cs index 98fd7bf..123849e 100644 --- a/Models/eva_salary_cylinder/eva_salary_cylinderViewModel.cs +++ b/Models/eva_salary_cylinder/eva_salary_cylinderViewModel.cs @@ -32,6 +32,8 @@ namespace TodoAPI2.Models public decimal? monthly_compensation { get; set; } + public decimal? salary_max { get; set; } + public string position_type_external_linkage_external_name { get; set; } public string position_level_external_linkage_external_name { get; set; } diff --git a/Views/eva_salary_cylinderView/eva_salary_cylinder.cshtml b/Views/eva_salary_cylinderView/eva_salary_cylinder.cshtml index 2ae3b25..f3d0e9e 100644 --- a/Views/eva_salary_cylinderView/eva_salary_cylinder.cshtml +++ b/Views/eva_salary_cylinderView/eva_salary_cylinder.cshtml @@ -32,28 +32,28 @@
- +
- +
- +
- +
- +
@@ -66,7 +66,12 @@
- +
+
+ + +
+
@@ -123,6 +128,7 @@ + diff --git a/wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js b/wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js index fa2eba0..8c0178a 100644 --- a/wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js +++ b/wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js @@ -28,6 +28,7 @@ function eva_salary_cylinder_FeedDataToForm(data) { $("#eva_salary_cylinder_cost_living").val(data.cost_living); $("#eva_salary_cylinder_position_allowance").val(data.position_allowance); $("#eva_salary_cylinder_monthly_compensation").val(data.monthly_compensation); + $("#eva_salary_cylinder_salary_max").val(data.salary_max); } function eva_salary_cylinder_GetFromForm() { @@ -42,6 +43,7 @@ function eva_salary_cylinder_GetFromForm() { eva_salary_cylinderObject.cost_living = $("#eva_salary_cylinder_cost_living").val(); eva_salary_cylinderObject.position_allowance = $("#eva_salary_cylinder_position_allowance").val(); eva_salary_cylinderObject.monthly_compensation = $("#eva_salary_cylinder_monthly_compensation").val(); + eva_salary_cylinderObject.salary_max = $("#eva_salary_cylinder_salary_max").val(); return eva_salary_cylinderObject; } @@ -174,7 +176,8 @@ var eva_salary_cylinder_setupTable = function (result) { { "data": "themax" }, { "data": "middle" }, { "data": "position_allowance" }, - { "data": "monthly_compensation" }, + { "data": "monthly_compensation" }, + { "data": "salary_max" }, ], "columnDefs": [ {