浏览代码

[Timesheet] Quick fix for checking "Company Holiday".

main
cyril.tsui 1 天前
父节点
当前提交
89427f3783
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. +2
    -2
      src/app/api/timesheets/utils.ts

+ 2
- 2
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)),
]),
);



正在加载...
取消
保存