wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-23 08:48:01 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

TSK-871: Fix overtime display (#2769)

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2023-03-19 19:36:24 +07:00 committed by GitHub
parent 1fe73b588e
commit c1e4abd766
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/hr-resources/src/components/ScheduleRequests.svelte
View File

@ -58,7 +58,7 @@
<div class="w-full h-full relative p-1 flex"> <div class="w-full h-full relative p-1 flex">
{#each requests as request} {#each requests as request}
{#await getType(request) then type} {#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 --> <!-- svelte-ignore a11y-click-events-have-key-events -->
<div <div
class="request flex-center" class="request flex-center"

1
server/front/src/index.ts
View File

@ -454,6 +454,7 @@ export function start (
}) })
app.get('*', function (request, response) { app.get('*', function (request, response) {
response.set('Cache-Control', 'no-cache')
response.sendFile(join(dist, 'index.html')) response.sendFile(join(dist, 'index.html'))
}) })