Meetings fix (#835)

* fixed incorrect meeting times on catalog and enumerated by meeting on scheduler

* single meeting assumption fix

Author: ARtheboss

apps/frontend/src/app/Schedule/Editor/SideBar/Class/Section/index.tsx

@@ -22,8 +22,8 @@ export default function Section({
   number,
   meetings,
 }: SectionProps & ISection) {
-  const meeting = meetings.length > 0 ? meetings[0] : null;
-  return (
+  const meetingsAdjusted = meetings.length > 0 ? meetings : [null];
+  return meetingsAdjusted.map((meeting) => (
     <div
       className={classNames(styles.root, {
         [styles.active]: active,
@@ -44,5 +44,5 @@ export default function Section({
         className={styles.time}
       />
     </div>
-  );
+  ));
 }

apps/frontend/src/app/Schedule/Week/index.tsx

@@ -100,23 +100,25 @@ export default function Week({
 
         const relevantSections = sections
           // Filter sections for the current day which have a time specified
-          .filter(
-            (section) =>
-              section.meetings.length > 0 &&
-              section.meetings[0].days[day] &&
-              section.meetings[0].startTime &&
-              getY(section.meetings[0].startTime) > 0
-          )
-          .map(
-            (section) =>
-              ({
-                section,
-                startTime: section.meetings[0].startTime,
-                endTime: section.meetings[0].endTime,
-                days: section.meetings[0].days,
-                id: section.sectionId,
-                type: "section",
-              }) as ScheduleEvent
+          .flatMap((section) =>
+            section.meetings
+              .filter(
+                (meeting) =>
+                  meeting.days[day] &&
+                  meeting.startTime &&
+                  getY(meeting.startTime) > 0
+              )
+              .map(
+                (meeting) =>
+                  ({
+                    section,
+                    startTime: meeting.startTime,
+                    endTime: meeting.endTime,
+                    days: meeting.days,
+                    id: section.sectionId,
+                    type: "section",
+                  }) as ScheduleEvent
+              )
           );
 
         const relevantEventsAndSections = [

apps/frontend/src/components/Class/Overview/index.tsx

@@ -12,7 +12,9 @@ export default function Overview() {
     <Box p="5">
       <Container size="3">
         <Flex direction="column" gap="5">
-          <Details {..._class.primarySection.meetings[0]} />
+          {_class.primarySection.meetings.map((meeting, i) => (
+            <Details {...meeting} key={i} />
+          ))}
           <Flex direction="column" gap="2">
             <p className={styles.label}>Description</p>
             <p className={styles.description}>

apps/frontend/src/components/Class/Sections/index.tsx

@@ -149,13 +149,9 @@ export default function Sections() {
                     </a>
                   </Tooltip>
                 </div>
-                <Details
-                  days={section.meetings[0].days}
-                  startTime={section.meetings[0].startTime}
-                  endTime={section.meetings[0].endTime}
-                  location={section.meetings[0].location}
-                  instructors={section.meetings[0].instructors}
-                />
+                {section.meetings.map((meeting, i) => (
+                  <Details {...meeting} key={i} />
+                ))}
               </div>
             ))}
           </div>

apps/frontend/src/components/ClassCard/index.tsx

@@ -82,10 +82,12 @@ export default function ClassCard({
           </Card.Footer>
         </Card.Body>
         <Card.Actions>
-          <AverageGrade
-            gradeDistribution={gradeDistribution}
-            style={{ marginTop: 0.5, fontSize: 15 }}
-          />
+          {gradeDistribution && (
+            <AverageGrade
+              gradeDistribution={gradeDistribution}
+              style={{ marginTop: 0.5, fontSize: 15 }}
+            />
+          )}
           {bookmarked && bookmarkToggle && (
             <Card.ActionIcon onClick={bookmarkToggle}>
               {bookmarked ? (

apps/frontend/src/components/Time/index.tsx

@@ -75,7 +75,7 @@ export default function Time({
         .reduce(
           (time, day, index) =>
             day
-              ? [...time, ["Su", "M", "Tu", "W", "Th", "F", "Sa"][index]]
+              ? [...time, ["M", "Tu", "W", "Th", "F", "Sa", "Su"][index]]
               : time,
           [] as string[]
         )