feat: add necessary wiring and formatting to make page mirror figma

carddev81 · corypride · commit ae0a9ebb38a2 · 2026-02-20T13:52:31.000-06:00
diff --git a/SESSION_STATE.md b/SESSION_STATE.md
@@ -0,0 +1,28 @@
+# Session State
+
+## Current status
+- Facility dashboard aligned with Carolina: metrics, missing attendance, today's schedule, grey background, spacing fixes.
+- Missing attendance service uses DST-safe canonical time and filters future occurrences.
+- Department admin now pulls all facilities' classes via `facility=all` support.
+- Facility health heading layout matches Carolina (heading outside table card).
+
+## Key file changes
+### Backend
+- `backend/src/database/dashboard.go`: attendance concerns now based only on 3+ unexcused absences.
+- `backend/src/services/classes.go`: missing attendance business logic, DST canonical time, future filter.
+- `backend/src/handlers/classes_handler.go`: missing attendance endpoint uses service; `/api/program-classes` supports `facility=all`.
+- `backend/src/database/events_attendance.go`: query helpers for missing attendance.
+- `backend/src/database/class_events.go`: exported `GenerateEventInstances`.
+- `backend/src/database/program_classes.go`: added `GetClasses` with optional facility; `GetClassesForFacility` delegates.
+
+### Frontend
+- `frontend-v2/src/pages/Dashboard.tsx`: metrics from `/api/dashboard/class-metrics`, missing attendance wiring, today’s schedule attendance route fix, layout/spacing updates, dept admin classes fetch uses `facility=all`, memoization for `allClasses`/`programs`.
+
+## Current endpoints in use
+- `GET /api/dashboard/class-metrics` (dept admin uses `?facility=all`)
+- `GET /api/program-classes?facility=all&all=true` (dept admin)
+- `GET /api/program-classes/missing-attendance?facility=all&days=3&all=true`
+
+## Next steps (if needed)
+1) Add a department-admin backend endpoint for per-facility health metrics (program count, missing attendance, attendance concerns) and wire `FacilityHealthTable` to it.
+2) Final layout adjustments to department admin view to match Carolina pixel-for-pixel if any remain.
diff --git a/backend/src/database/events_attendance.go b/backend/src/database/events_attendance.go
@@ -416,6 +416,24 @@ func (db *DB) GetActiveClassesForMissingAttendance(args *models.QueryContext, fa
 	return missClasses, nil
 }
 
