diff --git a/src/components/TimesheetAmendment/TimesheetAmendment.tsx b/src/components/TimesheetAmendment/TimesheetAmendment.tsx index d12999c..c224486 100644 --- a/src/components/TimesheetAmendment/TimesheetAmendment.tsx +++ b/src/components/TimesheetAmendment/TimesheetAmendment.tsx @@ -313,8 +313,7 @@ const TimesheetAmendment: React.FC = ({ ({ event }: EventClickArg) => { const dayJsObj = dayjs(event.startStr); const holiday = getHolidayForDate(event.startStr, companyHolidays); - const isWeekend = !isSaturdayWorker ? dayJsObj.day() === 0 || dayJsObj.day() === 6 : dayJsObj.day() === 0; - const isHoliday = holiday || isWeekend; + const isHoliday = holiday || dayJsObj.day() === 0 || dayJsObj.day() === 6; if ( event.extendedProps.calendar === "timeEntry" && @@ -343,8 +342,7 @@ const TimesheetAmendment: React.FC = ({ (e: { dateStr: string; dayEl: HTMLElement }) => { const dayJsObj = dayjs(e.dateStr); const holiday = getHolidayForDate(e.dateStr, companyHolidays); - const isWeekend = !isSaturdayWorker ? dayJsObj.day() === 0 || dayJsObj.day() === 6 : dayJsObj.day() === 0; - const isHoliday = holiday || isWeekend; + const isHoliday = holiday || dayJsObj.day() === 0 || dayJsObj.day() === 6; setSelectedDateInfo({ dateStr: e.dateStr, isHoliday: Boolean(isHoliday), @@ -361,8 +359,7 @@ const TimesheetAmendment: React.FC = ({ } const dayJsObj = dayjs(date); const holiday = getHolidayForDate(date, companyHolidays); - const isWeekend = !isSaturdayWorker ? dayJsObj.day() === 0 || dayJsObj.day() === 6 : dayJsObj.day() === 0; - const isHoliday = holiday || isWeekend; + const isHoliday = holiday || dayJsObj.day() === 0 || dayJsObj.day() === 6; const intStaffId = parseInt(selectedStaff.id); const leaves = localTeamLeaves[intStaffId].leaveEntries[date] || []; diff --git a/src/components/TimesheetAmendment/TimesheetAmendmentModal.tsx b/src/components/TimesheetAmendment/TimesheetAmendmentModal.tsx index 4c7b0a3..0018419 100644 --- a/src/components/TimesheetAmendment/TimesheetAmendmentModal.tsx +++ b/src/components/TimesheetAmendment/TimesheetAmendmentModal.tsx @@ -27,7 +27,6 @@ const modalSx: SxProps = { interface Props extends TimesheetAmendmentProps { open: boolean; onClose: () => void; - isSaturdayWorker: boolean; } export const TimesheetAmendmentModal: React.FC = ({ diff --git a/src/components/UserWorkspacePage/UserWorkspacePage.tsx b/src/components/UserWorkspacePage/UserWorkspacePage.tsx index 07c21d2..029129b 100644 --- a/src/components/UserWorkspacePage/UserWorkspacePage.tsx +++ b/src/components/UserWorkspacePage/UserWorkspacePage.tsx @@ -200,7 +200,6 @@ const UserWorkspacePage: React.FC = ({ leaveRecords={defaultLeaveRecords} isFullTime={isFullTime} joinDate={dayjs(joinDate)} - isSaturdayWorker={isSaturdayWorker} miscTasks={miscTasks} /> = ({ timesheetRecords={defaultTimesheets} isFullTime={isFullTime} joinDate={dayjs(joinDate)} - isSaturdayWorker={isSaturdayWorker} /> {assignedProjects.length > 0 ? (