Merge remote-tracking branch 'origin' into ui-updates

sandboxnu · Oct 22, 2023 · 6eb83c0 · 6eb83c0
2 parents c608ebf + e377149
commit 6eb83c0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -25,7 +25,8 @@
     "lint": "eslint packages/ --ext .ts,.tsx .",
     "tsc": "yarn workspaces foreach -v --exclude . run tsc",
     "g:babel": "cd $INIT_CWD && babel",
-    "g:cross-env": "cd $INIT_CWD && cross-env"
+    "g:cross-env": "cd $INIT_CWD && cross-env",
+    "postinstall": "husky install"
   },
   "dependencies": {
     "@babel/plugin-proposal-class-properties": "^7.18.6",

diff --git a/packages/frontend-v2/pages/home.tsx b/packages/frontend-v2/pages/home.tsx
@@ -101,7 +101,9 @@ const HomePage: NextPage = () => {
     if (student) {
       const plan = student.plans.find((plan) => plan.id === selectedPlanId);
       if (plan) {
-        setPreReqWarnings(getPreReqWarnings(plan.schedule));
+        setPreReqWarnings(
+          getPreReqWarnings(plan.schedule, student.coursesTransfered)
+        );
         setCoReqWarnings(getCoReqWarnings(plan.schedule));
       }
     }
@@ -170,7 +172,9 @@ const HomePage: NextPage = () => {
       return;
     }
 
-    setPreReqWarnings(getPreReqWarnings(updatedPlan.schedule));
+    setPreReqWarnings(
+      getPreReqWarnings(updatedPlan.schedule, student.coursesTransfered)
+    );
     setCoReqWarnings(getCoReqWarnings(updatedPlan.schedule));
     mutateStudentWithUpdatedPlan(updatedPlan);
   };

diff --git a/packages/frontend-v2/utils/plan/preAndCoReqCheck.ts b/packages/frontend-v2/utils/plan/preAndCoReqCheck.ts
@@ -8,6 +8,7 @@ import {
   INEUReqError,
   PreReqWarnings,
   Schedule2,
+  ScheduleCourse2,
   ScheduleTerm2,
   TermError,
 } from "@graduate/common";
@@ -44,9 +45,15 @@ export const getCoReqWarningsSem = (
 };
 
 export const getPreReqWarnings = (
-  schedule: Schedule2<unknown>
+  schedule: Schedule2<unknown>,
+  coursesTransfered: ScheduleCourse2<null>[] | undefined
 ): PreReqWarnings => {
   const seen: Set<string> = new Set();
+  if (coursesTransfered != undefined) {
+    for (const course of coursesTransfered) {
+      seen.add(courseToString(course));
+    }
+  }
   const preReqErrors: PreReqWarnings = {
     type: "prereq",
     years: schedule.years.map((year) => ({
@@ -55,8 +62,8 @@ export const getPreReqWarnings = (
       spring: getPreReqWarningSem(year.spring, seen),
       summer1: getPreReqWarningSem(year.summer1, seen),
       summer2: getPreReqWarningSem(year.summer2, seen),
-    }))
-  }
+    })),
+  };
   return preReqErrors;
 };
 
@@ -128,8 +135,6 @@ const isOrCourse = (course: INEUReq): course is INEUOrReq => {
   return (course as INEUOrReq).type === "or";
 };
 
-const isError = (
-  error: INEUReqError | undefined
-): error is INEUReqError => {
+const isError = (error: INEUReqError | undefined): error is INEUReqError => {
   return !!error;
 };