เพิ่มลำดับการกดส่งและตีกลับ ข้อตกลงการประเมิน

This commit is contained in:
Nakorn Rientrakrunchai
2021-02-11 18:21:27 +07:00
parent 682dc2e5ae
commit cb3a43e624
18 changed files with 1755 additions and 63 deletions

View File

@@ -0,0 +1,761 @@
// <auto-generated />
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("25640211101629_AddNextA")]
partial class AddNextA
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
.HasAnnotation("ProductVersion", "2.2.4-servicing-10062")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b =>
{
b.Property<int>("id");
b.Property<string>("command_no")
.HasMaxLength(4000);
b.Property<int?>("create_evaluation_id");
b.Property<DateTime>("created");
b.Property<int?>("fiscal_year");
b.Property<DateTime?>("imported_date");
b.Property<string>("imported_file")
.HasMaxLength(1000);
b.Property<bool>("isActive");
b.Property<decimal?>("limit");
b.Property<decimal?>("limit_frame");
b.Property<decimal?>("limit_frame_quota");
b.Property<decimal?>("limit_quota");
b.Property<int?>("managed_by");
b.Property<decimal?>("percentage");
b.Property<string>("report_type")
.HasMaxLength(1000);
b.Property<DateTime?>("theDate");
b.Property<int?>("theRound");
b.Property<DateTime>("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<int>("id");
b.Property<int?>("adjust_postponement_id");
b.Property<int?>("adjust_postponement_quota_id");
b.Property<decimal?>("cost_living");
b.Property<DateTime>("created");
b.Property<int?>("employee_id");
b.Property<bool>("isActive");
b.Property<string>("level_this_time")
.HasMaxLength(1000);
b.Property<decimal?>("middle");
b.Property<string>("migration_eva_result")
.HasMaxLength(1000);
b.Property<decimal?>("migration_total_score");
b.Property<decimal?>("new_cost_living");
b.Property<decimal?>("new_sarary");
b.Property<decimal?>("new_sarary_with_quota");
b.Property<int?>("order_at_this_time");
b.Property<int?>("org_at_this_time");
b.Property<decimal?>("other_money_at_this_time");
b.Property<decimal?>("position_allowance_at_this_time");
b.Property<string>("position_this_time")
.HasMaxLength(1000);
b.Property<decimal?>("promoted_percentage");
b.Property<decimal?>("receive_quota");
b.Property<string>("remark")
.HasMaxLength(1000);
b.Property<decimal?>("sarary");
b.Property<decimal?>("total_promote");
b.Property<DateTime>("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<int>("id");
b.Property<DateTime>("created");
b.Property<int?>("employee_id");
b.Property<Guid?>("evaluation_group_id");
b.Property<bool>("isActive");
b.Property<Guid?>("performance_plan_id");
b.Property<decimal?>("score1");
b.Property<decimal?>("score2");
b.Property<int?>("supervisor1_id");
b.Property<int?>("supervisor2_id");
b.Property<DateTime>("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<int>("id");
b.Property<decimal?>("Final_summary_chief");
b.Property<decimal?>("Final_summary_competency_chief");
b.Property<decimal?>("Final_summary_competency_supervisor");
b.Property<decimal?>("Final_summary_competency_supervisor1A");
b.Property<decimal?>("Final_summary_competency_supervisor2A");
b.Property<decimal?>("Final_summary_supervisor");
b.Property<decimal?>("Final_summary_supervisor1A");
b.Property<decimal?>("Final_summary_supervisor2A");
b.Property<decimal?>("achievement_chief");
b.Property<decimal?>("achievement_supervisor");
b.Property<decimal?>("achievement_supervisor1A");
b.Property<decimal?>("achievement_supervisor2A");
b.Property<int?>("chief");
b.Property<decimal?>("competency_chief");
b.Property<decimal?>("competency_supervisor");
b.Property<decimal?>("competency_supervisor1A");
b.Property<decimal?>("competency_supervisor2A");
b.Property<int?>("create_evaluation_id");
b.Property<DateTime>("created");
b.Property<int?>("employee_id");
b.Property<bool>("isActive");
b.Property<string>("level_score_chief")
.HasMaxLength(255);
b.Property<string>("level_score_supervisor")
.HasMaxLength(255);
b.Property<string>("level_score_supervisor1A")
.HasMaxLength(255);
b.Property<string>("level_score_supervisor2A")
.HasMaxLength(255);
b.Property<decimal?>("score_chief");
b.Property<decimal?>("score_supervisor");
b.Property<decimal?>("score_supervisor1A");
b.Property<decimal?>("score_supervisor2A");
b.Property<string>("status_chief")
.HasMaxLength(1);
b.Property<DateTime?>("status_chief_a_click_date");
b.Property<DateTime?>("status_chief_click_date");
b.Property<string>("status_self")
.HasMaxLength(1);
b.Property<string>("status_self_a")
.HasMaxLength(1);
b.Property<DateTime?>("status_self_a_click_date");
b.Property<DateTime?>("status_self_click_date");
b.Property<string>("status_supervisor")
.HasMaxLength(1);
b.Property<string>("status_supervisor1A")
.HasMaxLength(1);
b.Property<DateTime?>("status_supervisor1A_click_date");
b.Property<string>("status_supervisor2A")
.HasMaxLength(1);
b.Property<DateTime?>("status_supervisor2A_click_date");
b.Property<DateTime?>("status_supervisor_click_date");
b.Property<int?>("supervisor1");
b.Property<int?>("supervisor1A");
b.Property<DateTime?>("supervisor1A_date");
b.Property<string>("supervisor1A_remark")
.HasMaxLength(1000);
b.Property<string>("supervisor1A_result")
.HasMaxLength(1);
b.Property<DateTime?>("supervisor1_date");
b.Property<string>("supervisor1_remark")
.HasMaxLength(1000);
b.Property<string>("supervisor1_result")
.HasMaxLength(1);
b.Property<int?>("supervisor2");
b.Property<int?>("supervisor2A");
b.Property<DateTime?>("supervisor2A_date");
b.Property<string>("supervisor2A_remark")
.HasMaxLength(1000);
b.Property<string>("supervisor2A_result")
.HasMaxLength(1);
b.Property<DateTime?>("supervisor2_date");
b.Property<string>("supervisor2_remark")
.HasMaxLength(1000);
b.Property<string>("supervisor2_result")
.HasMaxLength(1);
b.Property<decimal?>("total_summary_chief");
b.Property<decimal?>("total_summary_competency_chief");
b.Property<decimal?>("total_summary_competency_supervisor");
b.Property<decimal?>("total_summary_competency_supervisor1A");
b.Property<decimal?>("total_summary_competency_supervisor2A");
b.Property<decimal?>("total_summary_supervisor");
b.Property<decimal?>("total_summary_supervisor1A");
b.Property<decimal?>("total_summary_supervisor2A");
b.Property<DateTime>("updated");
b.HasKey("id");
b.ToTable("eva_create_evaluation_detail");
});
modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b =>
{
b.Property<int>("id");
b.Property<string>("achievement")
.HasMaxLength(1000);
b.Property<int?>("create_evaluation_detail_id");
b.Property<DateTime>("created");
b.Property<bool>("isActive");
b.Property<decimal?>("score");
b.Property<decimal?>("score2");
b.Property<decimal?>("score3");
b.Property<decimal?>("score4");
b.Property<decimal?>("sumary");
b.Property<decimal?>("sumary2");
b.Property<decimal?>("sumary3");
b.Property<decimal?>("sumary4");
b.Property<string>("target_score1")
.HasMaxLength(255);
b.Property<string>("target_score2")
.HasMaxLength(255);
b.Property<string>("target_score3")
.HasMaxLength(255);
b.Property<string>("target_score4")
.HasMaxLength(255);
b.Property<string>("target_score5")
.HasMaxLength(255);
b.Property<string>("thefile")
.HasMaxLength(1000);
b.Property<DateTime>("updated");
b.Property<decimal?>("weight");
b.HasKey("id");
b.HasIndex("create_evaluation_detail_id");
b.ToTable("eva_evaluation_achievement");
});
modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
{
b.Property<int>("id");
b.Property<string>("behavior")
.HasMaxLength(1000);
b.Property<int?>("create_evaluation_detail_id");
b.Property<DateTime>("created");
b.Property<bool>("isActive");
b.Property<decimal?>("score");
b.Property<decimal?>("score2");
b.Property<decimal?>("score3");
b.Property<decimal?>("score4");
b.Property<decimal?>("sumary");
b.Property<decimal?>("sumary2");
b.Property<decimal?>("sumary3");
b.Property<decimal?>("sumary4");
b.Property<string>("target_score1")
.HasMaxLength(255);
b.Property<string>("target_score2")
.HasMaxLength(255);
b.Property<string>("target_score3")
.HasMaxLength(255);
b.Property<string>("target_score4")
.HasMaxLength(255);
b.Property<string>("target_score5")
.HasMaxLength(255);
b.Property<DateTime>("updated");
b.Property<decimal?>("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<Guid>("id")
.ValueGeneratedOnAdd();
b.Property<string>("code")
.HasMaxLength(255);
b.Property<DateTime>("created");
b.Property<bool>("isActive");
b.Property<string>("thegroup")
.HasMaxLength(255);
b.Property<DateTime>("updated");
b.HasKey("id");
b.ToTable("eva_evaluation_group");
});
modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b =>
{
b.Property<Guid>("id")
.ValueGeneratedOnAdd();
b.Property<DateTime>("created");
b.Property<int?>("employee_id");
b.Property<Guid?>("evaluation_group_id");
b.Property<bool>("isActive");
b.Property<DateTime>("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<int>("id");
b.Property<int?>("create_evaluation_detail_id");
b.Property<DateTime>("created");
b.Property<string>("indicators")
.HasMaxLength(4000);
b.Property<bool>("isActive");
b.Property<string>("mission_detail")
.HasMaxLength(4000);
b.Property<int?>("mission_no");
b.Property<string>("target")
.HasMaxLength(4000);
b.Property<DateTime>("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<int>("id");
b.Property<int?>("create_evaluation_detail_id");
b.Property<DateTime>("created");
b.Property<string>("develop")
.HasMaxLength(1000);
b.Property<string>("development_method")
.HasMaxLength(1000);
b.Property<DateTime?>("end_date");
b.Property<bool>("isActive");
b.Property<string>("period_text")
.HasMaxLength(1000);
b.Property<DateTime?>("start_date");
b.Property<DateTime>("updated");
b.HasKey("id");
b.ToTable("eva_idp_plan");
});
modelBuilder.Entity("TodoAPI2.Models.eva_level_scoreEntity", b =>
{
b.Property<Guid>("id")
.ValueGeneratedOnAdd();
b.Property<string>("code")
.HasMaxLength(255);
b.Property<DateTime>("created");
b.Property<string>("detail")
.HasMaxLength(1000);
b.Property<bool>("isActive");
b.Property<decimal?>("max_score");
b.Property<decimal?>("min_score");
b.Property<DateTime>("updated");
b.HasKey("id");
b.ToTable("eva_level_score");
});
modelBuilder.Entity("TodoAPI2.Models.eva_performance_planEntity", b =>
{
b.Property<Guid>("id")
.ValueGeneratedOnAdd();
b.Property<DateTime>("created");
b.Property<int?>("fiscal_year");
b.Property<bool>("isActive");
b.Property<int?>("theTime");
b.Property<DateTime>("updated");
b.HasKey("id");
b.ToTable("eva_performance_plan");
});
modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b =>
{
b.Property<Guid>("id")
.ValueGeneratedOnAdd();
b.Property<DateTime>("created");
b.Property<DateTime?>("end_date");
b.Property<bool>("isActive");
b.Property<int?>("list_no");
b.Property<Guid?>("performance_plan_id");
b.Property<string>("remark")
.HasMaxLength(1000);
b.Property<DateTime?>("start_date");
b.Property<string>("step")
.HasMaxLength(1000);
b.Property<DateTime>("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<Guid>("id")
.ValueGeneratedOnAdd();
b.Property<string>("code")
.HasMaxLength(255);
b.Property<DateTime>("created");
b.Property<string>("detail")
.HasMaxLength(1000);
b.Property<bool>("isActive");
b.Property<Guid?>("level_score_id");
b.Property<decimal?>("max_score");
b.Property<decimal?>("min_score");
b.Property<decimal?>("promoted_percentage");
b.Property<DateTime>("updated");
b.HasKey("id");
b.HasIndex("level_score_id");
b.ToTable("eva_promoted_percentage");
});
modelBuilder.Entity("TodoAPI2.Models.eva_salary_cylinderEntity", b =>
{
b.Property<int>("id");
b.Property<decimal?>("cost_living");
b.Property<DateTime>("created");
b.Property<bool>("isActive");
b.Property<decimal?>("middle");
b.Property<int?>("position_level");
b.Property<int?>("position_type");
b.Property<decimal?>("temporary_min");
b.Property<decimal?>("themax");
b.Property<decimal?>("themin");
b.Property<DateTime>("updated");
b.HasKey("id");
b.ToTable("eva_salary_cylinder");
});
modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b =>
{
b.HasOne("TodoAPI2.Models.eva_create_evaluationEntity", "eva_create_evaluation")
.WithMany()
.HasForeignKey("create_evaluation_id");
});
modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponement_detailEntity", b =>
{
b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement")
.WithMany()
.HasForeignKey("adjust_postponement_id");
b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement_quota")
.WithMany()
.HasForeignKey("adjust_postponement_quota_id")
.HasConstraintName("FK_eva_adjust_postponement_detail_eva_adjust_postponement_adj~1");
});
modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b =>
{
b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group")
.WithMany()
.HasForeignKey("evaluation_group_id");
b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan")
.WithMany()
.HasForeignKey("performance_plan_id");
});
modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b =>
{
b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail")
.WithMany()
.HasForeignKey("create_evaluation_detail_id");
});
modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
{
b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail")
.WithMany()
.HasForeignKey("create_evaluation_detail_id");
});
modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b =>
{
b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group")
.WithMany()
.HasForeignKey("evaluation_group_id");
});
modelBuilder.Entity("TodoAPI2.Models.eva_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_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
}
}
}

