Rename the confusing operator field to subRequirementProgress (#265)

cornell-dti · Feb 9, 2021 · c1ac578 · c1ac578
1 parent 8996080
commit c1ac578
Show file tree

Hide file tree

Showing 37 changed files with 194 additions and 191 deletions.
diff --git a/src/requirements/data/colleges/ag.ts b/src/requirements/data/colleges/ag.ts
@@ -9,7 +9,7 @@ const totalAcademicCreditsRequirement: CollegeOrMajorRequirement = {
     'PE courses do not count.',
   source: 'http://courses.cornell.edu/content.php?catoid=41&navoid=11561',
   checker: (course: Course): boolean => !['PE'].includes(course.subject),
-  operator: 'or',
+  subRequirementProgress: 'any-can-count',
   fulfilledBy: 'credits',
   minCount: 120,
 };
@@ -28,7 +28,7 @@ const calsCreditsRequirement: CollegeOrMajorRequirement = {
     ['AEM', 'BIOEE', 'BIOMG', 'BIOMI', 'BIONB', 'BSOC', 'EAS', 'INFO', 'NS', 'STSCI'].includes(
       course.subject
     ),
-  operator: 'or',
+  subRequirementProgress: 'any-can-count',
   fulfilledBy: 'credits',
   minCount: 55,
 };
@@ -112,7 +112,7 @@ const calsIntroductoryLifeSciencesOrBiologyRequirement: CollegeOrMajorRequiremen
     'STS 2871',
     'VIEN 2204'
   ),
-  operator: 'or',
+  subRequirementProgress: 'any-can-count',
   fulfilledBy: 'credits',
   minCount: 6,
 };
@@ -134,7 +134,7 @@ const calsChemistryOrPhysicsRequiement: CollegeOrMajorRequirement = {
   source:
     'https://cals.cornell.edu/undergraduate-students/student-services/degree-requirements/graduation-requirements/distribution-requirements',
   checker: (course: Course): boolean => ['CHEM', 'CHEME', 'PHYS'].includes(course.subject),
-  operator: 'or',
+  subRequirementProgress: 'any-can-count',
   fulfilledBy: 'credits',
   minCount: 3,
 };
@@ -148,7 +148,7 @@ const calsQuantitativeLiteracyRequirement: CollegeOrMajorRequirement = {
   source:
     'https://cals.cornell.edu/undergraduate-students/student-services/degree-requirements/graduation-requirements/distribution-requirements',
   checker: (course: Course): boolean => ['MATH', 'STSCI'].includes(course.subject),
-  operator: 'or',
+  subRequirementProgress: 'any-can-count',
   fulfilledBy: 'courses',
   minCount: 1,
 };
@@ -171,7 +171,7 @@ const calsSocialSciencesAndHumanitiesRequiement: CollegeOrMajorRequirement = {
     (course: Course): boolean => course.catalogDistr?.includes('(LA-') ?? false,
     (course: Course): boolean => course.catalogDistr?.includes('(SBA-') ?? false,
   ],
-  operator: 'and',
+  subRequirementProgress: 'every-course-needed',
   fulfilledBy: 'courses',
   minCount: 4,
 };
@@ -183,7 +183,7 @@ const calsHumanDiversityRequirement: CollegeOrMajorRequirement = {
   source:
     'https://cals.cornell.edu/undergraduate-students/student-services/degree-requirements/graduation-requirements/distribution-requirements',
   checker: (course: Course): boolean => course.catalogDistr?.includes('(D-') ?? false,
-  operator: 'or',
+  subRequirementProgress: 'any-can-count',
   fulfilledBy: 'courses',
   minCount: 1,
 };
@@ -200,7 +200,7 @@ const calsWrittenAndOralExpressionRequirement: CollegeOrMajorRequirement = {
     ['written expression', 'oral expression', 'First-Year Writing Seminar'].some(
       keyword => course.catalogSatisfiesReq?.includes(keyword) ?? false
     ),
-  operator: 'or',
+  subRequirementProgress: 'any-can-count',
   fulfilledBy: 'credits',
   minCount: 9,
 };
@@ -214,7 +214,7 @@ const calsWrittenExpressionRequirement: CollegeOrMajorRequirement = {
     ['written expression', 'First-Year Writing Seminar'].some(
       keyword => course.catalogSatisfiesReq?.includes(keyword) ?? false
     ),
-  operator: 'or',
+  subRequirementProgress: 'any-can-count',
   fulfilledBy: 'credits',
   minCount: 6,
 };

diff --git a/src/requirements/data/colleges/as.ts b/src/requirements/data/colleges/as.ts
@@ -13,7 +13,7 @@ const casRequirements: readonly CollegeOrMajorRequirement[] = [
       'PE courses and courses numbered 1000-1099 do not count towards the 120 credits',
     source: 'http://courses.cornell.edu/content.php?catoid=41&navoid=11570#credit-req',
     checker: courseIsAllEligible,
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'credits',
     minCount: 120,
   },
