From c1e4abd766723caddea8de954c5622be460fa085 Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Sun, 19 Mar 2023 19:36:24 +0700
Subject: [PATCH] TSK-871: Fix overtime display (#2769)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 plugins/hr-resources/src/components/ScheduleRequests.svelte | 2 +-
 server/front/src/index.ts                                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/hr-resources/src/components/ScheduleRequests.svelte b/plugins/hr-resources/src/components/ScheduleRequests.svelte
index 7e9747a670..72dbb77851 100644
--- a/plugins/hr-resources/src/components/ScheduleRequests.svelte
+++ b/plugins/hr-resources/src/components/ScheduleRequests.svelte
@@ -58,7 +58,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 && !((isWeekend(date) || isHoliday(getHolidayDatesForEmployee(staffDepartmentMap, employee._id, holidays), date)) && noWeekendHolidayType.includes(type._id))}
         <!-- svelte-ignore a11y-click-events-have-key-events -->
         <div
           class="request flex-center"
diff --git a/server/front/src/index.ts b/server/front/src/index.ts
index 2b99062578..68cea57a71 100644
--- a/server/front/src/index.ts
+++ b/server/front/src/index.ts
@@ -454,6 +454,7 @@ export function start (
   })
 
   app.get('*', function (request, response) {
+    response.set('Cache-Control', 'no-cache')
     response.sendFile(join(dist, 'index.html'))
   })