+
{`${time}:00`}
);
diff --git a/client-course-schedulizer/src/data/Class Schedule Meeting Patterns (2023-2024).xlsx b/client-course-schedulizer/src/data/Class Schedule Meeting Patterns (2023-2024).xlsx
new file mode 100644
index 00000000..5829125e
Binary files /dev/null and b/client-course-schedulizer/src/data/Class Schedule Meeting Patterns (2023-2024).xlsx differ
diff --git a/client-course-schedulizer/src/data/meeting-patterns.R b/client-course-schedulizer/src/data/meeting-patterns.R
new file mode 100644
index 00000000..f33891e3
--- /dev/null
+++ b/client-course-schedulizer/src/data/meeting-patterns.R
@@ -0,0 +1,3 @@
+mp <- readr::read_csv('meeting-patterns.csv', col_types = 'icc')
+jsonlite::write_json(mp, path = 'meeting-patterns.json')
+
diff --git a/client-course-schedulizer/src/data/meeting-patterns.csv b/client-course-schedulizer/src/data/meeting-patterns.csv
new file mode 100644
index 00000000..d18cd226
--- /dev/null
+++ b/client-course-schedulizer/src/data/meeting-patterns.csv
@@ -0,0 +1,112 @@
+duration,days,startTime
+65,MWF,8:00 AM
+65,MWF,9:15 AM
+65,MWF,11:00 AM
+65,MWF,12:15 PM
+65,MWF,1:30 PM
+65,MWF,2:45 PM
+65,MTR,6:30 PM
+65,MTR,7:45 PM
+100,TR,8:00 AM
+100,TR,10:20 AM
+100,TR,12:15 PM
+100,TR,2:10 PM
+100,MR,6:30 PM
+100,TR,6:30 PM
+210,M,6:30 PM
+210,T,6:30 PM
+210,R,6:30 PM
+100,M,6:30 PM
+100,T,6:30 PM
+100,R,6:30 PM
+100,M,8:20 PM
+100,T,8:20 PM
+100,R,8:20 PM
+50,MW,8:00 AM
+50,MW,9:15 AM
+50,MW,11:00 AM
+50,MW,12:15 PM
+50,MW,1:30 PM
+50,MW,2:45 PM
+50,TR,8:00 AM
+50,TR,8:55 AM
+50,TR,10:20 AM
+50,TR,11:15 AM
+50,TR,12:15 PM
+50,TR,1:10 PM
+50,TR,2:10 PM
+50,TR,3:05 PM
+50,TR,6:30 PM
+50,TR,7:30 PM
+50,TR,8:30 PM
+50,MR,6:30 PM
+50,MR,7:30 PM
+50,MR,8:30 PM
+120,MWF,8:20 AM
+120,MWF,11:00 AM
+120,MWF,1:30 PM
+120,MWF,6:30 PM
+180,MW,8:00 AM
+180,MW,12:30 PM
+180,MW,6:30 PM
+180,TR,8:00 AM
+180,TR,12:30 PM
+180,TR,6:30 PM
+170,M,8:00 AM
+170,M,11:15 AM
+170,M,2:30 PM
+170,M,6:30 PM
+170,T,8:00 AM
+170,T,11:15 AM
+170,T,2:30 PM
+170,T,6:30 PM
+170,W,8:00 AM
+170,W,11:15 AM
+170,W,2:30 PM
+170,W,6:30 PM
+170,R,8:00 AM
+170,R,11:15 AM
+170,R,2:30 PM
+170,R,6:30 PM
+170,F,8:00 AM
+170,F,11:15 AM
+170,F,2:30 PM
+80,M,8:00 AM
+80,M,9:30 AM
+80,M,11:00 AM
+80,M,1:00 PM
+80,M,2:30 PM
+80,M,4:00 PM
+80,T,8:00 AM
+80,T,9:30 AM
+80,T,11:00 AM
+80,T,1:00 PM
+80,T,2:30 PM
+80,T,4:00 PM
+80,W,8:00 AM
+80,W,9:30 AM
+80,W,11:00 AM
+80,W,1:00 PM
+80,W,2:30 PM
+80,W,4:00 PM
+80,R,8:00 AM
+80,R,9:30 AM
+80,R,11:00 AM
+80,R,1:00 PM
+80,R,2:30 PM
+80,R,4:00 PM
+80,F,8:00 AM
+80,F,9:30 AM
+80,F,11:00 AM
+80,F,1:00 PM
+80,F,2:30 PM
+80,F,4:00 PM
+65,TWR,4:00 PM
+60,MWF,4:00 PM
+75,TWR,5:15 PM
+60,MW,5:15 PM
+60,R,5:30 PM
+60,TR,5:30 PM
+60,MW,7:00 PM
+120,R,7:00 PM
+120,M,7:30 PM
diff --git a/client-course-schedulizer/src/data/meeting-patterns.json b/client-course-schedulizer/src/data/meeting-patterns.json
new file mode 100644
index 00000000..1a80a747
--- /dev/null
+++ b/client-course-schedulizer/src/data/meeting-patterns.json
@@ -0,0 +1 @@
+[{"duration":65,"days":"MWF","startTime":"8:00 AM"},{"duration":65,"days":"MWF","startTime":"9:15 AM"},{"duration":65,"days":"MWF","startTime":"11:00 AM"},{"duration":65,"days":"MWF","startTime":"12:15 PM"},{"duration":65,"days":"MWF","startTime":"1:30 PM"},{"duration":65,"days":"MWF","startTime":"2:45 PM"},{"duration":65,"days":"MTR","startTime":"6:30 PM"},{"duration":65,"days":"MTR","startTime":"7:45 PM"},{"duration":100,"days":"TR","startTime":"8:00 AM"},{"duration":100,"days":"TR","startTime":"10:20 AM"},{"duration":100,"days":"TR","startTime":"12:15 PM"},{"duration":100,"days":"TR","startTime":"2:10 PM"},{"duration":100,"days":"MR","startTime":"6:30 PM"},{"duration":100,"days":"TR","startTime":"6:30 PM"},{"duration":210,"days":"M","startTime":"6:30 PM"},{"duration":210,"days":"T","startTime":"6:30 PM"},{"duration":210,"days":"R","startTime":"6:30 PM"},{"duration":100,"days":"M","startTime":"6:30 PM"},{"duration":100,"days":"T","startTime":"6:30 PM"},{"duration":100,"days":"R","startTime":"6:30 PM"},{"duration":100,"days":"M","startTime":"8:20 PM"},{"duration":100,"days":"T","startTime":"8:20 PM"},{"duration":100,"days":"R","startTime":"8:20 PM"},{"duration":50,"days":"MW","startTime":"8:00 AM"},{"duration":50,"days":"MW","startTime":"9:15 AM"},{"duration":50,"days":"MW","startTime":"11:00 AM"},{"duration":50,"days":"MW","startTime":"12:15 PM"},{"duration":50,"days":"MW","startTime":"1:30 PM"},{"duration":50,"days":"MW","startTime":"2:45 PM"},{"duration":50,"days":"TR","startTime":"8:00 AM"},{"duration":50,"days":"TR","startTime":"8:55 AM"},{"duration":50,"days":"TR","startTime":"10:20 AM"},{"duration":50,"days":"TR","startTime":"11:15 AM"},{"duration":50,"days":"TR","startTime":"12:15 PM"},{"duration":50,"days":"TR","startTime":"1:10 PM"},{"duration":50,"days":"TR","startTime":"2:10 PM"},{"duration":50,"days":"TR","startTime":"3:05 PM"},{"duration":50,"days":"TR","startTime":"6:30 PM"},{"duration":50,"days":"TR","startTime":"7:30 PM"},{"duration":50,"days":"TR","startTime":"8:30 PM"},{"duration":50,"days":"MR","startTime":"6:30 PM"},{"duration":50,"days":"MR","startTime":"7:30 PM"},{"duration":50,"days":"MR","startTime":"8:30 PM"},{"duration":120,"days":"MWF","startTime":"8:20 AM"},{"duration":120,"days":"MWF","startTime":"11:00 AM"},{"duration":120,"days":"MWF","startTime":"1:30 PM"},{"duration":120,"days":"MWF","startTime":"6:30 PM"},{"duration":180,"days":"MW","startTime":"8:00 AM"},{"duration":180,"days":"MW","startTime":"12:30 PM"},{"duration":180,"days":"MW","startTime":"6:30 PM"},{"duration":180,"days":"TR","startTime":"8:00 AM"},{"duration":180,"days":"TR","startTime":"12:30 PM"},{"duration":180,"days":"TR","startTime":"6:30 PM"},{"duration":170,"days":"M","startTime":"8:00 AM"},{"duration":170,"days":"M","startTime":"11:15 AM"},{"duration":170,"days":"M","startTime":"2:30 PM"},{"duration":170,"days":"M","startTime":"6:30 PM"},{"duration":170,"days":"T","startTime":"8:00 AM"},{"duration":170,"days":"T","startTime":"11:15 AM"},{"duration":170,"days":"T","startTime":"2:30 PM"},{"duration":170,"days":"T","startTime":"6:30 PM"},{"duration":170,"days":"W","startTime":"8:00 AM"},{"duration":170,"days":"W","startTime":"11:15 AM"},{"duration":170,"days":"W","startTime":"2:30 PM"},{"duration":170,"days":"W","startTime":"6:30 PM"},{"duration":170,"days":"R","startTime":"8:00 AM"},{"duration":170,"days":"R","startTime":"11:15 AM"},{"duration":170,"days":"R","startTime":"2:30 PM"},{"duration":170,"days":"R","startTime":"6:30 PM"},{"duration":170,"days":"F","startTime":"8:00 AM"},{"duration":170,"days":"F","startTime":"11:15 AM"},{"duration":170,"days":"F","startTime":"2:30 PM"},{"duration":80,"days":"M","startTime":"8:00 AM"},{"duration":80,"days":"M","startTime":"9:30 AM"},{"duration":80,"days":"M","startTime":"11:00 AM"},{"duration":80,"days":"M","startTime":"1:00 PM"},{"duration":80,"days":"M","startTime":"2:30 PM"},{"duration":80,"days":"M","startTime":"4:00 PM"},{"duration":80,"days":"T","startTime":"8:00 AM"},{"duration":80,"days":"T","startTime":"9:30 AM"},{"duration":80,"days":"T","startTime":"11:00 AM"},{"duration":80,"days":"T","startTime":"1:00 PM"},{"duration":80,"days":"T","startTime":"2:30 PM"},{"duration":80,"days":"T","startTime":"4:00 PM"},{"duration":80,"days":"W","startTime":"8:00 AM"},{"duration":80,"days":"W","startTime":"9:30 AM"},{"duration":80,"days":"W","startTime":"11:00 AM"},{"duration":80,"days":"W","startTime":"1:00 PM"},{"duration":80,"days":"W","startTime":"2:30 PM"},{"duration":80,"days":"W","startTime":"4:00 PM"},{"duration":80,"days":"R","startTime":"8:00 AM"},{"duration":80,"days":"R","startTime":"9:30 AM"},{"duration":80,"days":"R","startTime":"11:00 AM"},{"duration":80,"days":"R","startTime":"1:00 PM"},{"duration":80,"days":"R","startTime":"2:30 PM"},{"duration":80,"days":"R","startTime":"4:00 PM"},{"duration":80,"days":"F","startTime":"8:00 AM"},{"duration":80,"days":"F","startTime":"9:30 AM"},{"duration":80,"days":"F","startTime":"11:00 AM"},{"duration":80,"days":"F","startTime":"1:00 PM"},{"duration":80,"days":"F","startTime":"2:30 PM"},{"duration":80,"days":"F","startTime":"4:00 PM"},{"duration":65,"days":"TWR","startTime":"4:00 PM"},{"duration":60,"days":"MWF","startTime":"4:00 PM"},{"duration":75,"days":"TWR","startTime":"5:15 PM"},{"duration":60,"days":"MW","startTime":"5:15 PM"},{"duration":60,"days":"R","startTime":"5:30 PM"},{"duration":60,"days":"TR","startTime":"5:30 PM"},{"duration":60,"days":"MW","startTime":"7:00 PM"},{"duration":120,"days":"R","startTime":"7:00 PM"},{"duration":120,"days":"M","startTime":"7:30 PM"}]
diff --git a/client-course-schedulizer/src/data/times.json b/client-course-schedulizer/src/data/times.json
new file mode 100644
index 00000000..6801ca5c
--- /dev/null
+++ b/client-course-schedulizer/src/data/times.json
@@ -0,0 +1,85 @@
+
+{
+
+"times": [
+ {"day": ["M", "W", "F"],
+ "time": ["8:00", "9:15", "11:00", "12:15", "13:30", "14:45"],
+ "duration": [50, 65]},
+
+ {"day": ["M", "T", "TH"],
+ "time": ["18:30", "19:45"],
+ "duration": [65]},
+
+ {"day": ["T", "TH"],
+ "time": ["8:00", "10:20", "12:15", "14:10"],
+ "duration": [50, 100]},
+
+ {"day": ["T", "TH"],
+ "time": ["8:55", "11:15", "13:10", "15:05", "19:30", "20:30"],
+ "duration": [50]},
+
+ {"day": ["M", "T", "TH"],
+ "time": ["18:30"],
+ "duration": [210, 100, 90, 65, 50]},
+
+ {"day": ["M", "T", "TH"],
+ "time": ["20:20"],
+ "duration": [100]},
+
+ {"day": ["M", "W", "F"],
+ "time": ["8:00", "11:00", "13:30", "18:30"],
+ "duration": [120]},
+
+ {"day": ["M", "T", "W", "TH"],
+ "time": ["8:00", "12:30", "18:30"],
+ "duration": [180]},
+
+ {"day": ["M", "T", "W", "TH"],
+ "time": ["8:00", "11:15", "14:30", "18:30"],
+ "duration": [170]},
+
+ {"day": ["F"],
+ "time": ["8:00", "11:15", "14:30"],
+ "duration": [170]},
+
+ {"day": ["M", "T", "W", "TH", "F"],
+ "time": ["8:00", "9:30", "11:00", "13:00", "14:30", "16:00"],
+ "duration": [80]},
+
+ {"day": ["M", "T", "W", "TH", "F"],
+ "time": ["8:00", "9:30", "11:00", "13:00", "14:30", "16:00", "18:30"],
+ "duration": [80]},
+
+ {"day": ["T", "W", "TH"],
+ "time": ["16:00"],
+ "duration": [65]},
+
+ {"day": ["M", "W", "F"],
+ "time": ["16:00"],
+ "duration": [60]},
+
+ {"day": ["T", "W", "TH"],
+ "time": ["17:15"],
+ "duration": [75]},
+
+ {"day": ["M", "W"],
+ "time": ["17:15"],
+ "duration": [60]},
+
+ {"day": ["T", "R"],
+ "time": ["17:30"],
+ "duration": [60]},
+
+ {"day": ["M", "W"],
+ "time": ["19:00"],
+ "duration": [60]},
+
+ {"day": ["TH"],
+ "time": ["19:00"],
+ "duration": [120]},
+
+ {"day": ["M"],
+ "time": ["19:30"],
+ "duration": [120]}
+]
+}
diff --git a/client-course-schedulizer/src/utilities/constants.ts b/client-course-schedulizer/src/utilities/constants.ts
index cd29fec5..3b5921a3 100644
--- a/client-course-schedulizer/src/utilities/constants.ts
+++ b/client-course-schedulizer/src/utilities/constants.ts
@@ -1,3 +1,6 @@
+import meetingPatterns from 'data/meeting-patterns.json';
+import { meetingPatternCode } from './helpers';
+
import {
Course,
CourseSectionMeeting,
@@ -66,6 +69,7 @@ export const emptyMeeting: Meeting = {
days: [],
duration: 0,
isConflict: false,
+ isNonstandardTime: false,
location: { building: "", roomNumber: "" },
startTime: "",
};
@@ -79,6 +83,19 @@ export const emptySection: Section = {
term: Term.Fall,
};
+export const legalTimes = new Set
();
+
+// For each meeting pattern add both the full meeting pattern and also each
+// abbreviated single day version. See issue #300.
+meetingPatterns.forEach((meetingPattern) => {
+ legalTimes.add(meetingPatternCode(meetingPattern));
+ const abbreviatedMeetingPattern = {...meetingPattern};
+ meetingPattern.days.replace("TH", "R").split("").forEach((day) => {
+ abbreviatedMeetingPattern.days = (day === 'R') ? 'TH' : day;
+ legalTimes.add(meetingPatternCode(abbreviatedMeetingPattern));
+ })
+})
+
// TODO: Delete this code
// export const setConstraints = (constraints: JSON) => {
// return constraints;
diff --git a/client-course-schedulizer/src/utilities/contexts/appContext.ts b/client-course-schedulizer/src/utilities/contexts/appContext.ts
index b6c20fc8..98003823 100644
--- a/client-course-schedulizer/src/utilities/contexts/appContext.ts
+++ b/client-course-schedulizer/src/utilities/contexts/appContext.ts
@@ -1,5 +1,5 @@
import { createContext, Dispatch, SetStateAction } from "react";
-import { AppAction, AppState, initialAppState, voidFn } from "utilities";
+import { AppAction, AppState, voidFn } from "utilities";
export interface AppContext {
appDispatch: Dispatch | (() => void);
@@ -8,14 +8,49 @@ export interface AppContext {
setIsCSVLoading: Dispatch> | (() => void);
}
+enum SemesterLength {
+ Full = "Full",
+ HalfFirst = "First",
+ HalfSecond = "Second",
+ IntensiveA = "A",
+ IntensiveB = "B",
+ IntensiveC = "C",
+ IntensiveD = "D",
+}
+
+enum Term {
+ Fall = "FA",
+ Spring = "SP",
+ // eslint-disable-next-line typescript-sort-keys/string-enum
+ Interim = "IN", // TODO: Remove?
+ Summer = "SU",
+}
+
+
/* Used for containing the global state of the app
and a dispatcher to perform updates against the
state of the app.
*/
export const AppContext = createContext({
appDispatch: voidFn,
- appState: initialAppState,
+ appState: {
+ classes: [],
+ colorBy: 0,
+ constraints: {},
+ departments: [],
+ fileUrl: "",
+ professors: [],
+ rooms: [],
+ schedule: { courses: [], numDistinctSchedules: 0 },
+ schedulizerTab: 0,
+ selectedSemesterPart: SemesterLength.Full,
+ selectedTerm: Term.Fall,
+ slotMaxTime: "22:00",
+ slotMinTime: "6:00",
+ times: [],
+ },
isCSVLoading: false,
setIsCSVLoading: voidFn,
});
AppContext.displayName = "AppContext";
+
diff --git a/client-course-schedulizer/src/utilities/helpers/caseFunctions.ts b/client-course-schedulizer/src/utilities/helpers/caseFunctions.ts
index 1fffb52c..798fad1a 100644
--- a/client-course-schedulizer/src/utilities/helpers/caseFunctions.ts
+++ b/client-course-schedulizer/src/utilities/helpers/caseFunctions.ts
@@ -199,6 +199,15 @@ export const instructionalMethodCallback = (value: string, { section }: CaseCall
section.instructionalMethod = value;
};
+export const deliveryModeCallback = (value: string, { section }: CaseCallbackParams) => {
+ section.deliveryMode = value;
+};
+
+export const groupCallback = (value: string, { section }: CaseCallbackParams) => {
+ section.group = value;
+};
+
+
export const sectionCallback = (value: string, params: CaseCallbackParams) => {
if (value === "--" || value.trim() === "") {
params.section.isNonTeaching = true;
@@ -219,6 +228,7 @@ export const timeCallback = (value: string, params: CaseCallbackParams) => {
export const nonTeachingActivityCallback = (value: string, params: CaseCallbackParams) => {
params.section.isNonTeaching = true;
instructionalMethodCallback(value, params);
+ deliveryModeCallback(value, params);
};
export const startTimeCase = (value: string): string => {
diff --git a/client-course-schedulizer/src/utilities/helpers/index.ts b/client-course-schedulizer/src/utilities/helpers/index.ts
index 6fdda901..42d65de0 100644
--- a/client-course-schedulizer/src/utilities/helpers/index.ts
+++ b/client-course-schedulizer/src/utilities/helpers/index.ts
@@ -6,3 +6,4 @@ export * from "./teamMembers";
export * from "./utils";
export * from "./writeFullCSV";
export * from "./writeLoadsCSV";
+export * from "./standardTimes";
diff --git a/client-course-schedulizer/src/utilities/helpers/makeFC.tsx b/client-course-schedulizer/src/utilities/helpers/makeFC.tsx
index 5514c3cc..f1563f5c 100644
--- a/client-course-schedulizer/src/utilities/helpers/makeFC.tsx
+++ b/client-course-schedulizer/src/utilities/helpers/makeFC.tsx
@@ -23,7 +23,7 @@ export const createFC = (
const subComponent = forwardRef(
// eslint-disable-next-line @typescript-eslint/no-explicit-any
({ className, as: Tag = Component || "div", ...props }: any, ref) => {
- return ;
+ return ;
},
);
subComponent.defaultProps = defaultProps;
diff --git a/client-course-schedulizer/src/utilities/helpers/readCSV.ts b/client-course-schedulizer/src/utilities/helpers/readCSV.ts
index 6a26af1f..7d4b7cb2 100644
--- a/client-course-schedulizer/src/utilities/helpers/readCSV.ts
+++ b/client-course-schedulizer/src/utilities/helpers/readCSV.ts
@@ -4,13 +4,14 @@ import {
Course,
emptyCourse,
emptySection,
+ isStandardTime,
Meeting,
Schedule,
Section,
updateNonIdentifyingCourseInfo,
updateNonIdentifyingSectionInfo,
} from "utilities";
-import { getCourse, getSection } from "utilities/services";
+import { getCourse, getSection, isNonTeaching } from "utilities/services";
import * as cf from "./caseFunctions";
interface ValidFields {
@@ -49,10 +50,12 @@ const registrarSpreadsheetFields: ValidFields = {
Comments: cf.commentsCallback,
CourseNum: cf.numberCallback,
Day10Used: cf.day10UsedCallback,
+ DeliveryMode: cf.deliveryModeCallback,
Department: cf.departmentCallback,
Faculty: cf.instructorCallback,
FacultyLoad: cf.facultyHoursCallback,
GlobalMax: cf.globalMaxCallback,
+ Group: cf.groupCallback,
InstructionalMethod: cf.instructionalMethodCallback,
LastEditTimestamp: cf.timestampCallback,
LocalMax: cf.localMaxCallback,
@@ -165,6 +168,7 @@ export const insertSectionCourse = (schedule: Schedule, section: Section, course
section.term,
section.instructors,
section.instructionalMethod,
+ section.deliveryMode,
);
// Update Course fields which were changed
@@ -184,6 +188,7 @@ export const insertSectionCourse = (schedule: Schedule, section: Section, course
existingSection,
);
const newMeetings = section.meetings;
+ newMeetings.forEach(meeting => {meeting.isNonstandardTime = !isStandardTime(meeting)});
// Update Section fields which were changed
schedule.courses[existingCourseIndex].sections[
@@ -212,13 +217,18 @@ export const insertSectionCourse = (schedule: Schedule, section: Section, course
}
// Otherwise, add the new section to the existing course
else {
+ section.isNonTeaching = isNonTeaching(course, section);
+ section.meetings.forEach(meeting => {meeting.isNonstandardTime = !isStandardTime(meeting)});
schedule.courses[existingCourseIndex].sections.push(section);
}
}
// Otherwise, add the new course to the schedule
else {
+ section.isNonTeaching = isNonTeaching(course, section);
+ section.meetings.forEach(meeting => {meeting.isNonstandardTime = !isStandardTime(meeting)});
course.sections.push(section);
schedule.courses.push(course);
}
return schedule;
};
+
diff --git a/client-course-schedulizer/src/utilities/helpers/standardTimes.spec.ts b/client-course-schedulizer/src/utilities/helpers/standardTimes.spec.ts
new file mode 100644
index 00000000..fe872f6a
--- /dev/null
+++ b/client-course-schedulizer/src/utilities/helpers/standardTimes.spec.ts
@@ -0,0 +1,71 @@
+import { Day, isStandardTime, militaryTo12Hour } from "utilities";
+
+const test_times = [
+ {out: "12:15 PM", time: "12:15"},
+ {out: "10:15 AM", time: "10:15"},
+ {out: "2:15 PM", time: "14:15"},
+]
+const test_meetings =
+[
+ {meeting : {
+ days: [Day.Monday, Day.Wednesday, Day.Friday],
+ duration: 65,
+ location: {building: "NH", roomNumber: "276"},
+ startTime: "9:15 AM",
+ },
+ out: true},
+ {meeting : {
+ days: [Day.Monday],
+ duration: 65,
+ location: {building: "NH", roomNumber: "276"},
+ startTime: "1:30 PM",
+ },
+ out: true},
+ {meeting : {
+ days: [Day.Friday],
+ duration: 65,
+ location: {building: "NH", roomNumber: "276"},
+ startTime: "1:30 PM",
+ },
+ out: true},
+ {meeting : {
+ days: [Day.Monday, Day.Wednesday, Day.Friday],
+ duration: 65,
+ location: {building: "NH", roomNumber: "276"},
+ startTime: "1:30 PM",
+ },
+ out: true},
+ {meeting : {
+ days: [Day.Monday, Day.Friday],
+ duration: 65,
+ location: {building: "NH", roomNumber: "276"},
+ startTime: "1:30 PM",
+ },
+ out: false},
+ {meeting : {
+ days: [Day.Tuesday, Day.Thursday],
+ duration: 100,
+ location: {building: "NH", roomNumber: "276"},
+ startTime: "8:00 AM",
+ },
+ out: true},
+ {meeting : {
+ days: [Day.Thursday],
+ duration: 100,
+ location: {building: "NH", roomNumber: "276"},
+ startTime: "8:00 AM",
+ },
+ out: true},
+];
+
+test_times.forEach( (test_case) => {
+ test(`correctly converting from military to 12-hour times`, () => {
+ expect(militaryTo12Hour(test_case.time)).toEqual(test_case.out);
+ });
+});
+test_meetings.forEach( (test_case) => {
+ test(`correctly identify standard meeting times ${test_case.meeting.days.join("")} @ ${test_case.meeting.startTime} for ${test_case.meeting.duration} mins`,
+ () => {
+ expect(isStandardTime(test_case.meeting)).toEqual(test_case.out);
+ });
+});
\ No newline at end of file
diff --git a/client-course-schedulizer/src/utilities/helpers/standardTimes.ts b/client-course-schedulizer/src/utilities/helpers/standardTimes.ts
new file mode 100644
index 00000000..242c65e1
--- /dev/null
+++ b/client-course-schedulizer/src/utilities/helpers/standardTimes.ts
@@ -0,0 +1,32 @@
+import { legalTimes, Meeting, MeetingPattern} from "utilities";
+
+
+// convert from 14:45 to 2:45 PM, etc.
+export const militaryTo12Hour = (time: string): string => {
+ const [hour, minute] = time.split(':');
+ if (parseInt(hour) < 12) {
+ return `${time} AM`;
+ }
+ if (parseInt(hour) === 12) {
+ return `${time} PM`;
+ }
+ return `${(parseInt(hour) - 12)}:${minute} PM`;
+};
+
+militaryTo12Hour('15:15');
+
+export const meetingPatternCode = (meeting: MeetingPattern): string => {
+ // collapse days to a string if it is a list
+ let days = typeof meeting.days === 'string' ? meeting.days : meeting.days.join("");
+ days = days.replace('R', 'TH')
+
+ return `${days} @ ${meeting.startTime} for ${meeting.duration} mins`
+}
+
+export const isStandardTime = (meeting: Meeting, strict = true): boolean => {
+ if (strict) {
+ return legalTimes.has(meetingPatternCode(meeting));
+ }
+ // replace this with a looser test that allows matching a subset of days
+ return legalTimes.has(meetingPatternCode(meeting));
+};
\ No newline at end of file
diff --git a/client-course-schedulizer/src/utilities/helpers/teamMembers.ts b/client-course-schedulizer/src/utilities/helpers/teamMembers.ts
index 5c141e30..fe1bad6e 100644
--- a/client-course-schedulizer/src/utilities/helpers/teamMembers.ts
+++ b/client-course-schedulizer/src/utilities/helpers/teamMembers.ts
@@ -82,6 +82,24 @@ export const team2022: TeamMember[] = [
},
];
+export const team2023: TeamMember[] = [
+ {
+ bio:
+ "Computer Science Student at Calvin University.",
+ name: "ZeAi Sun",
+ photo: "https://avatars.githubusercontent.com/u/112643038?s=400&v=4",
+ website: "https://github.com/SophiaSun18",
+ },
+ {
+ bio:
+ "Computer Science Student at Calvin University.",
+ name: "Faeren Madza",
+ photo:
+ "https://avatars.githubusercontent.com/u/143450134?v=4",
+ website: "https://github.com/NycoCC1993",
+ },
+];
+
export const teamAdvisors: TeamMember[] = [
{
bio:
diff --git a/client-course-schedulizer/src/utilities/helpers/writeFullCSV.ts b/client-course-schedulizer/src/utilities/helpers/writeFullCSV.ts
index 723fa058..584038b5 100644
--- a/client-course-schedulizer/src/utilities/helpers/writeFullCSV.ts
+++ b/client-course-schedulizer/src/utilities/helpers/writeFullCSV.ts
@@ -1,6 +1,6 @@
import { forEach } from "lodash";
import moment, { Moment } from "moment";
-import { Day, Schedule, Section, Term } from "utilities/interfaces";
+import { Schedule, Section, Term } from "utilities/interfaces";
import { getLocationString } from "utilities/services";
export const scheduleToFullCSVString = (schedule: Schedule): string => {
@@ -20,7 +20,7 @@ export const scheduleToFullCSVString = (schedule: Schedule): string => {
});
let csvStr =
- "Department,Term,SubjectCode,CourseNum,SectionCode,CourseLevelCode,MinimumCredits,FacultyLoad,BuildingAndRoom,MeetingDays,MeetingTime,SectionStartDate,SectionEndDate,SemesterLength,Building,RoomNumber,MeetingStart,MeetingDurationMinutes,MeetingEnd,ShortTitle,Faculty,SectionStatus,InstructionalMethod,Comments,LastEditTimestamp\n";
+ "Department,Term,SubjectCode,CourseNum,SectionCode,CourseLevelCode,MinimumCredits,FacultyLoad,BuildingAndRoom,MeetingDays,MeetingTime,SectionStartDate,SectionEndDate,SemesterLength,Building,RoomNumber,MeetingStart,MeetingDurationMinutes,MeetingEnd,ShortTitle,Faculty,SectionStatus,InstructionalMethod,DeliveryMode,Group,Comments,LastEditTimestamp\n";
schedule.courses.forEach((course) => {
const termOrder = Object.values(Term);
course.sections = course.sections.sort((a, b): number => {
@@ -46,14 +46,14 @@ export const scheduleToFullCSVString = (schedule: Schedule): string => {
let endMoment;
let meetingTimeStr = "";
let meetingStartStr = "";
- let meetingStartInternalStr = "";
+ // let meetingStartInternalStr = "";
let meetingEndStr = "";
- let meetingEndInternalStr = "";
+ // let meetingEndInternalStr = "";
let meetingDurationMinutesStr = "";
let buildingStr = "";
let roomNumberStr = "";
let buildingAndRoomStr = "";
- let roomCapacityStr = "";
+ // let roomCapacityStr = "";
let daysStr = "";
// let monStr = "";
// let tuesStr = "";
@@ -66,9 +66,9 @@ export const scheduleToFullCSVString = (schedule: Schedule): string => {
if (startMoment.isValid()) {
meetingTimeStr += getMeetingTimeStr(startMoment, endMoment);
meetingStartStr += `${startMoment.format("h:mm A")}\n`;
- meetingStartInternalStr += `${startMoment.format("H:mm:ss")}\n`;
+ // meetingStartInternalStr += `${startMoment.format("H:mm:ss")}\n`;
meetingEndStr += `${endMoment.format("h:mm A")}\n`;
- meetingEndInternalStr += `${endMoment.format("H:mm:ss")}\n`;
+ // meetingEndInternalStr += `${endMoment.format("H:mm:ss")}\n`;
} else {
meetingTimeStr += "\n";
meetingStartStr += "\n";
@@ -84,7 +84,7 @@ export const scheduleToFullCSVString = (schedule: Schedule): string => {
? `${getLocationString(meeting.location)}\n`
: `${meeting.location.building}\n`;
}
- roomCapacityStr += `${meeting.location.roomCapacity ?? ""}\n`;
+ // roomCapacityStr += `${meeting.location.roomCapacity ?? ""}\n`;
daysStr += `${meeting.days.join("")}\n`;
// monStr += `${meeting.days.includes(Day.Monday) ? "M" : ""}\n`;
// tuesStr += `${meeting.days.includes(Day.Tuesday) ? "T" : ""}\n`;
@@ -95,14 +95,14 @@ export const scheduleToFullCSVString = (schedule: Schedule): string => {
// Remove trailing newlines
meetingTimeStr = meetingTimeStr.slice(0, -1);
meetingStartStr = meetingStartStr.slice(0, -1);
- meetingStartInternalStr = meetingStartInternalStr.slice(0, -1);
+ // meetingStartInternalStr = meetingStartInternalStr.slice(0, -1);
meetingEndStr = meetingEndStr.slice(0, -1);
- meetingEndInternalStr = meetingEndInternalStr.slice(0, -1);
+ // meetingEndInternalStr = meetingEndInternalStr.slice(0, -1);
meetingDurationMinutesStr = meetingDurationMinutesStr.slice(0, -1);
buildingStr = buildingStr.slice(0, -1);
roomNumberStr = roomNumberStr.slice(0, -1);
buildingAndRoomStr = buildingAndRoomStr.slice(0, -1);
- roomCapacityStr = roomCapacityStr.slice(0, -1);
+ // roomCapacityStr = roomCapacityStr.slice(0, -1);
daysStr = daysStr.slice(0, -1);
// monStr = monStr.slice(0, -1);
// tuesStr = tuesStr.slice(0, -1);
@@ -111,9 +111,9 @@ export const scheduleToFullCSVString = (schedule: Schedule): string => {
// friStr = friStr.slice(0, -1);
// Create strings for fields that need to be constructed
const termStr = getTermsStr(section);
- const sectionNameStr = `${course.prefixes.length ? course.prefixes[0] : ""}-${
- course.number
- }-${section.letter}`;
+ // const sectionNameStr = `${course.prefixes.length ? course.prefixes[0] : ""}-${
+ // course.number
+ // }-${section.letter}`;
const courseLevelCodeStr = numericReg.test(course.number[0]) ? `${course.number[0]}00` : "";
// Construct a row in the output CSV
@@ -124,7 +124,11 @@ export const scheduleToFullCSVString = (schedule: Schedule): string => {
}","${daysStr}","${meetingTimeStr}",${section.startDate ?? ""},${section.endDate ?? ""},${section.semesterLength ?? ""},"${buildingStr
}","${roomNumberStr}","${meetingStartStr}","${meetingDurationMinutesStr
}","${meetingEndStr}","${ section.name ?? course.name
- }","${section.instructors.join("\n")}","${section.status ?? ""}","${section.instructionalMethod ?? "" }","${section.comments ?? ""}","${section.timestamp ?? ""}"\n`;
+ }","${section.instructors.join("\n")}","${section.status ?? ""
+ }","${section.instructionalMethod ?? ""
+ }","${section.deliveryMode ?? ""
+ }","${section.group ?? ""
+ }","${section.comments ?? ""}","${section.timestamp ?? ""}"\n`;
});
});
return csvStr;
diff --git a/client-course-schedulizer/src/utilities/helpers/writeLoadsCSV.ts b/client-course-schedulizer/src/utilities/helpers/writeLoadsCSV.ts
index ff2749a6..955d6a44 100644
--- a/client-course-schedulizer/src/utilities/helpers/writeLoadsCSV.ts
+++ b/client-course-schedulizer/src/utilities/helpers/writeLoadsCSV.ts
@@ -15,9 +15,10 @@ export const scheduleToNonTeachingCSVString = (schedule: Schedule): string => {
// TODO: Should instructionalMethod be used for Non-Teaching Activity or should we add a new field?
// Construct a row in the output CSV
- csvStr += `${termStr},${section.instructionalMethod},${section.facultyHours.toFixed(
- 2,
- )},"${section.instructors.join("\n")}"\n`;
+ csvStr += `${termStr},${section.instructionalMethod},${section.deliveryMode
+ },${section.facultyHours.toFixed(
+ 2,
+ )},"${section.instructors.join("\n")}"\n`;
});
}
});
diff --git a/client-course-schedulizer/src/utilities/hooks/addSectionHooks.ts b/client-course-schedulizer/src/utilities/hooks/addSectionHooks.ts
index d06e5bc1..7b3557e9 100644
--- a/client-course-schedulizer/src/utilities/hooks/addSectionHooks.ts
+++ b/client-course-schedulizer/src/utilities/hooks/addSectionHooks.ts
@@ -2,8 +2,9 @@ import { camelCase, forEach } from "lodash";
import moment from "moment";
import { useContext } from "react";
import { DeepMap, FieldError } from "react-hook-form";
-import { insertSectionCourse } from "utilities";
+import { insertSectionCourse} from "utilities";
import { AppContext } from "utilities/contexts";
+import { isStandardTime } from "utilities/";
import {
AppAction,
Course,
@@ -76,6 +77,7 @@ export const useAddSectionToSchedule = () => {
scrollToUpdatedFacultyRow(newSection.instructors[newSection.instructors.length - 1]);
};
+
const addToSchedule = ({
newCourse,
newSection,
@@ -83,6 +85,9 @@ export const useAddSectionToSchedule = () => {
removeOldMeeting,
}: AddToScheduleParams) => {
newSection.timestamp = moment().format();
+ newSection.meetings.forEach((meeting) => {
+ meeting.isNonstandardTime = ! isStandardTime(meeting)
+ })
handleOldMeeting(oldData, newSection, newCourse, removeOldMeeting, schedule);
insertSectionCourse(schedule, newSection, newCourse);
appDispatch({ payload: { schedule }, type: "setScheduleData" });
@@ -135,7 +140,7 @@ const scrollToUpdatedFacultyRow = (instructor: string) => {
// a helper to provide consistent naming and retrieve error messages
export const useInput = (label: string, errors: DeepMap) => {
// (temporary?) hack to match new labels to previously used labels
- if (label === "Delivery Mode") { label = "Instructional Method" }
+ // if (label === "Delivery Mode") { label = "Instructional Method" }
if (label === "Course Title") { label = "Name" }
const name = camelCase(label);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/client-course-schedulizer/src/utilities/interfaces/appInterfaces.ts b/client-course-schedulizer/src/utilities/interfaces/appInterfaces.ts
index 25c25b18..8462d40f 100644
--- a/client-course-schedulizer/src/utilities/interfaces/appInterfaces.ts
+++ b/client-course-schedulizer/src/utilities/interfaces/appInterfaces.ts
@@ -1,12 +1,13 @@
import { loadLocal } from "utilities/hooks/useLocal";
import { HarmonyClass } from "utilities/services";
-import { Schedule, Term } from "./dataInterfaces";
+import { Schedule, SemesterLength, Term } from "./dataInterfaces";
export enum ColorBy {
Level,
Room,
Instructor,
Prefix,
+ Group,
}
export enum SchedulizerTab {
@@ -27,6 +28,7 @@ export interface AppState {
rooms: string[];
schedule: Schedule;
schedulizerTab: SchedulizerTab;
+ selectedSemesterPart: SemesterLength;
selectedTerm: Term;
slotMaxTime: string;
slotMinTime: string;
@@ -36,7 +38,7 @@ export interface AppState {
// Defaults for the app state when it launches, will try to load
// previous appState to launch app from.
// If no previous state saved, will default to the object below.
-export const initialAppState: AppState = loadLocal("appState") || {
+export const initialAppState: AppState = {
classes: [],
colorBy: 0,
constraints: {},
@@ -46,6 +48,7 @@ export const initialAppState: AppState = loadLocal("appState") || {
rooms: [],
schedule: { courses: [], numDistinctSchedules: 0 },
schedulizerTab: 0,
+ selectedSemesterPart: SemesterLength.Full,
selectedTerm: Term.Fall,
slotMaxTime: "22:00",
slotMinTime: "6:00",
@@ -63,11 +66,11 @@ if (!initialAppState.professors) {
initialAppState.departments = [];
}
if (!initialAppState.rooms) {
- initialAppState.departments = [];
+ initialAppState.departments = [];
}
// structure of actions that can be sent to app dispatch
export interface AppAction {
payload: Partial;
- type: "setScheduleData" | "setSelectedTerm" | "setFileUrl" | "setColorBy" | "setSchedulizerTab" | "setConstraints"; // add | to add more actions in the future
+ type: "setScheduleData" | "setSelectedTerm" | "setFileUrl" | "setColorBy" | "setSchedulizerTab" | "setSelectedSemesterPart" | "setConstraints"; // add | to add more actions in the future
}
diff --git a/client-course-schedulizer/src/utilities/interfaces/dataInterfaces/scheduleInterfaces.ts b/client-course-schedulizer/src/utilities/interfaces/dataInterfaces/scheduleInterfaces.ts
index e42aaf45..dad4b647 100644
--- a/client-course-schedulizer/src/utilities/interfaces/dataInterfaces/scheduleInterfaces.ts
+++ b/client-course-schedulizer/src/utilities/interfaces/dataInterfaces/scheduleInterfaces.ts
@@ -11,14 +11,22 @@ export interface Location {
export interface Meeting {
// All days on which the given Meeting time and room is applicable
days: Day[];
- // In minutes (usually 50)
+ // In minutes
duration: number;
isConflict?: boolean;
+ isNonstandardTime?: boolean;
location: Location;
// Like "8:00 AM" or "12:30 PM"
startTime: string;
}
+// a subset of a meeting
+export interface MeetingPattern {
+ days: string | Day[];
+ duration: number;
+ startTime: string;
+}
+
export type Prefix = string;
// If new non-identifying fields are added to this interface, must update updateNonIdentifyingCourseInfo()
@@ -59,10 +67,12 @@ export interface Section {
comments?: string;
// Number of students enrolled in this section 10 days into the course
day10Used?: number;
+ deliveryMode?: string;
// Like 2/3/2020
endDate?: string;
facultyHours: number;
globalMax?: number;
+ group?: string;
instructionalMethod?: string;
instructors: Instructor[];
isNonTeaching?: boolean;
@@ -100,6 +110,7 @@ export const updateNonIdentifyingSectionInfo = (
oldSection.endDate = newSection.endDate;
oldSection.facultyHours = newSection.facultyHours;
oldSection.globalMax = newSection.globalMax;
+ oldSection.group = newSection.group;
oldSection.isNonTeaching = newSection.isNonTeaching;
oldSection.localMax = newSection.localMax;
oldSection.name = newSection.name;
@@ -120,6 +131,7 @@ export const updateIdentifyingSectionInfo = (oldSection: Section, newSection: Se
oldSection.term = newSection.term;
oldSection.instructors = newSection.instructors;
oldSection.instructionalMethod = newSection.instructionalMethod;
+ oldSection.deliveryMode = newSection.deliveryMode;
return oldSection;
};
diff --git a/client-course-schedulizer/src/utilities/reducers/appReducer.ts b/client-course-schedulizer/src/utilities/reducers/appReducer.ts
index 8b5f02f1..06098316 100644
--- a/client-course-schedulizer/src/utilities/reducers/appReducer.ts
+++ b/client-course-schedulizer/src/utilities/reducers/appReducer.ts
@@ -1,5 +1,5 @@
import { voidFn } from "utilities";
-import { AppAction, AppState, ColorBy, SchedulizerTab, Term } from "utilities/interfaces";
+import { AppAction, AppState, ColorBy, SchedulizerTab, SemesterLength, Term } from "utilities/interfaces";
import {
getClasses,
getDepts,
@@ -54,6 +54,12 @@ export const reducer = (actionCallback: (item: AppState) => void = voidFn) => {
newState = { ...state, colorBy };
break;
}
+ case "setSelectedSemesterPart": {
+ let { selectedSemesterPart } = action.payload;
+ selectedSemesterPart = selectedSemesterPart || SemesterLength.Full;
+ newState = { ...state, selectedSemesterPart };
+ break;
+ }
case "setSchedulizerTab": {
let { schedulizerTab } = action.payload;
schedulizerTab = schedulizerTab || SchedulizerTab.Faculty;
diff --git a/client-course-schedulizer/src/utilities/services/addSectionService.ts b/client-course-schedulizer/src/utilities/services/addSectionService.ts
index 3931abe9..2d3f72a7 100644
--- a/client-course-schedulizer/src/utilities/services/addSectionService.ts
+++ b/client-course-schedulizer/src/utilities/services/addSectionService.ts
@@ -31,12 +31,14 @@ export interface SectionInput {
comments?: Section["comments"];
day10Used?: Section["day10Used"];
days: CheckboxDays;
+ deliveryMode?: Section["deliveryMode"];
department?: Course["department"];
duration?: Meeting["duration"];
facultyHours?: Section["facultyHours"];
globalMax?: Section["globalMax"];
+ group?: Section["group"];
halfSemester?: Half;
- instructionalMethod?: Section["instructionalMethod"];
+ // instructionalMethod?: Section["instructionalMethod"];
instructor: Instructor[];
intensiveSemester?: Intensive;
localMax?: Section["localMax"];
@@ -93,7 +95,13 @@ const convertToSemesterLength = (sl: Half | Intensive | SemesterLengthOption): S
};
export const getSectionName = (course: Course, section: Section) => {
- return `${course.prefixes[0]}-${course.number}-${section.letter}`;
+ return `${course.prefixes.length ? course.prefixes[0] : ""}-${course.number}-${section.letter}`;
+};
+
+// if isNonTeaching hasn't already been set, infer it from the
+// section name (computed from prefix, course number, and section letter all being empty)
+export const isNonTeaching = (course: Course, section: Section) => {
+ return section.isNonTeaching || getSectionName(course, section) === "--";
};
export const getCourse = (
@@ -115,6 +123,7 @@ export const getSection = (
term: Section["term"],
instructors: Section["instructors"],
instructionalMethod: Section["instructionalMethod"],
+ deliveryMode: Section["deliveryMode"],
) => {
const course = getCourse(schedule, prefixes, courseNumber);
const sections = filter(course?.sections, (section) => {
@@ -122,31 +131,32 @@ export const getSection = (
section.letter === letter &&
section.term === term &&
isEqual(section.instructors, instructors) &&
- section.instructionalMethod === instructionalMethod
+ section.instructionalMethod === instructionalMethod &&
+ section.deliveryMode === deliveryMode
);
});
return sections.length > 0 ? sections[0] : undefined;
};
-// Deprecated, replaced by removeMeeting
-// TODO: Remove?
-const removeSection = (
- schedule: Schedule,
- letter: Section["letter"],
- term: Section["term"],
- instructors: Section["instructors"],
- courseIndex: number,
-) => {
- schedule.courses[courseIndex].sections = filter(
- schedule.courses[courseIndex].sections,
- (section) => {
- return (
- section.letter !== letter || section.term !== term || section.instructors !== instructors
- );
- },
- );
- // TODO: Delete course if no sections left?
-};
+// // Deprecated, replaced by removeMeeting
+// // TODO: Remove?
+// const removeSection = (
+// schedule: Schedule,
+// letter: Section["letter"],
+// term: Section["term"],
+// instructors: Section["instructors"],
+// courseIndex: number,
+// ) => {
+// schedule.courses[courseIndex].sections = filter(
+// schedule.courses[courseIndex].sections,
+// (section) => {
+// return (
+// section.letter !== letter || section.term !== term || section.instructors !== instructors
+// );
+// },
+// );
+// // TODO: Delete course if no sections left?
+// };
/* Used to map the input from the popover form to the
internal JSON object type. */
@@ -177,6 +187,7 @@ export const mapInternalTypesToInput = (data?: CourseSectionMeeting): SectionInp
comments: data?.section.comments?.trim() === "" ? undefined : data?.section.comments,
day10Used: data?.section.day10Used,
days,
+ deliveryMode: data?.section.deliveryMode ?? "", // TODO: should this be "In-person"?
department: data?.course.department,
duration: data?.meeting?.duration,
facultyHours:
@@ -184,11 +195,12 @@ export const mapInternalTypesToInput = (data?: CourseSectionMeeting): SectionInp
? data.section.facultyHours
: undefined,
globalMax: data?.section.globalMax,
+ group: data?.section.group ?? "",
halfSemester: ((data?.section.semesterLength &&
convertFromSemesterLength(data?.section.semesterLength) === SemesterLengthOption.HalfSemester
? data?.section.semesterLength
: SemesterLength.HalfFirst) as unknown) as Half,
- instructionalMethod: data?.section.instructionalMethod ?? "In-person",
+ // instructionalMethod: data?.section.instructionalMethod ?? "", // TODO: should this be "LEC"?
instructor: data?.section.instructors ?? [],
intensiveSemester: ((data?.section.semesterLength &&
convertFromSemesterLength(data?.section.semesterLength) ===
@@ -230,10 +242,12 @@ const createNewSectionFromInput = (data: SectionInput): Section => {
anticipatedSize: data.anticipatedSize,
comments: data.comments,
day10Used: data.day10Used,
+ deliveryMode: data.deliveryMode,
endDate: "",
facultyHours: Number(data.facultyHours),
globalMax: data.globalMax,
- instructionalMethod: data.instructionalMethod,
+ group: data.group,
+ // instructionalMethod: data.instructionalMethod,
instructors: data.instructor,
letter: data.section,
localMax: data.localMax,
@@ -272,46 +286,46 @@ const createNewCourseFromInput = (data: SectionInput): Course => {
};
};
-// Deprecated, replaced by handleOldMeeting
-// TODO: Remove?
-export const handleOldSection = (
- oldData: CourseSectionMeeting | undefined,
- newSection: Section,
- removeOldSection: boolean,
- schedule: Schedule,
-) => {
- const oldSection = oldData?.section;
- if (oldSection) {
- // If the year, term, and semester length haven't changed...
- if (
- String(newSection.year) === String(oldSection.year) &&
- newSection.term === oldSection.term &&
- newSection.semesterLength === oldSection.semesterLength
- ) {
- // Update the new Section to match the date fields of the old Section
- newSection.termStart = oldSection.termStart;
- newSection.startDate = oldSection.startDate;
- newSection.endDate = oldSection.endDate;
- }
+// // Deprecated, replaced by handleOldMeeting
+// // TODO: Remove?
+// export const handleOldSection = (
+// oldData: CourseSectionMeeting | undefined,
+// newSection: Section,
+// removeOldSection: boolean,
+// schedule: Schedule,
+// ) => {
+// const oldSection = oldData?.section;
+// if (oldSection) {
+// // If the year, term, and semester length haven't changed...
+// if (
+// String(newSection.year) === String(oldSection.year) &&
+// newSection.term === oldSection.term &&
+// newSection.semesterLength === oldSection.semesterLength
+// ) {
+// // Update the new Section to match the date fields of the old Section
+// newSection.termStart = oldSection.termStart;
+// newSection.startDate = oldSection.startDate;
+// newSection.endDate = oldSection.endDate;
+// }
- // Remove the old version of the Section
- if (removeOldSection) {
- removeSectionFromSchedule(oldData, schedule, oldSection);
- }
- }
-};
+// // Remove the old version of the Section
+// if (removeOldSection) {
+// removeSectionFromSchedule(oldData, schedule, oldSection);
+// }
+// }
+// };
-// Deprecated, replaced by removeMeetingFromSchedule
-// TODO: Remove?
-export const removeSectionFromSchedule = (
- data: CourseSectionMeeting | undefined,
- schedule: Schedule,
- section: Section,
-) => {
- const oldCourse = data?.course;
- const courseIndex = indexOf(schedule.courses, oldCourse);
- removeSection(schedule, section.letter, section.term, section.instructors, courseIndex);
-};
+// // Deprecated, replaced by removeMeetingFromSchedule
+// // TODO: Remove?
+// export const removeSectionFromSchedule = (
+// data: CourseSectionMeeting | undefined,
+// schedule: Schedule,
+// section: Section,
+// ) => {
+// const oldCourse = data?.course;
+// const courseIndex = indexOf(schedule.courses, oldCourse);
+// removeSection(schedule, section.letter, section.term, section.instructors, courseIndex);
+// };
export const addFalseToDaysCheckboxList = (days?: Day[]): CheckboxDays => {
const weekdays = Object.values(Day).filter((day) => {
diff --git a/client-course-schedulizer/src/utilities/services/conflictServices.spec.ts b/client-course-schedulizer/src/utilities/services/conflictServices.spec.ts
new file mode 100644
index 00000000..47ce3198
--- /dev/null
+++ b/client-course-schedulizer/src/utilities/services/conflictServices.spec.ts
@@ -0,0 +1,37 @@
+import { sign, rangesOverlap, termsOverlap } from "./conflictsService";
+
+[
+ {in: -2, out: -1},
+ {in: 3, out: 1},
+ {in: 0, out: 0},
+].forEach((test_case) => {
+ test("sign function works correctly", () => {
+ expect(sign(test_case.in)).toBe(test_case.out);
+ });
+});
+
+[
+ {a: [1, 5], b: [3, 7], out: true},
+ {a: [1, 3], b: [5, 7], out: false},
+ {a: [1, 4], b: [4, 7], out: true},
+].forEach((test_case) => {
+ test("rangesOverlap() works correctly", () => {
+ expect(rangesOverlap(test_case.a, test_case.b)).toBe(test_case.out);
+ expect(rangesOverlap(test_case.b, test_case.a)).toBe(test_case.out);
+ });
+});
+
+[
+ {a: 'Full', b_list: ['First', 'Second', 'A', 'B', 'C', 'D'], out: true},
+ {a: 'First', b_list: ['Full', 'A', 'B'], out: true},
+ {a: 'Second', b_list: ['Full', 'C', 'D'], out: true},
+ {a: 'First', b_list: ['Second', 'C', 'D'], out: false},
+ {a: 'Second', b_list: ['First', 'A', 'B'], out: false},
+].forEach((test_case) => {
+ test_case.b_list.forEach( (b) => {
+ test(`check for conflict between ${test_case.a} and ${b} is correct`, () => {
+ expect(termsOverlap(test_case.a, b)).toBe(test_case.out);
+ expect(termsOverlap(b, test_case.a)).toBe(test_case.out);
+ });
+ })
+});
diff --git a/client-course-schedulizer/src/utilities/services/conflictsService.ts b/client-course-schedulizer/src/utilities/services/conflictsService.ts
index 227da81d..a04c98f3 100644
--- a/client-course-schedulizer/src/utilities/services/conflictsService.ts
+++ b/client-course-schedulizer/src/utilities/services/conflictsService.ts
@@ -15,6 +15,7 @@ interface ConflictData {
instructors: Section["instructors"];
room: string;
sectionName: string;
+ semLength: string;
startTime: Moment;
term: Section["term"];
}
@@ -36,6 +37,31 @@ export interface Constraints {
[key: string]: string[];
}
+export const numericalSemLength = (semLength: string): number[] => {
+ switch (semLength) {
+ case 'Full': return [1, 16];
+ case 'First': return [1, 8];
+ case 'Second': return [9, 16];
+ case 'A': return [1, 4];
+ case 'B': return [5, 8];
+ case 'C': return [9, 12];
+ case 'D': return [13, 16];
+ default: return [0, 0];
+ }
+}
+
+export const sign = (x: number): number => {
+ return x < 0 ? -1 : (x > 0 ? 1 : 0)
+}
+
+export const rangesOverlap = (a: number[], b: number[]): boolean => {
+ return sign(a[0] - b[1]) * sign(a[1] - b[0]) <= 0
+}
+
+export const termsOverlap = (term1: string, term2: string): boolean => {
+ return rangesOverlap(numericalSemLength(term1), numericalSemLength(term2))
+}
+
export const findConflicts = (
schedule: Schedule,
constraints: Constraints = { "": [] },
@@ -54,6 +80,7 @@ export const findConflicts = (
instructors: section.instructors,
room: getLocationString(meeting.location),
sectionName: getSectionName(course, section),
+ semLength: section.semesterLength || 'Full',
startTime: startTimeMoment,
term: section.term,
});
@@ -154,6 +181,7 @@ export const findConflicts = (
i !== j &&
range1.overlaps(range2) &&
meeting1.term === meeting2.term &&
+ termsOverlap(meeting1.semLength, meeting2.semLength) &&
meeting1.days.some(meeting2IncludesDay) &&
(meeting1.instructors.some(meeting2IncludesInstructor) ||
meeting2IncludesConstriant() ||
diff --git a/client-course-schedulizer/src/utilities/services/scheduleService.ts b/client-course-schedulizer/src/utilities/services/scheduleService.ts
index a53eb1fd..2f32d6f8 100644
--- a/client-course-schedulizer/src/utilities/services/scheduleService.ts
+++ b/client-course-schedulizer/src/utilities/services/scheduleService.ts
@@ -1,4 +1,3 @@
-import { EventInput } from "@fullcalendar/react";
import { ScheduleBaseProps } from "components";
import { filter, flatten, forEach, forOwn, map, maxBy, minBy, range } from "lodash";
import moment from "moment";
@@ -6,8 +5,9 @@ import hash from "object-hash";
import randomColor from "randomcolor";
import { enumArray, WILDCARD_COLOR } from "utilities";
import { INITIAL_DATE } from "utilities/constants";
-import { ColorBy, Day, Location, Meeting, Schedule, Section, Term } from "utilities/interfaces";
-import { Constraints, findConflicts } from "./conflictsService";
+import { ColorBy, Day, Location, Meeting, Schedule, Section, SemesterLength, Term } from "utilities/interfaces";
+import { Constraints, findConflicts, termsOverlap } from "./conflictsService";
+import { EventInput } from "@fullcalendar/core";
// Returns a list of hours to display on the Schedule
// TODO: add better types for timing, maybe: https://stackoverflow.com/questions/51445767/how-to-define-a-regex-matched-string-type-in-typescript
@@ -131,11 +131,15 @@ export const getMinAndMaxTimes = (schedule: Schedule) => {
};
};
-export const filterEventsByTerm = (groupedEvents: GroupedEvents, term: Term) => {
+export const filterEventsByTerm = (
+ groupedEvents: GroupedEvents,
+ term: Term,
+ semesterLength: SemesterLength = SemesterLength.Full) => {
const tempGroupedEvents: GroupedEvents = {};
forOwn(groupedEvents, (_, key) => {
tempGroupedEvents[key] = filter(groupedEvents[key], (e) => {
- return e.extendedProps?.section.term === term;
+ return e.extendedProps?.section.term === term &&
+ termsOverlap(e.extendedProps?.section.semesterLength, semesterLength);
});
});
return tempGroupedEvents;
@@ -158,6 +162,16 @@ export const colorConflictBorders = (groupedEvents: GroupedEvents) => {
});
};
+export const colorNonstandardTimeBorders = (groupedEvents: GroupedEvents) => {
+ forOwn(groupedEvents, (_, key) => {
+ forEach(groupedEvents[key], (event) => {
+ if (event.extendedProps?.meeting?.isNonstandardTime) {
+ event.borderColor = "orange";
+ }
+ });
+ });
+};
+
export const colorEventsByFeature = (groupedEvents: GroupedEvents, colorBy: ColorBy) => {
// TODO: Multiple colors for multiple instructors/prefixes?
// TODO: Pre-hashing strings too slow?
@@ -196,6 +210,15 @@ export const colorEventsByFeature = (groupedEvents: GroupedEvents, colorBy: Colo
});
});
break;
+ case ColorBy.Group:
+ forOwn(groupedEvents, (_, key) => {
+ forEach(groupedEvents[key], (event) => {
+ const groupStr = event.extendedProps?.section?.group ?? "";
+ event.color = randomColor({ luminosity: "light", seed: hash(groupStr) });
+ event.textColor = "black";
+ });
+ });
+ break;
case ColorBy.Prefix:
forOwn(groupedEvents, (_, key) => {
forEach(groupedEvents[key], (event) => {
@@ -289,20 +312,60 @@ export const getSectionLetters = (schedule: Schedule) => {
return letters.sort();
};
-export const getInstructionalMethods = (schedule: Schedule) => {
- const instructionalMethods: string[] = [];
+// // get list of instructional methods already in use in the Schedule
+// // used for autocompletion
+// // deprecated -- using getDeliveryModes() now
+//
+// export const getInstructionalMethods = (schedule: Schedule) => {
+// const instructionalMethods: string[] = [];
+// forEach(schedule.courses, (course) => {
+// forEach(course.sections, (section) => {
+// if (
+// section.instructionalMethod &&
+// !instructionalMethods.includes(section.instructionalMethod) &&
+// !section.isNonTeaching
+// ) {
+// instructionalMethods.push(section.instructionalMethod);
+// }
+// });
+// });
+// return instructionalMethods.sort();
+// };
+
+// get list of delivery modes already in use in the Schedule
+// used for autocompletion
+export const getDeliveryModes = (schedule: Schedule) => {
+ const deliveryModes: string[] = [];
+ forEach(schedule.courses, (course) => {
+ forEach(course.sections, (section) => {
+ if (
+ section.deliveryMode &&
+ !deliveryModes.includes(section.deliveryMode) &&
+ !section.isNonTeaching
+ ) {
+ deliveryModes.push(section.deliveryMode);
+ }
+ });
+ });
+ return deliveryModes.sort();
+};
+
+// get list of groups already in use in the Schedule
+// used for autocompletion
+export const getGroups = (schedule: Schedule) => {
+ const groupsInUse: string[] = [];
forEach(schedule.courses, (course) => {
forEach(course.sections, (section) => {
if (
- section.instructionalMethod &&
- !instructionalMethods.includes(section.instructionalMethod) &&
+ section.group &&
+ !groupsInUse.includes(section.group) &&
!section.isNonTeaching
) {
- instructionalMethods.push(section.instructionalMethod);
+ groupsInUse.push(section.group);
}
});
});
- return instructionalMethods.sort();
+ return groupsInUse.sort();
};
export const getDepts = (schedule: Schedule) => {
diff --git a/client-course-schedulizer/src/utilities/services/validation/popover.ts b/client-course-schedulizer/src/utilities/services/validation/popover.ts
index fd4e8e1c..ccf17c59 100644
--- a/client-course-schedulizer/src/utilities/services/validation/popover.ts
+++ b/client-course-schedulizer/src/utilities/services/validation/popover.ts
@@ -44,6 +44,7 @@ export const addSectionSchema = object().shape({
.transform(emptyStringToNull)
.nullable(),
days: array().transform(removeUncheckedValues),
+ deliveryMode: string().nullable(),
department: string().nullable(),
duration: number()
.typeError("duration must be a number")
@@ -62,6 +63,7 @@ export const addSectionSchema = object().shape({
.min(0)
.transform(emptyStringToNull)
.nullable(),
+ group: string().nullable(),
instructionalMethod: string().nullable(),
instructor: array().of(string()).required(),
localMax: number()