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

Merge branch 'feature/fix_eva' into develop

Browse Source
This commit is contained in:
Pairat Sangprasert
2021-03-28 19:31:52 +07:00
parent 56e8bb1446 4a9a19ba11
commit acff346da6
8 changed files with 94 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml
View File

@@ -354,6 +354,13 @@
</tr>
</thead>
<tbody></tbody>
<tfoot>
<tr>
<th></th>
<th>รวมน้ำหนัก</th>
<th><span id="sum_weight_eva_evaluation_behavior"></span></th>
</tr>
</tfoot>
</table>
</section>
<p style="display:none;" id="sum_b"></p>

4
Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml
View File

@@ -177,7 +177,7 @@
<th width="8%"><label>น้ำหนัก (%)</label></th>
<th width="130px"><label>คะแนน (ระบุ 1.00-5.00)</label></th>
<th width="130px"><label>คะแนน (ระบุ 1.000 - 5.000)</label></th>
<th><label>รวมคะแนน<br />(น้ำหนัก x คะแนน / 100)</label></th>
</tr>
@@ -230,7 +230,7 @@
<th><label>พฤติกรรมการปฏิบัติงาน</label></th>
<th><label>น้ำหนัก (%)</label></th>
<th width="130px"><label>คะแนน (ระบุ 1.00-5.00)</label></th>
<th width="130px"><label>คะแนน (ระบุ 1.000 - 5.000)</label></th>
<th><label>รวมคะแนน<br />(น้ำหนัก x คะแนน / 100)</label></th>
</tr>
</thead>

6
Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml
View File

@@ -226,7 +226,7 @@
<th><label>น้ำหนัก (%)</label></th>
<th><label>คะแนน</label></th>
<th><label>รวมคะแนน</label></th>
<th width="130px"><label>คะแนน <br />(ระบุ 1.00-5.00)</label></th>
<th width="150px"><label>คะแนน <br />(ระบุ 1.000 - 5.000)</label></th>
<th><label>รวมคะแนน<br />(น้ำหนัก x คะแนน / 100)</label></th>
</tr>
@@ -278,11 +278,11 @@
<tr>
<th>ลำดับ</th>
<th><label>พฤติกรรมการปฏิบัติงาน</label></th>
<th><label>น้ำหนัก (%)</label></th>
<th style="width:100px; "><label>น้ำหนัก (%)</label></th>
<th><label>คะแนน</label></th>
<th><label>รวมคะแนน</label></th>
<th width="130px"><label>คะแนน <br />(ระบุ 1.00-5.00)</label></th>
<th width="130px"><label>คะแนน <br />(ระบุ 1.000 - 5.000)</label></th>
<th><label>รวมคะแนน<br />(น้ำหนัก x คะแนน / 100)</label></th>
</tr>
</thead>

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

@@ -20,8 +20,8 @@ function eva_evaluation_achievement_process_FeedDataToForm(data, i, blankItem) {
$("#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_weight_" + i).text(data.weight);
$("#eva_evaluation_achievement_process_score_" + i).val(data.score);
$("#eva_evaluation_achievement_process_sumary_" + i).text(data.sumary);
$("#eva_evaluation_achievement_process_score_" + i).val(data.score.toFixed(3));
$("#eva_evaluation_achievement_process_sumary_" + i).text(data.sumary.toFixed(3));
//$("#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_score3_" + i).val(data.target_score3);

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

@@ -25,22 +25,20 @@ function eva_evaluation_achievement_process2_FeedDataToForm(data, i, blankItem,
//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);
$("#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);
$("#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);
$("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary4);
$("#eva_evaluation_achievement_process2_score_" + i).text(data.score.toFixed(3));
$("#eva_evaluation_achievement_process2_sumary_" + i).text(data.sumary.toFixed(3));
$("#eva_evaluation_achievement_process2_score2_" + i).val(data.score2.toFixed(3));
$("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary2.toFixed(3));
} else if (role_code === "3") {
$("#eva_evaluation_achievement_process2_score_" + i).text(data.score2.toFixed(3));
$("#eva_evaluation_achievement_process2_sumary_" + i).text(data.sumary2.toFixed(3));
$("#eva_evaluation_achievement_process2_score2_" + i).val(data.score3.toFixed(3));
$("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary3.toFixed(3));
} else if (role_code === "4") {
$("#eva_evaluation_achievement_process2_score_" + i).text(data.score3.toFixed(3));
$("#eva_evaluation_achievement_process2_sumary_" + i).text(data.sumary3.toFixed(3));
$("#eva_evaluation_achievement_process2_score2_" + i).val(data.score4.toFixed(3));
$("#eva_evaluation_achievement_process2_sumary2_" + i).text(data.sumary4.toFixed(3));
}
//$("#eva_evaluation_achievement_process2_target_score1_" + i).val(data.target_score1);

1
wwwroot/js/eva_evaluation_behavior/eva_evaluation_behavior.js
View File

@@ -162,6 +162,7 @@ var eva_evaluation_behavior_setupTable = function (result) {
sum_b += v.weight;
});
$("#sum_b").text(sum_b);
$("#sum_weight_eva_evaluation_behavior").text(sum_b);
eva_evaluation_behaviorTableV = $('#eva_evaluation_behaviorTable').DataTable({
"processing": true,

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

@@ -19,8 +19,8 @@ function eva_evaluation_behavior_process_FeedDataToForm(data, i, blankItem) {
$("#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_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_score_" + i).val(data.score.toFixed(3));
$("#eva_evaluation_behavior_process_sumary_" + i).text(data.sumary.toFixed(3));
//$("#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_score3_" + i).val(data.target_score3);

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

@@ -21,22 +21,22 @@ function eva_evaluation_behavior_process2_FeedDataToForm(data, i, blankItem, rol
$("#eva_evaluation_behavior_process2_weight_" + i).val(data.weight);
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);
$("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary2);
$("#eva_evaluation_behavior_process2_score_" + i).text(data.score.toFixed(3));
$("#eva_evaluation_behavior_process2_sumary_" + i).text(data.sumary.toFixed(3));
$("#eva_evaluation_behavior_process2_score2_" + i).val(data.score2.toFixed(3));
$("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary2.toFixed(3));
}
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);
$("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary3);
$("#eva_evaluation_behavior_process2_score_" + i).text(data.score2.toFixed(3));
$("#eva_evaluation_behavior_process2_sumary_" + i).text(data.sumary2.toFixed(3));
$("#eva_evaluation_behavior_process2_score2_" + i).val(data.score3.toFixed(3));
$("#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);
$("#eva_evaluation_behavior_process2_sumary_" + i).text(data.sumary3);
$("#eva_evaluation_behavior_process2_score2_" + i).val(data.score4);
$("#eva_evaluation_behavior_process2_sumary2_" + i).text(data.sumary4);
$("#eva_evaluation_behavior_process2_score_" + i).text(data.score3.toFixed(3));
$("#eva_evaluation_behavior_process2_sumary_" + i).text(data.sumary3.toFixed(3));
$("#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);