Merge pull request #25792 from anupamvs/timesheet-refa

refactor: timesheet