@@ -26,7 +26,7 @@ const casRequirements: readonly CollegeOrMajorRequirement[] = [
       'Note: AP, IB, and A-Level credits count toward the 120 total credits but not toward the 100 A&S credits.',
     source: 'https://as.cornell.edu/degree-requirements',
     checker: (course: Course): boolean => course.catalogDistr?.includes('-AS') ?? false,
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'credits',
     minCount: 100,
   },
@@ -37,7 +37,7 @@ const casRequirements: readonly CollegeOrMajorRequirement[] = [
       'First-year students should plan to take an FWS during their first semester at Cornell.',
     source: 'https://as.cornell.edu/degree-requirements',
     checker: courseIsFWS,
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'credits',
     minCount: 6,
   },
@@ -78,7 +78,7 @@ const casRequirements: readonly CollegeOrMajorRequirement[] = [
       'YORUB 2***',
       'ZULU 2***'
     ),
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'courses',
     minCount: 1,
   },
@@ -120,7 +120,7 @@ const casRequirements: readonly CollegeOrMajorRequirement[] = [
         'YORUB',
         'ZULU',
       ].includes(course.subject),
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'credits',
     minCount: 11,
   },
@@ -133,7 +133,7 @@ const casRequirements: readonly CollegeOrMajorRequirement[] = [
       ['(PBS-AS)', '(PBSS-AS)', '(MQR-AS)'].some(
         distribution => course.catalogDistr?.includes(distribution) ?? false
       ),
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'courses',
     minCount: 4,
   },
@@ -145,7 +145,7 @@ const casRequirements: readonly CollegeOrMajorRequirement[] = [
       ['(PBS-AS)', '(PBSS-AS)'].some(
         distribution => course.catalogDistr?.includes(distribution) ?? false
       ),
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'courses',
     minCount: 2,
   },
@@ -154,7 +154,7 @@ const casRequirements: readonly CollegeOrMajorRequirement[] = [
     description: 'Students must take 1 in Mathematics & Quantitative Reasoning (MQR).',
     source: 'https://as.cornell.edu/degree-requirements',
     checker: (course: Course): boolean => course.catalogDistr?.includes('(MQR-AS)') ?? false,
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'courses',
     minCount: 1,
   },
@@ -170,7 +170,7 @@ const casRequirements: readonly CollegeOrMajorRequirement[] = [
       (course: Course): boolean => course.catalogDistr?.includes('(LA-AS)') ?? false,
       (course: Course): boolean => course.catalogDistr?.includes('(SBA-AS)') ?? false,
     ],
-    operator: 'and',
+    subRequirementProgress: 'every-course-needed',
     fulfilledBy: 'courses',
     minCount: 5,
   },
@@ -182,7 +182,7 @@ const casRequirements: readonly CollegeOrMajorRequirement[] = [
     source: 'https://as.cornell.edu/degree-requirements',
     checker: (course: Course): boolean =>
       ['GB', 'GHB'].some(breadth => course.catalogBreadth?.includes(breadth) ?? false),
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'courses',
     minCount: 1,
   },
@@ -194,7 +194,7 @@ const casRequirements: readonly CollegeOrMajorRequirement[] = [
     source: 'https://as.cornell.edu/degree-requirements',
     checker: (course: Course): boolean =>
       ['HB', 'GHB'].some(breadth => course.catalogBreadth?.includes(breadth) ?? false),
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'courses',
     minCount: 1,
   },

diff --git a/src/requirements/data/colleges/bu.ts b/src/requirements/data/colleges/bu.ts
@@ -9,7 +9,7 @@ const businessRequirements: readonly CollegeOrMajorRequirement[] = [
       'PE courses and courses numbered 1000-1099 do not count towards the 120 credits',
     source: 'http://courses.cornell.edu/content.php?catoid=41&navoid=11715',
     checker: courseIsAllEligible,
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'credits',
     minCount: 120,
   },

diff --git a/src/requirements/data/colleges/en.ts b/src/requirements/data/colleges/en.ts
@@ -12,7 +12,7 @@ const engineeringRequirements: readonly CollegeOrMajorRequirement[] = [
     source:
       'https://www.engineering.cornell.edu/students/undergraduate-students/curriculum/undergraduate-requirements',
     checker: includesWithSubRequirements(['MATH 1910'], ['MATH 1920'], ['MATH 2930', 'MATH 2940']),
-    operator: 'and',
+    subRequirementProgress: 'every-course-needed',
     fulfilledBy: 'courses',
     minCount: 3,
   },
@@ -23,7 +23,7 @@ const engineeringRequirements: readonly CollegeOrMajorRequirement[] = [
     source:
       'https://www.engineering.cornell.edu/students/undergraduate-students/curriculum/undergraduate-requirements',
     checker: includesWithSubRequirements(['PHYS 1112'], ['PHYS 2213']),
-    operator: 'and',
+    subRequirementProgress: 'every-course-needed',
     fulfilledBy: 'courses',
     minCount: 2,
   },
