From 7f004f48d151dcb72c0585686f982be6d948a41a Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 16 Jan 2025 14:20:05 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A8?=
 =?UTF-8?q?=E0=B8=B6=E0=B8=81=E0=B8=A9=E0=B8=B2=E0=B8=9A=E0=B8=A3=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=88=E0=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PersonalDetail/DetailMain.vue  | 26 +++++++++----------
 .../PersonalDetail/Information/Certicate.vue  |  4 +--
 .../PersonalDetail/Information/Education.vue  | 14 +++++++---
 .../05_placement/interface/index/Main.ts      |  4 +--
 4 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalDetail/DetailMain.vue b/src/modules/05_placement/components/PersonalDetail/DetailMain.vue
index 4b75284f9..0e5bf0ce5 100644
--- a/src/modules/05_placement/components/PersonalDetail/DetailMain.vue
+++ b/src/modules/05_placement/components/PersonalDetail/DetailMain.vue
@@ -224,22 +224,22 @@ async function fetchData() {
       data.education.map((row: any) => {
         listRow.push({
           id: guidCheck(row.id) ?? "",
-          educationLevel: row.educationLevel ?? "",
-          educationLevelId: guidCheck(row.educationLevelId) ?? "",
-          institute: row.institute ?? "",
-          degree: row.degree ?? "",
-          field: row.field ?? "",
-          gpa: row.gpa ?? "",
-          country: row.country ?? "",
-          duration: row.duration ?? "",
-          other: row.other ?? "",
-          fundName: row.fundName ?? "",
+          educationLevel: row.educationLevel ?? "-",
+          educationLevelId: guidCheck(row.educationLevelId) ?? "-",
+          institute: row.institute ?? "-",
+          degree: row.degree ?? "-",
+          field: row.field ?? "-",
+          gpa: row.gpa ?? "-",
+          country: row.country ?? "-",
+          duration: row.duration ?? "-",
+          other: row.other ?? "-",
+          fundName: row.fundName ?? "-",
           durationYear: row.durationYear ?? 0,
           finishDate: row.finishDate ?? new Date(),
           isDate: row.isDate ? "true" : "false",
-          startDate: row.startDate ? new Date(row.startDate) : new Date(),
-          endDate: row.endDate ? new Date(row.endDate) : new Date(),
-          positionPath: row.positionPath ?? "",
+          startDate: row.startDate ? new Date(row.startDate) : "",
+          endDate: row.endDate ? new Date(row.endDate) : "",
+          positionPath: row.positionPath ?? "-",
           isEducation: row.isEducation ? true : false,
         });
       });
diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue b/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue
index e672d9044..446df1a7f 100644
--- a/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue
@@ -544,10 +544,10 @@ onMounted(() => {
                 v-if="col.name == 'issueDate' || col.name == 'expireDate'"
                 class="table_ellipsis"
               >
-                {{ date2Thai(col.value) }}
+                {{ col.value ? date2Thai(col.value) : "-" }}
               </div>
               <div v-else class="table_ellipsis">
-                {{ col.value }}
+                {{ col.value ? col.value : "-" }}
               </div>
             </q-td>
           </q-tr>
diff --git a/src/modules/05_placement/components/PersonalDetail/Information/Education.vue b/src/modules/05_placement/components/PersonalDetail/Information/Education.vue
index d9ab751de..1cd7825b1 100644
--- a/src/modules/05_placement/components/PersonalDetail/Information/Education.vue
+++ b/src/modules/05_placement/components/PersonalDetail/Information/Education.vue
@@ -696,7 +696,9 @@ watch(visibleColumns, (count: String[], prevCount: String[]) => {
 onMounted(async () => {
   await fetchLevel();
   await fetchPositionPath();
+
   rows.value = props.data;
+  rowsData.value = props.data;
 });
 </script>
 <template>
@@ -729,15 +731,19 @@ onMounted(async () => {
               >
                 {{
                   props.row.isDate == "true"
-                    ? date2Thai(col.value)
-                    : new Date(col.value).getFullYear() + 543
+                    ? col.value
+                      ? date2Thai(col.value)
+                      : "-"
+                    : col.value
+                    ? new Date(col.value).getFullYear() + 543
+                    : "-"
                 }}
               </div>
               <div v-else-if="col.name == 'finishDate'" class="table_ellipsis">
-                {{ date2Thai(col.value) }}
+                {{ col.value ? date2Thai(col.value) : "-" }}
               </div>
               <div v-else class="table_ellipsis">
-                {{ col.value }}
+                {{ col.value ?? "-" }}
               </div>
             </q-td>
             <!-- <q-td auto-width>
diff --git a/src/modules/05_placement/interface/index/Main.ts b/src/modules/05_placement/interface/index/Main.ts
index 1644f460c..74ab35f68 100644
--- a/src/modules/05_placement/interface/index/Main.ts
+++ b/src/modules/05_placement/interface/index/Main.ts
@@ -107,8 +107,8 @@ interface Education {
   durationYear: number;
   finishDate: Date;
   isDate: string;
-  startDate: Date;
-  endDate: Date;
+  startDate: Date | string;
+  endDate: Date | string;
   positionPath: string;
   isEducation: boolean;
 }