From 727f3c6765bfd5d344d1f2f4f3d31bae0ab4fb34 Mon Sep 17 00:00:00 2001
From: oat <oatkub402@gmail.com>
Date: Wed, 7 Feb 2024 11:16:41 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=9A=E0=B8=B8=E0=B8=84=E0=B8=84=E0=B8=A5:=20API?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=94=E0=B8=B1=E0=B8=9A=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=A8=E0=B8=B6=E0=B8=81=E0=B8=A9=E0=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/personal/07ListEducationLevel.vue | 16 +++++++++++++---
 .../components/personal/DialogForm.vue           |  3 ++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/modules/01_metadataNew/components/personal/07ListEducationLevel.vue b/src/modules/01_metadataNew/components/personal/07ListEducationLevel.vue
index 34833037a..6b998694f 100644
--- a/src/modules/01_metadataNew/components/personal/07ListEducationLevel.vue
+++ b/src/modules/01_metadataNew/components/personal/07ListEducationLevel.vue
@@ -71,7 +71,7 @@ const columns = [
 ] as const satisfies QTableProps["columns"];
 
 const $q = useQuasar();
-
+const editId = ref<string>("");
 const filterKeyword = ref<string>("");
 const dialog = ref<boolean>(false);
 const educationLevel = ref<string>("");
@@ -139,6 +139,8 @@ onMounted(async () => {
         () => {
           dialogStatus = 'create';
           dialog = true;
+          educationLevel = '';
+          educationRank = undefined;
         }
       "
     >
@@ -211,6 +213,9 @@ onMounted(async () => {
                     () => {
                       dialogStatus = 'edit';
                       dialog = true;
+                      editId = props.row.id;
+                      educationLevel = props.row.name;
+                      educationRank = props.row.rank;
                     }
                   "
                 >
@@ -223,7 +228,12 @@ onMounted(async () => {
                 </q-item>
                 <q-item clickable>
                   <q-item-section
-                    @click="dialogRemove($q, async () => {})"
+                    @click="
+                      dialogRemove(
+                        $q,
+                        async () => await deleteData(props.row.id)
+                      )
+                    "
                     v-close-popup
                   >
                     <div class="row items-center white">
@@ -241,7 +251,7 @@ onMounted(async () => {
   </d-table>
 
   <DialogForm
-    v-model:educationRank:="educationRank"
+    v-model:educationRank="educationRank"
     v-model:dialog="dialog"
     v-model:data="educationLevel"
     v-model:personalName="personalName"
diff --git a/src/modules/01_metadataNew/components/personal/DialogForm.vue b/src/modules/01_metadataNew/components/personal/DialogForm.vue
index d6413a0c9..7b6e40557 100644
--- a/src/modules/01_metadataNew/components/personal/DialogForm.vue
+++ b/src/modules/01_metadataNew/components/personal/DialogForm.vue
@@ -17,7 +17,7 @@ const personalName = defineModel<string>("personalName");
 const dialogStatus = defineModel<string>("dialogStatus");
 const editId = defineModel<string>("editId");
 const dialog = defineModel<boolean>("dialog");
-const educationRank = defineModel<number>("rank");
+const educationRank = defineModel<number>("educationRank");
 const props = defineProps({
   fetchData: {
     type: Function,
@@ -52,6 +52,7 @@ async function onSubmit() {
           : props.editData(editId.value);
         closeDialog();
         data.value = "";
+        educationRank.value = undefined;
       },
       "ยืนยันการบันทึกข้อมูล",
       "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"