thamming_dev01/hrm_eva
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

แก้บักระบบ โดยต้น นคร

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-04-06 16:40:05 +07:00
parent 39c11f277a
commit b3c7cd12d8
11 changed files with 82 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wwwroot/js/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2_inline.js
View File

@@ -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();
}

15
wwwroot/js/eva_evaluation_behavior/eva_evaluation_behavior.js
View File

@@ -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": [
{

10
wwwroot/js/eva_evaluation_behavior_process/eva_evaluation_behavior_process_inline.js
View File

@@ -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);
}

2
wwwroot/js/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2_inline.js
View File

@@ -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();
}