Merge pull request #349 from senior-knights/feature/update-scheduling…

…-format

Feature/update scheduling format

.github/workflows/deploy.yml

@@ -11,18 +11,18 @@ jobs:
       working-directory: ./client-course-schedulizer
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [20.x]
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install Packages
-        run: npm install
+        run: pnpm install
         working-directory: ${{env.working-directory}}
       - name: Build Page
-        run: npm run build
+        run: pnpm run build
         working-directory: ${{env.working-directory}}
       - name: Remove gh-pages Cache
         run: rm -rf node_modules/gh-pages/.cache

client-course-schedulizer/src/utilities/helpers/caseFunctions.ts

@@ -1,5 +1,6 @@
 import { cloneDeep, forEach } from "lodash";
 import moment from "moment";
+import { Case } from "runtypes";
 import { emptyMeeting } from "utilities/constants";
 import { Course, Day, Meeting, Section, SemesterLength, Term } from "utilities/interfaces";
 
@@ -53,15 +54,58 @@ const assignWithMeetings = (
   });
 };
 
+export const meetingPatternCallback = (value: string, params: CaseCallbackParams) => {
+  const patternParts = value.split("\n");
+  var meetingDays = "";
+  var times = "";
+
+  patternParts.forEach((element) => {
+    if (element.length > 1) {
+      meetingDays += element.split("|")[0].trimEnd() + "\n";
+      const timeParts = element.split(" ");
+      const time = timeParts[2] + timeParts[3] + " - " + timeParts[5] + timeParts[6] + "\n";
+      times += time;
+    }
+  });
+
+  daysCallback(meetingDays, params);
+  timeCallback(times, params);
+};
+
+export const daysCallback = (value: string, params: CaseCallbackParams) => {
+  assignWithMeetings(value, params, (days, i, meetings) => {
+    meetings[i].days = daysCase(days);
+  });
+};
+
+export const timeCallback = (value: string, params: CaseCallbackParams) => {
+  const timeParts = value.split("\n");
+  var startTimes = "";
+
+  timeParts.forEach((time) => {
+    const startTime = time.split(" ").join("").split("-")[0];
+    startTimes += startTime + "\n";
+  })
+
+  startTimeCallback(startTimes, params);
+  durationCallback(value, params);
+};
+
 export const startTimeCallback = (value: string, params: CaseCallbackParams) => {
   assignWithMeetings(value, params, (startTime, i, meetings) => {
     meetings[i].startTime = startTimeCase(startTime);
   });
 };
 
+export const durationCallback = (value: string, params: CaseCallbackParams) => {
+  assignWithMeetings(value, params, (duration, i, meetings) => {
+    meetings[i].duration = durationCase(duration);
+  });
+};
+
 export const locationCallback = (value: string, params: CaseCallbackParams) => {
   assignWithMeetings(value, params, (location, i, meetings) => {
-    [meetings[i].location.building, meetings[i].location.roomNumber] = locationCase(location);
+    [meetings[i].location.building, meetings[i].location.roomNumber] = locationCase(location.split("-")[0]);
   });
 };
 
@@ -88,16 +132,21 @@ export const semesterLengthCallback = (value: string, { section }: CaseCallbackP
   section.semesterLength = semesterLengthCase(value);
 };
 
-export const daysCallback = (value: string, params: CaseCallbackParams) => {
-  assignWithMeetings(value, params, (days, i, meetings) => {
-    meetings[i].days = daysCase(days);
-  });
-};
-
 export const instructorCallback = (value: string, { section }: CaseCallbackParams) => {
   section.instructors = instructorCase(value);
 };
 
+export const courseCallback = (value: string, { course }: CaseCallbackParams) => {
+  course.department = value.split(" ")[0];
+  course.prefixes = [value.split(" ")[0]];
+  course.number = value.split(" ")[1];
+}
+
+export const courseSectionCallback = (value: string, { course, section }: CaseCallbackParams) => {
+  section.letter = value.split("-")[1];
+  course.name = value.split("-")[2];
+}
+
 export const prefixCallback = (value: string, { course }: CaseCallbackParams) => {
   course.prefixes = value === "" ? [] : prefixCase(value);
 };
@@ -114,13 +163,13 @@ export const letterCallback = (value: string, { section }: CaseCallbackParams) =
   section.letter = value;
 };
 
-export const globalMaxCallback = (value: string, { section }: CaseCallbackParams) => {
-  section.globalMax = integerDefaultZeroCase(value);
-};
+// export const globalMaxCallback = (value: string, { section }: CaseCallbackParams) => {
+//   section.globalMax = integerDefaultZeroCase(value);
+// };
 
-export const localMaxCallback = (value: string, { section }: CaseCallbackParams) => {
-  section.localMax = integerDefaultZeroCase(value);
-};
+// export const localMaxCallback = (value: string, { section }: CaseCallbackParams) => {
+//   section.localMax = integerDefaultZeroCase(value);
+// };
 
 export const anticipatedSizeCallback = (value: string, { section }: CaseCallbackParams) => {
   section.anticipatedSize = integerDefaultZeroCase(value);
@@ -136,6 +185,11 @@ export const yearCallback = (value: string, { section }: CaseCallbackParams) =>
   section.year = yearCase(value);
 };
 