View File

@@ -0,0 +1,42 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace tb320eva.Migrations
{
public partial class AddNextA : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<DateTime>(
name: "status_chief_a_click_date",
table: "eva_create_evaluation_detail",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "status_self_a",
table: "eva_create_evaluation_detail",
maxLength: 1,
nullable: true);
migrationBuilder.AddColumn<DateTime>(
name: "status_self_a_click_date",
table: "eva_create_evaluation_detail",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "status_chief_a_click_date",
table: "eva_create_evaluation_detail");
migrationBuilder.DropColumn(
name: "status_self_a",
table: "eva_create_evaluation_detail");
migrationBuilder.DropColumn(
name: "status_self_a_click_date",
table: "eva_create_evaluation_detail");
}
}
}

View File

@@ -0,0 +1,764 @@
// <auto-generated />
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("25640211102515_AddNextA2")]
partial class AddNextA2
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
.HasAnnotation("ProductVersion", "2.2.4-servicing-10062")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b =>
{
b.Property<int>("id");
b.Property<string>("command_no")
.HasMaxLength(4000);
b.Property<int?>("create_evaluation_id");
b.Property<DateTime>("created");
b.Property<int?>("fiscal_year");
b.Property<DateTime?>("imported_date");
b.Property<string>("imported_file")
.HasMaxLength(1000);
b.Property<bool>("isActive");
b.Property<decimal?>("limit");
b.Property<decimal?>("limit_frame");
b.Property<decimal?>("limit_frame_quota");
b.Property<decimal?>("limit_quota");
b.Property<int?>("managed_by");
b.Property<decimal?>("percentage");
b.Property<string>("report_type")
.HasMaxLength(1000);
b.Property<DateTime?>("theDate");
b.Property<int?>("theRound");
b.Property<DateTime>("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<int>("id");
b.Property<int?>("adjust_postponement_id");
b.Property<int?>("adjust_postponement_quota_id");
b.Property<decimal?>("cost_living");
b.Property<DateTime>("created");
b.Property<int?>("employee_id");
b.Property<bool>("isActive");
b.Property<string>("level_this_time")
.HasMaxLength(1000);
b.Property<decimal?>("middle");
b.Property<string>("migration_eva_result")
.HasMaxLength(1000);
b.Property<decimal?>("migration_total_score");
b.Property<decimal?>("new_cost_living");
b.Property<decimal?>("new_sarary");
b.Property<decimal?>("new_sarary_with_quota");
b.Property<int?>("order_at_this_time");
b.Property<int?>("org_at_this_time");
b.Property<decimal?>("other_money_at_this_time");
b.Property<decimal?>("position_allowance_at_this_time");
b.Property<string>("position_this_time")
.HasMaxLength(1000);
b.Property<decimal?>("promoted_percentage");
b.Property<decimal?>("receive_quota");
b.Property<string>("remark")
.HasMaxLength(1000);
b.Property<decimal?>("sarary");
b.Property<decimal?>("total_promote");
b.Property<DateTime>("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<int>("id");
b.Property<DateTime>("created");
b.Property<int?>("employee_id");
b.Property<Guid?>("evaluation_group_id");
b.Property<bool>("isActive");
b.Property<Guid?>("performance_plan_id");
b.Property<decimal?>("score1");
b.Property<decimal?>("score2");
b.Property<int?>("supervisor1_id");
b.Property<int?>("supervisor2_id");
b.Property<DateTime>("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<int>("id");
b.Property<decimal?>("Final_summary_chief");
b.Property<decimal?>("Final_summary_competency_chief");
b.Property<decimal?>("Final_summary_competency_supervisor");
b.Property<decimal?>("Final_summary_competency_supervisor1A");
b.Property<decimal?>("Final_summary_competency_supervisor2A");
b.Property<decimal?>("Final_summary_supervisor");
b.Property<decimal?>("Final_summary_supervisor1A");
b.Property<decimal?>("Final_summary_supervisor2A");
b.Property<decimal?>("achievement_chief");
b.Property<decimal?>("achievement_supervisor");
b.Property<decimal?>("achievement_supervisor1A");
b.Property<decimal?>("achievement_supervisor2A");
b.Property<int?>("chief");
b.Property<decimal?>("competency_chief");
b.Property<decimal?>("competency_supervisor");
b.Property<decimal?>("competency_supervisor1A");
b.Property<decimal?>("competency_supervisor2A");
b.Property<int?>("create_evaluation_id");
b.Property<DateTime>("created");
b.Property<int?>("employee_id");
b.Property<bool>("isActive");
b.Property<string>("level_score_chief")
.HasMaxLength(255);
b.Property<string>("level_score_supervisor")
.HasMaxLength(255);
b.Property<string>("level_score_supervisor1A")
.HasMaxLength(255);
b.Property<string>("level_score_supervisor2A")
.HasMaxLength(255);
b.Property<decimal?>("score_chief");
b.Property<decimal?>("score_supervisor");
b.Property<decimal?>("score_supervisor1A");
b.Property<decimal?>("score_supervisor2A");
b.Property<string>("status_chief")
.HasMaxLength(1);
b.Property<string>("status_chief_a")
.HasMaxLength(1);
b.Property<DateTime?>("status_chief_a_click_date");
b.Property<DateTime?>("status_chief_click_date");
b.Property<string>("status_self")
.HasMaxLength(1);
b.Property<string>("status_self_a")
.HasMaxLength(1);
b.Property<DateTime?>("status_self_a_click_date");
b.Property<DateTime?>("status_self_click_date");
b.Property<string>("status_supervisor")
.HasMaxLength(1);
b.Property<string>("status_supervisor1A")
.HasMaxLength(1);
b.Property<DateTime?>("status_supervisor1A_click_date");
b.Property<string>("status_supervisor2A")
.HasMaxLength(1);
b.Property<DateTime?>("status_supervisor2A_click_date");
b.Property<DateTime?>("status_supervisor_click_date");
b.Property<int?>("supervisor1");
b.Property<int?>("supervisor1A");
b.Property<DateTime?>("supervisor1A_date");
b.Property<string>("supervisor1A_remark")
.HasMaxLength(1000);
b.Property<string>("supervisor1A_result")
.HasMaxLength(1);
b.Property<DateTime?>("supervisor1_date");
b.Property<string>("supervisor1_remark")
.HasMaxLength(1000);
b.Property<string>("supervisor1_result")
.HasMaxLength(1);
b.Property<int?>("supervisor2");
b.Property<int?>("supervisor2A");
b.Property<DateTime?>("supervisor2A_date");
b.Property<string>("supervisor2A_remark")
.HasMaxLength(1000);
b.Property<string>("supervisor2A_result")
.HasMaxLength(1);
b.Property<DateTime?>("supervisor2_date");
b.Property<string>("supervisor2_remark")
.HasMaxLength(1000);
b.Property<string>("supervisor2_result")
.HasMaxLength(1);
b.Property<decimal?>("total_summary_chief");
b.Property<decimal?>("total_summary_competency_chief");
b.Property<decimal?>("total_summary_competency_supervisor");
b.Property<decimal?>("total_summary_competency_supervisor1A");
b.Property<decimal?>("total_summary_competency_supervisor2A");
b.Property<decimal?>("total_summary_supervisor");
b.Property<decimal?>("total_summary_supervisor1A");
b.Property<decimal?>("total_summary_supervisor2A");
b.Property<DateTime>("updated");
b.HasKey("id");
b.ToTable("eva_create_evaluation_detail");
});
modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b =>
{
b.Property<int>("id");
b.Property<string>("achievement")
.HasMaxLength(1000);
b.Property<int?>("create_evaluation_detail_id");
b.Property<DateTime>("created");
b.Property<bool>("isActive");
b.Property<decimal?>("score");
b.Property<decimal?>("score2");
b.Property<decimal?>("score3");
b.Property<decimal?>("score4");
b.Property<decimal?>("sumary");
b.Property<decimal?>("sumary2");
b.Property<decimal?>("sumary3");
b.Property<decimal?>("sumary4");
b.Property<string>("target_score1")
.HasMaxLength(255);
b.Property<string>("target_score2")
.HasMaxLength(255);
b.Property<string>("target_score3")
.HasMaxLength(255);
b.Property<string>("target_score4")
.HasMaxLength(255);
b.Property<string>("target_score5")
.HasMaxLength(255);
b.Property<string>("thefile")
.HasMaxLength(1000);
b.Property<DateTime>("updated");
b.Property<decimal?>("weight");
b.HasKey("id");
b.HasIndex("create_evaluation_detail_id");
b.ToTable("eva_evaluation_achievement");
});
modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
{
b.Property<int>("id");
b.Property<string>("behavior")
.HasMaxLength(1000);
b.Property<int?>("create_evaluation_detail_id");
b.Property<DateTime>("created");
b.Property<bool>("isActive");
b.Property<decimal?>("score");
b.Property<decimal?>("score2");
b.Property<decimal?>("score3");
b.Property<decimal?>("score4");
b.Property<decimal?>("sumary");
b.Property<decimal?>("sumary2");
b.Property<decimal?>("sumary3");
b.Property<decimal?>("sumary4");
b.Property<string>("target_score1")
.HasMaxLength(255);
b.Property<string>("target_score2")
.HasMaxLength(255);
b.Property<string>("target_score3")
.HasMaxLength(255);
b.Property<string>("target_score4")
.HasMaxLength(255);
b.Property<string>("target_score5")
.HasMaxLength(255);
b.Property<DateTime>("updated");
b.Property<decimal?>("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<Guid>("id")
.ValueGeneratedOnAdd();
b.Property<string>("code")
.HasMaxLength(255);
b.Property<DateTime>("created");
b.Property<bool>("isActive");
b.Property<string>("thegroup")
.HasMaxLength(255);
b.Property<DateTime>("updated");
b.HasKey("id");
b.ToTable("eva_evaluation_group");
});
modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b =>
{
b.Property<Guid>("id")
.ValueGeneratedOnAdd();
b.Property<DateTime>("created");
b.Property<int?>("employee_id");
b.Property<Guid?>("evaluation_group_id");
b.Property<bool>("isActive");
b.Property<DateTime>("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<int>("id");
b.Property<int?>("create_evaluation_detail_id");
b.Property<DateTime>("created");
b.Property<string>("indicators")
.HasMaxLength(4000);
b.Property<bool>("isActive");
b.Property<string>("mission_detail")
.HasMaxLength(4000);
b.Property<int?>("mission_no");
b.Property<string>("target")
.HasMaxLength(4000);
b.Property<DateTime>("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<int>("id");
b.Property<int?>("create_evaluation_detail_id");
b.Property<DateTime>("created");
b.Property<string>("develop")
.HasMaxLength(1000);
b.Property<string>("development_method")
.HasMaxLength(1000);
b.Property<DateTime?>("end_date");
b.Property<bool>("isActive");
b.Property<string>("period_text")
.HasMaxLength(1000);
b.Property<DateTime?>("start_date");
b.Property<DateTime>("updated");
b.HasKey("id");
b.ToTable("eva_idp_plan");
});
modelBuilder.Entity("TodoAPI2.Models.eva_level_scoreEntity", b =>
{
b.Property<Guid>("id")
.ValueGeneratedOnAdd();
b.Property<string>("code")
.HasMaxLength(255);
b.Property<DateTime>("created");
b.Property<string>("detail")
.HasMaxLength(1000);
b.Property<bool>("isActive");
b.Property<decimal?>("max_score");
b.Property<decimal?>("min_score");
b.Property<DateTime>("updated");
b.HasKey("id");
b.ToTable("eva_level_score");
});
modelBuilder.Entity("TodoAPI2.Models.eva_performance_planEntity", b =>
{
b.Property<Guid>("id")
.ValueGeneratedOnAdd();
b.Property<DateTime>("created");
b.Property<int?>("fiscal_year");
b.Property<bool>("isActive");
b.Property<int?>("theTime");
b.Property<DateTime>("updated");
b.HasKey("id");
b.ToTable("eva_performance_plan");
});
modelBuilder.Entity("TodoAPI2.Models.eva_performance_plan_detailEntity", b =>
{
b.Property<Guid>("id")
.ValueGeneratedOnAdd();
b.Property<DateTime>("created");
b.Property<DateTime?>("end_date");
b.Property<bool>("isActive");
b.Property<int?>("list_no");
b.Property<Guid?>("performance_plan_id");
b.Property<string>("remark")
.HasMaxLength(1000);
b.Property<DateTime?>("start_date");
b.Property<string>("step")
.HasMaxLength(1000);
b.Property<DateTime>("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<Guid>("id")
.ValueGeneratedOnAdd();
b.Property<string>("code")
.HasMaxLength(255);
b.Property<DateTime>("created");
b.Property<string>("detail")
.HasMaxLength(1000);
b.Property<bool>("isActive");
b.Property<Guid?>("level_score_id");
b.Property<decimal?>("max_score");
b.Property<decimal?>("min_score");
b.Property<decimal?>("promoted_percentage");
b.Property<DateTime>("updated");
b.HasKey("id");
b.HasIndex("level_score_id");
b.ToTable("eva_promoted_percentage");
});
modelBuilder.Entity("TodoAPI2.Models.eva_salary_cylinderEntity", b =>
{
b.Property<int>("id");
b.Property<decimal?>("cost_living");
b.Property<DateTime>("created");
b.Property<bool>("isActive");
b.Property<decimal?>("middle");
b.Property<int?>("position_level");
b.Property<int?>("position_type");
b.Property<decimal?>("temporary_min");
b.Property<decimal?>("themax");
b.Property<decimal?>("themin");
b.Property<DateTime>("updated");
b.HasKey("id");
b.ToTable("eva_salary_cylinder");
});
modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponementEntity", b =>
{
b.HasOne("TodoAPI2.Models.eva_create_evaluationEntity", "eva_create_evaluation")
.WithMany()
.HasForeignKey("create_evaluation_id");
});
modelBuilder.Entity("TodoAPI2.Models.eva_adjust_postponement_detailEntity", b =>
{
b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement")
.WithMany()
.HasForeignKey("adjust_postponement_id");
b.HasOne("TodoAPI2.Models.eva_adjust_postponementEntity", "eva_adjust_postponement_quota")
.WithMany()
.HasForeignKey("adjust_postponement_quota_id")
.HasConstraintName("FK_eva_adjust_postponement_detail_eva_adjust_postponement_adj~1");
});
modelBuilder.Entity("TodoAPI2.Models.eva_create_evaluationEntity", b =>
{
b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group")
.WithMany()
.HasForeignKey("evaluation_group_id");
b.HasOne("TodoAPI2.Models.eva_performance_planEntity", "eva_performance_plan")
.WithMany()
.HasForeignKey("performance_plan_id");
});
modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_achievementEntity", b =>
{
b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail")
.WithMany()
.HasForeignKey("create_evaluation_detail_id");
});
modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_behaviorEntity", b =>
{
b.HasOne("TodoAPI2.Models.eva_create_evaluation_detailEntity", "eva_create_evaluation_detail")
.WithMany()
.HasForeignKey("create_evaluation_detail_id");
});
modelBuilder.Entity("TodoAPI2.Models.eva_evaluation_group_detailEntity", b =>
{
b.HasOne("TodoAPI2.Models.eva_evaluation_groupEntity", "eva_evaluation_group")
.WithMany()
.HasForeignKey("evaluation_group_id");
});
modelBuilder.Entity("TodoAPI2.Models.eva_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_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
}
}
}

