diff --git a/plugins/hr-resources/src/components/ScheduleRequests.svelte b/plugins/hr-resources/src/components/ScheduleRequests.svelte index dc5ef291e8..a59d269826 100644 --- a/plugins/hr-resources/src/components/ScheduleRequests.svelte +++ b/plugins/hr-resources/src/components/ScheduleRequests.svelte @@ -38,7 +38,10 @@ function getStyle (type: RequestType, request: Request): string { let res = `background-color: ${ - isWeekend(date) && noWeekendHolidayType.includes(type._id) ? getPlatformColor(16) : getPlatformColor(type.color) + (isWeekend(date) || isHoliday(getHolidayDatesForEmployee(staffDepartmentMap, employee._id, holidays), date)) && + noWeekendHolidayType.includes(type._id) + ? getPlatformColor(16) + : getPlatformColor(type.color) };` if (Math.abs(type.value % 1) === 0.5) { res += ' height: 50%;' @@ -60,7 +63,7 @@
{#each requests as request} {#await getType(request) then type} - {#if type && !((isWeekend(date) || isHoliday(getHolidayDatesForEmployee(staffDepartmentMap, employee._id, holidays), date)) && noWeekendHolidayType.includes(type._id))} + {#if type}