Miscellaneous fixes relating to PE classes (#293)

Some finishing touches on the PE classes feature (prev: #284).

---------

Co-authored-by: Diego Temkin <65834932+dtemkin1@users.noreply.github.com>

Author: psvenk

package-lock.json

@@ -37,7 +37,8 @@
     "Fencing",
     "Pistol",
     "Air Pistol",
-    "Rifle",  # TODO ask if air rifle is also eligible
+    "Rifle",
+    "Air Rifle",
     "Sailing",
 ]
 
@@ -84,6 +85,7 @@ class PEWSchema(TypedDict):
     wellness: bool
     pirate: bool
     swimGIR: bool
+    remote: bool
     prereqs: str
     equipment: str
     fee: str
@@ -125,7 +127,7 @@ def augment_location(location: str) -> str:
         str: The location, with a building number possibly prepended
 
     >>> augment_location("Du Pont T Club Lounge")
-    'W35 - Du Pont T Club Lounge'
+    'W35+ - Du Pont T Club Lounge'
 
     >>> augment_location("Harvard")
     'Harvard'
@@ -134,10 +136,10 @@ def augment_location(location: str) -> str:
     'Du Pont T Club Lounge and 26-100'
     """
     buildings = {
-        "Du Pont": "W35",
-        "Zesiger": "W35",
-        "Rockwell": "W35",
-        "Johnson": "W35",
+        "Du Pont": "W35+",
+        "Zesiger": "W35+",
+        "Rockwell": "W35+",
+        "Johnson": "W35+",
     }
 
     if " and " in location:
@@ -261,7 +263,7 @@ def parse_date(date_str: str) -> date:
 
 def parse_times_to_raw_section(start_time: str, days: str, location: str) -> str:
     """
-    Parses times from CVS to format from Fireroad, for compatibility.
+    Parses times from CSV to Fireroad format, for compatibility.
 
     Args:
         start_time (str): Start time of the class
@@ -273,21 +275,16 @@ def parse_times_to_raw_section(start_time: str, days: str, location: str) -> str
     """
     start_c = time_c.strptime(start_time, "%I:%M %p")
     start = time(start_c.tm_hour, start_c.tm_min)
-    end = time(
-        start.hour + 1, start.minute
-    )  # default to 1 hour, can be changed in overrides
+    # default to 1 hour, can be changed in overrides
 
     start_raw_time = (
-        f"{12 - ((- start.hour) % 12)}" f"{'.30' if start.minute > 29 else ''}"
+        f"{12 - ((- start.hour) % 12)}"
+        f"{'.30' if start.minute > 29 else ''}"
+        f"{' PM' if start.hour >= 17 else ''}"
     )
-    end_raw_time = (
-        f"{12 - ((- end.hour) % 12)}"
-        f"{'.30' if end.minute > 29 else ''}"
-        f"{' PM' if end.hour >= 17 else ''}"
-    )
-    evening = "1" if end.hour >= 17 else "0"
+    evening = "1" if start.hour >= 17 else "0"
 
-    return f"{location}/{days}/{evening}/{start_raw_time}-{end_raw_time}"
+    return f"{location}/{days}/{evening}/{start_raw_time}"
 
 
 def parse_data(row: PEWFile, quarter: int) -> PEWSchema:
@@ -322,6 +319,7 @@ def parse_data(row: PEWFile, quarter: int) -> PEWSchema:
         "wellness": any(number.startswith(prefix) for prefix in WELLNESS_PREFIXES),
         "pirate": any(row["Title"].startswith(prefix) for prefix in PIRATE_CLASSES),
         "swimGIR": parse_bool(row["Swim GIR"]),
+        "remote": row["Title"].lower().find("remote") != -1,
         "prereqs": row["Prerequisites"] or "None",
         "equipment": row["Equipment"],
         "fee": row["Fee Amount"],

scrapers/pe.py

@@ -166,6 +166,7 @@ function PEClassTypes(props: { cls: PEClass }) {
     ["wellness", "Wellness Wizard eligible"],
     ["pirate", "Pirate Certificate eligible"],
     ["swim", "Satisfies swim GIR"],
+    ["remote", "Remote class"],
   ]);
 
   return (

scrapers/pe/pe-q3.csv

@@ -35,6 +35,26 @@ export function Calendar() {
       .flatMap((event) => event.eventInputs);
   }, [selectedActivities]);
 
+  const getBuildingNumber = (room: string) =>
+    room.split("-")[0].trim().replace(/\+$/, "");
+
+  /**
+   * Get the approximate distance (in feet) between two buildings on campus
+   */
+  const getDistance = (building1: string, building2: string) => {
+    // Get coordinates of each building
+    const location1 = state.locations.get(building1);
+    const location2 = state.locations.get(building2);
+
+    if (!location1 || !location2) {
+      return undefined;
+    }
+
+    const dx = location1.x - location2.x;
+    const dy = location1.y - location2.y;
+    return Math.sqrt(dx * dx + dy * dy);
+  };
+
   /**
    * Check if event1 ends at the same time that some other event starts. If
    * this is the case and the commute distance between the two events' locations
@@ -55,26 +75,13 @@ export function Calendar() {
         continue;
       }
 
-      // Extract building numbers from room numbers
-      const building1 = room1.split("-")[0].trim();
-      const building2 = event2.room.split("-")[0].trim();
-
-      // Get coordinates of each building
-      const location1 = state.locations.get(building1);
-      const location2 = state.locations.get(building2);
-
-      if (!location1 || !location2) {
-        continue;
-      }
+      const building1 = getBuildingNumber(room1);
+      const building2 = getBuildingNumber(event2.room);
 
-      // Approximate distance (in feet) between the two buildings using Pythagoras
-      const distance = (() => {
-        const dx = location1.x - location2.x;
-        const dy = location1.y - location2.y;
-        return Math.sqrt(dx * dx + dy * dy);
-      })();
+      // Approximate distance (in feet) between the two buildings
+      const distance = getDistance(building1, building2);
 
-      if (distance < DISTANCE_WARNING_THRESHOLD) {
+      if (distance === undefined || distance < DISTANCE_WARNING_THRESHOLD) {
         continue;
       }
 
@@ -111,26 +118,39 @@ export function Calendar() {
     const distanceWarning = getDistanceWarning(event);
 
     return (
-      <Box
-        color={event.textColor}
-        p={0.5}
-        lineHeight={1.3}
-        cursor="pointer"
-        height="100%"
-        position="relative"
-      >
-        {!(activity instanceof CustomActivity) ? (
-          <Tooltip
-            content={activity.name}
-            portalled
-            positioning={{ placement: "top" }}
-          >
-            {TitleText()}
-          </Tooltip>
-        ) : (
-          <TitleText />
-        )}
-        <Text fontSize="xs">{room}</Text>
+      <>
+        <Box
+          color={event.textColor}
+          overflow="hidden"
+          p={0.5}
+          lineHeight={1.3}
+          cursor="pointer"
+          height="100%"
+          position="relative"
+        >
+          {!(activity instanceof CustomActivity) ? (
+            <Tooltip
+              content={activity.name}
+              portalled
+              positioning={{ placement: "top" }}
+            >
+              {TitleText()}
+            </Tooltip>
+          ) : (
+            <TitleText />
+          )}
+          {event.extendedProps.roomClarification ? (
+            <Tooltip
+              content={event.extendedProps.roomClarification as string}
+              portalled
+              positioning={{ placement: "top" }}
+            >
+              <Text fontSize="xs">{room}</Text>
+            </Tooltip>
+          ) : (
+            <Text fontSize="xs">{room}</Text>
+          )}
+        </Box>
         {distanceWarning ? (
           <Float placement="bottom-end">
             <Tooltip
@@ -149,7 +169,7 @@ export function Calendar() {
             </Tooltip>
           </Float>
         ) : null}
-      </Box>
+      </>
     );
   };
 

src/components/ActivityDescription.tsx

@@ -222,6 +222,7 @@ const CLASS_FLAGS_2: FilterGroup = [
   ["wellness", "🔮 Wellness Wizard"],
   ["pirate", "🏴‍☠️ Pirate Certificate"],
   ["swim", "🌊 Swim GIR"],
+  ["remote", "💻 Remote"],
 ];
 
 const CLASS_FLAGS = [...CLASS_FLAGS_1, ...CLASS_FLAGS_2];
@@ -459,7 +460,6 @@ export function PEClassTable() {
         fee: cls.fee,
         name: cls.rawClass.name,
         class: cls,
-        // TODO figure out if we get PE instructor names
       })),
     [peClasses],
   );

src/components/Calendar.tsx

@@ -104,6 +104,8 @@ export class Event {
   slots: Timeslot[];
   /** The room of the event. */
   room?: string;
+  /** Room clarification, e.g. "in the pool" */
+  roomClarification?: string;
   /** If defined, 1 -> first half; 2 -> second half. */
   half?: number;
 
@@ -113,12 +115,14 @@ export class Event {
     slots: Timeslot[],
     room?: string,
     half?: number,
+    roomClarification?: string,
   ) {
     this.activity = activity;
     this.name = name;
     this.slots = slots;
     this.room = room;
     this.half = half;
+    this.roomClarification = roomClarification;
   }
 
   /** List of events that can be directly given to FullCalendar. */
@@ -136,6 +140,7 @@ export class Event {
       backgroundColor: color,
       borderColor: color,
       room: this.room,
+      roomClarification: this.roomClarification,
       activity: this.activity,
     }));
   }

src/components/PEClassTable.tsx

@@ -229,7 +229,7 @@ export class Class implements BaseActivity {
     return this.number;
   }
 
-  /** Name, e.g. "Introduction to Machine Learning". */
+  /** Name; e.g. "Introduction to Machine Learning". */
   get name(): string {
     if (this.rawClass.oldNumber) {
       return `[${this.rawClass.oldNumber}] ${this.rawClass.name}`;

src/lib/activity.ts

@@ -3,10 +3,14 @@ import { type RawPEClass, type RawSection } from "./raw";
 import { Event } from "./activity";
 import { fallbackColor, type ColorScheme } from "./colors";
 
+export const W35_PLUS_TEXT =
+  "W31, W32, W33, W34 and W35 are all connected. Enter through W35.";
+
 export interface PEFlags {
   wellness: boolean;
   pirate: boolean;
   swim: boolean;
+  remote: boolean;
   nofee: boolean;
   nopreq: boolean;
 }
@@ -15,6 +19,7 @@ const peFlagEmojis: { [k in keyof PEFlags]?: string } = {
   wellness: "🔮",
   pirate: "🏴‍☠️",
   swim: "🌊",
+  remote: "💻",
 };
 
 export const getPEFlagEmoji = (flag: keyof PEFlags): string => {
@@ -64,6 +69,20 @@ export class PESections extends Sections {
   get priority(): number {
     return -1;
   }
+
+  get event(): Event | null {
+    const room = this.roomOverride || this.selected?.room;
+    return this.selected
+      ? new Event(
+          this.cls,
+          this.longName,
+          this.selected.timeslots,
+          room,
+          undefined,
+          room?.includes("W35+") ? W35_PLUS_TEXT : undefined,
+        )
+      : null;
+  }
 }
 
 /**
@@ -88,10 +107,12 @@ export class PEClass implements BaseActivity {
     ];
   }
 
+  /** ID unique over all Activities. */
   get id(): string {
     return this.rawClass.number;
   }
 
+  /** Name; e.g. "Swimming, Beginner". */
   get name(): string {
     return this.rawClass.name;
   }
@@ -160,6 +181,7 @@ export class PEClass implements BaseActivity {
       wellness: this.rawClass.wellness,
       pirate: this.rawClass.pirate,
       swim: this.rawClass.swimGIR,
+      remote: this.rawClass.remote,
       nofee: this.fee == 0,
       nopreq: this.rawClass.prereqs == "None",
     };

src/lib/class.ts

@@ -229,6 +229,8 @@ export interface RawPEClass {
   pirate: boolean;
   /** Satisfies swim GIR */
   swimGIR: boolean;
+  /** Remote status */
+  remote: boolean;
 
   /** Prereqs, no specific format */
   prereqs: string;