diff --git a/apps/frontend/src/components/Timetable/DayColumn.tsx b/apps/frontend/src/components/Timetable/DayColumn.tsx index a08c789..b89ea95 100644 --- a/apps/frontend/src/components/Timetable/DayColumn.tsx +++ b/apps/frontend/src/components/Timetable/DayColumn.tsx @@ -11,7 +11,7 @@ type Props = { startTime: dayjs.Dayjs; endTime: dayjs.Dayjs; events: Event[]; - renderCell?: (events: Event[]) => JSX.Element; + renderCell?: (date: dayjs.Dayjs) => JSX.Element; renderEvent?: (event: Event) => JSX.Element; }; @@ -45,27 +45,7 @@ export default function DayColumn({
{renderCell ? (
- {renderCell( - events.filter((event) => { - // return event.start.isSame( - // startTime.add(i, "h"), - // "hour" - // ); - - return ( - currentDateTime.isSame( - event.start, - "hour" - ) || - (currentDateTime.isAfter( - event.start - ) && - currentDateTime.isBefore( - event.end - )) - ); - }) - )} + {renderCell(currentDateTime)}
) : ( diff --git a/apps/frontend/src/components/Timetable/Timetable.tsx b/apps/frontend/src/components/Timetable/Timetable.tsx index c4d01c4..02eb075 100644 --- a/apps/frontend/src/components/Timetable/Timetable.tsx +++ b/apps/frontend/src/components/Timetable/Timetable.tsx @@ -16,7 +16,7 @@ type Props = { startTime?: dayjs.Dayjs; endTime?: dayjs.Dayjs; events: Event[]; - renderCell?: (events: Event[]) => JSX.Element; + renderCell?: (date: dayjs.Dayjs) => JSX.Element; renderEvent?: (event: Event) => JSX.Element; };