From 67a4c35f8e7e225019ef6e247fe94525acdf3c75 Mon Sep 17 00:00:00 2001 From: nakorn Date: Sun, 21 Nov 2021 21:47:22 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B8=E0=B8=87=E0=B8=81=E0=B8=B2=E0=B8=A3=20defaul?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._evaluation_achievement_process2_inline.js | 30 ++++++++++++++++--- ...eva_evaluation_behavior_process2_inline.js | 27 +++++++++++++++-- 2 files changed, 50 insertions(+), 7 deletions(-) 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 a462451..a54c636 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 @@ -34,23 +34,45 @@ function eva_evaluation_achievement_process2_FeedDataToForm(data, i, blankItem, data.score4 = Number(data.score4).toFixed(3); data.sumary4 = Number(data.sumary4).toFixed(3); - // console.log(data); + //console.log(role_code); + //console.log(data); if (role_code === "2") { $("#eva_evaluation_achievement_process2_score_" + i).text(data.score); $("#eva_evaluation_achievement_process2_sumary_" + i).text(data.sumary); - $("#eva_evaluation_achievement_process2_score2_" + i).val(data.score2); + if (data.score2 === "0.000") { + $("#eva_evaluation_achievement_process2_score2_" + i).val(data.score); + } else { + $("#eva_evaluation_achievement_process2_score2_" + i).val(data.score2); + } $("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary2); } else if (role_code === "3") { $("#eva_evaluation_achievement_process2_score_" + i).text(data.score2); $("#eva_evaluation_achievement_process2_sumary_" + i).text(data.sumary2); - $("#eva_evaluation_achievement_process2_score2_" + i).val(data.score3); + if (data.score3 === "0.000") { + $("#eva_evaluation_achievement_process2_score2_" + i).val(data.score2); + } else { + $("#eva_evaluation_achievement_process2_score2_" + i).val(data.score3); + } $("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary3); } else if (role_code === "4") { $("#eva_evaluation_achievement_process2_score_" + i).text(data.score3); $("#eva_evaluation_achievement_process2_sumary_" + i).text(data.sumary3); - $("#eva_evaluation_achievement_process2_score2_" + i).val(data.score4); + if (data.score4 === "0.000") { + $("#eva_evaluation_achievement_process2_score2_" + i).val(data.score3); + } else { + $("#eva_evaluation_achievement_process2_score2_" + i).val(data.score4); + } $("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary4); + } else if (role_code === "5") { + $("#eva_evaluation_achievement_process2_score_" + i).text(data.score4); + $("#eva_evaluation_achievement_process2_sumary_" + i).text(data.sumary4); + if (data.score5 === "0.000") { + $("#eva_evaluation_achievement_process2_score2_" + i).val(data.score4); + } else { + $("#eva_evaluation_achievement_process2_score2_" + i).val(data.score5); + } + $("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary5); } //$("#eva_evaluation_achievement_process2_target_score1_" + i).val(data.target_score1); 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 8d7ece3..97428b8 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 @@ -37,18 +37,39 @@ function eva_evaluation_behavior_process2_FeedDataToForm(data, i, blankItem, rol if (role_code === "2") { $("#eva_evaluation_behavior_process2_score_" + i).text(data.score); $("#eva_evaluation_behavior_process2_sumary_" + i).text(data.sumary); - $("#eva_evaluation_behavior_process2_score2_" + i).val(data.score2); + if (data.score2 === "0.000") { + $("#eva_evaluation_behavior_process2_score2_" + i).val(data.score); + } else { + $("#eva_evaluation_behavior_process2_score2_" + i).val(data.score2); + } $("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary2); } else if (role_code === "3") { $("#eva_evaluation_behavior_process2_score_" + i).text(data.score2); $("#eva_evaluation_behavior_process2_sumary_" + i).text(data.sumary2); - $("#eva_evaluation_behavior_process2_score2_" + i).val(data.score3); + if (data.score3 === "0.000") { + $("#eva_evaluation_behavior_process2_score2_" + i).val(data.score2); + } else { + $("#eva_evaluation_behavior_process2_score2_" + i).val(data.score3); + } $("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary3); } else if (role_code === "4") { $("#eva_evaluation_behavior_process2_score_" + i).text(data.score3); $("#eva_evaluation_behavior_process2_sumary_" + i).text(data.sumary3); - $("#eva_evaluation_behavior_process2_score2_" + i).val(data.score4); + if (data.score4 === "0.000") { + $("#eva_evaluation_behavior_process2_score2_" + i).val(data.score3); + } else { + $("#eva_evaluation_behavior_process2_score2_" + i).val(data.score4); + } $("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary4); + } else if (role_code === "5") { + $("#eva_evaluation_behavior_process2_score_" + i).text(data.score4); + $("#eva_evaluation_behavior_process2_sumary_" + i).text(data.sumary4); + if (data.score5 === "0.000") { + $("#eva_evaluation_behavior_process2_score2_" + i).val(data.score4); + } else { + $("#eva_evaluation_behavior_process2_score2_" + i).val(data.score5); + } + $("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary5); } //$("#eva_evaluation_behavior_process2_target_score1_" + i).val(data.target_score1);