From 9591eed2f8e388c2e8c77628557b9ca2ef4b23a0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 10 Apr 2024 11:09:52 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=AF=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B9=84=E0=B8=94?=
 =?UTF-8?q?=E0=B9=89=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=97=E0=B8=B8=E0=B8=99?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A8=E0=B8=B6=E0=B8=81=E0=B8=A9?=
 =?UTF-8?q?=E0=B8=B2=20=3D>=20status?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/15_development/api.development.ts     |  2 +-
 .../components/scholarship/DetailView.vue     | 22 +++++--------------
 .../interface/response/Scholarship.ts         |  1 +
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/api/15_development/api.development.ts b/src/api/15_development/api.development.ts
index f862af924..499edda5a 100644
--- a/src/api/15_development/api.development.ts
+++ b/src/api/15_development/api.development.ts
@@ -21,7 +21,7 @@ export default {
   devScholarship,
   devScholarshipByid: (id: string) => `${devScholarship}/${id}`,
   devScholarshipStatus: (id: string, status: string) =>
-    `${devScholarship}/${id}/${status}`,
+    `${devScholarship}/status/${id}/${status}`,
 
   /** download File */
   developmentReportMain: () => `${developmentReport}/main`,
diff --git a/src/modules/15_development/components/scholarship/DetailView.vue b/src/modules/15_development/components/scholarship/DetailView.vue
index bcd965979..e2f05f71f 100644
--- a/src/modules/15_development/components/scholarship/DetailView.vue
+++ b/src/modules/15_development/components/scholarship/DetailView.vue
@@ -216,7 +216,7 @@ function fetchDataDetail(id: string) {
       dataGuarantor.positionSide = data.guarantorPosExecutive
         ? data.guarantorPosExecutive
         : "-";
-
+      isStatus.value = data.status;
       isGov.value = data.citizenId ? true : false;
       isGuarantor.value = data.guarantorCitizenId ? true : false;
     })
@@ -228,17 +228,6 @@ function fetchDataDetail(id: string) {
     });
 }
 
-function fetchStatus(id: string) {
-  // http
-  //   .get(config.API.devScholarshipStatus(id,"GRADUATE"))
-  //   .then((res) => {
-  //     const data = res.data.result;
-  //     console.log(data);
-      isStatus.value = "PENDING";
-  //   })
-  //   .catch((err) => {});
-}
-
 function onSubmit() {
   dialogConfirm($q, async () => {
     showLoader();
@@ -323,10 +312,10 @@ function onClickUpdateStatus(type: string) {
       showLoader();
       http
         .get(config.API.devScholarshipStatus(scholarshipId.value, type))
-        .then((res) => {
-          const data = res.data.result;
-          console.log(data);
-          isStatus.value = type;
+        .then(() => {
+          if (scholarshipId.value) {
+            fetchDataDetail(scholarshipId.value);
+          }
         })
         .catch((err) => {
           messageError($q, err);
@@ -399,7 +388,6 @@ function upDate(data: DataPerson) {
 onMounted(() => {
   if (scholarshipId.value) {
     fetchDataDetail(scholarshipId.value);
-    fetchStatus(scholarshipId.value);
   }
 });
 </script>
diff --git a/src/modules/15_development/interface/response/Scholarship.ts b/src/modules/15_development/interface/response/Scholarship.ts
index 95d7edd2c..7a15508f7 100644
--- a/src/modules/15_development/interface/response/Scholarship.ts
+++ b/src/modules/15_development/interface/response/Scholarship.ts
@@ -62,6 +62,7 @@ interface DataSholarship {
   studyAbroadStartDate: Date | null; //วันเริ่มต้นการศึกษาดูงานต่างประเทศ
   studyAbroadEndDate: Date | null; //วันสิ้นสุดการศึกษาดูงานต่างประเทศ
   totalPeriod: string; //รวมระยะเวลาในการศึกษา/รวมระยะเวลาในการฝึกอบรม
+  status: string;
 }
 
 export type { DataSholarship, ListSholarship };