@@ -36,7 +36,7 @@ const engineeringRequirements: readonly CollegeOrMajorRequirement[] = [
     source:
       'https://www.engineering.cornell.edu/students/undergraduate-students/curriculum/undergraduate-requirements',
     checker: includesWithSingleRequirement('CHEM 2090'),
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'courses',
     minCount: 1,
   },
@@ -46,7 +46,7 @@ const engineeringRequirements: readonly CollegeOrMajorRequirement[] = [
     source:
       'https://www.engineering.cornell.edu/students/undergraduate-students/curriculum/undergraduate-requirements',
     checker: courseIsFWS,
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'courses',
     minCount: 2,
   },
@@ -56,7 +56,7 @@ const engineeringRequirements: readonly CollegeOrMajorRequirement[] = [
     source:
       'https://www.engineering.cornell.edu/students/undergraduate-students/curriculum/undergraduate-requirements',
     checker: includesWithSingleRequirement('CS 1110', 'CS 1112', 'CS 1114', 'CS 1115'),
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'courses',
     minCount: 1,
   },
@@ -66,7 +66,7 @@ const engineeringRequirements: readonly CollegeOrMajorRequirement[] = [
     source:
       'https://www.engineering.cornell.edu/students/undergraduate-students/curriculum/undergraduate-requirements',
     checker: (course: Course): boolean => course.subject === 'ENGRI',
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'credits',
     minCount: 3,
   },
@@ -77,7 +77,7 @@ const engineeringRequirements: readonly CollegeOrMajorRequirement[] = [
     source:
       'https://www.engineering.cornell.edu/students/undergraduate-students/curriculum/undergraduate-requirements',
     checker: (course: Course): boolean => course.subject === 'ENGRD',
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'courses',
     minCount: 2,
   },
@@ -93,7 +93,7 @@ const engineeringRequirements: readonly CollegeOrMajorRequirement[] = [
       ['CA', 'HA', 'LA/LAD', 'KCM', 'SBA', 'FL', 'CE'].some(
         distribution => course.catalogDistr?.includes(distribution) ?? false
       ),
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'courses',
     minCount: 6,
   },
@@ -107,7 +107,7 @@ const engineeringRequirements: readonly CollegeOrMajorRequirement[] = [
       ['CA', 'HA', 'LA/LAD', 'KCM', 'SBA', 'FL', 'CE'].some(
         distribution => course.catalogDistr?.includes(distribution) ?? false
       ),
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'credits',
     minCount: 18,
   },
@@ -155,7 +155,7 @@ const engineeringRequirements: readonly CollegeOrMajorRequirement[] = [
       ['MSE 4030', 'MSE 4040'],
       ['MSE 4050', 'MSE 4060']
     ),
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'courses',
     minCount: 1,
   },

diff --git a/src/requirements/data/colleges/he.ts b/src/requirements/data/colleges/he.ts
@@ -10,7 +10,7 @@ const humanEcologyRequirements: readonly CollegeOrMajorRequirement[] = [
     source:
       'http://courses.cornell.edu/content.php?catoid=41&navoid=11600#Cornell_Credit_Requirements',
     checker: courseIsAllEligible,
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'credits',
     minCount: 120,
   },
@@ -20,7 +20,7 @@ const humanEcologyRequirements: readonly CollegeOrMajorRequirement[] = [
       'Students must complete a minimum of 43 Human Ecology credits from College Distribution, Major Requirements and electives.',
     source: 'https://www.human.cornell.edu/academics/policies/requirements',
     checker: (course: Course): boolean => course.acadGroup.includes('HE'),
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'credits',
     minCount: 43,
   },

diff --git a/src/requirements/data/colleges/il.ts b/src/requirements/data/colleges/il.ts
@@ -14,7 +14,7 @@ const ilrRequirements: readonly CollegeOrMajorRequirement[] = [
       'PE courses and courses numbered 1000-1099 do not count towards the 120 credits',
     source: 'http://courses.cornell.edu/content.php?catoid=41&navoid=11587',
     checker: courseIsAllEligible,
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'credits',
     minCount: 120,
   },
@@ -35,7 +35,7 @@ const ilrRequirements: readonly CollegeOrMajorRequirement[] = [
       ['ILRLR 2050'],
       ['ILRLE 2400']
     ),
-    operator: 'and',
+    subRequirementProgress: 'every-course-needed',
     fulfilledBy: 'courses',
     minCount: 9,
   },
@@ -46,7 +46,7 @@ const ilrRequirements: readonly CollegeOrMajorRequirement[] = [
     source:
       'https://www.ilr.cornell.edu/student-experience/curriculum-requirements/undergraduate-requirements',
     checker: courseIsFWS,
-    operator: 'or',
+    subRequirementProgress: 'any-can-count',
     fulfilledBy: 'credits',
     minCount: 3,
   },
@@ -67,7 +67,7 @@ const ilrRequirements: readonly CollegeOrMajorRequirement[] = [
       'ENGL 2880',
       'ENGL 2890'
     ),
-    operator: 'and',
+    subRequirementProgress: 'every-course-needed',
     fulfilledBy: 'courses',
     minCount: 1,
   },