add college requirements to gradtrak (#1140)

* add checkmark meaning to ui

* added rausser college reqs

* added colleges of env design and chemistry

* added school of edu

* upper div check fixes

Author: garimau

apps/frontend/src/app/GradTrak/BtLLInterface/BtLLInterface.module.scss

@@ -296,3 +296,53 @@
     }
   }
 }
+
+// Checkmark legend above accordions
+.legend {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 0.75rem 1.25rem;
+  padding: 0.625rem 1rem;
+  border-bottom: 1px solid var(--border-color);
+  background: transparent;
+
+  .legendItem {
+    display: flex;
+    align-items: center;
+    gap: 0.3rem;
+    font-size: 0.7em;
+    color: var(--paragraph-color);
+    white-space: nowrap;
+  }
+
+  .legendHint {
+    font-style: italic;
+    opacity: 0.7;
+    margin-left: auto;
+  }
+
+  .legendCheck {
+    width: 1rem;
+    height: 1rem;
+    flex-shrink: 0;
+  }
+
+  .legendEmpty {
+    width: 1rem;
+    height: 1rem;
+    flex-shrink: 0;
+    border: 1.5px dashed var(--border-color);
+    border-radius: 2px;
+  }
+
+  // Reuse existing check color classes
+  .auto {
+    color: var(--green-600);
+  }
+
+  .manual {
+    color: var(--heading-color);
+  }
+}
+

apps/frontend/src/app/GradTrak/BtLLInterface/index.tsx