View File

@@ -0,0 +1,23 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace tb320eva.Migrations
{
public partial class AddNextA2 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "status_chief_a",
table: "eva_create_evaluation_detail",
maxLength: 1,
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "status_chief_a",
table: "eva_create_evaluation_detail");
}
}
}

View File

@@ -234,11 +234,21 @@ namespace tb320eva.Migrations
b.Property<string>("status_chief") b.Property<string>("status_chief")
.HasMaxLength(1); .HasMaxLength(1);
b.Property<string>("status_chief_a")
.HasMaxLength(1);
b.Property<DateTime?>("status_chief_a_click_date");
b.Property<DateTime?>("status_chief_click_date"); b.Property<DateTime?>("status_chief_click_date");
b.Property<string>("status_self") b.Property<string>("status_self")
.HasMaxLength(1); .HasMaxLength(1);
b.Property<string>("status_self_a")
.HasMaxLength(1);
b.Property<DateTime?>("status_self_a_click_date");
b.Property<DateTime?>("status_self_click_date"); b.Property<DateTime?>("status_self_click_date");
b.Property<string>("status_supervisor") b.Property<string>("status_supervisor")

View File

@@ -74,9 +74,15 @@ namespace TodoAPI2.Models
public DateTime? supervisor2_date { get; set; } public DateTime? supervisor2_date { get; set; }
[MaxLength(1)]
public string status_self_a { get; set; }
[MaxLength(1)] [MaxLength(1)]
public string status_self { get; set; } public string status_self { get; set; }
[MaxLength(1)]
public string status_chief_a { get; set; }
[MaxLength(1)] [MaxLength(1)]
public string status_chief { get; set; } public string status_chief { get; set; }
@@ -116,6 +122,10 @@ namespace TodoAPI2.Models
// existingEntity.status_supervisor2A = model.status_supervisor2A; // existingEntity.status_supervisor2A = model.status_supervisor2A;
public DateTime? status_self_click_date { get; set; } public DateTime? status_self_click_date { get; set; }
public DateTime? status_self_a_click_date { get; set; }
public DateTime? status_chief_a_click_date { get; set; }
public DateTime? status_chief_click_date { get; set; } public DateTime? status_chief_click_date { get; set; }
public DateTime? status_supervisor_click_date { get; set; } public DateTime? status_supervisor_click_date { get; set; }
public DateTime? status_supervisor1A_click_date { get; set; } public DateTime? status_supervisor1A_click_date { get; set; }

