Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
@einc
einc committed May 5, 2021
2 parents ab082c4 + 053382e commit 333f307
Show file tree
Hide file tree
Showing 6 changed files with 1,336 additions and 0 deletions.
16 changes: 16 additions & 0 deletions src/requirements/__test__/__snapshots__/requirement-data-id.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,16 @@ Array [
"Major-ESS-Social Science",
"Major-ESS-Statistics",
"Major-ESS-Sustainability Science Colloquium",
"Major-FDSC-Biochemistry",
"Major-FDSC-Calculus I",
"Major-FDSC-Concentration",
"Major-FDSC-Core Courses",
"Major-FDSC-General Chemistry",
"Major-FDSC-Introductory Biology Courses",
"Major-FDSC-Microbiology (Lecture & Lab)",
"Major-FDSC-Organic Chemistry",
"Major-FDSC-Physics",
"Major-FDSC-Statistics",
"Major-GOVT-Government Coursework",
"Major-GOVT-Government Seminar",
"Major-GOVT-Introductory Government Courses",
Expand Down Expand Up @@ -283,6 +293,9 @@ Array [
"Major-PHYS-Physics Core",
"Major-PHYS-Physics Intermediate Courses",
"Major-PHYS-Physics Lab",
"Major-SPAN-Core Courses",
"Major-SPAN-Electives",
"Major-SPAN-Senior Seminar",
"Major-STS-2000 Level STS Courses",
"Major-STS-3000+ STS Courses",
"Major-STS-4000+ STS Courses",
Expand Down Expand Up @@ -334,5 +347,8 @@ Array [
"Minor-POLICY-Gateway Course",
"Minor-POLICY-Methods Course",
"Minor-PSYCH-18 Credits in Psychology",
"Minor-SPAN-3 Electives",
"Minor-SPAN-Advanced Language Course",
"Minor-SPAN-Perspectives Course",
]
`;
18 changes: 18 additions & 0 deletions src/requirements/data/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import essRequirements from './majors/ess';
import englishRequirements from './majors/engl';
import envEngineeringRequirements from './majors/envE';
import epRequirements from './majors/ep';
import foodSciRequirements from './majors/foodsci';
import governmentRequirements from './majors/govt';
import hdRequirements from './majors/hd';
import hotelAdminRequirements from './majors/hadm';
Expand All @@ -41,6 +42,7 @@ import oldIsstRequirements from './majors/oldIsst';
import orieRequirements from './majors/orie';
import pamRequirements from './majors/pam';
import physRequirements from './majors/phys';
import spanishRequirements from './majors/spanish';
import stsRequirements from './majors/sts';
import aerospaceMinorRequirements from './minors/aerospace';
import appliedMathMinorRequirements from './minors/applied-math';
Expand All @@ -56,6 +58,7 @@ import mathMinorRequirements from './minors/math';
import ormsMinorRequirements from './minors/orms';
import policyMinorRequirements from './minors/policy';
import psychMinorRequirements from './minors/psych';
import spanishMinorRequirements from './minors/spanish';

const json: RequirementsJson = {
university: {
Expand Down Expand Up @@ -189,6 +192,11 @@ const json: RequirementsJson = {
schools: ['EN'],
requirements: epRequirements,
},
FDSC: {
name: 'Food Science',
schools: ['AG'],
requirements: foodSciRequirements,
},
GOVT: {
name: 'Government',
schools: ['AS1', 'AS2'],
Expand Down Expand Up @@ -259,6 +267,11 @@ const json: RequirementsJson = {
schools: ['AS1', 'AS2'],
requirements: physRequirements,
},
SPAN: {
name: 'Spanish',
schools: ['AS1', 'AS2'],
requirements: spanishRequirements,
},
STS: {
name: 'Science & Technology Studies',
schools: ['AS1', 'AS2'],
Expand Down Expand Up @@ -336,6 +349,11 @@ const json: RequirementsJson = {
schools: ['AS1', 'AS2'],
requirements: psychMinorRequirements,
},
SPAN: {
name: 'Spanish',
schools: ['AS1', 'AS2'],
requirements: spanishMinorRequirements,
},
},
};

Expand Down
286 changes: 286 additions & 0 deletions src/requirements/data/majors/foodsci.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,286 @@
import { CollegeOrMajorRequirement } from '../../types';
import { includesWithSubRequirements, includesWithSingleRequirement } from '../checkers-common';

const foodSciRequirements: readonly CollegeOrMajorRequirement[] = [
{
name: 'Introductory Biology Courses',
description:
'Two courses out of BIOG 1140, BIOG 1440, BIOG 1500, BIOEE 1610, BIOEE 1780, BIOAP 1100 and PLSCI 1115.',
source: 'https://cals.cornell.edu/education/degrees-programs/food-science-major-minor',
checker: includesWithSingleRequirement(
'BIOG 1140',
'BIOG 1440',
'BIOG 1500',
'BIOEE 1610',
'BIOEE 1780',
'BIOAP 1100',
'PLSCI 1115'
),
fulfilledBy: 'courses',
perSlotMinCount: [2],
slotNames: ['Course'],
},
{
name: 'General Chemistry',
description: 'Option 1: CHEM 2070 AND CHEM 2080, Option 2: CHEM 2150.',
source: 'https://cals.cornell.edu/education/degrees-programs/food-science-major-minor',
fulfilledBy: 'toggleable',
fulfillmentOptions: {
'Option 1': {
description: 'CHEM 2070 AND CHEM 2080',
checker: includesWithSubRequirements(['CHEM 2070'], ['CHEM 2080']),
counting: 'courses',
perSlotMinCount: [1, 1],
slotNames: ['CHEM 2070', 'CHEM 2080'],
},
'Option 2': {
description: 'CHEM 2150',
checker: includesWithSubRequirements(['CHEM 2150']),
counting: 'courses',
perSlotMinCount: [1],
slotNames: ['Course'],
},
},
},
{
name: 'Organic Chemistry',
description: 'CHEM 3570 and CHEM 3580.',
source: 'https://cals.cornell.edu/education/degrees-programs/food-science-major-minor',
checker: includesWithSubRequirements(['CHEM 3570'], ['CHEM 3580']),
fulfilledBy: 'courses',
perSlotMinCount: [1, 1],
slotNames: ['CHEM 3570', 'CHEM 3580'],
},
{
name: 'Calculus I',
description: 'MATH 1110',
source: 'https://cals.cornell.edu/education/degrees-programs/food-science-major-minor',
checker: includesWithSingleRequirement('MATH 1110'),
fulfilledBy: 'courses',
perSlotMinCount: [1],
slotNames: ['Course'],
},
{
name: 'Statistics',
description: 'AEM 2100 or STSCI 2100 or STSCI 2150 or STSCI 2200 or MATH 1710 or PSYCH 3500.',
source: 'https://cals.cornell.edu/education/degrees-programs/food-science-major-minor',
checker: includesWithSingleRequirement(
'AEM 2100',
'STSCI 2100',
'STSCI 2150',
'STSCI 2200',
'MATH 1710',
'PSYCH 3500'
),
fulfilledBy: 'courses',
perSlotMinCount: [1],
slotNames: ['Course'],
},
{
name: 'Microbiology (Lecture & Lab)',
description: 'BIOMI 2900 (lecture) and BIOMI 2911 (lab).',
source: 'https://cals.cornell.edu/education/degrees-programs/food-science-major-minor',
checker: includesWithSubRequirements(['BIOMI 2900'], ['BIOMI 2911']),
fulfilledBy: 'courses',
perSlotMinCount: [1, 1],
slotNames: ['BIOMI 2900', 'BIOMI 2911'],
},
{
name: 'Biochemistry',
description: 'BIOMG 3310 or BIOMG 3350 or NS 3200.',
source: 'https://cals.cornell.edu/education/degrees-programs/food-science-major-minor',
checker: includesWithSingleRequirement('BIOMG 3310', 'BIOMG 3350', 'NS 3200'),
fulfilledBy: 'courses',
perSlotMinCount: [1],
slotNames: ['Course'],
},
{
name: 'Physics',
description: 'PHYS 1101 or PHYS 2207.',
source: 'https://cals.cornell.edu/education/degrees-programs/food-science-major-minor',
checker: includesWithSingleRequirement('PHYS 1101', 'PHYS 2207'),
fulfilledBy: 'courses',
perSlotMinCount: [1],
slotNames: ['Course'],
},
{
name: 'Core Courses',
description:
'These are the core courses required for every concentration. ' +
'FDSC 1101, FDSC 1102, NS 1150, FDSC 2000, FDSC 2100, FDSC 2110, ' +
'FDSC 3940, FDSC 3960, FDSC 4000, FDSC 4170, and FDSC 4210.',
source: 'https://cals.cornell.edu/education/degrees-programs/food-science-major-minor',
checker: includesWithSubRequirements(
['FDSC 1101'],
['FDSC 1102'],
['NS 1150'],
['FDSC 2000'],
['FDSC 2100'],
['FDSC 2110'],
['FDSC 3940'],
['FDSC 3960'],
['FDSC 4000'],
['FDSC 4170'],
['FDSC 4210']
),
fulfilledBy: 'courses',
perSlotMinCount: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
slotNames: [
'FDSC 1101',
'FDSC 1102',
'NS 1150',
'FDSC 2000',
'FDSC 2100',
'FDSC 2110',
'FDSC 3940',
'FDSC 3960',
'FDSC 4000',
'FDSC 4170',
'FDSC 4210',
],
},
{
name: 'Concentration',
description:
'Students are required to complete one concentration from Science, Safety and Business.\nWarning: For the optional electives in each concentration, we do not check whether the courses selected fulfil the minimum credits needed for that category.',
source: 'https://cals.cornell.edu/education/degrees-programs/food-science-major-minor',
fulfilledBy: 'toggleable',
// TODO: Can change Science and Business options to be fulfilled by credits instead, however would lose slot names.
fulfillmentOptions: {
Science: {
description:
'Required FDSC courses, and 3 4000+ FDSC electives (with at least 3 credits from group 1 and 2 credits from group 2).',
counting: 'courses',
checker: includesWithSubRequirements(
['FDSC 3950'],
['FDSC 4100'],
['FDSC 4190'],
['FDSC 4230'],
['FDSC 4010', 'FDSC 4040', 'FDSC 4050', 'FDSC 4220', 'FDSC 4250', 'FDSC 4400'],
[
'FDSC 4020',
'FDSC 4110',
'FDSC 4500',
'FDSC 4510',
'FDSC 4880',
'FDSC 5970',
'FDSC 6950',
],
[
'FDSC 4020',
'FDSC 4110',
'FDSC 4500',
'FDSC 4510',
'FDSC 4880',
'FDSC 5970',
'FDSC 6950',
'FDSC 4010',
'FDSC 4040',
'FDSC 4050',
'FDSC 4220',
'FDSC 4250',
'FDSC 4400',
]
),
perSlotMinCount: [1, 1, 1, 1, 1, 1, 1],
slotNames: [
'FDSC 3950',
'FDSC 4100',
'FDSC 4190',
'FDSC 4230',
'Group 1 4000+ elective',
'Group 2 4000+ elective',
'Group 1 or Group 2 4000+ elective',
],
},
Safety: {
description:
'1. Required FDSC courses 2. Epidemiology course 3. Risk analysis and management course 4. Microbial pathogenesis course 5. 2 credits of 4000+ FDSC electives.\nNote: The course options for requirements 2 - 4 are given in order of the preferred course for fulfillment.',
counting: 'courses',
checker: includesWithSubRequirements(
['FDSC 3950'],
['FDSC 4230', 'FDSC 4250'],
['FDSC 5970'],
['NS 3600', 'PAM 3280', 'ENTOM 4250'],
['PAM 4240', 'DSOC 4080', 'ORIE 2380'],
['BIOMS 4040', 'BIOMS 4090', 'BIOMS 4150', 'BIOMS 4340', 'BIOMG 4390'],
[
'FDSC 4010',
'FDSC 4020',
'FDSC 4040',
'FDSC 4050',
'FDSC 4100',
'FDSC 4110',
'FDSC 4220',
'FDSC 4230',
'FDSC 4250',
'FDSC 4400',
'FDSC 4500',
'FDSC 4880',
'FDSC 5400',
]
),
perSlotMinCount: [1, 1, 1, 1, 1, 1, 1],
slotNames: [
'FDSC 3950',
'FDSC 4230 or FDSC 4250',
'FDSC 5970',
'NS 3600 or PAM 3280 or ENTOM 4250 (in preferred order)',
'PAM 4240 or DSOC 4080 or ORIE 2380 (in preferred order)',
'BIOMS 4040 or BIOMS 4090 or BIOMS 4150 or BIOMS 4340 or BIOMG 4390 (in preferred order)',
'2 credits of 4000+ FDSC electives',
],
},
Business: {
description:
'Required FDSC courses, economics course, management course, marketing course, accounting course, finance course, 2 credits of 4000+ FDSC electives, and 6 credits of business electives.',
counting: 'courses',
checker: includesWithSubRequirements(
['FDSC 4230'],
['FDSC 5970'],
['ECON 1110', 'ECON 3030', 'PAM 2000'],
['AEM 1200', 'HADM 1810', 'ILRID 1700', 'AEM 2200', 'ILROB 1220'],
['AEM 2400', 'HADM 2410', 'NCC 5530', 'AEM 2420'],
['AEM 2210', 'HADM 2230', 'NCC 5500', 'AEM 2225'],
['AEM 2241', 'NCC 5560', 'HADM 2250', 'AEM 2240'],
['FDSC 4***', 'FDSC 5***', 'FDSC 6***'],
[
'AEM 3340',
'AEM 3440',
'AEM 4485',
'AEM 3020',
'AEM 4420',
'AEM 4450',
'AEM 3270',
'AEM 3230',
'AEM 2011',
'AEM 2220',
'AEM 3249',
'AEM 2230',
'AEM 2015',
'AEM 3120',
'AEM 3249',
'AEM 4190',
'NBA 5070',
'AEM 2480',
'HADM 3470',
]
),
perSlotMinCount: [1, 1, 1, 1, 1, 1, 1, 1, 2],
slotNames: [
'FDSC 4230',
'FDSC 5970',
'Economics Course',
'Management Course',
'Marketing Course',
'Accounting Course',
'Finance Course',
'2 credits of 4000+ FDSC electives',
'6 credits of business electives',
],
},
},
},
];

export default foodSciRequirements;
Loading

0 comments on commit 333f307

Please sign in to comment.