@@ -707,6 +707,25 @@ export default function BtLLGradTrakInterface({
 
   return (
     <>
+      {/* Color-code legend */}
+      <div className={styles.legend}>
+        <div className={styles.legendItem}>
+          <Check className={classNames(styles.legendCheck, styles.auto)} />
+          <span>Fulfilled</span>
+        </div>
+        <div className={styles.legendItem}>
+          <Check className={classNames(styles.legendCheck, styles.manual)} />
+          <span>Manually marked</span>
+        </div>
+        <div className={styles.legendItem}>
+          <div className={styles.legendEmpty} />
+          <span>Not fulfilled</span>
+        </div>
+        <div className={classNames(styles.legendItem, styles.legendHint)}>
+          Click ✓ to toggle
+        </div>
+      </div>
+
       {evaluatedGroups.map((group, index) => (
         <BtLLRequirementsAccordion
           key={`group-${index}`}

apps/frontend/src/app/GradTrak/Dashboard/EditPlanDialog.tsx

@@ -80,7 +80,6 @@ export default function EditPlanDialog({
         case "Journalism":
           return Colleges.Journ;
         case "Law":
-        case "School of Law":
           return Colleges.Law;
         case "Natural Resources":
           return Colleges.Natres;

apps/frontend/src/app/GradTrak/Onboarding/AddColleges/colleges.json

@@ -14,7 +14,6 @@
         "Optometry",
         "Public Health",
         "Public Policy",
-        "School of Law",
         "Social Welfare"
     ]
 }

apps/frontend/src/app/GradTrak/Onboarding/AddColleges/index.tsx

@@ -52,7 +52,6 @@ export default function AddColleges({ onNext }: AddCollegesProps) {
         case "Journalism":
           return Colleges.Journ;
         case "Law":
-        case "School of Law":
           return Colleges.Law;
         case "Natural Resources":
           return Colleges.Natres;

migrations/seed-requirements.js

@@ -11,14 +11,18 @@ import {
   APPLIED_MATH_REQ_BTLL,
   BUSINESS_REQ_BTLL,
   CDSS_REQ_BTLL,
+  CHEMISTRY_REQ_BTLL,
   COE_REQ_BTLL,
   COMPSCI_REQ_BTLL,
   DATASCI_REQ_BTLL,
   ECON_REQ_BTLL,
+  EDU_REQ_BTLL,
   EECS_REQ_BTLL,
+  ENVDES_REQ_BTLL,
   HAAS_REQ_BTLL,
   LNS_REQ_BTLL,
   MECHE_REQ_BTLL,
+  RCNR_REQ_BTLL,
   UC_REQ_BTLL,
 } from "./reference_gradtrak_reqs";
 
@@ -64,6 +68,46 @@ const requirements: PlanRequirementSeed[] = [
     createdBy: "system",
     isOfficial: true,
   },
+  {
+    name: "School of Education Requirements",
+    code: EDU_REQ_BTLL,
+    isUcReq: false,
+    college: "EDU",
+    major: null,
+    minor: null,
+    createdBy: "system",
+    isOfficial: true,
+  },
+  {
+    name: "Rausser College of Natural Resources Requirements",
+    code: RCNR_REQ_BTLL,
+    isUcReq: false,
+    college: "NATRES",
+    major: null,
+    minor: null,
+    createdBy: "system",
+    isOfficial: true,
+  },
+  {
+    name: "College of Chemistry Requirements",
+    code: CHEMISTRY_REQ_BTLL,
+    isUcReq: false,
+    college: "CHEM",
+    major: null,
+    minor: null,
+    createdBy: "system",
+    isOfficial: true,
+  },
+  {
+    name: "College of Environmental Design Requirements",
+    code: ENVDES_REQ_BTLL,
+    isUcReq: false,
+    college: "ENVDES",
+    major: null,
+    minor: null,
+    createdBy: "system",
+    isOfficial: true,
+  },
   {
     name: "College of Computing, Data Science, and Society Requirements",
     code: CDSS_REQ_BTLL,
@@ -74,6 +118,16 @@ const requirements: PlanRequirementSeed[] = [
     createdBy: "system",
     isOfficial: true,
   },
+  {
+    name: "Haas School of Business Requirements",
+    code: HAAS_REQ_BTLL,
+    isUcReq: false,
+    college: "HAAS",
+    major: null,
+    minor: null,
+    createdBy: "system",
+    isOfficial: true,
+  },
   {
     name: "EECS Major Requirements",
     code: EECS_REQ_BTLL,
@@ -144,16 +198,6 @@ const requirements: PlanRequirementSeed[] = [
     createdBy: "system",
     isOfficial: true,
   },
-  {
-    name: "Haas School of Business Requirements",
-    code: HAAS_REQ_BTLL,
-    isUcReq: false,
-    college: "HAAS",
-    major: null,
-    minor: null,
-    createdBy: "system",
-    isOfficial: true,
-  },
 ];
 
 function escapeForMongosh(str: string): string {

packages/BtLL/generate-mongosh-commands.ts

@@ -444,6 +444,78 @@ Function<List<Requirement>>() main (){
 }
 `;
 
+export const EDU_REQ_BTLL = `${SEVEN_BREADTHS_BTLL}
+Function<List<Requirement>>() main (){
+  List<Course> courses get_attr(this, "allCourses")
+  
+  List<Requirement> breadth7 seven_breadths_requirements(courses)
+  Requirement arts_and_lit get_element(breadth7, 0)
+  Requirement biological_sciences get_element(breadth7, 1)
+  Requirement historical_studies get_element(breadth7, 2)
+  Requirement international_studies get_element(breadth7, 3)
+  Requirement philosophy_and_values get_element(breadth7, 4)
+  Requirement physical_sciences get_element(breadth7, 5)
+  Requirement social_and_behavioral_sciences get_element(breadth7, 6)
+
+  List<Requirement> return [arts_and_lit, biological_sciences, historical_studies, international_studies, philosophy_and_values, physical_sciences, social_and_behavioral_sciences]
+}
+`;
+
+export const ENVDES_REQ_BTLL = `
+`;
+
+export const CHEMISTRY_REQ_BTLL = `
+`;
+
+export const RCNR_REQ_BTLL = `${RNC_BTLL}
+Function<boolean>(Course) is_upper_div_course (course){
+  string number get_attr(course, "number")
+  boolean return or([regex_match(number, "^1[0-9][0-9]"), regex_match(number, "^2[0-9][0-9]"), regex_match(number, regex_match(number, "^C1[0-9][0-9]"), regex_match(number, "^C2[0-9][0-9]"), regex_match(number, "^W1[0-9][0-9]"), regex_match(number, "^W2[0-9][0-9]"), regex_match(number, "^N1[0-9][0-9]"), regex_match(number, "^N2[0-9][0-9]")])
+}
+
+Function<boolean>(Course) is_rcnr_dept_course (course){
+  string subject get_attr(course, "subject")
+  boolean is_envecon equal([subject, "ENVECON"])
+  boolean is_espm equal([subject, "ESPM"])
+  boolean is_eneres equal([subject, "ENERES"])
+  boolean is_nusctx equal([subject, "NUSCTX"])
+  boolean is_plantbi equal([subject, "PLANTBI"])
+  boolean return or([is_envecon, is_espm, is_eneres, is_nusctx, is_plantbi])
+}
+
+Function<number>(number, Course) add_course_units (acc, course){
+  number units get_attr(course, "units")
+  number return add([acc, units])
+}
+
+Function<List<Requirement>>() main (){
+  List<Course> courses get_attr(this, "allCourses")
+
+  // Reading & Composition
+  List<Requirement> rc_reqs rc_requirements(courses)
+  Requirement rca get_element(rc_reqs, 0)
+  Requirement rcb get_element(rc_reqs, 1)
+
+  // At least 36 upper-division units total
+  List<Course> upper_div_courses filter(courses, (c) {
+    boolean return is_upper_div_course(c)
+  })
+  number upper_div_units reduce(upper_div_courses, add_course_units, 0)
+  NumberRequirement upper_div_total {upper_div_units, 36, "Total Upper Division Units"}
+
+  // At least 15 of those 36 upper division units must be in Rausser departments
+  List<Course> rcnr_upper_div_courses filter(courses, (c) {
+    boolean is_upper is_upper_div_course(c)
+    boolean is_rcnr is_rcnr_dept_course(c)
+    boolean return and([is_upper, is_rcnr])
+  })
+  number rcnr_upper_div_units reduce(rcnr_upper_div_courses, add_course_units, 0)
+  NumberRequirement rcnr_upper_div {rcnr_upper_div_units, 15, "Rausser Upper Division Units"}
+
+  List<Requirement> return [rca, rcb, upper_div_total, rcnr_upper_div]
+}
+`;
+
 export const EECS_REQ_BTLL = `
 Function<boolean>(Course) eecs_upper_div_finder (course){
   string subject get_attr(course, "subject")
@@ -500,7 +572,7 @@ Function<boolean>(Course) natural_science_upper_div_finder (course){
   number units get_attr(course, "units")
 
   // Must be 3 units or more and upper division (100+)
-  boolean is_upper_div or([regex_match(number, "^1[0-9][0-9]"), regex_match(number, "^2[0-9][0-9]"), regex_match(number, "^C[0-9]")])
+  boolean is_upper_div or([regex_match(number, "^1[0-9][0-9]"), regex_match(number, "^2[0-9][0-9]"), regex_match(number, regex_match(number, "^C1[0-9][0-9]"), regex_match(number, "^C2[0-9][0-9]"), regex_match(number, "^W1[0-9][0-9]"), regex_match(number, "^W2[0-9][0-9]"), regex_match(number, "^N1[0-9][0-9]"), regex_match(number, "^N2[0-9][0-9]")])  
   boolean has_enough_units or([greater_than(units, 3), equal([units, 3])])
   boolean is_valid_units and([is_upper_div, has_enough_units])
 
@@ -857,7 +929,7 @@ Function<boolean>(Course) technical_elective_finder (course){
   number units get_attr(course, "units")
 
   // Must be upper division (100+) or C### and NOT 195–199
-  boolean is_upper_div or([regex_match(number, "^1[0-9][0-9]"), regex_match(number, "^2[0-9][0-9]"), regex_match(number, "^C[0-9][0-9]"), regex_match(number, "^C1[0-9][0-9]"), regex_match(number, "^C2[0-9][0-9]"), regex_match(number, "^W[0-9][0-9]"), regex_match(number, "^W1[0-9][0-9]"), regex_match(number, "^W2[0-9][0-9]"), regex_match(number, "^N[0-9][0-9]"), regex_match(number, "^N1[0-9][0-9]")])
+  boolean is_upper_div or([regex_match(number, "^1[0-9][0-9]"), regex_match(number, "^2[0-9][0-9]"), regex_match(number, "^C1[0-9][0-9]"), regex_match(number, "^C2[0-9][0-9]"), regex_match(number, "^W1[0-9][0-9]"), regex_match(number, "^W2[0-9][0-9]"), regex_match(number, "^N1[0-9][0-9]"), regex_match(number, "^N2[0-9][0-9]")])
   boolean is_excluded_seminar regex_match(number, "^19[5-9]")
   boolean is_valid_number and([is_upper_div, not(is_excluded_seminar)])