View File

@@ -121,11 +121,19 @@ namespace TodoAPI2.Models
search_employee_code = fk_external_employee.employee_no, search_employee_code = fk_external_employee.employee_no,
search_employee_fullname = fk_external_employee.fullname, search_employee_fullname = fk_external_employee.fullname,
status_self = m_eva_create_evaluation_detail_agreement.status_self, status_self = m_eva_create_evaluation_detail_agreement.status_self,
status_self_a = m_eva_create_evaluation_detail_agreement.status_self_a,
status_chief = m_eva_create_evaluation_detail_agreement.status_chief, status_chief = m_eva_create_evaluation_detail_agreement.status_chief,
status_chief_a = m_eva_create_evaluation_detail_agreement.status_chief_a,
status_supervisor = m_eva_create_evaluation_detail_agreement.status_supervisor, status_supervisor = m_eva_create_evaluation_detail_agreement.status_supervisor,
org_id_external_linkage_external_name = fk_external_employee.department_name, org_id_external_linkage_external_name = fk_external_employee.department_name,
status_self_click_date = m_eva_create_evaluation_detail_agreement.status_self_click_date,
status_chief_click_date = m_eva_create_evaluation_detail_agreement.status_chief_click_date,
status_self_a_click_date = m_eva_create_evaluation_detail_agreement.status_self_a_click_date,
status_chief_a_click_date = m_eva_create_evaluation_detail_agreement.status_chief_a_click_date,
status_supervisor_click_date = m_eva_create_evaluation_detail_agreement.status_supervisor_click_date,
remark_hrm_work_record = fk_external_employee.remark_hrm_work_record remark_hrm_work_record = fk_external_employee.remark_hrm_work_record
+ GetWorkTimeText(fk_external_employee.packing_date, endDate), + GetWorkTimeText(fk_external_employee.packing_date, endDate),
@@ -226,13 +234,17 @@ namespace TodoAPI2.Models
search_employee_code = fk_external_employee.employee_no, search_employee_code = fk_external_employee.employee_no,
search_employee_fullname = fk_external_employee.fullname, search_employee_fullname = fk_external_employee.fullname,
status_self = m_eva_create_evaluation_detail_agreement.status_self, status_self = m_eva_create_evaluation_detail_agreement.status_self,
status_self_a = m_eva_create_evaluation_detail_agreement.status_self_a,
status_chief = m_eva_create_evaluation_detail_agreement.status_chief, status_chief = m_eva_create_evaluation_detail_agreement.status_chief,
status_chief_a = m_eva_create_evaluation_detail_agreement.status_chief_a,
status_supervisor = m_eva_create_evaluation_detail_agreement.status_supervisor, status_supervisor = m_eva_create_evaluation_detail_agreement.status_supervisor,
org_id_external_linkage_external_name = fk_external_employee.department_name, org_id_external_linkage_external_name = fk_external_employee.department_name,
status_self_click_date = m_eva_create_evaluation_detail_agreement.status_self_click_date, status_self_click_date = m_eva_create_evaluation_detail_agreement.status_self_click_date,
status_chief_click_date = m_eva_create_evaluation_detail_agreement.status_chief_click_date, status_chief_click_date = m_eva_create_evaluation_detail_agreement.status_chief_click_date,
status_self_a_click_date = m_eva_create_evaluation_detail_agreement.status_self_a_click_date,
status_chief_a_click_date = m_eva_create_evaluation_detail_agreement.status_chief_a_click_date,
status_supervisor_click_date = m_eva_create_evaluation_detail_agreement.status_supervisor_click_date, status_supervisor_click_date = m_eva_create_evaluation_detail_agreement.status_supervisor_click_date,
plan_round_year = checkNull(fk_planResult.theTime) + "/" + checkNull(fk_planResult.fiscal_year), plan_round_year = checkNull(fk_planResult.theTime) + "/" + checkNull(fk_planResult.fiscal_year),