+export const semesterHourCallback = (value: string, params: CaseCallbackParams) => {
+  studentHoursCallback(value, params);
+  facultyHoursCallback(value, params);
+}
+
 export const studentHoursCallback = (value: string, { section }: CaseCallbackParams) => {
   // Remove '$' is Excel prepended it to the student hours
   section.studentHours = value.startsWith("$") ? Number(value.substr(1)) : Number(value);
@@ -145,12 +199,6 @@ export const facultyHoursCallback = (value: string, { section }: CaseCallbackPar
   section.facultyHours = value.startsWith("$") ? Number(value.substr(1)) : Number(value);
 };
 
-export const durationCallback = (value: string, params: CaseCallbackParams) => {
-  assignWithMeetings(value, params, (duration, i, meetings) => {
-    meetings[i].duration = durationCase(duration);
-  });
-};
-
 export const roomCapacityCallback = (value: string, params: CaseCallbackParams) => {
   assignWithMeetings(value, params, (capacity, i, meetings) => {
     meetings[i].location.roomCapacity =
@@ -166,13 +214,13 @@ export const termStartCallback = (value: string, { section }: CaseCallbackParams
   section.termStart = value;
 };
 
-export const usedCallback = (value: string, { section }: CaseCallbackParams) => {
-  section.used = integerDefaultZeroCase(value);
-};
+// export const usedCallback = (value: string, { section }: CaseCallbackParams) => {
+//   section.used = integerDefaultZeroCase(value);
+// };
 
-export const day10UsedCallback = (value: string, { section }: CaseCallbackParams) => {
-  section.day10Used = integerDefaultZeroCase(value);
-};
+// export const day10UsedCallback = (value: string, { section }: CaseCallbackParams) => {
+//   section.day10Used = integerDefaultZeroCase(value);
+// };
 
 export const startDateCallback = (value: string, { section }: CaseCallbackParams) => {
   if (value.trim() !== "") {
@@ -207,7 +255,6 @@ 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,12 +266,6 @@ export const sectionCallback = (value: string, params: CaseCallbackParams) => {
   }
 };
 
-export const timeCallback = (value: string, params: CaseCallbackParams) => {
-  const [startTime] = value.split(" ").join("").split("-");
-  startTimeCallback(startTime, params);
-  durationCallback(value, params);
-};
-
 export const nonTeachingActivityCallback = (value: string, params: CaseCallbackParams) => {
   params.section.isNonTeaching = true;
   instructionalMethodCallback(value, params);
@@ -337,8 +378,8 @@ export const endDateCase = (
   value: string,
   startSectionDate: string | undefined,
 ): SemesterLength => {
-  const sectionStart = moment(startSectionDate, "l");
-  const sectionEnd = moment(value, "l");
+  const sectionStart = moment(startSectionDate);
+  const sectionEnd = moment(value);
   const sectionLength = sectionEnd.diff(sectionStart, "days");
   const startMonth = sectionStart.month();
   const firstStartMonths = [0, 1, 7, 8]; // Jan, Feb, Aug, Sept

client-course-schedulizer/src/utilities/helpers/readCSV.ts

@@ -24,11 +24,11 @@ const pruimSpreadsheetFields: ValidFields = {
   days: cf.daysCallback,
   duration: cf.durationCallback,
   facultyHours: cf.facultyHoursCallback,
-  globalMax: cf.globalMaxCallback,
+  // globalMax: cf.globalMaxCallback,
   half: cf.semesterLengthCallback,
   instructor: cf.instructorCallback,
   instructors: cf.instructorCallback,
-  localMax: cf.localMaxCallback,
+  // localMax: cf.localMaxCallback,
   location: cf.locationCallback,
   name: cf.nameCallback,
   number: cf.numberCallback,
@@ -45,36 +45,41 @@ const pruimSpreadsheetFields: ValidFields = {
 };
 
 const registrarSpreadsheetFields: ValidFields = {
+  AcademicPeriod: cf.termCallback,
   AcademicYear: cf.yearCallback,
-  BuildingAndRoom: cf.locationCallback,
   Comments: cf.commentsCallback,
+  Course: cf.courseCallback,
   CourseNum: cf.numberCallback,
-  Day10Used: cf.day10UsedCallback,
+  CourseSection: cf.courseSectionCallback,
+  // Day10Used: cf.day10UsedCallback,
   DeliveryMode: cf.deliveryModeCallback,
   Department: cf.departmentCallback,
-  Faculty: cf.instructorCallback,
+  EndDate: cf.endDateCallback,
   FacultyLoad: cf.facultyHoursCallback,
-  GlobalMax: cf.globalMaxCallback,
+  // GlobalMax: cf.globalMaxCallback,
   Group: cf.groupCallback,
-  InstructionalMethod: cf.instructionalMethodCallback,
+  InstructionalFormat: cf.instructionalMethodCallback,
+  Instructors: cf.instructorCallback,
   LastEditTimestamp: cf.timestampCallback,
-  LocalMax: cf.localMaxCallback,
+  Location1: cf.locationCallback,
+  // Location2: cf.locationCallback,
+  // LocalMax: cf.localMaxCallback,
   MeetingDays: cf.daysCallback,
   MeetingDurationMinutes: cf.durationCallback,
+  MeetingPatterns: cf.meetingPatternCallback,
   MeetingStart: cf.startTimeCallback,
   MeetingTime: cf.timeCallback,
   MinimumCredits: cf.studentHoursCallback,
   RoomCapacity: cf.roomCapacityCallback,
   SectionCode: cf.letterCallback,
-  SectionEndDate: cf.endDateCallback,
-  SectionStartDate: cf.startDateCallback,
   SectionStatus: cf.statusCallback,
+  SemesterHours: cf.semesterHourCallback,
   SemesterLength: cf.semesterLengthCallback,
   ShortTitle: cf.nameCallback,
+  // StartDate: cf.termStartCallback,
+  StartDate: cf.startDateCallback,
   SubjectCode: cf.prefixCallback,
-  Term: cf.termCallback,
-  TermStart: cf.termStartCallback,
-  Used: cf.usedCallback,
+  // Used: cf.usedCallback,
 };
 
 const templateSpreadsheetFields: ValidFields = {