Merge branch 'develop' into dev

* develop:
  update manage web services list add access
  fix: default profileImg
  fix(issues): statusOptions value
  fix
  reafactor(issues): add status HELPDESK_IN_PROGRESS and REPLIED

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 : [],
   );
 }
 

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 "-";
     }

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"

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

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))