From db4498890d9f9204bcb75f3cae20f28dad8adfad Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 14 Aug 2024 12:24:35 +0700
Subject: [PATCH 1/2] fixing code

---
 .../components/probation/FormAssign.vue        | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/modules/05_placement/components/probation/FormAssign.vue b/src/modules/05_placement/components/probation/FormAssign.vue
index 1ef9299cc..915db0de9 100644
--- a/src/modules/05_placement/components/probation/FormAssign.vue
+++ b/src/modules/05_placement/components/probation/FormAssign.vue
@@ -1148,7 +1148,7 @@ onMounted(async () => {
 
           <div v-if="!isEdit">
             <q-btn
-            v-if="!checkRoutePermisson"
+              v-if="!checkRoutePermisson"
               dense
               flat
               round
@@ -1162,7 +1162,7 @@ onMounted(async () => {
 
           <div v-else>
             <q-btn
-            v-if="!checkRoutePermisson"
+              v-if="!checkRoutePermisson"
               dense
               flat
               round
@@ -1174,7 +1174,7 @@ onMounted(async () => {
             </q-btn>
             <!-- @click="saveEdit(assignId)" -->
             <q-btn
-            v-if="!checkRoutePermisson"
+              v-if="!checkRoutePermisson"
               dense
               flat
               class="q-ml-md"
@@ -2343,7 +2343,6 @@ onMounted(async () => {
                   การเรียนรู้ด้วยตนเองเพื่อให้มีความรู้เกี่ยวกับกฎหมายกฎระเบียบแบบแผนของทางราชการ
                 </div>
                 <div class="col-12 text-top2 row items-center">
-                  c
                   <q-icon name="mdi-label" color="grey-4" class="q-pr-sm" />
                   4.3
                   การอบรมสัมมนาร่วมกันเพื่อปลูกฝังการประพฤติปฏิบัติตนเป็นข้าราชการที่ดี
@@ -2504,7 +2503,6 @@ onMounted(async () => {
                     :locale="'th'"
                     autoApply
                     :readonly="isEdit != true"
-                    
                     :enableTimePicker="false"
                     week-start="0"
                   >
@@ -2603,7 +2601,6 @@ onMounted(async () => {
                     v-model="date2"
                     :locale="'th'"
                     autoApply
-                    
                     :enableTimePicker="false"
                     :readonly="isEdit != true"
                     week-start="0"
@@ -2620,9 +2617,7 @@ onMounted(async () => {
                         :rules="[(val) => !!val || 'กรุณาเลือกวันที่']"
                         :readonly="isEdit != true"
                         dense
-                        
                         :outlined="isEdit == true"
-                        
                         :model-value="date2 != null ? date2Thai(date2) : null"
                         label="ลงวันที่"
                         bg-color="white"
@@ -2694,11 +2689,9 @@ onMounted(async () => {
 
                 <div class="col-xs-12 col-sm-4">
                   <datepicker
-                    
                     v-model="date3"
                     :locale="'th'"
                     autoApply
-                    
                     :enableTimePicker="false"
                     week-start="0"
                     :readonly="isEdit != true || !caretaker2"
@@ -2720,9 +2713,7 @@ onMounted(async () => {
                             ? [(val) => !!val || 'กรุณาเลือกวันที่']
                             : []
                         "
-                        
                         :outlined="isEdit == true"
-                      
                         :model-value="
                           caretaker2 != null ? date2Thai(date3) : null
                         "
@@ -2805,7 +2796,6 @@ onMounted(async () => {
 
                 <div class="col-xs-12 col-sm-4">
                   <datepicker
-                    
                     v-model="date4"
                     :locale="'th'"
                     autoApply
@@ -2826,9 +2816,7 @@ onMounted(async () => {
                         :rules="[(val) => !!val || 'กรุณาเลือกวันที่']"
                         :readonly="isEdit != true"
                         dense
-                        
                         :outlined="isEdit == true"
-                      
                         :model-value="date4 != null ? date2Thai(date4) : null"
                         label="ลงวันที่"
                         bg-color="white"

From 56ee70c3b4234417ea99f75397a3a8273d289dc3 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 14 Aug 2024 14:01:58 +0700
Subject: [PATCH 2/2] fixing load profile

---
 src/components/Dialogs/PopupPersonalNew.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Dialogs/PopupPersonalNew.vue b/src/components/Dialogs/PopupPersonalNew.vue
index e1cce5bf9..a917080ea 100644
--- a/src/components/Dialogs/PopupPersonalNew.vue
+++ b/src/components/Dialogs/PopupPersonalNew.vue
@@ -116,6 +116,8 @@ async function fetchInformation(id: string) {
       avatar.position = data.position ? data.position : "-";
       if (data.avatarName) {
         fetchProfile(data.id as string, data.avatarName);
+      } else {
+        avatar.avatar = "";
       }
     })
     .catch((err) => {
@@ -199,7 +201,7 @@ async function fetchProfile(id: string, avatarName: string) {
   await http
     .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, avatarName))
     .then(async (res) => {
-      avatar.avatar = res.data.downloadUrl;
+      avatar.avatar = await res.data.downloadUrl;
     })
     .finally(() => {
       hideLoader();