From c3d247784373e2b6f7746e870ec3342dd1ba27a1 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 3 Oct 2024 13:44:56 +0700
Subject: [PATCH] fixing & updated

---
 src/components/LoginLinkage.vue               |  8 +----
 .../components/requestEdit/02_TabIDP.vue      | 10 +++++++
 .../requestEdit/Dialog02_EditIDP.vue          | 30 +++++++++++++++----
 .../interface/request/Main.ts                 |  2 ++
 .../components/PersonalList/DialogOrders.vue  |  1 -
 src/views/MainLayout.vue                      | 13 ++++----
 6 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/src/components/LoginLinkage.vue b/src/components/LoginLinkage.vue
index baf5cc4cc..026d2b6e3 100644
--- a/src/components/LoginLinkage.vue
+++ b/src/components/LoginLinkage.vue
@@ -7,13 +7,7 @@ const modal = defineModel<boolean>("modal", { required: true });
 
 const step = ref<number>(1);
 const devices = ref<string>("");
-const devicesData = ref<string[]>([
-  "Generic",
-  "EMV",
-  "Smartcard",
-  "Reader",
-  "0",
-]);
+const devicesData = ref<string[]>(["Generic EMV Smartcard Reader0"]);
 const devicesOp = ref<string[]>([]);
 
 /** 1.เสียบบัตรประชาชนเข้ากับเครื่องอ่าน*/