View File

@@ -42,8 +42,12 @@ namespace TodoAPI2.Models
public string org_id_external_linkage_external_name { get; set; } public string org_id_external_linkage_external_name { get; set; }
public string status_self_a { get; set; }
public string status_self { get; set; } public string status_self { get; set; }
public string status_chief_a { get; set; }
public string status_chief { get; set; } public string status_chief { get; set; }
public string status_supervisor { get; set; } public string status_supervisor { get; set; }
@@ -52,7 +56,11 @@ namespace TodoAPI2.Models
public string plan_round_year { get; set; } public string plan_round_year { get; set; }
public DateTime? status_self_a_click_date { get; set; }
public DateTime? status_self_click_date { get; set; } public DateTime? status_self_click_date { get; set; }
public DateTime? status_chief_a_click_date { get; set; }
public DateTime? status_chief_click_date { get; set; } public DateTime? status_chief_click_date { get; set; }
public DateTime? status_supervisor_click_date { get; set; } public DateTime? status_supervisor_click_date { get; set; }
@@ -60,7 +68,12 @@ namespace TodoAPI2.Models
public decimal? score2 { get; set; } public decimal? score2 { get; set; }
public string txt_status_self_a { get { return getStatusText(status_self_a) + MyHelper.GetDateStringForReport(status_self_a_click_date); } }
public string txt_status_self { get { return getStatusText(status_self) + MyHelper.GetDateStringForReport(status_self_click_date); } } public string txt_status_self { get { return getStatusText(status_self) + MyHelper.GetDateStringForReport(status_self_click_date); } }
public string txt_status_chief_a { get { return getStatusText(status_chief_a) + MyHelper.GetDateStringForReport(status_chief_a_click_date); } }
public string txt_status_chief { get { return getStatusText(status_chief) + MyHelper.GetDateStringForReport(status_chief_click_date); } } public string txt_status_chief { get { return getStatusText(status_chief) + MyHelper.GetDateStringForReport(status_chief_click_date); } }
public string txt_status_supervisor { get { return getStatusText(status_supervisor) + MyHelper.GetDateStringForReport(status_supervisor_click_date); } } public string txt_status_supervisor { get { return getStatusText(status_supervisor) + MyHelper.GetDateStringForReport(status_supervisor_click_date); } }

