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

Merge branch 'develop'

Browse Source
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-04-01 11:26:40 +07:00
parent d94900a29b 0160b2f8f8
commit 965e7b14b8
5 changed files with 136 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js
View File

@@ -25,6 +25,11 @@
} }
function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankItem) { function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankItem) {
var digits_position = 3;
data.achievement = Number(data.achievement).toFixed(digits_position);
data.competency = Number(data.competency).toFixed(digits_position);
data.total_score = Number(data.total_score).toFixed(digits_position);
$("#eva_adjust_postponement_detail_normal_02_id_" + i).val(data.id); $("#eva_adjust_postponement_detail_normal_02_id_" + i).val(data.id);
$("#eva_adjust_postponement_detail_normal_02_adjust_postponement_id_" + i).val(data.adjust_postponement_id); $("#eva_adjust_postponement_detail_normal_02_adjust_postponement_id_" + i).val(data.adjust_postponement_id);
$("#eva_adjust_postponement_detail_normal_02_employee_id_" + i).val(data.employee_id); $("#eva_adjust_postponement_detail_normal_02_employee_id_" + i).val(data.employee_id);

7
wwwroot/js/eva_evaluation_achievement_process/eva_evaluation_achievement_process_inline.js
View File

@@ -16,12 +16,15 @@
function eva_evaluation_achievement_process_FeedDataToForm(data, i, blankItem) { function eva_evaluation_achievement_process_FeedDataToForm(data, i, blankItem) {
// console.log(data); // console.log(data);
data.score = Number(data.score).toFixed(3);
data.sumary = Number(data.sumary).toFixed(3);
$("#eva_evaluation_achievement_process_id_" + i).val(data.id); $("#eva_evaluation_achievement_process_id_" + i).val(data.id);
$("#eva_evaluation_achievement_process_create_evaluation_detail_id_" + i).val(data.create_evaluation_detail_id); $("#eva_evaluation_achievement_process_create_evaluation_detail_id_" + i).val(data.create_evaluation_detail_id);
$("#eva_evaluation_achievement_process_achievement_" + i).text(data.achievement); $("#eva_evaluation_achievement_process_achievement_" + i).text(data.achievement);
$("#eva_evaluation_achievement_process_weight_" + i).text(data.weight); $("#eva_evaluation_achievement_process_weight_" + i).text(data.weight);
$("#eva_evaluation_achievement_process_score_" + i).val(data.score.toFixed(3)); $("#eva_evaluation_achievement_process_score_" + i).val(data.score);
$("#eva_evaluation_achievement_process_sumary_" + i).text(data.sumary.toFixed(3)); $("#eva_evaluation_achievement_process_sumary_" + i).text(data.sumary);
//$("#eva_evaluation_achievement_process_target_score1_" + i).val(data.target_score1); //$("#eva_evaluation_achievement_process_target_score1_" + i).val(data.target_score1);
//$("#eva_evaluation_achievement_process_target_score2_" + i).val(data.target_score2); //$("#eva_evaluation_achievement_process_target_score2_" + i).val(data.target_score2);
//$("#eva_evaluation_achievement_process_target_score3_" + i).val(data.target_score3); //$("#eva_evaluation_achievement_process_target_score3_" + i).val(data.target_score3);

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

@@ -22,23 +22,35 @@ function eva_evaluation_achievement_process2_FeedDataToForm(data, i, blankItem,
$("#eva_evaluation_achievement_process2_achievement_" + i).text(data.achievement); $("#eva_evaluation_achievement_process2_achievement_" + i).text(data.achievement);
$("#eva_evaluation_achievement_process2_weight_" + i).text(data.weight); $("#eva_evaluation_achievement_process2_weight_" + i).text(data.weight);
data.score = Number(data.score).toFixed(3);
data.sumary = Number(data.sumary).toFixed(3);
data.score2 = Number(data.score2).toFixed(3);
data.sumary2 = Number(data.sumary2).toFixed(3);
data.score3 = Number(data.score3).toFixed(3);
data.sumary3 = Number(data.sumary3).toFixed(3);
data.score4 = Number(data.score4).toFixed(3);
data.sumary4 = Number(data.sumary4).toFixed(3);
// console.log(data); // console.log(data);
if (role_code === "2") { if (role_code === "2") {
$("#eva_evaluation_achievement_process2_score_" + i).text(data.score.toFixed(3)); $("#eva_evaluation_achievement_process2_score_" + i).text(data.score);
$("#eva_evaluation_achievement_process2_sumary_" + i).text(data.sumary.toFixed(3)); $("#eva_evaluation_achievement_process2_sumary_" + i).text(data.sumary);
$("#eva_evaluation_achievement_process2_score2_" + i).val(data.score2.toFixed(3)); $("#eva_evaluation_achievement_process2_score2_" + i).val(data.score2);
$("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary2.toFixed(3)); $("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary2);
} else if (role_code === "3") { } else if (role_code === "3") {
$("#eva_evaluation_achievement_process2_score_" + i).text(data.score2.toFixed(3)); $("#eva_evaluation_achievement_process2_score_" + i).text(data.score2);
$("#eva_evaluation_achievement_process2_sumary_" + i).text(data.sumary2.toFixed(3)); $("#eva_evaluation_achievement_process2_sumary_" + i).text(data.sumary2);
$("#eva_evaluation_achievement_process2_score2_" + i).val(data.score3.toFixed(3)); $("#eva_evaluation_achievement_process2_score2_" + i).val(data.score3);
$("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary3.toFixed(3)); $("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary3);
} else if (role_code === "4") { } else if (role_code === "4") {
$("#eva_evaluation_achievement_process2_score_" + i).text(data.score3.toFixed(3)); $("#eva_evaluation_achievement_process2_score_" + i).text(data.score3);
$("#eva_evaluation_achievement_process2_sumary_" + i).text(data.sumary3.toFixed(3)); $("#eva_evaluation_achievement_process2_sumary_" + i).text(data.sumary3);
$("#eva_evaluation_achievement_process2_score2_" + i).val(data.score4.toFixed(3)); $("#eva_evaluation_achievement_process2_score2_" + i).val(data.score4);
$("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary4.toFixed(3)); $("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary4);
} }
//$("#eva_evaluation_achievement_process2_target_score1_" + i).val(data.target_score1); //$("#eva_evaluation_achievement_process2_target_score1_" + i).val(data.target_score1);

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

@@ -15,12 +15,16 @@
} }
function eva_evaluation_behavior_process_FeedDataToForm(data, i, blankItem) { function eva_evaluation_behavior_process_FeedDataToForm(data, i, blankItem) {
// console.log(data);
data.score = Number(data.score).toFixed(3);
data.sumary = Number(data.sumary).toFixed(3);
$("#eva_evaluation_behavior_process_id_" + i).val(data.id); $("#eva_evaluation_behavior_process_id_" + i).val(data.id);
$("#eva_evaluation_behavior_process_create_evaluation_detail_id_" + i).val(data.create_evaluation_detail_id); $("#eva_evaluation_behavior_process_create_evaluation_detail_id_" + i).val(data.create_evaluation_detail_id);
$("#eva_evaluation_behavior_process_behavior_" + i).text(data.behavior); $("#eva_evaluation_behavior_process_behavior_" + i).text(data.behavior);
$("#eva_evaluation_behavior_process_weight_" + i).text(data.weight); $("#eva_evaluation_behavior_process_weight_" + i).text(data.weight);
$("#eva_evaluation_behavior_process_score_" + i).val(data.score.toFixed(3)); $("#eva_evaluation_behavior_process_score_" + i).val(data.score);
$("#eva_evaluation_behavior_process_sumary_" + i).text(data.sumary.toFixed(3)); $("#eva_evaluation_behavior_process_sumary_" + i).text(data.sumary);
//$("#eva_evaluation_behavior_process_target_score1_" + i).val(data.target_score1); //$("#eva_evaluation_behavior_process_target_score1_" + i).val(data.target_score1);
//$("#eva_evaluation_behavior_process_target_score2_" + i).val(data.target_score2); //$("#eva_evaluation_behavior_process_target_score2_" + i).val(data.target_score2);
//$("#eva_evaluation_behavior_process_target_score3_" + i).val(data.target_score3); //$("#eva_evaluation_behavior_process_target_score3_" + i).val(data.target_score3);

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

@@ -20,23 +20,35 @@ function eva_evaluation_behavior_process2_FeedDataToForm(data, i, blankItem, rol
$("#eva_evaluation_behavior_process2_behavior_" + i).text(data.behavior); $("#eva_evaluation_behavior_process2_behavior_" + i).text(data.behavior);
$("#eva_evaluation_behavior_process2_weight_" + i).val(data.weight); $("#eva_evaluation_behavior_process2_weight_" + i).val(data.weight);
data.score = Number(data.score).toFixed(3);
data.sumary = Number(data.sumary).toFixed(3);
data.score2 = Number(data.score2).toFixed(3);
data.sumary2 = Number(data.sumary2).toFixed(3);
data.score3 = Number(data.score3).toFixed(3);
data.sumary3 = Number(data.sumary3).toFixed(3);
data.score4 = Number(data.score4).toFixed(3);
data.sumary4 = Number(data.sumary4).toFixed(3);
// console.log("data", data);
if (role_code === "2") { if (role_code === "2") {
$("#eva_evaluation_behavior_process2_score_" + i).text(data.score.toFixed(3)); $("#eva_evaluation_behavior_process2_score_" + i).text(data.score);
$("#eva_evaluation_behavior_process2_sumary_" + i).text(data.sumary.toFixed(3)); $("#eva_evaluation_behavior_process2_sumary_" + i).text(data.sumary);
$("#eva_evaluation_behavior_process2_score2_" + i).val(data.score2.toFixed(3)); $("#eva_evaluation_behavior_process2_score2_" + i).val(data.score2);
$("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary2.toFixed(3)); $("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary2);
} } else if (role_code === "3") {
else if(role_code === "3"){ $("#eva_evaluation_behavior_process2_score_" + i).text(data.score2);
$("#eva_evaluation_behavior_process2_score_" + i).text(data.score2.toFixed(3)); $("#eva_evaluation_behavior_process2_sumary_" + i).text(data.sumary2);
$("#eva_evaluation_behavior_process2_sumary_" + i).text(data.sumary2.toFixed(3)); $("#eva_evaluation_behavior_process2_score2_" + i).val(data.score3);
$("#eva_evaluation_behavior_process2_score2_" + i).val(data.score3.toFixed(3)); $("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary3);
$("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary3.toFixed(3)); } else if (role_code === "4") {
} $("#eva_evaluation_behavior_process2_score_" + i).text(data.score3);
else if(role_code === "4"){ $("#eva_evaluation_behavior_process2_sumary_" + i).text(data.sumary3);
$("#eva_evaluation_behavior_process2_score_" + i).text(data.score3.toFixed(3)); $("#eva_evaluation_behavior_process2_score2_" + i).val(data.score4);
$("#eva_evaluation_behavior_process2_sumary_" + i).text(data.sumary3.toFixed(3)); $("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary4);
$("#eva_evaluation_behavior_process2_score2_" + i).val(data.score4.toFixed(3));
$("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary4.toFixed(3));
} }
//$("#eva_evaluation_behavior_process2_target_score1_" + i).val(data.target_score1); //$("#eva_evaluation_behavior_process2_target_score1_" + i).val(data.target_score1);