From 429e2bde32c810b773c6239546fab89fd44dc692 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Tue, 6 Feb 2024 11:58:23 +0700
Subject: [PATCH] updated role menu

---
 src/interface/request/main/main.ts                            | 2 +-
 src/modules/04_registry/views/Main.vue                        | 3 ++-
 .../interface/index/Main.ts                                   | 0
 .../interface/request/Main.ts                                 | 0
 src/modules/{03_recruitingNew => 04_registryNew}/router.ts    | 4 ++--
 src/modules/{03_recruitingNew => 04_registryNew}/store.ts     | 0
 .../{03_recruitingNew => 04_registryNew}/views/main.vue       | 0
 src/router/index.ts                                           | 2 +-
 src/views/Dashboard.vue                                       | 4 ++--
 9 files changed, 8 insertions(+), 7 deletions(-)
 rename src/modules/{03_recruitingNew => 04_registryNew}/interface/index/Main.ts (100%)
 rename src/modules/{03_recruitingNew => 04_registryNew}/interface/request/Main.ts (100%)
 rename src/modules/{03_recruitingNew => 04_registryNew}/router.ts (60%)
 rename src/modules/{03_recruitingNew => 04_registryNew}/store.ts (100%)
 rename src/modules/{03_recruitingNew => 04_registryNew}/views/main.vue (100%)

diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts
index 3ce59c892..a79e11b54 100644
--- a/src/interface/request/main/main.ts
+++ b/src/interface/request/main/main.ts
@@ -132,7 +132,7 @@ const menuList = readonly<any[]>([
     activeIcon: "contact_page",
     label: "ทะเบียนประวัติ (ใหม่)",
     path: "registryNew",
-    role: "registry",
+    role: "organization",
   },
   {
     key: 2,
diff --git a/src/modules/04_registry/views/Main.vue b/src/modules/04_registry/views/Main.vue
index 5488893ea..92ed0884a 100644
--- a/src/modules/04_registry/views/Main.vue
+++ b/src/modules/04_registry/views/Main.vue
@@ -48,7 +48,7 @@
             </div>
           </q-scroll-area>
         </q-drawer>
-        
+
         <q-page-container class="q-ma-sm">
           <ProfileTable
             style="height: 77vh"
@@ -1185,6 +1185,7 @@ const nodeTree = async () => {
       messageError($q, e);
     })
     .finally(async () => {
+      hideLoader();
       await doSearch();
     });
 };
diff --git a/src/modules/03_recruitingNew/interface/index/Main.ts b/src/modules/04_registryNew/interface/index/Main.ts
similarity index 100%
rename from src/modules/03_recruitingNew/interface/index/Main.ts
rename to src/modules/04_registryNew/interface/index/Main.ts
diff --git a/src/modules/03_recruitingNew/interface/request/Main.ts b/src/modules/04_registryNew/interface/request/Main.ts
similarity index 100%
rename from src/modules/03_recruitingNew/interface/request/Main.ts
rename to src/modules/04_registryNew/interface/request/Main.ts
diff --git a/src/modules/03_recruitingNew/router.ts b/src/modules/04_registryNew/router.ts
similarity index 60%
rename from src/modules/03_recruitingNew/router.ts
rename to src/modules/04_registryNew/router.ts
index c36ce682b..fc400a1e1 100644
--- a/src/modules/03_recruitingNew/router.ts
+++ b/src/modules/04_registryNew/router.ts
@@ -1,4 +1,4 @@
-const mainPage = () => import("@/modules/02_organizationalNew/views/main.vue");
+const mainPage = () => import("@/modules/04_registryNew/views/main.vue");
 
 export default [
   {
@@ -8,7 +8,7 @@ export default [
     meta: {
       Auth: true,
       Key: [7],
-      Role: "registry",
+      Role: "organization",
     },
   },
 ];
diff --git a/src/modules/03_recruitingNew/store.ts b/src/modules/04_registryNew/store.ts
similarity index 100%
rename from src/modules/03_recruitingNew/store.ts
rename to src/modules/04_registryNew/store.ts
diff --git a/src/modules/03_recruitingNew/views/main.vue b/src/modules/04_registryNew/views/main.vue
similarity index 100%
rename from src/modules/03_recruitingNew/views/main.vue
rename to src/modules/04_registryNew/views/main.vue
diff --git a/src/router/index.ts b/src/router/index.ts
index c5c42cd98..cda3824d6 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -9,7 +9,7 @@ import ModuleMetadataNew from "@/modules/01_metadataNew/router";
 import ModuleOrganizational from "@/modules/02_organizational/router";
 import ModuleOrganizationalNew from "@/modules/02_organizationalNew/router";
 import ModuleRecruiting from "@/modules/03_recruiting/router";
-import ModuleRecruitingNew from "@/modules/03_recruitingNew/router";
+import ModuleRecruitingNew from "@/modules/04_registryNew/router";
 import ModuleRegistry from "@/modules/04_registry/router";
 import ModulePlacement from "@/modules/05_placement/router";
 import ModuleRetirement from "@/modules/06_retirement/router";
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index 8357baf27..ad9e3bb3c 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -66,7 +66,7 @@ const getData = async (index: number) => {
         }
       })
       .catch((e) => {
-        messageError($q, e);
+        // messageError($q, e);
       })
       .finally(() => {
         isLoadInbox.value = true;
@@ -157,7 +157,7 @@ const thaiOptions: Intl.DateTimeFormatOptions = {
         <div class="q-px-md q-py-sm row col-12 items-center">
           <div class="text-subtitle1 text-weight-medium">กล่องข้อความ</div>
           <q-space />
-          <div class="text-grey-5" style="font-size: 12px;">ทั้งหมด {{ totalInbox }} ข้อความ</div>
+          <div v-if="totalInbox" class="text-grey-5" style="font-size: 12px;">ทั้งหมด {{ totalInbox }} ข้อความ</div>
         </div>
         <q-separator />