View File

@@ -22,6 +22,10 @@ namespace TodoAPI2.Models
public string status_chief { get; set; } public string status_chief { get; set; }
public string status_self_a { get; set; }
public string status_chief_a { get; set; }
public string status_supervisor { get; set; } public string status_supervisor { get; set; }
public string status_supervisor1A { get; set; } public string status_supervisor1A { get; set; }

View File

@@ -175,6 +175,8 @@ namespace TodoAPI2.Models
existingEntity.create_evaluation_id = model.create_evaluation_id; existingEntity.create_evaluation_id = model.create_evaluation_id;
existingEntity.status_self = model.status_self; existingEntity.status_self = model.status_self;
existingEntity.status_chief = model.status_chief; existingEntity.status_chief = model.status_chief;
existingEntity.status_self_a = model.status_self_a;
existingEntity.status_chief_a = model.status_chief_a;
existingEntity.status_supervisor = model.status_supervisor; existingEntity.status_supervisor = model.status_supervisor;
existingEntity.status_supervisor1A = model.status_supervisor1A; existingEntity.status_supervisor1A = model.status_supervisor1A;
existingEntity.status_supervisor2A = model.status_supervisor2A; existingEntity.status_supervisor2A = model.status_supervisor2A;
@@ -189,7 +191,35 @@ namespace TodoAPI2.Models
string noti_message = "กรุณาตรวจสอบแบบประเมินของ {0}"; string noti_message = "กรุณาตรวจสอบแบบประเมินของ {0}";
string noti_url = "/eva/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2?id=" + existingEntity.id.ToString(); string noti_url = "/eva/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2?id=" + existingEntity.id.ToString();
if (model.status_mode == "next0")
if (model.status_mode == "nextA")
{
existingEntity.status_self_a_click_date = MyHelper.RemoveTimeFromDate(DateTime.Now);
noti_to_employee_id = existingEntity.chief;
noti_message = "กรุณาตรวจสอบ ข้อตกลงการประเมิน ของ {0}";
noti_url = "/eva/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_firstdoc_d?id=" + existingEntity.id.ToString();
}
else if (model.status_mode == "backB")
{
existingEntity.status_chief_a_click_date = MyHelper.RemoveTimeFromDate(DateTime.Now);
existingEntity.status_self_a_click_date = null;
noti_to_employee_id = existingEntity.employee_id;
noti_message = "ข้อตกลงการประเมินของคุณ ({0}) ถูกตีกลับ";
noti_url = "/eva/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_firstdoc_d?id=" + existingEntity.id.ToString();
}
else if (model.status_mode == "nextB")
{
existingEntity.status_chief_a_click_date = MyHelper.RemoveTimeFromDate(DateTime.Now);
if (current_eva.employee_id == existingEntity.chief) // หัวหน้าและผู้ประเมินสูงสุด เป็นคนคนเดียวกัน
{
noti_to_employee_id = current_eva.supervisor1_id;
}
else
{
noti_to_employee_id = current_eva.employee_id;
}
}
else if (model.status_mode == "next0")
{ {
existingEntity.status_self_click_date = MyHelper.RemoveTimeFromDate(DateTime.Now); existingEntity.status_self_click_date = MyHelper.RemoveTimeFromDate(DateTime.Now);
noti_to_employee_id = existingEntity.chief; noti_to_employee_id = existingEntity.chief;
@@ -293,7 +323,7 @@ values('{Guid.NewGuid().ToString()}','App\Notifications\WorkflowNotification','A
List<NpgsqlParameter> para = new List<NpgsqlParameter>(); List<NpgsqlParameter> para = new List<NpgsqlParameter>();
para.Add(data); para.Add(data);
db.ExecuteNonQueryNpgsql(sql, para); //db.ExecuteNonQueryNpgsql(sql, para);
} }
public string UpdateMultiple(List<eva_create_evaluation_detail_statusInputModel> model) public string UpdateMultiple(List<eva_create_evaluation_detail_statusInputModel> model)
@@ -308,6 +338,8 @@ values('{Guid.NewGuid().ToString()}','App\Notifications\WorkflowNotification','A
existingEntity.create_evaluation_id = i.create_evaluation_id; existingEntity.create_evaluation_id = i.create_evaluation_id;
existingEntity.status_self = i.status_self; existingEntity.status_self = i.status_self;
existingEntity.status_chief = i.status_chief; existingEntity.status_chief = i.status_chief;
existingEntity.status_self_a = i.status_self_a;
existingEntity.status_chief_a = i.status_chief_a;
existingEntity.status_supervisor = i.status_supervisor; existingEntity.status_supervisor = i.status_supervisor;
existingEntity.status_supervisor1A = i.status_supervisor1A; existingEntity.status_supervisor1A = i.status_supervisor1A;
existingEntity.status_supervisor2A = i.status_supervisor2A; existingEntity.status_supervisor2A = i.status_supervisor2A;

View File

@@ -20,6 +20,10 @@ namespace TodoAPI2.Models
public string status_chief { get; set; } public string status_chief { get; set; }
public string status_self_a { get; set; }
public string status_chief_a { get; set; }
public string status_supervisor { get; set; } public string status_supervisor { get; set; }
public string status_supervisor1A { get; set; } public string status_supervisor1A { get; set; }

View File

@@ -170,7 +170,7 @@
<input class="form-control" type="hidden" id="s_eva_evaluation_operating_agreement_create_evaluation_detail_id" /> <input class="form-control" type="hidden" id="s_eva_evaluation_operating_agreement_create_evaluation_detail_id" />
<div class="col-md-6"> <div class="col-md-6">
<button class="btn btn-info" onclick="javascript:eva_evaluation_operating_agreement_GoCreate();"><i class="fa fa-plus" style="font-size: 14px;"></i> เพิ่มรายการ</button> <button class="btn btn-info status_self" onclick="javascript:eva_evaluation_operating_agreement_GoCreate();"><i class="fa fa-plus" style="font-size: 14px;"></i> เพิ่มรายการ</button>
<button class="btn btn-info" onclick="javascript:rep_eva_p01_DoSearch('pdf');">พิมพ์แบบข้อตกลง</button> <button class="btn btn-info" onclick="javascript:rep_eva_p01_DoSearch('pdf');">พิมพ์แบบข้อตกลง</button>
</div> </div>
@@ -201,12 +201,16 @@
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_create_evaluation_id" /> <input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_create_evaluation_id" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_self" /> <input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_self" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_chief" /> <input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_chief" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_self_a" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_chief_a" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_supervisor" /> <input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_supervisor" />
<div class="row"> <div class="row">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<button type="button" class="btn btn-submit status_self" onclick="javascript:eva_create_evaluation_detail_status_PutUpdate('next0')">ส่งข้อตกลงการประเมิน</button> <button type="button" class="btn btn-submit status_self" onclick="javascript:eva_create_evaluation_detail_status_PutUpdate('nextA')">ส่งข้อตกลงการประเมิน</button>
<button type="button" class="btn btn-submit status_chief" onclick="javascript:eva_create_evaluation_detail_status_PutUpdate('nextB')">อนุมัติข้อตกลงการประเมิน</button>
<button type="button" class="btn btn-submit status_chief" onclick="javascript:eva_create_evaluation_detail_status_PutUpdate('backB')">ตีกลับ</button>
<button type="button" class="btn btn-submit status_self" onclick="javascript:alert('บันทึกเรียบร้อย')">บันทึก</button> <button type="button" class="btn btn-submit status_self" onclick="javascript:alert('บันทึกเรียบร้อย')">บันทึก</button>
<button type="button" class="btn btn-danger" onclick="javascript:window_close()"><i class="fa fa-repeat"></i> กลับ</button> <button type="button" class="btn btn-danger" onclick="javascript:window_close()"><i class="fa fa-repeat"></i> กลับ</button>
</div> </div>
@@ -222,6 +226,7 @@
<script> <script>
var status_self = ""; var status_self = "";
var status_chief = "";
$(document).ready(function () { $(document).ready(function () {
var id = getUrlParameter("id"); var id = getUrlParameter("id");
@@ -243,28 +248,21 @@
}); });
function CheckPermission() { function CheckPermission() {
if (status_self === "Y") { if (status_self_a === "Y") {
$(".status_self").hide(); $(".status_self").hide();
$("#status").text("คุณส่งแบบประเมินไปแล้ว"); $("#status").text("คุณส่งแบบประเมินไปแล้ว");
} $(".status_chief").show();
}
function OnWeightChanged(c) {
if ($(c).val() < 0) {
$(c).val(0)
}
if ($(c).val() > 100) {
$(c).val(100)
}
}
function CheckWeightBeforeSubmitStatus() {
if (parseInt($("#sum_a").text()) !== 100) {
return false;
} else { } else {
return true; $(".status_chief").hide();
}
if (status_chief_a === "Y") {
$(".status_chief").hide();
$("#status").text("แบบประเมินได้รับการอนุมัติไปแล้ว");
} }
} }
</script> </script>
} }

