From 89427f3783e80dc5118d4c729125d720c6899833 Mon Sep 17 00:00:00 2001 From: "cyril.tsui" Date: Wed, 8 Apr 2026 20:05:48 +0800 Subject: [PATCH] [Timesheet] Quick fix for checking "Company Holiday". --- src/app/api/timesheets/utils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/api/timesheets/utils.ts b/src/app/api/timesheets/utils.ts index 2ecca5f..be9e782 100644 --- a/src/app/api/timesheets/utils.ts +++ b/src/app/api/timesheets/utils.ts @@ -1,7 +1,7 @@ import { getPublicHolidaysForNYears } from "@/app/utils/holidayUtils"; import { HolidaysResult } from "../holidays"; import { LeaveEntry, RecordTimeLeaveInput, TimeEntry } from "./actions"; -import { convertDateArrayToString } from "@/app/utils/formatUtil"; +import { INPUT_DATE_FORMAT, convertDateArrayToString } from "@/app/utils/formatUtil"; import compact from "lodash/compact"; import dayjs, { Dayjs } from "dayjs"; import isSameOrAfter from "dayjs/plugin/isSameOrAfter"; @@ -93,7 +93,7 @@ export const validateTimeLeaveRecord = ( const holidays = new Set( compact([ ...getPublicHolidaysForNYears(2).map((h) => h.date), - ...companyHolidays.map((h) => convertDateArrayToString(h.date)), + ...companyHolidays.map((h) => convertDateArrayToString(h.date, INPUT_DATE_FORMAT)), ]), );