diff --git a/src/modules/01_exam/views/ExamDetail.vue b/src/modules/01_exam/views/ExamDetail.vue
index c808521..4fdf970 100644
--- a/src/modules/01_exam/views/ExamDetail.vue
+++ b/src/modules/01_exam/views/ExamDetail.vue
@@ -82,10 +82,10 @@
     <q-card :style="$q.screen.gt.xs ? 'min-width: 30vw' : 'min-width: 80vw'" class="q-pa-sm">
       <q-card-section class="row items-center col-12">
         <div class="column col-12 text-center">
-          <div><q-icon name="mdi-alert-outline" size="50px" color="pink" /></div>
+          <div><q-icon name="mdi-alert-outline" size="50px" :color="isBeforeToday && timeout ? 'amber-7':'pink'" /></div>
 
-          <div class="text-bold text-pink text-subtitle1 q-mb-md">หมดเขตรับสมัครสอบ !</div>
-          ไม่สามารถทำรายการได้ เนื่องจากหมดเขตรับสมัครแล้ว
+          <div :class="isBeforeToday && timeout ? 'text-bold text-amber-7 text-subtitle1 q-mb-md':'text-bold text-pink text-subtitle1 q-mb-md'">{{isBeforeToday && timeout ? 'ยังไม่ถึงรอบรับสมัครสอบ':'หมดเขตรับสมัครสอบ'}} !</div>
+           {{`ไม่สามารถทำรายการได้ ${isBeforeToday && timeout ? 'เนื่องจากยังไม่ถึงรอบรับสมัครสอบ':'เนื่องจากหมดเขตรับสมัครแล้ว'}`}} 
           <!-- {{ dateThaiRange([registerEndDate, registerStartDate]) }} -->
         </div>
       </q-card-section>
@@ -114,11 +114,12 @@ import keycloak from '@/plugins/keycloak'
 const $q = useQuasar()
 const storeExam = useExamDataStore()
 const mixin = useCounterMixin()
-const { modalError, messageError, dateThaiRange } = mixin
+const { modalError, messageError, dateThaiRange, dateToISO } = mixin
 const dataStore = useDataStore()
 const { loaderPage } = dataStore
 const step = ref<number>(1)
 const stepRaw = ref<number>(1)
+const isBeforeToday = ref<boolean>(false)
 const tittle = ref<string>('')
 const position = ref<string>('')
 const positionLevel = ref<string>('')
@@ -174,7 +175,9 @@ const candidateCheck = async () => {
             modalConsend.value = true
             stepRaw.value = 2
             step.value = 2
+            isBeforeToday.value = false
           } else {
+            isBeforeToday.value = dateToISO(data.registerEndDate) > dateToISO(new Date())
             registerStartDate.value = new Date(data.registerStartDate)
             registerEndDate.value = new Date(data.registerEndDate)
             timeout.value = true
diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts
index 93fccd8..373a956 100644
--- a/src/stores/mixin.ts
+++ b/src/stores/mixin.ts
@@ -205,16 +205,22 @@ export const useCounterMixin = defineStore('mixin', () => {
   }
 
   function dateToISO(date: Date) {
-    return (
-      date.getFullYear() +
-      '-' +
-      appendLeadingZeroes(date.getMonth() + 1) +
-      '-' +
-      appendLeadingZeroes(date.getDate())
-    )
+    if (date != null) {
+      const srcDate = new Date(date)
+
+      return (
+        srcDate.getFullYear() +
+        '-' +
+        appendLeadingZeroes(srcDate.getMonth() + 1) +
+        '-' +
+        appendLeadingZeroes(srcDate.getDate())
+      )
+    } else {
+      return ''
+    }
   }
 
-  function appendLeadingZeroes(n: Number) {
+  function appendLeadingZeroes(n: number) {
     if (n <= 9) return '0' + n
     return n
   }