ปรับปรุงหน้าจอแบบประเมิน

This commit is contained in:
Nakorn Rientrakrunchai
2021-03-08 20:43:08 +07:00
parent d04faecb92
commit 858d905f60
3 changed files with 69 additions and 9 deletions

View File

@@ -373,14 +373,16 @@ namespace TodoAPI2.Controllers
select x).FirstOrDefault();
if(detail != null)
{
i.total_summary_supervisor2a = detail.total_summary_supervisor2A;
i.final_summary_supervisor2a = detail.Final_summary_supervisor2A;
i.total_summary_competency_supervisor2a = detail.total_summary_competency_supervisor2A;
i.final_summary_competency_supervisor2a = detail.Final_summary_competency_supervisor2A;
i.achievement_supervisor2a = detail.achievement_supervisor2A;
i.competency_supervisor2a = detail.competency_supervisor2A;
i.score_supervisor2a = detail.score_supervisor2A;
i.level_score_supervisor2a = detail.level_score_supervisor2A;
//i.total_summary_supervisor2a = detail.total_summary_supervisor2A;
//i.final_summary_supervisor2a = detail.Final_summary_supervisor2A;
//i.total_summary_competency_supervisor2a = detail.total_summary_competency_supervisor2A;
//i.final_summary_competency_supervisor2a = detail.Final_summary_competency_supervisor2A;
//i.achievement_supervisor2a = detail.achievement_supervisor2A;
//i.competency_supervisor2a = detail.competency_supervisor2A;
//i.score_supervisor2a = detail.score_supervisor2A;
//i.level_score_supervisor2a = detail.level_score_supervisor2A;
checkValue(detail, ref i);
}
i.w1 = p.create_evaluation_score1;
@@ -409,5 +411,63 @@ namespace TodoAPI2.Controllers
return i;
}
private void checkValue(eva_create_evaluation_detailEntity detail, ref rep_eva_xInputModel2 i)
{
if (detail.status_supervisor2A == "Y")
{
i.total_summary_supervisor2a = detail.total_summary_supervisor2A;
i.final_summary_supervisor2a = detail.Final_summary_supervisor2A;
i.total_summary_competency_supervisor2a = detail.total_summary_competency_supervisor2A;
i.final_summary_competency_supervisor2a = detail.Final_summary_competency_supervisor2A;
i.achievement_supervisor2a = detail.achievement_supervisor2A;
i.competency_supervisor2a = detail.competency_supervisor2A;
i.score_supervisor2a = detail.score_supervisor2A;
i.level_score_supervisor2a = detail.level_score_supervisor2A;
}
else if (detail.status_supervisor1A == "Y")
{
i.total_summary_supervisor2a = detail.total_summary_supervisor1A;
i.final_summary_supervisor2a = detail.Final_summary_supervisor1A;
i.total_summary_competency_supervisor2a = detail.total_summary_competency_supervisor1A;
i.final_summary_competency_supervisor2a = detail.Final_summary_competency_supervisor1A;
i.achievement_supervisor2a = detail.achievement_supervisor1A;
i.competency_supervisor2a = detail.competency_supervisor1A;
i.score_supervisor2a = detail.score_supervisor1A;
i.level_score_supervisor2a = detail.level_score_supervisor1A;
}
else if (detail.status_supervisor == "Y")
{
i.total_summary_supervisor2a = detail.total_summary_supervisor;
i.final_summary_supervisor2a = detail.Final_summary_supervisor;
i.total_summary_competency_supervisor2a = detail.total_summary_competency_supervisor;
i.final_summary_competency_supervisor2a = detail.Final_summary_competency_supervisor;
i.achievement_supervisor2a = detail.achievement_supervisor;
i.competency_supervisor2a = detail.competency_supervisor;
i.score_supervisor2a = detail.score_supervisor;
i.level_score_supervisor2a = detail.level_score_supervisor;
}
else if (detail.status_chief == "Y")
{
i.total_summary_supervisor2a = detail.total_summary_chief;
i.final_summary_supervisor2a = detail.Final_summary_chief;
i.total_summary_competency_supervisor2a = detail.total_summary_competency_chief;
i.final_summary_competency_supervisor2a = detail.Final_summary_competency_chief;
i.achievement_supervisor2a = detail.achievement_chief;
i.competency_supervisor2a = detail.competency_chief;
i.score_supervisor2a = detail.score_chief;
i.level_score_supervisor2a = detail.level_score_chief;
}
else
{
i.total_summary_supervisor2a = null;
i.final_summary_supervisor2a = null;
i.total_summary_competency_supervisor2a = null;
i.final_summary_competency_supervisor2a = null;
i.achievement_supervisor2a = null;
i.competency_supervisor2a = null;
i.score_supervisor2a = null;
i.level_score_supervisor2a = null;
}
}
}
}

View File

@@ -313,7 +313,7 @@
<thead>
<tr>
<th>เครื่องมือ</th>
<th><label id='h_eva_evaluation_achievement_achievement'>ผลสัมฤทธิ์ตัวชี้วัดผลงาน</label></th>
<th width="70%"><label id='h_eva_evaluation_achievement_achievement'>ผลสัมฤทธิ์ตัวชี้วัดผลงาน</label></th>
<th><label id='h_eva_evaluation_achievement_weight'>น้ำหนัก</label></th>
<th style="display:none;"><label id='h_eva_evaluation_achievement_target_score1'>1</label></th>
<th style="display:none;"><label id='h_eva_evaluation_achievement_target_score2'>2</label></th>