View File

@@ -335,6 +335,8 @@
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_create_evaluation_id" /> <input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_create_evaluation_id" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_self" /> <input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_self" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_chief" /> <input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_chief" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_self_a" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_chief_a" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_supervisor" /> <input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_supervisor" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_supervisor1A" /> <input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_supervisor1A" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_supervisor2A" /> <input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_supervisor2A" />

View File

@@ -456,6 +456,8 @@
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_create_evaluation_id" /> <input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_create_evaluation_id" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_self" /> <input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_self" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_chief" /> <input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_chief" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_self_a" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_chief_a" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_supervisor" /> <input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_supervisor" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_supervisor1A" /> <input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_supervisor1A" />
<input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_supervisor2A" /> <input class="form-control" type="hidden" id="eva_create_evaluation_detail_status_status_supervisor2A" />

View File

@@ -194,8 +194,8 @@ var eva_create_evaluation_detail_firstdoc_setupTable = function (result) {
{ "data": "employee_position" }, { "data": "employee_position" },
{ "data": "employee_position_level" }, { "data": "employee_position_level" },
{ "data": "org_id_external_linkage_external_name" }, { "data": "org_id_external_linkage_external_name" },
{ "data": "txt_status_self" }, { "data": "txt_status_self_a" },
{ "data": "txt_status_chief" }, { "data": "txt_status_chief_a" },
], ],
"columnDefs": [ "columnDefs": [
@@ -248,4 +248,3 @@ function eva_create_evaluation_detail_firstdoc_GetSelect(f) {
//================= Multi-Selection Function ========================================= //================= Multi-Selection Function =========================================

View File

@@ -21,7 +21,8 @@ function eva_create_evaluation_detail_firstdoc_FeedDataToForm(data) {
$("#remark_hrm_work_record").text(data.remark_hrm_work_record); $("#remark_hrm_work_record").text(data.remark_hrm_work_record);
status_self = data.status_self; status_self_a = data.status_self_a;
status_chief_a = data.status_chief_a;
CheckPermission(); CheckPermission();
console.log(data); console.log(data);
} }
@@ -124,4 +125,7 @@ function eva_create_evaluation_detail_firstdoc_GoDelete(a) {
//================= Multi-Selection Function ========================================= //================= Multi-Selection Function =========================================
function CheckWeightBeforeSubmitStatus() {
return true;
}

View File

@@ -4,25 +4,29 @@ var eva_create_evaluation_detail_status_API = "/api/eva_create_evaluation_detail
//================= Form Data Customizaiton ========================================= //================= Form Data Customizaiton =========================================
function eva_create_evaluation_detail_status_FeedDataToForm(data) { function eva_create_evaluation_detail_status_FeedDataToForm(data) {
$("#eva_create_evaluation_detail_status_id").val(data.id); $("#eva_create_evaluation_detail_status_id").val(data.id);
$("#eva_create_evaluation_detail_status_create_evaluation_id").val(data.create_evaluation_id); $("#eva_create_evaluation_detail_status_create_evaluation_id").val(data.create_evaluation_id);
$("#eva_create_evaluation_detail_status_status_self").val(data.status_self); $("#eva_create_evaluation_detail_status_status_self").val(data.status_self);
$("#eva_create_evaluation_detail_status_status_chief").val(data.status_chief); $("#eva_create_evaluation_detail_status_status_chief").val(data.status_chief);
$("#eva_create_evaluation_detail_status_status_supervisor").val(data.status_supervisor); $("#eva_create_evaluation_detail_status_status_self_a").val(data.status_self_a);
$("#eva_create_evaluation_detail_status_status_supervisor1A").val(data.status_supervisor1A); $("#eva_create_evaluation_detail_status_status_chief_a").val(data.status_chief_a);
$("#eva_create_evaluation_detail_status_status_supervisor2A").val(data.status_supervisor2A); $("#eva_create_evaluation_detail_status_status_supervisor").val(data.status_supervisor);
$("#eva_create_evaluation_detail_status_status_supervisor1A").val(data.status_supervisor1A);
$("#eva_create_evaluation_detail_status_status_supervisor2A").val(data.status_supervisor2A);
} }
function eva_create_evaluation_detail_status_GetFromForm() { function eva_create_evaluation_detail_status_GetFromForm() {
var eva_create_evaluation_detail_statusObject = new Object(); var eva_create_evaluation_detail_statusObject = new Object();
eva_create_evaluation_detail_statusObject.id = $("#eva_create_evaluation_detail_status_id").val(); eva_create_evaluation_detail_statusObject.id = $("#eva_create_evaluation_detail_status_id").val();
eva_create_evaluation_detail_statusObject.create_evaluation_id = $("#eva_create_evaluation_detail_status_create_evaluation_id").val(); eva_create_evaluation_detail_statusObject.create_evaluation_id = $("#eva_create_evaluation_detail_status_create_evaluation_id").val();
eva_create_evaluation_detail_statusObject.status_self = $("#eva_create_evaluation_detail_status_status_self").val(); eva_create_evaluation_detail_statusObject.status_self = $("#eva_create_evaluation_detail_status_status_self").val();
eva_create_evaluation_detail_statusObject.status_chief = $("#eva_create_evaluation_detail_status_status_chief").val(); eva_create_evaluation_detail_statusObject.status_chief = $("#eva_create_evaluation_detail_status_status_chief").val();
eva_create_evaluation_detail_statusObject.status_supervisor = $("#eva_create_evaluation_detail_status_status_supervisor").val(); eva_create_evaluation_detail_statusObject.status_self_a = $("#eva_create_evaluation_detail_status_status_self_a").val();
eva_create_evaluation_detail_statusObject.status_supervisor1A = $("#eva_create_evaluation_detail_status_status_supervisor1A").val(); eva_create_evaluation_detail_statusObject.status_chief_a = $("#eva_create_evaluation_detail_status_status_chief_a").val();
eva_create_evaluation_detail_statusObject.status_supervisor2A = $("#eva_create_evaluation_detail_status_status_supervisor2A").val(); eva_create_evaluation_detail_statusObject.status_supervisor = $("#eva_create_evaluation_detail_status_status_supervisor").val();
eva_create_evaluation_detail_statusObject.status_supervisor1A = $("#eva_create_evaluation_detail_status_status_supervisor1A").val();
eva_create_evaluation_detail_statusObject.status_supervisor2A = $("#eva_create_evaluation_detail_status_status_supervisor2A").val();
return eva_create_evaluation_detail_statusObject; return eva_create_evaluation_detail_statusObject;
@@ -31,9 +35,9 @@ eva_create_evaluation_detail_statusObject.status_supervisor2A = $("#eva_create_e
function eva_create_evaluation_detail_status_InitialForm() { function eva_create_evaluation_detail_status_InitialForm() {
var successFunc = function (result) { var successFunc = function (result) {
eva_create_evaluation_detail_status_FeedDataToForm(result); eva_create_evaluation_detail_status_FeedDataToForm(result);
endLoad(); endLoad();
}; };
startLoad(); startLoad();
AjaxGetRequest(apisite + eva_create_evaluation_detail_status_API + "GetBlankItem", successFunc, AlertDanger); AjaxGetRequest(apisite + eva_create_evaluation_detail_status_API + "GetBlankItem", successFunc, AlertDanger);
} }
@@ -43,15 +47,15 @@ function eva_create_evaluation_detail_status_SetEditForm(a) {
var successFunc = function (result) { var successFunc = function (result) {
eva_create_evaluation_detail_status_editMode = "UPDATE"; eva_create_evaluation_detail_status_editMode = "UPDATE";
eva_create_evaluation_detail_status_FeedDataToForm(result); eva_create_evaluation_detail_status_FeedDataToForm(result);
endLoad(); endLoad();
}; };
startLoad(); startLoad();
AjaxGetRequest(apisite + eva_create_evaluation_detail_status_API + a, successFunc, AlertDanger); AjaxGetRequest(apisite + eva_create_evaluation_detail_status_API + a, successFunc, AlertDanger);
} }
function eva_create_evaluation_detail_status_SetCreateForm() { function eva_create_evaluation_detail_status_SetCreateForm() {
eva_create_evaluation_detail_status_editMode = "CREATE"; eva_create_evaluation_detail_status_editMode = "CREATE";
eva_create_evaluation_detail_status_InitialForm(); eva_create_evaluation_detail_status_InitialForm();
} }
//================= Update and Delete ========================================= //================= Update and Delete =========================================
@@ -61,12 +65,11 @@ var eva_create_evaluation_detail_status_customValidation = function (group) {
}; };
function eva_create_evaluation_detail_status_PutUpdate(a) { function eva_create_evaluation_detail_status_PutUpdate(a) {
if (!ValidateForm('eva_create_evaluation_detail_status', eva_create_evaluation_detail_status_customValidation)) if (!ValidateForm('eva_create_evaluation_detail_status', eva_create_evaluation_detail_status_customValidation)) {
{
return; return;
} }
if(CheckWeightBeforeSubmitStatus() === false){ if (CheckWeightBeforeSubmitStatus() === false) {
alert("น้ำหนักแต่ละส่วน ต้องมีค่า 100 จึงจะส่งแบบประเมินได้"); alert("น้ำหนักแต่ละส่วน ต้องมีค่า 100 จึงจะส่งแบบประเมินได้");
return; return;
} }
@@ -74,35 +77,44 @@ function eva_create_evaluation_detail_status_PutUpdate(a) {
var data = eva_create_evaluation_detail_status_GetFromForm(); var data = eva_create_evaluation_detail_status_GetFromForm();
data.status_mode = a; data.status_mode = a;
if (a === "nextA") {
if(a == "next0"){ data.status_self_a = "Y";
}
else if (a === "backB") {
data.status_chief_a = "N";
data.status_self_a = "";
}
else if (a === "nextB") {
data.status_chief_a = "Y";
}
else if (a === "next0") {
data.status_self = "Y"; data.status_self = "Y";
} }
else if(a == "next1"){ else if (a === "next1") {
data.status_chief = "Y"; data.status_chief = "Y";
} }
else if(a == "back1"){ else if (a === "back1") {
data.status_chief = "N"; data.status_chief = "N";
data.status_self = ""; data.status_self = "";
} }
else if(a == "next2"){ else if (a === "next2") {
data.status_supervisor = "Y"; data.status_supervisor = "Y";
} }
else if(a == "back2"){ else if (a === "back2") {
data.status_supervisor = "N"; data.status_supervisor = "N";
data.status_chief = ""; data.status_chief = "";
} }
else if(a == "next3"){ else if (a === "next3") {
data.status_supervisor1A = "Y"; data.status_supervisor1A = "Y";
} }
else if(a == "back3"){ else if (a === "back3") {
data.status_supervisor = ""; data.status_supervisor = "";
data.status_supervisor1A = "N"; data.status_supervisor1A = "N";
} }
else if(a == "next4"){ else if (a === "next4") {
data.status_supervisor2A = "Y"; data.status_supervisor2A = "Y";
} }
else if(a == "back4"){ else if (a === "back4") {
data.status_supervisor1A = ""; data.status_supervisor1A = "";
data.status_supervisor2A = "N"; data.status_supervisor2A = "N";
} }
@@ -110,9 +122,9 @@ function eva_create_evaluation_detail_status_PutUpdate(a) {
var successFunc1 = function (result) { var successFunc1 = function (result) {
AlertSuccess(result.message); AlertSuccess(result.message);
window.location.reload(); window.location.reload();
endLoad(); endLoad();
}; };
startLoad(); startLoad();
AjaxPutRequest(apisite + eva_create_evaluation_detail_status_API + data.id, data, successFunc1, AlertDanger); AjaxPutRequest(apisite + eva_create_evaluation_detail_status_API + data.id, data, successFunc1, AlertDanger);
} }
@@ -121,9 +133,9 @@ function eva_create_evaluation_detail_status_GoDelete(a) {
var successFunc = function (result) { var successFunc = function (result) {
AlertSuccess(result.message); AlertSuccess(result.message);
eva_create_evaluation_detail_status_RefreshTable(); eva_create_evaluation_detail_status_RefreshTable();
endLoad(); endLoad();
}; };
startLoad(); startLoad();
AjaxDeleteRequest(apisite + eva_create_evaluation_detail_status_API + a, null, successFunc, AlertDanger); AjaxDeleteRequest(apisite + eva_create_evaluation_detail_status_API + a, null, successFunc, AlertDanger);
} }
} }

View File

@@ -172,7 +172,7 @@ var eva_evaluation_operating_agreement_setupTable = function (result) {
"targets": 0, //1, "targets": 0, //1,
"data": "id", "data": "id",
"render": function (data, type, row, meta) { "render": function (data, type, row, meta) {
return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_evaluation_operating_agreement_GoEdit(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button> <button type='button' class='btn btn-danger btn-sm' onclick='javascript:eva_evaluation_operating_agreement_GoDelete(" + tmp + data + tmp + ")'><i class='fa fa-trash-o '></i></button> "; return "<button type='button' class='btn btn-warning btn-sm status_self' onclick='javascript:eva_evaluation_operating_agreement_GoEdit(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button> <button type='button' class='btn btn-danger btn-sm status_self' onclick='javascript:eva_evaluation_operating_agreement_GoDelete(" + tmp + data + tmp + ")'><i class='fa fa-trash-o '></i></button> ";
} }
}, },
//{ //{