Merge branch 'NiceDev' into develop

src/modules/05_leave/components/Calendar.vue

@@ -100,16 +100,15 @@ async function fetchDataCalendar() {
         };
         filterLists.value.push(filterName);
       }
-			console.log(double_name);
+      const eventData = filterVal.value.map((item: any) => {
-
+        return mainData.value
-			if (filterVal.value.length !== 0) {
+          .filter(
-				const data = mainData.value.filter(
+            (e: DataCalendar) =>
-					(e: any) => e.keycloakId === keycloakId.value
+              e.keycloakId === item &&
-				);
+              e.status != "REJECT" &&
-
+              e.status != "DELETE"
-				const event = data
+          )
-					.filter((x: any) => x.status != "REJECT" && x.status != "DELETE")
+          .map((e) => ({
-					.map((e: DataCalendar) => ({
             id: e.id,
             title: `${e.fullName} (${e.leaveTypeName})`,
             start: e.leaveStartDate,
@@ -120,9 +119,10 @@ async function fetchDataCalendar() {
             color: e.keycloakId === keycloakId.value ? "#DCEDC8" : "#CFD8DC",
             textColor: "black",
           }));
-				calendarOptions.value.events = event;
+      });
-				console.log(calendarOptions.value.events);
+      const allEventData = [].concat(...eventData);
-			}
+      calendarOptions.value.events = allEventData;
+      //   }
     })
     .catch((err) => {
       messageError($q, err);
@@ -130,7 +130,6 @@ async function fetchDataCalendar() {
     .finally(() => {
       hideLoader();
     });
-	await fetchData();
 }
 
 /**
@@ -238,7 +237,7 @@ async function onClickClose() {
 
 /** filter calendar left */
 const filterLists = ref<any>([]);
-const filterVal = ref<any>([]);
+const filterVal = ref<any>([keycloakId.value]);
 
 /**** ตรวจสอบว่ามีการส่งข้อมูลเข้ามาที่Calendar */
 watch(
@@ -266,6 +265,7 @@ watch(
     });
     const allEventData = [].concat(...eventData);
     calendarOptions.value.events = allEventData;
+    fetchData();
   }
 );
 
@@ -273,6 +273,7 @@ watch(
 onMounted(async () => {
   filterVal.value.push(keycloakId.value);
   await fetchDataCalendar();
+  await fetchData();
   await fectOptionType();
 });
 </script>