diff --git a/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue b/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue
index f34761819..4f20b06bc 100644
--- a/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue
+++ b/src/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue
@@ -47,6 +47,15 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
+  {
+    name: "createdFullName",
+    align: "left",
+    label: "ผู้ยื่นขอ",
+    sortable: true,
+    field: "createdFullName",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "name",
     align: "left",
@@ -124,6 +133,7 @@ const columns = ref<QTableProps["columns"]>([
 ]);
 const visibleColumns = ref<string[]>([
   "createdAt",
+  "createdFullName",
   "name",
   "developmentProjects",
   "developmentTarget",
diff --git a/src/modules/04_registryPerson/components/requestEdit/Dialog02_EditIDP.vue b/src/modules/04_registryPerson/components/requestEdit/Dialog02_EditIDP.vue
index 2dae1f215..9ce760a0c 100644
--- a/src/modules/04_registryPerson/components/requestEdit/Dialog02_EditIDP.vue
+++ b/src/modules/04_registryPerson/components/requestEdit/Dialog02_EditIDP.vue
@@ -17,8 +17,14 @@ import DialogHeader from "@/components/DialogHeader.vue";
 
 const $q = useQuasar();
 const store = useRequestEditStore();
-const { dialogConfirm, showLoader, hideLoader, messageError, success } =
-  useCounterMixin();
+const {
+  dialogConfirm,
+  showLoader,
+  hideLoader,
+  messageError,
+  success,
+  date2Thai,
+} = useCounterMixin();
 
 const modal = defineModel<boolean>("modal", { required: true }); //เปิด,ปิด popup แก้ไขสถานะคำร้อง
 const requestId = defineModel<string>("requestId", { required: true }); // id ที่ต้องการแก้ไข
@@ -40,6 +46,8 @@ const formData = reactive<FormDataIDP>({
   developmentReport: "", //รายงานผลการพัฒนา
   status: "", //สถานะ
   reason: "", //หมายเหตุ
+  createdFullName: "", //ผู้ขอแก้ไข
+  createdAt: null, //เวลาที่แก้ไข
 });
 
 //70 การลงมือปฏิบัติ (โดยผู้บังคับบัญชามอบหมาย)
@@ -151,6 +159,8 @@ function fetchDataByid(id: string) {
       formData.reasonDevelopment10 = data.reasonDevelopment10;
       formData.status = data.status;
       formData.reason = data.reason;
+      formData.createdFullName = data.createdFullName;
+      formData.createdAt = data.createdAt;
     })
     .catch((err) => {
       messageError($q, err);
@@ -213,6 +223,8 @@ function closeDialog() {
   formData.developmentReport = "";
   formData.status = "";
   formData.reason = "";
+  formData.createdFullName = "";
+  formData.createdAt = null;
 }
 
 /**
@@ -241,16 +253,22 @@ watch(modal, (val) => {
   <q-dialog v-model="modal" persistent>
     <q-card style="min-width: 65%">
       <q-form greedy @submit.prevent @validation-success="onSubmit">
-        <DialogHeader tittle="ข้อมูลการพัฒนารายบุคคล" :close="closeDialog" />
+        <DialogHeader
+          :tittle="`${formData.createdFullName}
+        (ขอแก้ไขเมื่อ ${
+          formData.createdAt ? date2Thai(formData.createdAt, true, true) : ''
+        })`"
+          :close="closeDialog"
+        />
         <q-separator />
 
         <!-- สถานะคำร้อง -->
         <q-card-section>
           <q-card bordered class="col-12">
-            <div class="col-12 text-weight-medium bg-grey-1 q-py-xs q-px-md">
+            <!-- <div class="col-12 text-weight-medium bg-grey-1 q-py-xs q-px-md">
               สถานะคำร้อง
             </div>
-            <q-separator />
+            <q-separator /> -->
             <div class="row q-pa-md q-col-gutter-sm">
               <!-- สถานะ -->
               <div class="col-4">
@@ -297,6 +315,8 @@ watch(modal, (val) => {
               </div>
             </div>
 
+            <q-separator />
+
             <q-card-actions align="right">
               <q-btn label="บันทึก" color="secondary" type="submit"
                 ><q-tooltip>บันทึก</q-tooltip></q-btn
diff --git a/src/modules/04_registryPerson/interface/request/Main.ts b/src/modules/04_registryPerson/interface/request/Main.ts
index 97556ceb6..9218f938a 100644
--- a/src/modules/04_registryPerson/interface/request/Main.ts
+++ b/src/modules/04_registryPerson/interface/request/Main.ts
@@ -77,6 +77,8 @@ interface FormDataIDP {
   developmentReport: string;
   status: string;
   reason: string;
+  createdFullName?: string;
+  createdAt?: Date | null;
 }
 
 export type {
diff --git a/src/modules/05_placement/components/PersonalList/DialogOrders.vue b/src/modules/05_placement/components/PersonalList/DialogOrders.vue
index 4d423f3f1..ed4c2f40b 100644
--- a/src/modules/05_placement/components/PersonalList/DialogOrders.vue
+++ b/src/modules/05_placement/components/PersonalList/DialogOrders.vue
@@ -15,7 +15,6 @@ import type { ListCommand } from "@/modules/18_command/interface/index/Main";
 
 import DialogHeader from "@/components/DialogHeader.vue";
 import DialogCreateCommand from "@/modules/18_command/components/DialogCreateCommand.vue";
-import { options } from "@fullcalendar/core/preact";
 
 const $q = useQuasar();
 const mixin = useCounterMixin();
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index 5e33e30eb..f8ad13240 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -703,23 +703,24 @@ async function fetchPermissionsSys() {
                 <div class="text-subtitle2 q-mt-md q-mb-xs text-center">
                   {{ fullname }}
                 </div>
-                <div class="row q-col-gutter-sm q-pa-sm">
-                  <div class="col-6">
+                <div class="row q-col-gutter-sm q-pa-sm text-center">
+                  <div class="col-12">
                     <q-btn
-                      color="blue"
+                      flat
+                      color="blue-6"
                       label="เข้าสู่ระบบ Linkage Center"
-                      size="sm"
                       v-close-popup
                       @click="modalLoginLinkage = true"
                     />
                   </div>
-                  <div class="col-6">
+                  <div class="col-12" id="#logout">
                     <q-btn
+                      push
+                      size="sm"
                       color="primary"
                       label="ออกจากระบบ"
                       v-close-popup
                       @click="doLogout"
-                      class="full-width full-height"
                     />
                   </div>
                 </div>