classrooms: Show holiday as overlay notice

Author: SheepTester

classrooms/components/App.tsx

@@ -4,6 +4,7 @@
 /// <reference lib="deno.ns" />
 
 import { useEffect, useRef, useState } from 'preact/hooks'
+import { getHolidays } from '../../terms/holidays.ts'
 import { getTerm, Season, termName } from '../../terms/index.ts'
 import { Day } from '../../util/Day.ts'
 import { Time } from '../../util/Time.ts'
@@ -15,13 +16,7 @@ import {
 } from '../lib/coursesToClassrooms.ts'
 import { northeast, southwest, PADDING, mapPosition } from '../lib/locations.ts'
 import { now } from '../lib/now.ts'
-import {
-  Term,
-  TermCache,
-  TermError,
-  TermRequest,
-  TermResult
-} from '../lib/TermCache.ts'
+import { Term, TermCache, TermError, TermResult } from '../lib/TermCache.ts'
 import { BuildingPanel } from './building/BuildingPanel.tsx'
 import { BuildingButton } from './BuildingButton.tsx'
 import { DateTimeButton } from './date-time/DateTimeButton.tsx'
@@ -41,6 +36,7 @@ type AppState = {
   buildings?: TermBuildings
   errors: TermError[]
   season: Season
+  holiday?: string
 }
 
 /**
@@ -102,12 +98,13 @@ export function App () {
       ? 'Loading...'
       : state.buildings
       ? null
-      : error ??
-        (state.season === 'WI'
-          ? 'Winter break.'
-          : state.season === 'SP'
-          ? 'Spring break.'
-          : 'Summer break.')
+      : error ?? state.holiday
+      ? `${state.holiday}!`
+      : state.season === 'WI'
+      ? 'Winter break.'
+      : state.season === 'SP'
+      ? 'Spring break.'
+      : 'Summer break.'
   )
 
   const [showDatePanel, setShowDatePanel] = useState(false)
@@ -122,9 +119,10 @@ export function App () {
         ? { year, quarter: 'S3' }
         : null
     ]
-    if (requests.every(request => request === null)) {
+    const holiday = getHolidays(date.year)[date.id]
+    if (holiday || requests.every(request => request === null)) {
       // Have the date selector open for the user to select another day
-      setState({ errors: [], season })
+      setState({ errors: [], season, holiday })
       setViewing(null)
       setShowDatePanel(true)
       return

classrooms/components/date-time/CalendarRow.tsx

@@ -117,9 +117,7 @@ export function CalendarWeekRow ({
                 ? 'calendar-finals-day'
                 : ''
             } ${day.id === date.id ? 'calendar-selected' : ''} ${
-              day >= termDays.start &&
-              day <= termDays.end &&
-              !holidays.includes(day.id)
+              day >= termDays.start && day <= termDays.end && !holidays[day.id]
                 ? ''
                 : 'calendar-break-day'
             }`}

classrooms/lib/TermCache.ts

@@ -10,7 +10,6 @@ export type Term = {
   quarter: Quarter
 }
 
-export type TermRequest = Term | null
 /**
  * Represents a term result that was unintentionally not retrieved.
  * - `unavailable` means the term data successfully loaded.
@@ -24,36 +23,6 @@ export type TermResult = {
   request: Term
   result: TermCourses
 }
-export type GetTermsCallbacks = {
-  requests: TermRequest[]
-  full?: boolean
-  onNoRequest: () => void
-  /**
-   * Called only when a term needs to be fetched. Called synchronously with
-   * `getTerms`. Used to show a loading screen.
-   *
-   * @param terms - Contains the terms that need to be fetched.
-   */
-  onStartFetch: (terms: Term[]) => void
-  /**
-   * Called immediately if all `requests` are `null`. Called synchronously with
-   * `getTerms`. Used to show that UCSD is on break.
-   */
-  /**
-   * Called if all of the non-`null` requests gave errors. May be called
-   * asynchronously after `getTerms`.
-   *
-   * @param fetched - True if a term had to be fetched.
-   */
-  onError: (errors: TermError[], fetched: boolean) => void
-  /**
-   * Called once all the terms are ready, and at least one term has loaded
-   * successfully. May be called asynchronously after `getTerms`.
-   *
-   * @param fetched - True if a term had to be fetched.
-   */
-  onLoad: (results: TermResult[], errors: TermError[], fetched: boolean) => void
-}
 
 export class TermCache {
   #cache: Record<string, TermCourses | 'unavailable' | undefined> = {}

classrooms/lib/coursesToClassrooms.ts

@@ -79,8 +79,8 @@ export function coursesToClassrooms (
           continue
         }
         const days = time.days.filter(weekday => {
-          const day = monday.add(weekday)
-          if (holidays.includes(day.id)) {
+          const day = monday.add((weekday + 6) % 7)
+          if (holidays[day.id]) {
             return false
           }
           if (dateRange && meeting.kind !== 'exam') {

terms/holidays.ts

@@ -1,43 +1,35 @@
 import { Day } from '../util/Day.ts'
 
-const holidayCache: Record<number, number[]> = {}
+const holidayCache: Record<number, Record<number, string>> = {}
 
 /**
- * Returns a list of holidays that occur during the given year. Memoized. For
- * your convenience, the array contains day IDs rather than `Day` objects so you
- * can do `holidays.includes(day.id)`.
+ * Returns an objecting mapping the day IDs of holidays that occur during the
+ * given year to their names. Memoized.
  * https://blink.ucsd.edu/HR/benefits/time-off/holidays.html
  */
-export function getHolidays (year: number): number[] {
-  holidayCache[year] ??= [
-    // New Year's Day
-    Day.from(year, 1, 1),
-    // Martin Luther King Jr. Day, observed on the third Monday in January
-    Day.from(year, 1, 7).monday.add(14),
-    // Presidents' Day, observed on the third Monday in February
-    Day.from(year, 2, 7).monday.add(14),
-    // César Chávez Day: observed on the last Friday in March
-    Day.from(year, 3, 31).last(5),
-    // Memorial Day, observed on the last Monday in May
-    Day.from(year, 5, 31).monday,
-    // Juneteenth National Independence Day, June
-    Day.from(year, 6, 19),
-    // Independence Day
-    Day.from(year, 7, 4),
-    // Labor Day (first Monday in September)
-    Day.from(year, 9, 7).monday,
-    // Veterans Day
-    Day.from(year, 9, 11),
-    // Thanksgiving Day (fourth Thursday of November)
-    Day.from(year, 11, 7).last(4).add(21),
-    // Friday after Thanksgiving
-    Day.from(year, 11, 7).last(4).add(22),
-    // Winter Break (2 days)
-    Day.from(year, 12, 24),
-    Day.from(year, 12, 25),
-    // New Year's Eve (or equivalent)
-    Day.from(year, 12, 31)
-  ].map(day => day.id)
+export function getHolidays (year: number): Record<number, string> {
+  holidayCache[year] ??= {
+    [Day.from(year, 1, 1).id]: "New Year's Day",
+    // third Monday in January
+    [Day.from(year, 1, 7).monday.add(14).id]: 'Martin Luther King Jr. Day',
+    // third Monday in February
+    [Day.from(year, 2, 7).monday.add(14).id]: "Presidents' Day",
+    // last Friday in March
+    [Day.from(year, 3, 31).last(5).id]: 'César Chávez Day',
+    // last Monday in May
+    [Day.from(year, 5, 31).monday.id]: 'Memorial Day',
+    [Day.from(year, 6, 19).id]: 'Juneteenth',
+    [Day.from(year, 7, 4).id]: 'Independence Day',
+    // first Monday in September
+    [Day.from(year, 9, 7).monday.id]: 'Labor Day',
+    [Day.from(year, 9, 11).id]: 'Veterans Day',
+    // fourth Thursday of November
+    [Day.from(year, 11, 7).last(4).add(21).id]: 'Thanksgiving',
+    [Day.from(year, 11, 7).last(4).add(22).id]: 'Day after Thanksgiving',
+    [Day.from(year, 12, 24).id]: 'Christmas Eve',
+    [Day.from(year, 12, 25).id]: 'Christmas',
+    [Day.from(year, 12, 31).id]: "New Year's Eve"
+  }
   return holidayCache[year]
 }