From fc6a42ee910cfadbe2910d635aec4cf37dc9630d Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 28 Apr 2026 18:46:30 +0700
Subject: [PATCH 1/6] fixed dialog reset password

---
 src/modules/02_users/views/01_user.vue | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/modules/02_users/views/01_user.vue b/src/modules/02_users/views/01_user.vue
index b30e964b..b9a086f8 100644
--- a/src/modules/02_users/views/01_user.vue
+++ b/src/modules/02_users/views/01_user.vue
@@ -36,7 +36,7 @@ const {
   hideLoader,
   success,
   dialogConfirm,
-  dialogMessageNotify,
+  dialogMessage,
 } = useCounterMixin();
 
 const NODE_ENV = ref<string>(process.env.NODE_ENV || "development");
@@ -454,8 +454,18 @@ function onReSetPassword(id: string) {
         await http.post(config.API.resetPassword, {
           keycloak: id,
         });
-        success($q, "รีเซ็ตรหัสผ่านสำเร็จ");
-        dialogMessageNotify($q, messsage);
+        // success($q, "รีเซ็ตรหัสผ่านสำเร็จ");
+        dialogMessage(
+          $q,
+          "รีเซ็ตรหัสผ่านสำเร็จ",
+          messsage,
+          "mdi-check-circle",
+          "ตกลง",
+          "green",
+          () => {},
+          () => {},
+          true,
+        );
       } catch (error) {
         messageError($q, error);
       } finally {

From bfcbe96678b2254daf5067f311afeeda0d2e2b9f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 8 May 2026 10:16:45 +0700
Subject: [PATCH 2/6] reafactor(issues): add status HELPDESK_IN_PROGRESS and
 REPLIED

---
 src/modules/07_issues/store.ts       | 10 +++-
 src/modules/07_issues/views/Main.vue | 69 ++++++++++++++++------------
 2 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/src/modules/07_issues/store.ts b/src/modules/07_issues/store.ts
index efddccdc..30809595 100644
--- a/src/modules/07_issues/store.ts
+++ b/src/modules/07_issues/store.ts
@@ -13,8 +13,10 @@ export const useIssueStore = defineStore("issue", () => {
   const statusOptions = ref<Options[]>([
     { label: "ทั้งหมด", value: "" },
     { label: "ใหม่", value: "NEW" },
-    { label: "กำลังดำเนินการ", value: "IN_PROGRESS" },
+    { label: "Dev กำลังดำเนินการ", value: "IN_PROGRESS" },
     { label: "แก้ไขแล้ว", value: "RESOLVED" },
+    { label: "Helpdesk กำลังดำเนินการ", value: "HELPDESK_IN_PROGRESS" },
+    { label: "แจ้งกลับแล้ว", value: "REPLIED " },
     { label: "ปิดแล้ว", value: "CLOSED" },
   ]);
 
@@ -24,11 +26,15 @@ export const useIssueStore = defineStore("issue", () => {
       case "NEW":
         return "ใหม่";
       case "IN_PROGRESS":
-        return "กำลังดำเนินการ";
+        return "Dev กำลังดำเนินการ";
       case "RESOLVED":
         return "แก้ไขแล้ว";
       case "CLOSED":
         return "ปิดแล้ว";
+      case "HELPDESK_IN_PROGRESS":
+        return "Helpdesk กำลังดำเนินการ";
+      case "REPLIED":
+        return "แจ้งกลับแล้ว";
       default:
         return "-";
     }
diff --git a/src/modules/07_issues/views/Main.vue b/src/modules/07_issues/views/Main.vue
index 3eac5f83..34977d08 100644
--- a/src/modules/07_issues/views/Main.vue
+++ b/src/modules/07_issues/views/Main.vue
@@ -22,6 +22,7 @@ const { convertStatus, convertSystem } = store;
 const { systemOptions, statusOptions } = storeToRefs(store);
 
 const visibleColumns = ref<string[]>([
+  "codeIssue",
   "title",
   "description",
   "system",
@@ -34,6 +35,43 @@ const visibleColumns = ref<string[]>([
   "status",
 ]);
 const columns = ref<QTableProps["columns"]>([
+  {
+    name: "codeIssue",
+    align: "left",
+    label: "รหัส",
+    sortable: false,
+    field: "codeIssue",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "createdAt",
+    align: "left",
+    label: "วันที่สร้าง",
+    sortable: false,
+    field: "createdAt",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (val: string) => date2Thai(new Date(val), false, true),
+  },
+  {
+    name: "createdFullName",
+    align: "left",
+    label: "ชื่อผู้สร้าง",
+    sortable: false,
+    field: "createdFullName",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "org",
+    align: "left",
+    label: "หน่วยงาน",
+    sortable: false,
+    field: "org",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
   {
     name: "title",
     align: "left",
@@ -71,16 +109,6 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-
-  {
-    name: "org",
-    align: "left",
-    label: "หน่วยงาน",
-    sortable: false,
-    field: "org",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "email",
     align: "left",
@@ -100,25 +128,6 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
 
-  {
-    name: "createdAt",
-    align: "left",
-    label: "วันที่สร้าง",
-    sortable: false,
-    field: "createdAt",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-    format: (val: string) => date2Thai(new Date(val), false, true),
-  },
-  {
-    name: "createdFullName",
-    align: "left",
-    label: "ชื่อผู้สร้าง",
-    sortable: false,
-    field: "createdFullName",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "status",
     align: "left",
@@ -194,6 +203,7 @@ onMounted(async () => {
   await fetchListIssues();
 });
 </script>
+
 <template>
   <div class="row items-center">
     <div class="toptitle text-dark row items-center q-py-xs">
@@ -231,6 +241,7 @@ onMounted(async () => {
               </div>
               <div class="col-xs-12 col-sm-8 col-md-6">
                 <q-select
+                class="select_ellipsis2"
                   dense
                   outlined
                   v-model="statusFilter"

From 5f0c6756d9fc2fd27614b32a4b5a1516e80ec0b4 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 8 May 2026 10:17:23 +0700
Subject: [PATCH 3/6] fix

---
 src/style/quasar-variables.sass | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/style/quasar-variables.sass b/src/style/quasar-variables.sass
index 1ab88b7e..dd9bf67e 100644
--- a/src/style/quasar-variables.sass
+++ b/src/style/quasar-variables.sass
@@ -187,5 +187,18 @@ h3.resigtry-tab-title
     text-overflow: ellipsis
     width: 200px
 
+.select_ellipsis2 .q-field__native > span
+    white-space: nowrap
+    overflow: hidden
+    text-overflow: ellipsis
+    width: 300px
+
+.select_ellipsis3 .q-field__native > span
+    white-space: nowrap
+    overflow: hidden
+    text-overflow: ellipsis
+    width: auto
+    max-width: 60ch
+
 .dialog-content-top .q-dialog__inner
     align-items: start

From d82d138c76e1cd93c6c41a1638e2c16b74fa3958 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 8 May 2026 10:42:10 +0700
Subject: [PATCH 4/6] fix(issues): statusOptions value

---
 src/modules/07_issues/store.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/07_issues/store.ts b/src/modules/07_issues/store.ts
index 30809595..0c983f7d 100644
--- a/src/modules/07_issues/store.ts
+++ b/src/modules/07_issues/store.ts
@@ -16,7 +16,7 @@ export const useIssueStore = defineStore("issue", () => {
     { label: "Dev กำลังดำเนินการ", value: "IN_PROGRESS" },
     { label: "แก้ไขแล้ว", value: "RESOLVED" },
     { label: "Helpdesk กำลังดำเนินการ", value: "HELPDESK_IN_PROGRESS" },
-    { label: "แจ้งกลับแล้ว", value: "REPLIED " },
+    { label: "แจ้งกลับแล้ว", value: "REPLIED" },
     { label: "ปิดแล้ว", value: "CLOSED" },
   ]);
 

From 7489c9d2aa12fb21d5b689499a895235826b4adf Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 26 May 2026 15:00:49 +0700
Subject: [PATCH 5/6] fix: default profileImg

---
 src/views/MainLayout.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index d9b71c84..0907b056 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -357,7 +357,7 @@ async function fetchKeycloakPosition() {
     });
 }
 
-const profileImg = ref<string>("");
+const profileImg = ref<string>(avatar);
 async function getImg(id: string, pathName: string) {
   await http
     .get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, pathName))

From dfd20c97dcd5f8e2a1174c5d96b000b6c7af4438 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 28 May 2026 09:52:24 +0700
Subject: [PATCH 6/6] update manage web services list add access

---
 src/modules/06_webservices/view/listView.vue | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/modules/06_webservices/view/listView.vue b/src/modules/06_webservices/view/listView.vue
index 56fb82db..8ee8bdb5 100644
--- a/src/modules/06_webservices/view/listView.vue
+++ b/src/modules/06_webservices/view/listView.vue
@@ -37,6 +37,7 @@ const visibleColumns = ref<string[]>([
   "amount",
   "createdAt",
   "createdFullName",
+  "accessType",
 ]);
 const columns = ref<QTableProps["columns"]>([
   {
@@ -62,6 +63,22 @@ const columns = ref<QTableProps["columns"]>([
         .join("");
     },
   },
+  {
+    name: "accessType",
+    align: "left",
+    label: "การเข้าถึง",
+    sortable: true,
+    field: "accessType",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      if (val === "ALL") {
+        return `ทั้งหมด`;
+      } else {
+        return `${val} (${row.orgName})`;
+      }
+    },
+  },
   {
     name: "amount",
     align: "left",
@@ -147,7 +164,7 @@ function serchDataTable() {
   rows.value = onSearchDataTable(
     keyword.value,
     rowsMain.value,
-    columns.value ? columns.value : []
+    columns.value ? columns.value : [],
   );
 }