|
|
@@ -51,6 +51,8 @@ export interface Props { |
|
|
|
companyHolidays: HolidaysResult[]; |
|
|
|
allProjects: ProjectWithTasks[]; |
|
|
|
miscTasks: Task[]; |
|
|
|
isSaturdayWorker: boolean; |
|
|
|
userId: number; |
|
|
|
} |
|
|
|
|
|
|
|
type MemberOption = TeamTimeSheets[0] & TeamLeaves[0] & { id: string }; |
|
|
@@ -79,6 +81,8 @@ const TimesheetAmendment: React.FC<Props> = ({ |
|
|
|
allProjects, |
|
|
|
leaveTypes, |
|
|
|
miscTasks, |
|
|
|
isSaturdayWorker, |
|
|
|
userId |
|
|
|
}) => { |
|
|
|
const { t, i18n:{language}} = useTranslation(["home", "common"]); |
|
|
|
const locale = language === "zh" ? "zh-tw" : "en"; |
|
|
@@ -121,12 +125,15 @@ const TimesheetAmendment: React.FC<Props> = ({ |
|
|
|
}, [localTeamLeaves, localTeamTimesheets]); |
|
|
|
|
|
|
|
const [selectedStaff, setSelectedStaff] = useState<MemberOption>( |
|
|
|
allMembers[0], |
|
|
|
allMembers.find((member) => parseInt(member.id) === userId) ?? allMembers[0] |
|
|
|
); |
|
|
|
useEffect(() => { |
|
|
|
console.log(allMembers) |
|
|
|
console.log(userId) |
|
|
|
setSelectedStaff( |
|
|
|
(currentStaff) => |
|
|
|
allMembers.find((member) => member.id === currentStaff.id) || |
|
|
|
allMembers.find((member) => parseInt(member.id) === userId) || |
|
|
|
allMembers[0], |
|
|
|
); |
|
|
|
}, [allMembers]); |
|
|
|