From 296f6a755fb32ebbfb5f57f69329aa6f54c6c413 Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Mon, 15 Jul 2024 15:50:06 +0800 Subject: [PATCH] update --- .../GenerateMonthlyWorkHoursReport.tsx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/components/GenerateMonthlyWorkHoursReport/GenerateMonthlyWorkHoursReport.tsx b/src/components/GenerateMonthlyWorkHoursReport/GenerateMonthlyWorkHoursReport.tsx index 1f34212..d60664f 100644 --- a/src/components/GenerateMonthlyWorkHoursReport/GenerateMonthlyWorkHoursReport.tsx +++ b/src/components/GenerateMonthlyWorkHoursReport/GenerateMonthlyWorkHoursReport.tsx @@ -45,20 +45,19 @@ const GenerateMonthlyWorkHoursReport: React.FC = ({ staffs, companyHolida ], [t] ); - - const holidayList: String[] = [...getPublicHolidaysForNYears(1, 2023).map((item) => dayjs(item.date).format("DD/MM/YYYY")), ...companyHolidays] - const uniqueHoliday = holidayList.filter((value, index, arr) => index === arr.indexOf(value)); - console.log(uniqueHoliday) - - return ( <> { + console.log(query); + const yearNeeded = parseInt(dayjs(query.date).format("YYYY")) + const holidayList: String[] = [...getPublicHolidaysForNYears(1, yearNeeded).map((item) => dayjs(item.date).format("DD/MM/YYYY")), ...companyHolidays] + const uniqueHoliday = holidayList.filter((value, index, arr) => index === arr.indexOf(value)); + let postData = { id: query.staff, yearMonth: dayjs().format("YYYY-MM").toString(), @@ -78,7 +77,7 @@ const GenerateMonthlyWorkHoursReport: React.FC = ({ staffs, companyHolida } }} /> - + ); };