TSK-1419: show greyed requests on holidays and weekends (#3121)

Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
hcengineering · May 2, 2023 · f893b2c · f893b2c
1 parent afea88f
commit f893b2c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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 @@
 <div class="w-full h-full relative p-1 flex">
   {#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}
         <!-- svelte-ignore a11y-click-events-have-key-events -->
         <div
           class="request flex-center"