fix: add changes per requests

Author: carddev81

backend/src/database/dashboard.go

@@ -166,7 +166,7 @@ func (db *DB) GetFacilityAttendanceConcerns(ctx *models.QueryContext, facilityID
 		JOIN program_class_enrollments e ON e.class_id = c.id
 		WHERE c.status = ?
 		AND c.archived_at IS NULL
-		AND e.enrollment_status = ?`
+		AND e.enrollment_status = ? `
 	args := []any{models.Active, models.Enrolled}
 	if facilityID != nil {
 		attendanceSQL += "AND c.facility_id = ? "

backend/src/handlers/dashboard.go

@@ -264,18 +264,10 @@ func (srv *Server) handleFacilityHealthSummary(w http.ResponseWriter, r *http.Re
 	claims := r.Context().Value(ClaimsKey).(*Claims)
 	facility := r.URL.Query().Get("facility")
 	var facilityID *uint
-	switch facility {
-	case "all":
+	if facility == "all" && claims.canSwitchFacility() {
 		facilityID = nil
-	case "":
-		facilityID = &claims.FacilityID
-	default:
-		facilityIDInt, err := strconv.Atoi(facility)
-		if err != nil {
-			return newInvalidIdServiceError(err, "facility")
-		}
-		ref := uint(facilityIDInt)
-		facilityID = &ref
+	} else {
+		facilityID = &args.FacilityID
 	}
 
 	days := 3

frontend-v2/src/lib/formatters.ts

@@ -130,8 +130,33 @@ 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 {

frontend-v2/src/pages/Dashboard.tsx

@@ -50,7 +50,7 @@ export default function Dashboard() {
                 : '/api/program-classes/missing-attendance?days=3&all=true'
         );
     const { data: facilityHealthResp } = useSWR<
-        ServerResponseOne<FacilityHealthSummary[]>
+        ServerResponseMany<FacilityHealthSummary>
     >(
         deptAdmin
             ? '/api/dashboard/facility-health?facility=all&days=3'