From e8b1523895a2c0fcff51b9c477f8b50af4067479 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Fri, 28 Apr 2023 11:40:41 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=81?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=A8=E0=B8=9C=E0=B8=A5=E0=B8=AA=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/01_exam/components/ExamCard.vue         | 6 ++++++
 src/modules/01_exam/components/Form/Career.vue      | 1 +
 src/modules/01_exam/components/Form/Education.vue   | 1 +
 src/modules/01_exam/components/Form/Information.vue | 5 +++++
 src/modules/01_exam/views/ExamDetail.vue            | 5 +++++
 5 files changed, 18 insertions(+)

diff --git a/src/modules/01_exam/components/ExamCard.vue b/src/modules/01_exam/components/ExamCard.vue
index 458ed95..79d0a8d 100644
--- a/src/modules/01_exam/components/ExamCard.vue
+++ b/src/modules/01_exam/components/ExamCard.vue
@@ -71,6 +71,10 @@
               examResultinscore
             }}</span>
           </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 ? '' : dateToISO(score_expired) }}
+          </div>
         </div>
       </div>
       <!-- <div class="q-pt-xs row">
@@ -124,6 +128,7 @@ const scoreSumFull = ref<number | null>(null)
 const scoreSum = ref<number | null>(null)
 const examResultinscore = ref<string>('')
 const avatar = ref<string>('')
+const score_expired = ref<Date>(new Date())
 
 onMounted(async () => {
   await fetchStatus()
@@ -154,6 +159,7 @@ const fetchStatus = async () => {
       scoreC.value = data.pointC
       examResultinscore.value = data.pass
       avatar.value = data.avatar
+      score_expired.value = data.announcementDate
     })
     .catch(() => {
       //   acceptTermOfUse.value = false
diff --git a/src/modules/01_exam/components/Form/Career.vue b/src/modules/01_exam/components/Form/Career.vue
index 03343a0..38329a7 100644
--- a/src/modules/01_exam/components/Form/Career.vue
+++ b/src/modules/01_exam/components/Form/Career.vue
@@ -107,6 +107,7 @@
             </div>
             <div class="col-xs-12 col-sm-6 col-md-6">
               <datepicker
+                menu-class-name="modalfix"
                 :readonly="!edit"
                 v-model="duration"
                 :locale="'th'"
diff --git a/src/modules/01_exam/components/Form/Education.vue b/src/modules/01_exam/components/Form/Education.vue
index f274de6..8523808 100644
--- a/src/modules/01_exam/components/Form/Education.vue
+++ b/src/modules/01_exam/components/Form/Education.vue
@@ -124,6 +124,7 @@
             </div>
             <div class="col-xs-6 col-sm-6 col-md-6">
               <datepicker
+                menu-class-name="modalfix"
                 :readonly="!edit"
                 v-model="duration"
                 :locale="'th'"
diff --git a/src/modules/01_exam/components/Form/Information.vue b/src/modules/01_exam/components/Form/Information.vue
index 7d0ea2c..40a9511 100644
--- a/src/modules/01_exam/components/Form/Information.vue
+++ b/src/modules/01_exam/components/Form/Information.vue
@@ -70,6 +70,7 @@
       </div>
       <div class="col-xs-12 col-sm-3 col-md-3">
         <datepicker
+          menu-class-name="modalfix"
           v-model="defaultInformation.birthDate"
           :locale="'th'"
           autoApply
@@ -209,6 +210,7 @@
 
       <div class="col-xs-12 col-sm-3 col-md-3">
         <datepicker
+          menu-class-name="modalfix"
           v-model="defaultInformation.cardIdDate"
           :locale="'th'"
           autoApply
@@ -520,6 +522,9 @@ const getClass = (val: boolean) => {
 </script>
 
 <style>
+.modalfix {
+  position: fixed !important;
+}
 .containerimage {
   position: relative;
   width: 100%;
diff --git a/src/modules/01_exam/views/ExamDetail.vue b/src/modules/01_exam/views/ExamDetail.vue
index bae6e8d..9b11fe4 100644
--- a/src/modules/01_exam/views/ExamDetail.vue
+++ b/src/modules/01_exam/views/ExamDetail.vue
@@ -3,6 +3,7 @@
   <q-toolbar class="q-pa-sm text-center">
     <q-toolbar-title class="text-dark">
       {{ tittle }}
+      {{ `ครั้งที่${round}/${yearly + 543}` }}
       <div class="text-light text-body2">{{ position }}</div>
     </q-toolbar-title>
   </q-toolbar>
@@ -94,6 +95,8 @@ const status = ref<string>('register')
 const modalConsend = ref<boolean>(false)
 const stepPayment = ref<boolean>(true)
 const rejectMessage = ref<string>('')
+const round = ref<number | null>(null)
+const yearly = ref<number | null>(null)
 
 onMounted(async () => {
   //   stepRaw.value = 3
@@ -205,6 +208,8 @@ const fetchPeriodExam = async () => {
     .then((res) => {
       const data = res.data.result
       tittle.value = data.name
+      round.value = data.round
+      yearly.value = data.year
       position.value = data.posiiton == null ? '' : 'ตำแหน่ง: ' + data.posiiton.positionName
     })
     .catch(() => {})