Merge branch 'develop' into working

# Conflicts:
#	src/modules/01_exam/components/ExamCard.vue

src/modules/01_exam/components/ExamCard.vue

@@ -7,7 +7,8 @@
         <q-tooltip>พิมพ์บัตรประจำตัวผู้สอบ</q-tooltip>
       </q-btn>
     </div>
-    <div class="col-8 q-pa-md">
+    <div class="col-12 row q-pa-md">
+      <div class="col-xs-12 col-sm-8">
         <div class="q-pt-xs row">
           <div class="">ชื่อ :</div>
           <div class="text-black text-bold q-pl-sm">{{ fullName }}</div>
@@ -26,7 +27,7 @@
         </div>
         <div class="row">
           <div class="">วันสอบ :</div>
-        <div class="text-black text-bold q-pl-sm">05 มิ.ย. 2566</div>
+          <div class="text-black text-bold q-pl-sm">25 มิ.ย. 2568</div>
         </div>
         <div class="row">
           <div class="">ครั้งที่สอบ :</div>
@@ -34,9 +35,28 @@
         </div>
         <div class="row">
           <div class="">ชุดข้อสอบ :</div>
-        <div class="text-black text-bold q-pl-sm">0506-1/2566</div>
+          <div class="text-black text-bold q-pl-sm">ทดสอบ</div>
         </div>
-      <div class="q-pt-xs row">
+      </div>
+      <div class="col-xs-12 col-sm-4 row justify-center">
+        <q-img
+          v-if="avatar == ''"
+          class="rounded-borders"
+          src="@/assets/avatar_user.jpg"
+          :ratio="1"
+          style="width: 150px; height: 600px"
+        />
+        <q-img
+          v-else
+          class="rounded-borders"
+          :src="avatar"
+          :ratio="1"
+          style="width: 150px; height: 600px"
+        />
+      </div>
+    </div>
+  </q-card>
+  <q-card bordered flat class="q-pa-md q-mt-sm">
     <div class="col-12 text-weight-bold">ผลคะแนนสอบ</div>
     <div class="row items-center q-gutter-y-sm col-12">
       <div class="col-xs-4 col-sm-5 text-weight-medium text-grey-7">ประเภท</div>
@@ -44,6 +64,15 @@
       <div class="col-xs-3 col-sm-2 text-primary text-weight-bold">คะแนนที่ได้</div>
       <div class="col-xs-2 col-sm-2 text-primary text-weight-bold"></div>
 
+      <div class="col-xs-4 col-sm-5 text-grey-7">ภาค ก</div>
+      <div class="col-xs-3 col-sm-2 q-pr-xs">
+        {{ scoreAFull }}
+      </div>
+      <div class="col-xs-3 col-sm-2 q-pr-xs">
+        {{ scoreA }}
+      </div>
+      <div class="col-xs-2 col-sm-2 q-pr-xs text-grey-7">คะแนน</div>
+
       <div class="col-xs-4 col-sm-5 text-grey-7">ภาค ข</div>
       <div class="col-xs-3 col-sm-2 q-pr-xs">
         {{ scoreBFull }}
@@ -90,25 +119,6 @@
         {{ score_expired == null ? '' : date2Thai(score_expired) }}
       </div>
     </div>
-      </div>
-    </div>
-
-    <q-card-section class="col-4 flex flex-center">
-      <q-img
-        v-if="avatar == ''"
-        class="rounded-borders"
-        src="@/assets/avatar_user.jpg"
-        :ratio="1"
-        style="width: 150px; height: 600px"
-      />
-      <q-img
-        v-else
-        class="rounded-borders"
-        :src="avatar"
-        :ratio="1"
-        style="width: 150px; height: 600px"
-      />
-    </q-card-section>
   </q-card>
 </template>
 
@@ -134,6 +144,8 @@ const examNumber = ref<string>('')
 const position = ref<string>('')
 const citizenId = ref<string>('')
 const examSeat = ref<string>('')
+const scoreAFull = ref<number | null>(null)
+const scoreA = ref<number | null>(null)
 const scoreBFull = ref<number | null>(null)
 const scoreB = ref<number | null>(null)
 const scoreCFull = ref<number | null>(null)
@@ -159,30 +171,21 @@ const fetchStatus = async () => {
       examNumber.value = data.examIdenNumber
       citizenId.value = data.citizenId
       examSeat.value = data.seatNumber
+      scoreAFull.value = data.pointTotalA
+      scoreA.value = data.pointA
       scoreBFull.value = data.pointTotalB
       scoreB.value = data.pointB
       position.value = data.posiiton == null ? '' : '' + data.posiiton.positionName
       scoreCFull.value = data.pointTotalC
       scoreC.value = data.pointC
-      if (data.pointB != null && data.pointC != null) {
+      scoreSum.value =
-        scoreSum.value = parseInt(data.pointB) + parseInt(data.pointC)
+        parseInt(data.pointA == null ? 0 : data.pointA) +
-      } else if (data.pointC != null) {
+        parseInt(data.pointB == null ? 0 : data.pointB) +
-        scoreSum.value = parseInt(data.pointC)
+        parseInt(data.pointC == null ? 0 : data.pointC)
-      } else if (data.pointB != null) {
+      scoreSumFull.value =
-        scoreSum.value = parseInt(data.pointB)
+        parseInt(data.pointTotalA == null ? 0 : data.pointTotalA) +
-      } else {
+        parseInt(data.pointTotalB == null ? 0 : data.pointTotalB) +
-        scoreSum.value = null
+        parseInt(data.pointTotalC == null ? 0 : data.pointTotalC)
-      }
-      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
       score_expired.value = new Date(data.announcementDate)