From ddb2876626fd93f6b7f6fc2634586b2f017310a6 Mon Sep 17 00:00:00 2001
From: oat_dev <nattapon@frappet.com>
Date: Mon, 18 Mar 2024 15:10:58 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4:=20=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?=
 =?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+=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9D=E0=B8=B6?=
 =?UTF-8?q?=E0=B8=81=E0=B8=AD=E0=B8=9A=E0=B8=A3=E0=B8=A1=E0=B8=94=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/Achievement/02_Train.vue           | 35 +++++++++++++++++--
 .../PersonalInformation/05_Education.vue      | 33 +++++++++--------
 2 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
index 6e4bf1a93..6f520059c 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/02_Train.vue
@@ -633,7 +633,24 @@ onMounted(async () => {
               round
               color="primary"
               icon="edit"
-              @click="dialog = true"
+              @click="
+                dialogStatus = 'edit';
+                editId = props.row.id;
+                isDate = props.row.isDate ? 'true' : 'false';
+                trainData.name = props.row.name;
+                trainData.topic = props.row.topic;
+                trainData.yearly = props.row.yearly;
+                trainData.place = props.row.place;
+                trainData.duration = props.row.duration;
+                trainData.department = props.row.department;
+                trainData.numberOrder = props.row.numberOrder;
+                trainData.dateOrder = props.row.dateOrder;
+                trainData.startDate = props.row.startDate;
+                trainData.endDate = props.row.endDate;
+                trainData.startYear = +props.row.startDate.slice(0, 4);
+                trainData.finishYear = +props.row.endDate.slice(0, 4);
+                dialog = true;
+              "
             >
               <q-tooltip>แก้ไขข้อมูล</q-tooltip>
             </q-btn>
@@ -654,7 +671,21 @@ onMounted(async () => {
               :key="col.name"
               :style="`background-color: ${index % 2 !== 0 ? '#FAFAFA' : ''}`"
             >
-              <div class="row q-pa-sm">
+              <div
+                v-if="col.name === 'startDate' || col.name === 'endDate'"
+                class="row q-pa-sm"
+              >
+                <div class="col-7 label-color">
+                  <div>{{ col.label }}</div>
+                </div>
+                <div class="col">
+                  <div v-if="props.row.isDate">
+                    {{ date2Thai(col.value) }}
+                  </div>
+                  <div v-else>{{ +col.value.slice(0, 4) + 543 }}</div>
+                </div>
+              </div>
+              <div v-else class="row q-pa-sm">
                 <div class="col-7 label-color">
                   <div>{{ col.label }}</div>
                 </div>
diff --git a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
index 463dc8aaa..c1df295c3 100644
--- a/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryNew/components/detail/PersonalInformation/05_Education.vue
@@ -671,25 +671,24 @@ onMounted(async () => {
               @click="
                 dialogStatus = 'edit';
                 editId = props.row.id;
-                console.log(props.cols);
                 isDate = props.row.isDate ? 'true' : 'false';
-                educationData.educationLevel = props.cols[0].value;
-                educationData.institute = props.cols[1].value;
-                educationData.startDate = props.cols[2].value;
-                educationData.endDate = props.cols[3].value;
-                educationData.finishDate = props.cols[4].value;
-                educationData.isEducation = props.cols[5].value;
-                educationData.degree = props.cols[6].value;
-                educationData.field = props.cols[7].value;
-                educationData.fundName = props.cols[8].value;
-                educationData.gpa = props.cols[9].value;
-                educationData.country = props.cols[10].value;
-                educationData.other = props.cols[11].value;
-                educationData.duration = props.cols[12].value;
-                educationData.durationYear = props.cols[13].value;
+                educationData.educationLevel = props.row.educationLevel;
+                educationData.institute = props.row.institute;
+                educationData.finishDate = props.row.finishDate;
+                educationData.startDate = props.row.startDate;
+                educationData.endDate = props.row.endDate;
+                educationData.isEducation = props.row.isEducation;
+                educationData.degree = props.row.degree;
+                educationData.field = props.row.field;
+                educationData.fundName = props.row.fundName;
+                educationData.gpa = props.row.gpa;
+                educationData.country = props.row.country;
+                educationData.other = props.row.other;
+                educationData.duration = props.row.duration;
+                educationData.durationYear = props.row.durationYear;
                 educationData.note = props.row.note;
-                educationData.startYear = +props.cols[2].value.slice(0, 4);
-                educationData.endYear = +props.cols[3].value.slice(0, 4);
+                educationData.startYear = +props.row.startDate.slice(0, 4);
+                educationData.endYear = +props.row.endDate.slice(0, 4);
                 dialog = true;
               "
             >