diff --git a/EXCEL/eva_evaluation_behavior.xlsx b/EXCEL/eva_evaluation_behavior.xlsx index a52e2df..26255b8 100644 Binary files a/EXCEL/eva_evaluation_behavior.xlsx and b/EXCEL/eva_evaluation_behavior.xlsx differ diff --git a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs index befbb31..6f8c89a 100644 --- a/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs +++ b/Models/eva_create_evaluation_detail/eva_create_evaluation_detailService.cs @@ -317,7 +317,7 @@ namespace TodoAPI2.Models p.id = k1; p.create_evaluation_detail_id = n.id; p.behavior = k.competency_code + " " + k.competency_topic; - p.weight = 0; + p.weight = 20; p.created = DateTime.Now; p.updated = DateTime.Now; p.isActive = true; diff --git a/Models/eva_evaluation_behavior/eva_evaluation_behaviorInputModel.cs b/Models/eva_evaluation_behavior/eva_evaluation_behaviorInputModel.cs index c6fcd87..4908f1a 100644 --- a/Models/eva_evaluation_behavior/eva_evaluation_behaviorInputModel.cs +++ b/Models/eva_evaluation_behavior/eva_evaluation_behaviorInputModel.cs @@ -22,6 +22,16 @@ namespace TodoAPI2.Models public decimal? weight { get; set; } + public string target_score1 { get; set; } + + public string target_score2 { get; set; } + + public string target_score3 { get; set; } + + public string target_score4 { get; set; } + + public string target_score5 { get; set; } + public string active_mode { get; set; } } } diff --git a/Models/eva_evaluation_behavior/eva_evaluation_behaviorService.cs b/Models/eva_evaluation_behavior/eva_evaluation_behaviorService.cs index 2157001..8b7ad43 100644 --- a/Models/eva_evaluation_behavior/eva_evaluation_behaviorService.cs +++ b/Models/eva_evaluation_behavior/eva_evaluation_behaviorService.cs @@ -103,6 +103,11 @@ namespace TodoAPI2.Models create_evaluation_detail_id = m_eva_evaluation_behavior.create_evaluation_detail_id, behavior = m_eva_evaluation_behavior.behavior, weight = m_eva_evaluation_behavior.weight, + target_score1 = m_eva_evaluation_behavior.target_score1, + target_score2 = m_eva_evaluation_behavior.target_score2, + target_score3 = m_eva_evaluation_behavior.target_score3, + target_score4 = m_eva_evaluation_behavior.target_score4, + target_score5 = m_eva_evaluation_behavior.target_score5, create_evaluation_detail_id_eva_create_evaluation_detail_create_evaluation_id = fk_eva_create_evaluation_detailResult1.create_evaluation_id, @@ -193,7 +198,11 @@ namespace TodoAPI2.Models existingEntity.create_evaluation_detail_id = model.create_evaluation_detail_id; existingEntity.behavior = model.behavior; existingEntity.weight = model.weight; - + existingEntity.target_score1 = model.target_score1; + existingEntity.target_score2 = model.target_score2; + existingEntity.target_score3 = model.target_score3; + existingEntity.target_score4 = model.target_score4; + existingEntity.target_score5 = model.target_score5; var updated = _repository.Update(id, existingEntity); return Get(updated.id); @@ -223,7 +232,11 @@ namespace TodoAPI2.Models existingEntity.create_evaluation_detail_id = i.create_evaluation_detail_id; existingEntity.behavior = i.behavior; existingEntity.weight = i.weight; - + existingEntity.target_score1 = i.target_score1; + existingEntity.target_score2 = i.target_score2; + existingEntity.target_score3 = i.target_score3; + existingEntity.target_score4 = i.target_score4; + existingEntity.target_score5 = i.target_score5; _repository.UpdateWithoutCommit(i.id.Value, existingEntity); } diff --git a/Models/eva_evaluation_behavior/eva_evaluation_behaviorViewModel.cs b/Models/eva_evaluation_behavior/eva_evaluation_behaviorViewModel.cs index 22fc203..95b6546 100644 --- a/Models/eva_evaluation_behavior/eva_evaluation_behaviorViewModel.cs +++ b/Models/eva_evaluation_behavior/eva_evaluation_behaviorViewModel.cs @@ -20,6 +20,16 @@ namespace TodoAPI2.Models public decimal? weight { get; set; } + public string target_score1 { get; set; } + + public string target_score2 { get; set; } + + public string target_score3 { get; set; } + + public string target_score4 { get; set; } + + public string target_score5 { get; set; } + public int? create_evaluation_detail_id_eva_create_evaluation_detail_create_evaluation_id { get; set; } } diff --git a/Models/external_linkage/external_linkageService.cs b/Models/external_linkage/external_linkageService.cs index b8a7e21..b999469 100644 --- a/Models/external_linkage/external_linkageService.cs +++ b/Models/external_linkage/external_linkageService.cs @@ -249,7 +249,7 @@ namespace TodoAPI2.Models public List GetDepartmentData() { - var sql = string.Format("select * from public.{0}DepartmentData{0} where department_name != ''; ",'"'.ToString()); + var sql = string.Format("select * from public.{0}DepartmentData{0} where department_name != '' and deleted_at is null; ", '"'.ToString()); var para = db.GetParameterListNpgsql(); DataTable dt = db.ExecuteDataTableNpgsql(sql, para); var result = new List(); diff --git a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml index 142dbd5..3019154 100644 --- a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml +++ b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml @@ -19,7 +19,6 @@
-
@@ -29,11 +28,33 @@
- + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ +
- -
@@ -268,20 +289,12 @@ เครื่องมือ - - - -   -   -

- - - +
diff --git a/wwwroot/js/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2_inline.js b/wwwroot/js/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2_inline.js index 59b1483..a8c33cf 100644 --- a/wwwroot/js/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2_inline.js +++ b/wwwroot/js/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2_inline.js @@ -132,7 +132,7 @@ function Oneva_evaluation_achievement_process2_scoreChange(){ total_achievement_weight += parseFloat(weight); total_achievement_score += parseFloat(score); total_achievement_score_old += parseFloat(score_old); - console.log(score_old); + //console.log(score_old); }); $("#h_eva_evaluation_achievement_process2_weight").text(total_achievement_weight.toFixed(2)); $("#h_eva_evaluation_achievement_process2_score2").text(total_achievement_score.toFixed(2)); @@ -142,7 +142,7 @@ function Oneva_evaluation_achievement_process2_scoreChange(){ $("#eva_create_evaluation_detail_summary2_total_summary_supervisor").text((total_achievement*20).toFixed(2)); $("#eva_create_evaluation_detail_summary2_Final_summary_supervisor").text((total_achievement*20).toFixed(2)); - $("#eva_create_evaluation_detail_summary2_achievement_supervisor").text((total_achievement_score*w1/10).toFixed(2)); + $("#eva_create_evaluation_detail_summary2_achievement_supervisor").text(((total_achievement*20)*w1/100).toFixed(2)); calculationAllItem(); } diff --git a/wwwroot/js/eva_evaluation_behavior/eva_evaluation_behavior.js b/wwwroot/js/eva_evaluation_behavior/eva_evaluation_behavior.js index c8e1038..edcb85b 100644 --- a/wwwroot/js/eva_evaluation_behavior/eva_evaluation_behavior.js +++ b/wwwroot/js/eva_evaluation_behavior/eva_evaluation_behavior.js @@ -22,7 +22,11 @@ $("#eva_evaluation_behavior_id").val(data.id); $("#eva_evaluation_behavior_create_evaluation_detail_id").val(data.create_evaluation_detail_id); $("#eva_evaluation_behavior_behavior").val(data.behavior); $("#eva_evaluation_behavior_weight").val(data.weight); - +$("#eva_evaluation_behavior_target_score1").val(data.target_score1); +$("#eva_evaluation_behavior_target_score2").val(data.target_score2); +$("#eva_evaluation_behavior_target_score3").val(data.target_score3); +$("#eva_evaluation_behavior_target_score4").val(data.target_score4); +$("#eva_evaluation_behavior_target_score5").val(data.target_score5); } function eva_evaluation_behavior_GetFromForm() { @@ -31,7 +35,11 @@ eva_evaluation_behaviorObject.id = $("#eva_evaluation_behavior_id").val(); eva_evaluation_behaviorObject.create_evaluation_detail_id = getUrlParameter("id"); //$("#eva_evaluation_behavior_create_evaluation_detail_id").val(); eva_evaluation_behaviorObject.behavior = $("#eva_evaluation_behavior_behavior").val(); eva_evaluation_behaviorObject.weight = $("#eva_evaluation_behavior_weight").val(); - +eva_evaluation_behaviorObject.target_score1 = $("#eva_evaluation_behavior_target_score1").val(); +eva_evaluation_behaviorObject.target_score2 = $("#eva_evaluation_behavior_target_score2").val(); +eva_evaluation_behaviorObject.target_score3 = $("#eva_evaluation_behavior_target_score3").val(); +eva_evaluation_behaviorObject.target_score4 = $("#eva_evaluation_behavior_target_score4").val(); +eva_evaluation_behaviorObject.target_score5 = $("#eva_evaluation_behavior_target_score5").val(); return eva_evaluation_behaviorObject; } @@ -162,8 +170,7 @@ var eva_evaluation_behavior_setupTable = function (result) { "select": false, "columns": [ { "data": "id" }, - { "data": "behavior" }, - { "data": "weight" }, + { "data": "behavior" } ], "columnDefs": [ { diff --git a/wwwroot/js/eva_evaluation_behavior_process/eva_evaluation_behavior_process_inline.js b/wwwroot/js/eva_evaluation_behavior_process/eva_evaluation_behavior_process_inline.js index 5f8f8ae..1ce41f7 100644 --- a/wwwroot/js/eva_evaluation_behavior_process/eva_evaluation_behavior_process_inline.js +++ b/wwwroot/js/eva_evaluation_behavior_process/eva_evaluation_behavior_process_inline.js @@ -21,11 +21,11 @@ $("#eva_evaluation_behavior_process_behavior_" + i).text(data.behavior); $("#eva_evaluation_behavior_process_weight_" + i).text(data.weight); $("#eva_evaluation_behavior_process_score_" + i).val(data.score); $("#eva_evaluation_behavior_process_sumary_" + i).text(data.sumary); -//$("#eva_evaluation_behavior_process_target_score1_" + i).text(data.target_score1); -//$("#eva_evaluation_behavior_process_target_score2_" + i).text(data.target_score2); -//$("#eva_evaluation_behavior_process_target_score3_" + i).text(data.target_score3); -//$("#eva_evaluation_behavior_process_target_score4_" + i).text(data.target_score4); -//$("#eva_evaluation_behavior_process_target_score5_" + i).text(data.target_score5); +$("#eva_evaluation_behavior_process_target_score1_" + i).text(data.target_score1); +$("#eva_evaluation_behavior_process_target_score2_" + i).text(data.target_score2); +$("#eva_evaluation_behavior_process_target_score3_" + i).text(data.target_score3); +$("#eva_evaluation_behavior_process_target_score4_" + i).text(data.target_score4); +$("#eva_evaluation_behavior_process_target_score5_" + i).text(data.target_score5); } diff --git a/wwwroot/js/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2_inline.js b/wwwroot/js/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2_inline.js index 111204e..14abfb2 100644 --- a/wwwroot/js/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2_inline.js +++ b/wwwroot/js/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2_inline.js @@ -137,7 +137,7 @@ function Oneva_evaluation_behavior_process2_scoreChange(){ $("#eva_create_evaluation_detail_summary2_total_summary_competency_supervisor").text((total_behavior*20).toFixed(2)); $("#eva_create_evaluation_detail_summary2_Final_summary_competency_supervisor").text((total_behavior*20).toFixed(2)); - $("#eva_create_evaluation_detail_summary2_competency_supervisor").text((total_behavior_score*w2/10).toFixed(2)); + $("#eva_create_evaluation_detail_summary2_competency_supervisor").text(((total_behavior*20)*w2/100).toFixed(2)); calculationAllItem(); }