incorporate reading start and end day if available

Author: dtemkin1

src/lib/dates.ts

@@ -244,17 +244,37 @@ export class Term {
   }
 
   /** The date a slot starts on. */
-  startDateFor(slot: Slot, secondHalf: boolean = false): Date {
+  startDateFor(
+    slot: Slot,
+    secondHalf: boolean = false,
+    startDay?: [number, number],
+  ): Date {
     const date = new Date((secondHalf ? this.h2Start : this.start).getTime());
+
+    if (startDay !== undefined) {
+      date.setMonth(startDay[0] - 1);
+      date.setDate(startDay[1]);
+    }
+
     while (date.getDay() !== slot.weekday) {
       date.setDate(date.getDate() + 1);
     }
     return slot.onDate(date);
   }
 
   /** The date a slot ends on, plus an extra day. */
-  endDateFor(slot: Slot, firstHalf: boolean = false): Date {
+  endDateFor(
+    slot: Slot,
+    firstHalf: boolean = false,
+    endDay?: [number, number],
+  ): Date {
     const date = new Date((firstHalf ? this.h1End : this.end).getTime());
+
+    if (endDay !== undefined) {
+      date.setMonth(endDay[0] - 1);
+      date.setDate(endDay[1]);
+    }
+
     while (date.getDay() !== slot.weekday) {
       date.setDate(date.getDate() - 1);
     }

src/lib/gapi.ts

@@ -59,11 +59,45 @@ function toGoogleCalendarEvents(
 ): Array<gapi.client.calendar.Event> {
   return activity.events.flatMap((event) =>
     event.slots.map((slot) => {
-      const startDate = term.startDateFor(slot.startSlot);
-      const startDateEnd = term.startDateFor(slot.endSlot);
-      const endDate = term.endDateFor(slot.startSlot);
+      let startDate: Date;
+      let startDateEnd: Date;
+      let endDate: Date;
+
+      if (
+        "rawClass" in event.activity &&
+        event.activity.rawClass.quarterInfo?.start
+      ) {
+        startDate = term.startDateFor(
+          slot.startSlot,
+          undefined,
+          event.activity.rawClass.quarterInfo?.start,
+        );
+        startDateEnd = term.startDateFor(
+          slot.endSlot,
+          undefined,
+          event.activity.rawClass.quarterInfo?.start,
+        );
+      } else {
+        startDate = term.startDateFor(slot.startSlot);
+        startDateEnd = term.startDateFor(slot.endSlot);
+      }
+
+      if (
+        "rawClass" in event.activity &&
+        event.activity.rawClass.quarterInfo?.end
+      ) {
+        endDate = term.endDateFor(
+          slot.startSlot,
+          undefined,
+          event.activity.rawClass.quarterInfo?.end,
+        );
+      } else {
+        endDate = term.endDateFor(slot.startSlot);
+      }
+
       const exDates = term.exDatesFor(slot.startSlot);
       const rDate = term.rDateFor(slot.startSlot);
+
       return {
         summary: event.name,
         location: event.room,
@@ -83,9 +117,42 @@ function toGoogleCalendarEvents(
 function toICalEvents(activity: Activity, term: Term): Array<ICalEventData> {
   return activity.events.flatMap((event) =>
     event.slots.map((slot) => {
-      const startDate = term.startDateFor(slot.startSlot);
-      const startDateEnd = term.startDateFor(slot.endSlot);
-      const endDate = term.endDateFor(slot.startSlot);
+      let startDate: Date;
+      let startDateEnd: Date;
+      let endDate: Date;
+
+      if (
+        "rawClass" in event.activity &&
+        event.activity.rawClass.quarterInfo?.start
+      ) {
+        startDate = term.startDateFor(
+          slot.startSlot,
+          undefined,
+          event.activity.rawClass.quarterInfo?.start,
+        );
+        startDateEnd = term.startDateFor(
+          slot.endSlot,
+          undefined,
+          event.activity.rawClass.quarterInfo?.start,
+        );
+      } else {
+        startDate = term.startDateFor(slot.startSlot);
+        startDateEnd = term.startDateFor(slot.endSlot);
+      }
+
+      if (
+        "rawClass" in event.activity &&
+        event.activity.rawClass.quarterInfo?.end
+      ) {
+        endDate = term.endDateFor(
+          slot.startSlot,
+          undefined,
+          event.activity.rawClass.quarterInfo?.end,
+        );
+      } else {
+        endDate = term.endDateFor(slot.startSlot);
+      }
+
       const exDates = term.exDatesFor(slot.startSlot);
       const rDate = term.rDateFor(slot.startSlot);