Merge pull request #783 from sandboxnu/individual-course-check

Courses in sidebar will display a checkmark if they are present anywhere in the users plan
sandboxnu · Dec 5, 2024 · f20fcb2 · f20fcb2
2 parents 068b0e3 + b8d6a34
commit f20fcb2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/packages/frontend/components/Sidebar/SectionRequirement.tsx b/packages/frontend/components/Sidebar/SectionRequirement.tsx
@@ -21,12 +21,14 @@ interface SidebarRequirementProps {
   requirement: Requirement2;
   courseData: { [id: string]: ScheduleCourse2<null> };
   dndIdPrefix: string;
+  coursesTaken: ScheduleCourse2<unknown>[];
 }
 
 const SectionRequirement: React.FC<SidebarRequirementProps> = ({
   requirement,
   courseData,
   dndIdPrefix,
+  coursesTaken,
 }) => {
   const renderRequirement = () => {
     switch (requirement.type) {
@@ -47,6 +49,21 @@ const SectionRequirement: React.FC<SidebarRequirementProps> = ({
     }
   };
 
+  const isCourseInPlan = (requirement: Requirement2): boolean => {
+    let isTrue = false;
+    if (coursesTaken) {
+      coursesTaken.forEach((course) => {
+        if (
+          requirement.type === "COURSE" &&
+          getCourseDisplayString(course) === getCourseDisplayString(requirement)
+        ) {
+          isTrue = true;
+        }
+      });
+    }
+    return isTrue;
+  };
+
   const renderXOM = (requirement: IXofManyCourse) => {
     return (
       <div>
@@ -57,6 +74,7 @@ const SectionRequirement: React.FC<SidebarRequirementProps> = ({
           <SectionRequirement
             requirement={course}
             courseData={courseData}
+            coursesTaken={coursesTaken}
             dndIdPrefix={dndIdPrefix + "-" + index}
             key={index}
           />
@@ -75,6 +93,7 @@ const SectionRequirement: React.FC<SidebarRequirementProps> = ({
           <SectionRequirement
             requirement={course}
             courseData={courseData}
+            coursesTaken={coursesTaken}
             dndIdPrefix={dndIdPrefix + "-" + index}
             key={index}
           />
@@ -93,6 +112,7 @@ const SectionRequirement: React.FC<SidebarRequirementProps> = ({
           <SectionRequirement
             requirement={course}
             courseData={courseData}
+            coursesTaken={coursesTaken}
             dndIdPrefix={dndIdPrefix + "-" + index}
             key={index}
           />
@@ -130,7 +150,7 @@ const SectionRequirement: React.FC<SidebarRequirementProps> = ({
           }}
           isInSidebar
           // TODO: isChecked is for when the requirement is added to the plan and validated. When true, this will render a checkmark.
-          isChecked={false}
+          isChecked={isCourseInPlan(requirement)}
           isDisabled={false}
         />
       );
@@ -145,6 +165,7 @@ const SectionRequirement: React.FC<SidebarRequirementProps> = ({
         validationStatus={SidebarValidationStatus.Complete}
         section={requirement}
         courseData={courseData}
+        coursesTaken={coursesTaken}
         dndIdPrefix={dndIdPrefix + "-sec"}
       />
     );

diff --git a/packages/frontend/components/Sidebar/Sidebar.tsx b/packages/frontend/components/Sidebar/Sidebar.tsx
@@ -258,6 +258,7 @@ const Sidebar: React.FC<SidebarProps> = memo(
                   courseData={courseData}
                   dndIdPrefix={`${SIDEBAR_DND_ID_PREFIX}-${index}`}
                   loading={isCoursesLoading}
+                  coursesTaken={coursesTaken}
                 />
               );
             })}
@@ -267,6 +268,7 @@ const Sidebar: React.FC<SidebarProps> = memo(
                 section={concentration}
                 courseData={courseData}
                 dndIdPrefix={`${SIDEBAR_DND_ID_PREFIX}-concentration`}
+                coursesTaken={[]}
               />
             )}
           </>

diff --git a/packages/frontend/components/Sidebar/SidebarSection.tsx b/packages/frontend/components/Sidebar/SidebarSection.tsx
@@ -18,6 +18,7 @@ interface SidebarSectionProps {
   courseData: { [id: string]: ScheduleCourse2<null> };
   dndIdPrefix: string;
   validationStatus: SidebarValidationStatus;
+  coursesTaken: ScheduleCourse2<unknown>[];
   loading?: boolean;
 }
 
@@ -27,6 +28,7 @@ const SidebarSection: React.FC<SidebarSectionProps> = ({
   dndIdPrefix,
   validationStatus,
   loading,
+  coursesTaken,
 }) => {
   const [opened, setOpened] = useState(false);
 
@@ -201,6 +203,7 @@ const SidebarSection: React.FC<SidebarSectionProps> = ({
                 courseData={courseData}
                 dndIdPrefix={dndIdPrefix + "-" + index}
                 key={index}
+                coursesTaken={coursesTaken}
               />
             ))}
           </>