From 61d1fe11022d7f7d91d8641232c291a0abba8f92 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Fri, 28 Apr 2023 12:23:37 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=99=E0=B8=A7=E0=B8=99?=
 =?UTF-8?q?=E0=B8=84=E0=B8=B0=E0=B9=81=E0=B8=99=E0=B8=99=E0=B8=A3=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/01_exam/components/ExamCard.vue | 28 ++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/modules/01_exam/components/ExamCard.vue b/src/modules/01_exam/components/ExamCard.vue
index e98d035..434c651 100644
--- a/src/modules/01_exam/components/ExamCard.vue
+++ b/src/modules/01_exam/components/ExamCard.vue
@@ -71,7 +71,7 @@
               examResultinscore
             }}</span>
           </div>
-          <div class="col-xs-6 col-sm-5 text-grey-7">วันหมดอายุบัญชีสอบแข่งขัน</div>
+          <div class="col-xs-6 col-sm-5 text-grey-7">วันหมดอายุบัญชีสอบคัดเลือก</div>
           <div class="col-xs-6 col-sm-7 q-pr-xs">
             {{ score_expired == null ? '' : date2Thai(score_expired) }}
           </div>
@@ -151,14 +151,24 @@ const fetchStatus = async () => {
       scoreB.value = data.pointB
       scoreCFull.value = data.pointTotalC
       scoreC.value = data.pointC
-      scoreSumFull.value =
-        data.pointTotalB == null || data.pointTotalC == null
-          ? null
-          : parseInt(data.pointTotalB) + parseInt(data.pointTotalC)
-      scoreSum.value =
-        data.pointB == null || data.pointC == null
-          ? null
-          : parseInt(data.pointB) + parseInt(data.pointC)
+      if (data.pointB != null && data.pointC != null) {
+        scoreSum.value = parseInt(data.pointB) + parseInt(data.pointC)
+      } else if (data.pointC != null) {
+        scoreSum.value = parseInt(data.pointC)
+      } else if (data.pointB != null) {
+        scoreSum.value = parseInt(data.pointB)
+      } else {
+        scoreSum.value = null
+      }
+      if (data.pointTotalB != null && data.pointTotalC != null) {
+        scoreSumFull.value = parseInt(data.pointTotalB) + parseInt(data.pointTotalC)
+      } else if (data.pointTotalC != null) {
+        scoreSumFull.value = parseInt(data.pointTotalC)
+      } else if (data.pointTotalB != null) {
+        scoreSumFull.value = parseInt(data.pointTotalB)
+      } else {
+        scoreSumFull.value = null
+      }
       scoreC.value = data.pointC
       examResultinscore.value = data.pass
       avatar.value = data.avatar