From afae9edf5f09d87b0bd97fb514e67d135d1188d8 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Mon, 10 Apr 2023 16:32:53 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=83=E0=B8=8A=E0=B9=89=E0=B8=82=E0=B9=89?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=AB=E0=B8=A5=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=81=E0=B8=88=E0=B8=B2=E0=B8=81=20db=E0=B8=AB=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/exam/api.metadata.ts                | 14 +++++++-------
 src/api/index.ts                            |  4 ++++
 src/modules/01_exam/components/ExamForm.vue | 11 ++++++++---
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/api/exam/api.metadata.ts b/src/api/exam/api.metadata.ts
index 8544314..e7b148a 100644
--- a/src/api/exam/api.metadata.ts
+++ b/src/api/exam/api.metadata.ts
@@ -1,11 +1,11 @@
 import env from '../index'
-const prefix = `${env.API_URI}/prefix/`
-const religion = `${env.API_URI}/religion/`
-const relationship = `${env.API_URI}/relationship/`
-const educationLevel = `${env.API_URI}/education-level/`
-const province = `${env.API_URI}/province/`
-const district = `${env.API_URI}/district/`
-const subDistrict = `${env.API_URI}/sub-district/`
+const prefix = `${env.API_METADATA_URI}/prefix/`
+const religion = `${env.API_METADATA_URI}/religion/`
+const relationship = `${env.API_METADATA_URI}/relationship/`
+const educationLevel = `${env.API_METADATA_URI}/education-level/`
+const province = `${env.API_METADATA_URI}/province/`
+const district = `${env.API_METADATA_URI}/district/`
+const subDistrict = `${env.API_METADATA_URI}/sub-district/`
 
 export default {
   prefix,
diff --git a/src/api/index.ts b/src/api/index.ts
index d95e4ef..5846721 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -10,6 +10,7 @@ const config = ref<any>({
   development: {
     API_URI: 'https://localhost:7007/api/v1',
     // API_URI: "https://bma-ehr-exam.frappet.synology.me/api/v1",
+    API_METADATA_URI: 'https://bma-ehr.frappet.synology.me/api/v1/metadata',
     MEET_URI: 'meet.frappet.com'
   },
   test: {
@@ -19,16 +20,19 @@ const config = ref<any>({
   production: {
     // API_URI: "https://localhost:5010",
     API_URI: `${window.location.protocol}//${window.location.host}/api/v1`,
+    API_METADATA_URI: 'https://bma-ehr.frappet.synology.me/api/v1/metadata',
     MEET_URI: 'meet.frappet.com'
   }
 })
 
 const API_URI = ref<string>(config.value[env.value].API_URI)
+const API_METADATA_URI = ref<string>(config.value[env.value].API_METADATA_URI)
 const MEET_URI = ref<string>(config.value[env.value].MEET_URI)
 
 export default {
   env: env.value,
   config: config.value,
   API_URI: API_URI.value,
+  API_METADATA_URI: API_METADATA_URI.value,
   MEET_URI: MEET_URI.value
 }
diff --git a/src/modules/01_exam/components/ExamForm.vue b/src/modules/01_exam/components/ExamForm.vue
index f92277f..99dd1ac 100644
--- a/src/modules/01_exam/components/ExamForm.vue
+++ b/src/modules/01_exam/components/ExamForm.vue
@@ -23,7 +23,7 @@
         label="บันทึกข้อมูล"
         outline
         icon="mdi-content-save"
-        @click="saveAuto = false && saveData"
+        @click="clickSave"
         v-if="status === 'register' || status === 'rejectRegister'"
         :disable="!acceptTermOfUse || statusEdit"
       />
@@ -131,6 +131,11 @@ const saveForm = async () => {
     })
 }
 
+const clickSave = async () => {
+  saveAuto.value = false
+  await saveData()
+}
+
 const saveData = async () => {
   await formInformation.value.validate().then(async (suc: boolean) => {
     if (suc) {
@@ -218,8 +223,9 @@ const saveData = async () => {
                           ? false
                           : null
                     })
-                    .then(() => {
+                    .then(async () => {
                       success($q, 'บันทึกข้อมูลส่วนตัวสำเร็จ')
+                      if (saveAuto.value) await saveForm()
                     })
                     .catch(() => {
                       //   modalError.value = true
@@ -229,7 +235,6 @@ const saveData = async () => {
                     })
                     .finally(async () => {
                       loader.value = false
-                      if (saveAuto.value) await saveForm()
                       await props.fetchStep()
                     })
                 }