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 }} -
วันหมดอายุบัญชีสอบแข่งขัน
+
วันหมดอายุบัญชีสอบคัดเลือก
{{ score_expired == null ? '' : date2Thai(score_expired) }}
@@ -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