From 42253e05dfcfe56acf5f9708b79d7250685e111a Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Mon, 22 Jan 2024 09:58:14 +0700
Subject: [PATCH 1/2] =?UTF-8?q?fixed=20bug=20=E0=B9=81=E0=B8=88=E0=B9=89?=
 =?UTF-8?q?=E0=B8=87=E0=B9=80=E0=B8=95=E0=B8=B7=E0=B8=AD=E0=B8=99=E0=B8=82?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=B2=E0=B8=A2=E0=B9=80=E0=B8=A7=E0=B8=A5=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2=20=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=B7=E0=B8=AA=E0=B8=A7=E0=B8=99=20=E0=B8=AA=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=AA=E0=B8=A7=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../11_discipline/components/2_InvestigateFacts/Form.vue      | 2 +-
 .../components/3_InvestigateDisciplinary/Form.vue             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index f043c8643..e920ac519 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -139,7 +139,7 @@ const formData = reactive<FormData>({
 const rows = ref([]);
 const dateEndInputStyle = computed(() => {
   if(formData.investigationDateStart){
-  const currentDate = new Date(formData.investigationDateStart as Date);
+  const currentDate = new Date();
   const investigationDateEnd = new Date(formData.investigationDateEnd as Date);
 
   const isInNext7Days =
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index 916e48468..2841a3cfe 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -180,9 +180,9 @@ const emit = defineEmits(["submit:disciplinary"]);
 
 const dateEndInputStyle = computed(() => {
   if (formData.disciplinaryDateStart) {
-    const currentDate = new Date(formData.disciplinaryDateStart as Date);
+    const currentDate = new Date();
     const investigationDateEnd = new Date(formData.disciplinaryDateEnd as Date);
-
+    
     const isInNext7Days =
       investigationDateEnd >= currentDate &&
       investigationDateEnd <=

From 6264cf42dad796d037b41e750ef64638bd1aba6c Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 22 Jan 2024 10:31:53 +0700
Subject: [PATCH 2/2] =?UTF-8?q?=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=88=E0=B9=89=E0=B8=87?=
 =?UTF-8?q?=E0=B9=80=E0=B8=95=E0=B8=B7=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/MainLayout.vue | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index f73b5be60..c5e5ee476 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -87,9 +87,8 @@ async function fetchmsgNoread() {
     });
 }
 
-const isLoad = ref<boolean>(false);
+const statusLoad = ref<boolean>(false);
 const getDataNotification = async (index: number, type: string) => {
-  isLoad.value = false;
   const thaiOptions: Intl.DateTimeFormatOptions = {
     hour: "2-digit",
     minute: "2-digit",
@@ -119,15 +118,12 @@ const getDataNotification = async (index: number, type: string) => {
         });
       });
       notiList.value.push(...list);
-      totalInbox.value = res.data.result.total;
+      statusLoad.value = totalInbox.value === 0 ? true : false;
     })
     .catch((e) => {
       messageError($q, e);
     })
-    .finally(() => {
-      isLoad.value = true;
-      // hideLoader();
-    });
+    .finally(() => {});
 };
 
 /**
@@ -536,11 +532,7 @@ watch(
             v-if="totalNoti !== 0"
             >{{ totalNoti }}</q-badge
           >
-          <q-menu
-            v-model="notiTrigger"
-            :offset="[0, 8]"
-            style="height: 400px; width: 480px"
-          >
+          <q-menu v-model="notiTrigger" :offset="[0, 8]" style="width: 480px">
             <div class="q-px-md q-py-sm row col-12 items-center">
               <div class="text-subtitle1 text-weight-medium">การแจ้งเตือน</div>
               <q-space />
@@ -549,7 +541,11 @@ watch(
               </div>
             </div>
 
-            <q-infinite-scroll @load="onLoad" :offset="250">
+            <q-infinite-scroll
+              @load="onLoad"
+              :offset="250"
+              v-if="statusLoad === false"
+            >
               <div
                 v-for="(n, index) in notiList"
                 :key="index"
@@ -604,6 +600,19 @@ watch(
                 </div>
               </template>
             </q-infinite-scroll>
+            <div class="q-pa-md" v-else>
+              <q-banner rounded class="bg-amber-1 text-center">
+                <div class="text-yellow-10">
+                  <q-icon
+                    name="mdi-alert-box"
+                    class="q-mx-xs"
+                    size="sm"
+                    color="yellow-10"
+                  />
+                  ไมมีข้อมูล
+                </div>
+              </q-banner>
+            </div>
           </q-menu>
         </q-btn>
         <div class="row items-center no-wrap">