DerexXD/UT-Registration-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hackathon' of https://github.com/UT-Developers/UT-Registration-Plus into hackathon

Browse Source
This commit is contained in:
Derek Chen
2024-02-20 22:06:52 -06:00
parent e99664fdae 8c82282467
commit b2eac59ae7
3 changed files with 53 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/components/calendar/CalendarGrid/CalendarGrid.tsx
View File

@@ -119,7 +119,7 @@ function CalendarGrid({ courseCells, saturdayClass }: React.PropsWithChildren<Pr
</div>
))}
{grid.map((row, rowIndex) => row)}
{courseCells ? accountForCourseConflicts(courseCells) : null}
{courseCells ? <AccountForCourseConflicts courseCells={courseCells}/> : null}
{/* courseCells.map((block: CalendarGridCourse) => (
<div
key={`${block}`}
@@ -142,7 +142,11 @@ function CalendarGrid({ courseCells, saturdayClass }: React.PropsWithChildren<Pr
export default CalendarGrid;
function accountForCourseConflicts(courseCells: CalendarGridCourse[]): JSX.Element[] {
interface AccountForCourseConflictsProps {
courseCells: CalendarGridCourse[];
}
function AccountForCourseConflicts({ courseCells }: AccountForCourseConflictsProps): JSX.Element[] {
// Groups by dayIndex to identify overlaps
const days = courseCells.reduce((acc, cell: CalendarGridCourse) => {
const { dayIndex } = cell.calendarGridPoint;