From f69b3269a9be6640892308b87bd290c5fc7a6281 Mon Sep 17 00:00:00 2001 From: "MSI\\2Fi" Date: Wed, 19 Mar 2025 14:20:30 +0800 Subject: [PATCH] Update Staff Info and Leave Table to include isSaturdayWorker --- src/components/CreateStaff/StaffInfo.tsx | 2 +- src/components/LeaveTable/LeaveTable.tsx | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/CreateStaff/StaffInfo.tsx b/src/components/CreateStaff/StaffInfo.tsx index 212295c..cee90c4 100644 --- a/src/components/CreateStaff/StaffInfo.tsx +++ b/src/components/CreateStaff/StaffInfo.tsx @@ -26,7 +26,7 @@ import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs"; import { DemoItem } from "@mui/x-date-pickers/internals/demo"; import dayjs from "dayjs"; import { INPUT_DATE_FORMAT } from "@/app/utils/formatUtil"; -import TableModal from "./TableModal"; +// import TableModal from "./TableModal"; import { Preview } from "@mui/icons-material"; import SalaryEffectiveModel from "../EditStaff/SalaryEffectiveModel"; import TeamHistoryModal from "../EditStaff/TeamHistoryModal"; diff --git a/src/components/LeaveTable/LeaveTable.tsx b/src/components/LeaveTable/LeaveTable.tsx index 4e36f44..c95f4b8 100644 --- a/src/components/LeaveTable/LeaveTable.tsx +++ b/src/components/LeaveTable/LeaveTable.tsx @@ -13,12 +13,14 @@ interface Props { leaveTypes: LeaveType[]; timesheetRecords: RecordTimesheetInput; companyHolidays: HolidaysResult[]; + isSaturdayWorker: boolean; } const LeaveTable: React.FC = ({ leaveTypes, timesheetRecords, companyHolidays, + isSaturdayWorker }) => { const { watch } = useFormContext(); const currentInput = watch(); @@ -32,6 +34,7 @@ const LeaveTable: React.FC = ({ timesheetEntries={timesheetRecords} EntryTableComponent={LeaveEntryTable} entryTableProps={{ leaveTypes }} + isSaturdayWorker={isSaturdayWorker} /> ); };