hrms-bangkok/hrms-user
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

แก้ bug calendar

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-12-25 15:43:26 +07:00
parent 8d17177c73
commit d421374f33
1 changed files with 29 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/modules/05_leave/components/Calendar.vue
View file

@ -102,22 +102,26 @@ async function fetchDataCalendar() {
filterLists.value.push(filterName); filterLists.value.push(filterName);
} }
const data = mainData.value.filter( if (filterVal.value.length !== 0) {
(e: any) => e.keycloakId === keycloakId.value const data = mainData.value.filter(
); (e: any) => e.keycloakId === keycloakId.value
);
const event = data const event = data
.filter((x: any) => x.status != "REJECT" && x.status != "DELETE") .filter((x: any) => x.status != "REJECT" && x.status != "DELETE")
.map((e: DataCalendar) => ({ .map((e: DataCalendar) => ({
id: e.id, id: e.id,
title: `${e.fullName} (${e.leaveTypeName})`, title: `${e.fullName} (${e.leaveTypeName})`,
start: e.leaveStartDate, start: e.leaveStartDate,
end: e.leaveEndDate, end: new Date(
allDay: true, new Date(e.leaveEndDate).setHours(23, 59, 59)
color: e.keycloakId === keycloakId.value ? "#DCEDC8" : "#CFD8DC", ).toISOString(),
textColor: "black", allDay: e.leaveStartDate === e.leaveEndDate ? true : false,
})); color: e.keycloakId === keycloakId.value ? "#DCEDC8" : "#CFD8DC",
calendarOptions.value.events = event; textColor: "black",
}));
calendarOptions.value.events = event;
}
}) })
.catch((err) => { .catch((err) => {
@ -189,13 +193,20 @@ watch(
() => { () => {
const eventData = filterVal.value.map((item: any) => { const eventData = filterVal.value.map((item: any) => {
return mainData.value return mainData.value
.filter((e: DataCalendar) => e.keycloakId === item) .filter(
(e: DataCalendar) =>
e.keycloakId === item &&
e.status != "REJECT" &&
e.status != "DELETE"
)
.map((e) => ({ .map((e) => ({
id: e.id, id: e.id,
title: `${e.fullName} (${e.leaveTypeName})`, title: `${e.fullName} (${e.leaveTypeName})`,
start: e.leaveStartDate, start: e.leaveStartDate,
end: e.leaveEndDate, end: new Date(
allDay: true, new Date(e.leaveEndDate).setHours(23, 59, 59)
).toISOString(),
allDay: e.leaveStartDate === e.leaveEndDate ? true : false,
color: e.keycloakId === keycloakId.value ? "#DCEDC8" : "#CFD8DC", color: e.keycloakId === keycloakId.value ? "#DCEDC8" : "#CFD8DC",
textColor: "black", textColor: "black",
})); }));