Merge branch 'develop' into devTee

src/modules/13_salary/components/DialogInfoMain.vue

@@ -86,7 +86,11 @@ async function fetchProfile(id: string, avatarName: string) {
  * function rediract ไปทะเบียนประวัติ
  */
 function redirecToRegistry() {
-  router.push(`/registry-officer${props.employeeClass}/${profileId.value}`);
+  router.push(
+    `/registry${props.employeeClass ? props.employeeClass : "-officer"}/${
+      profileId.value
+    }`
+  );
   modal.value = false;
 }
 
@@ -228,5 +232,4 @@ watch(
   </q-dialog>
 </template>
 
-<style scoped>
-</style>
+<style scoped></style>

src/views/MainLayout.vue

@@ -233,7 +233,7 @@ const activeBtn = () => {
 };
 
 const isSsoToken = ref<boolean>(false);
-
+const interval = ref<any>(null);
 /**
  * เมื่อเริ่มต้นโปรแกรมให้ฟัง event resize และ function myEventHandler
  * set function myEventHandler เพราะ state ยังไม่เซ็ท , state เซ็ทเมื่อ หน้าจอเริ่ม ขยับหน้าจอ
@@ -256,7 +256,12 @@ onMounted(async () => {
 
     await fetchroleUser(user.role);
   }
-  await fetchmsgNoread();
+
+  fetchmsgNoread();
+  // fetch noread noti every 15 seconds
+  interval.value = setInterval(() => {
+    fetchmsgNoread();
+  }, 15000);
 
   myEventHandler(null, false);
   window.addEventListener("resize", (e: any) => {
@@ -271,6 +276,9 @@ onUnmounted(() => {
   window.removeEventListener("resize", (e: any) => {
     myEventHandler(e, true);
   });
+  if (interval.value) {
+    clearInterval(interval.value);
+  }
 });
 
 /**