From 87068a9926e186093007702d5196baf9aac192f9 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Mon, 9 Oct 2023 16:37:30 +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=A7=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=97?=
 =?UTF-8?q?=E0=B8=B3=E0=B8=87=E0=B8=B2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/01_exam/components/ExamForm.vue    | 2 +-
 src/modules/01_exam/components/Form/Career.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/01_exam/components/ExamForm.vue b/src/modules/01_exam/components/ExamForm.vue
index 0e389ce..96c5593 100644
--- a/src/modules/01_exam/components/ExamForm.vue
+++ b/src/modules/01_exam/components/ExamForm.vue
@@ -10,6 +10,7 @@
       v-model:formContact="formContact"
     />
     <!-- v-model:formFamily="formFamily" -->
+    <div v-html="editorConfirm"></div>
     <div class="text-center q-pt-sm">
       <q-checkbox
         v-model="acceptTermOfUse"
@@ -17,7 +18,6 @@
         label="ข้าพเจ้าขอให้คำรับรองและแสดงความยินยอมตามเงื่อนไขทุกประการ"
       />
     </div>
-    <div v-html="editorConfirm"></div>
     <!-- <div>
       1. ข้าพเจ้าขอให้คำรับรองว่า
       ข้อความดังกล่าวข้างต้นนี้เป็นจริงทุกประการและข้าพเจ้ามีคุณสมบัติทั่วไปและ ไม่มีลักษณะต้องห้าม
diff --git a/src/modules/01_exam/components/Form/Career.vue b/src/modules/01_exam/components/Form/Career.vue
index e3ebd3d..847139f 100644
--- a/src/modules/01_exam/components/Form/Career.vue
+++ b/src/modules/01_exam/components/Form/Career.vue
@@ -510,12 +510,12 @@ const fetchData = async () => {
           monthDiff = monthDiff + d.monthDiff
           dayDiff = dayDiff + d.dayDiff
           if (dayDiff > 30) {
-            dayDiff = dayDiff % 30
             monthDiff = monthDiff + parseInt((dayDiff / 30).toString())
+            dayDiff = dayDiff % 30
           }
           if (monthDiff > 12) {
-            monthDiff = monthDiff % 12
             yearDiff = yearDiff + parseInt((monthDiff / 12).toString())
+            monthDiff = monthDiff % 12
           }
           total.value = `${yearDiff > 0 ? yearDiff + ' ปี ' : ''}${
             monthDiff > 0 ? monthDiff + ' เดือน ' : ''