+func (db *DB) GetActiveClassesWithEvents(args *models.QueryContext, facilityID *uint) ([]models.ProgramClass, error) {
+	var classes []models.ProgramClass
+	classQuery := db.WithContext(args.Ctx).
+		Model(&models.ProgramClass{}).
+		Preload("Events.Overrides").
+		Preload("Events.RoomRef").
+		Preload("Facility").
+		Where("status = ?", models.Active).
+		Where("archived_at IS NULL")
+	if facilityID != nil {
+		classQuery = classQuery.Where("facility_id = ?", *facilityID)
+	}
+	if err := classQuery.Find(&classes).Error; err != nil {
+		return nil, newGetRecordsDBError(err, "program_classes")
+	}
+	return classes, nil
+}
+
 func (db *DB) GetClassEventsWithOverrides(args *models.QueryContext, classIDs []uint) ([]models.ProgramClassEvent, error) {
 	var events []models.ProgramClassEvent
 	if err := db.WithContext(args.Ctx).
diff --git a/backend/src/handlers/class_events.go b/backend/src/handlers/class_events.go
@@ -3,6 +3,7 @@ package handlers
 import (
 	"UnlockEdv2/src"
 	"UnlockEdv2/src/models"
+	"UnlockEdv2/src/services"
 	"encoding/json"
 	"errors"
 	"net/http"
@@ -17,6 +18,7 @@ func (srv *Server) registerClassEventsRoutes() []routeDef {
 		featureRoute("GET /api/program-classes/{class_id}/events", srv.handleGetProgramClassEvents, axx),
 		/* admin */
 		adminFeatureRoute("GET /api/admin-calendar", srv.handleGetAdminCalendar, axx),
+		adminFeatureRoute("GET /api/program-classes/todays-schedule", srv.handleGetTodaysSchedule, axx),
 		adminValidatedFeatureRoute("PUT /api/program-classes/{class_id}/events/{event_id}", srv.handleEventOverrides, axx, resolver),
 		adminValidatedFeatureRoute("DELETE /api/program-classes/{class_id}/events/{event_override_id}", srv.handleDeleteEventOverride, axx, resolver),
 		adminValidatedFeatureRoute("POST /api/program-classes/{class_id}/events", srv.handleCreateEvent, axx, resolver),
@@ -59,6 +61,40 @@ func (srv *Server) handleGetStudentCalendar(w http.ResponseWriter, r *http.Reque
 	return writeJsonResponse(w, http.StatusOK, events)
 }
 
+func (srv *Server) handleGetTodaysSchedule(w http.ResponseWriter, r *http.Request, log sLog) error {
+	args := srv.getQueryContext(r)
+	facility := r.URL.Query().Get("facility")
+	var facilityId *uint
+	switch facility {
+	case "all":
+		facilityId = nil
+	default:
+		facilityId = &args.FacilityID
+	}
+
+	service := services.NewClassesService(srv.Db)
+	items, err := service.GetTodaysSchedule(&args, facilityId)
+	if err != nil {
+		return newDatabaseServiceError(err)
+	}
+
+	args.Total = int64(len(items))
+	if !args.All {
+		start := args.CalcOffset()
+		if start < len(items) {
+			end := start + args.PerPage
+			if end > len(items) {
+				end = len(items)
+			}
+			items = items[start:end]
+		} else {
+			items = []models.TodaysScheduleItem{}
+		}
+	}
+
+	return writePaginatedResponse(w, http.StatusOK, items, args.IntoMeta())
+}
+
 func (srv *Server) handleEventOverrides(w http.ResponseWriter, r *http.Request, log sLog) error {
 	eventId, err := strconv.Atoi(r.PathValue("event_id"))
 	if err != nil {
diff --git a/backend/src/models/program_classes.go b/backend/src/models/program_classes.go
@@ -50,6 +50,18 @@ type ProgramClass struct {
 
 func (ProgramClass) TableName() string { return "program_classes" }
 
+type TodaysScheduleItem struct {
+	ClassID        uint   `json:"class_id"`
+	ClassName      string `json:"class_name"`
+	InstructorName string `json:"instructor_name"`
+	FacilityID     uint   `json:"facility_id"`
+	FacilityName   string `json:"facility_name"`
+	EventID        uint   `json:"event_id"`
+	Date           string `json:"date"`
+	StartTime      string `json:"start_time"`
+	Room           string `json:"room"`
+}
+
 func (c *ProgramClass) BeforeCreate(tx *gorm.DB) error {
 	if err := c.DatabaseFields.BeforeCreate(tx); err != nil {
 		return err
diff --git a/backend/src/services/classes.go b/backend/src/services/classes.go
@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"sort"
 	"time"
+
+	"github.com/teambition/rrule-go"
 )
 
 type ClassesService struct {
@@ -185,3 +187,113 @@ func (svc *ClassesService) GetMissingAttendanceForFacility(args *models.QueryCon
 
 	return items, nil
 }
+
+func (svc *ClassesService) GetTodaysSchedule(args *models.QueryContext, facilityID *uint) ([]models.TodaysScheduleItem, error) {
+	classes, err := svc.db.GetActiveClassesWithEvents(args, facilityID)
+	if err != nil {
+		return nil, err
+	}
+	if len(classes) == 0 {
+		return []models.TodaysScheduleItem{}, nil
+	}
+
+	loc, err := time.LoadLocation(args.Timezone)
+	if err != nil {
+		loc = time.UTC
+	}
+	nowLocal := time.Now().In(loc)
+	startOfToday := time.Date(nowLocal.Year(), nowLocal.Month(), nowLocal.Day(), 0, 0, 0, 0, loc)
+	endOfToday := startOfToday.AddDate(0, 0, 1)
+
+	items := make([]models.TodaysScheduleItem, 0)
+	for _, class := range classes {
+		startDt := class.StartDt.In(loc)
+		if startDt.After(endOfToday) {
+			continue
+		}
+		if class.EndDt != nil {
+			endDt := class.EndDt.In(loc)
+			if endDt.Before(startOfToday) {
+				continue
+			}
+		}
+
+		for _, event := range class.Events {
+			rule, err := event.GetRRuleWithTimezone(args.Timezone)
+			if err != nil {
+				continue
+			}
+			firstOccurrence := rule.After(time.Time{}, false)
+			canonicalHour, canonicalMinute := getCanonicalHourAndMinute([]time.Time{firstOccurrence}, args.Timezone)
+			overrideStartTimes := make(map[string]struct{})
+			for _, override := range event.Overrides {
+				if override.IsCancelled {
+					continue
+				}
+				overrideOptions, err := rrule.StrToROption(override.OverrideRrule)
+				if err != nil {
+					continue
+				}
+				overrideOptions.Dtstart = overrideOptions.Dtstart.In(time.UTC)
+				overrideRule, err := rrule.NewRRule(*overrideOptions)
+				if err != nil {
+					continue
+				}
+				overrideOccurrences := overrideRule.Between(startOfToday.UTC(), endOfToday.UTC(), true)
+				for _, occ := range overrideOccurrences {
+					overrideStartTimes[occ.UTC().Format(time.RFC3339Nano)] = struct{}{}
+				}
+			}
+			eventInstances := database.GenerateEventInstances(event, startOfToday, endOfToday)
+			for _, inst := range eventInstances {
+				if inst.IsCancelled {
+					continue
+				}
+				localStart := inst.StartTime.In(loc)
+				localOcc := localStart
+				if _, isOverride := overrideStartTimes[inst.StartTime.UTC().Format(time.RFC3339Nano)]; !isOverride {
+					localOcc = time.Date(
+						localStart.Year(),
+						localStart.Month(),
+						localStart.Day(),
+						canonicalHour,
+						canonicalMinute,
+						0,
+						0,
+						loc,
+					)
+				}
+				if localOcc.Before(startOfToday) || !localOcc.Before(endOfToday) {
+					continue
+				}
+				facilityName := ""
+				if class.Facility != nil {
+					facilityName = class.Facility.Name
+				}
+				items = append(items, models.TodaysScheduleItem{
+					ClassID:        class.ID,
+					ClassName:      class.Name,
+					InstructorName: class.InstructorName,
+					FacilityID:     class.FacilityID,
+					FacilityName:   facilityName,
+					EventID:        inst.EventID,
+					Date:           localOcc.Format("2006-01-02"),
+					StartTime:      localOcc.Format("15:04"),
+					Room:           inst.Room,
+				})
+			}
+		}
+	}
+
+	sort.Slice(items, func(i, j int) bool {
+		if items[i].Date == items[j].Date { //sorting by date, time, then by name
+			if items[i].StartTime == items[j].StartTime {
+				return items[i].ClassName < items[j].ClassName
+			}
+			return items[i].StartTime < items[j].StartTime
+		}
+		return items[i].Date < items[j].Date
+	})
+
+	return items, nil
+}
diff --git a/frontend-v2/src/lib/formatters.ts b/frontend-v2/src/lib/formatters.ts
@@ -130,8 +130,34 @@ export function getClassSchedule(cls: Class): ClassScheduleInfo {
 
 export function isClassToday(cls: Class): boolean {
     const schedule = getClassSchedule(cls);
-    const today = new Date().toLocaleDateString('en-US', { weekday: 'long' });
-    return schedule.days.includes(today);
+    const now = new Date();
+    const todayName = now.toLocaleDateString('en-US', { weekday: 'long' });
+    if (!schedule.days.includes(todayName)) {
+        return false;
+    }
+
+    const startOfToday = new Date(
+        now.getFullYear(),
+        now.getMonth(),
+        now.getDate()
+    );
+    const endOfToday = new Date(
+        now.getFullYear(),
+        now.getMonth(),
+        now.getDate(),
+        23,
+        59,
+        59,
+        999
+    );
+    const start = cls.start_dt ? new Date(cls.start_dt) : null;
+    const end = cls.end_dt ? new Date(cls.end_dt) : null;
+    const startOk =
+        !start || Number.isNaN(start.getTime()) || start <= endOfToday;
+    const endOk =
+        !end || Number.isNaN(end.getTime()) || end >= startOfToday;
+
+    return startOk && endOk;
 }
 
 export function getStatusColor(status: string): string {
diff --git a/frontend-v2/src/pages/Dashboard.tsx b/frontend-v2/src/pages/Dashboard.tsx
diff --git a/frontend-v2/src/types/program.ts b/frontend-v2/src/types/program.ts
