From 858d905f60de41d2fced4ca4263a2788f99199f6 Mon Sep 17 00:00:00 2001
From: Nakorn Rientrakrunchai <nakorn@tonproject.com>
Date: Mon, 8 Mar 2021 20:43:08 +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=AB=E0=B8=99=E0=B9=89=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=88=E0=B8=AD=E0=B9=81=E0=B8=9A=E0=B8=9A=E0=B8=9B=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ApiControllers/rep_eva_xControllers.cs        |  76 ++++++++++++++++--
 EXCEL/eva_create_evaluation_detail.xlsx       | Bin 12670 -> 12831 bytes
 ...reate_evaluation_detail_agreement_d.cshtml |   2 +-
 3 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/ApiControllers/rep_eva_xControllers.cs b/ApiControllers/rep_eva_xControllers.cs
index 092595f..15394cc 100644
--- a/ApiControllers/rep_eva_xControllers.cs
+++ b/ApiControllers/rep_eva_xControllers.cs
@@ -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;
+            }
+        }
     }
 }
diff --git a/EXCEL/eva_create_evaluation_detail.xlsx b/EXCEL/eva_create_evaluation_detail.xlsx
index dd897526396bc4f2a716c02910678b5dac598f17..89fec57caf123a0d338ef8fb5cd3f48edb5f8948 100644
GIT binary patch
delta 6330
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
X;IbwmaBDxIWlPfIra|7|_!IMAm4yto

delta 6195
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

diff --git a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml
index a9a7400..a7de766 100644
--- a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml
+++ b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml
@@ -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>