fix: card view metrics

Author: corypride

backend/src/database/programs.go

@@ -577,6 +577,7 @@ func (db *DB) GetProgramsOverviewTable(args *models.QueryContext, timeFilter int
 			mr.total_enrollments AS total_enrollments,
 			mr.total_active_enrollments AS total_active_enrollments,
 			mr.total_classes AS total_classes,
+			mr.total_active_classes AS total_active_classes,
 			mr.total_capacity AS total_capacity,
 			time_filtered_rates.completion_rate AS completion_rate,
 			time_filtered_rates.attendance_rate AS attendance_rate,
@@ -595,6 +596,7 @@ func (db *DB) GetProgramsOverviewTable(args *models.QueryContext, timeFilter int
 			mr.total_enrollments AS total_enrollments,
 			mr.total_active_enrollments AS total_active_enrollments,
 			mr.total_classes AS total_classes,
+			mr.total_active_classes AS total_active_classes,
 			mr.total_capacity AS total_capacity,
 			time_filtered_rates.completion_rate AS completion_rate,
 			time_filtered_rates.attendance_rate AS attendance_rate,
@@ -614,6 +616,7 @@ func (db *DB) GetProgramsOverviewTable(args *models.QueryContext, timeFilter int
 					COUNT(DISTINCT pce.id) AS total_enrollments,
 					COUNT(DISTINCT CASE WHEN pce.enrollment_status = 'Enrolled' AND pce.enrolled_at IS NOT NULL AND (pce.enrollment_ended_at IS NULL OR pce.enrollment_ended_at > CURRENT_TIMESTAMP) THEN pce.id END) AS total_active_enrollments,
 					COUNT(DISTINCT CASE WHEN pc.status != 'Cancelled' THEN pc.id END) AS total_classes,
+					COUNT(DISTINCT CASE WHEN pc.status = 'Active' THEN pc.id END) AS total_active_classes,
 					COALESCE(SUM(CASE WHEN pc.status != 'Cancelled' THEN pc.capacity ELSE 0 END), 0) AS total_capacity
 				FROM programs p
 				JOIN facilities_programs fp ON fp.program_id = p.id
@@ -632,6 +635,7 @@ func (db *DB) GetProgramsOverviewTable(args *models.QueryContext, timeFilter int
 					COUNT(DISTINCT pce.id) AS total_enrollments,
 					COUNT(DISTINCT CASE WHEN pce.enrollment_status = 'Enrolled' AND pce.enrolled_at IS NOT NULL AND (pce.enrollment_ended_at IS NULL OR pce.enrollment_ended_at > CURRENT_TIMESTAMP) THEN pce.id END) AS total_active_enrollments,
 					COUNT(DISTINCT CASE WHEN pc.status != 'Cancelled' THEN pc.id END) AS total_classes,
+					COUNT(DISTINCT CASE WHEN pc.status = 'Active' THEN pc.id END) AS total_active_classes,
 					COALESCE(SUM(CASE WHEN pc.status != 'Cancelled' THEN pc.capacity ELSE 0 END), 0) AS total_capacity
 				FROM programs p
 				LEFT JOIN facilities_programs fp ON fp.program_id = p.id

backend/src/models/program.go

@@ -166,6 +166,7 @@ type ProgramsOverviewTable struct {
 	TotalEnrollments       *int64   `json:"total_enrollments"`
 	TotalActiveEnrollments *int64   `json:"total_active_enrollments"`
 	TotalClasses           *int64   `json:"total_classes"`
+	TotalActiveClasses     *int64   `json:"total_active_classes"`
 	TotalCapacity          *int64   `json:"total_capacity"`
 	CompletionRate         *float64 `json:"completion_rate"`
 	AttendanceRate         *float64 `json:"attendance_rate"`

frontend-v2/src/pages/ProgramsPage.tsx

@@ -63,7 +63,7 @@ export default function ProgramsPage() {
     const { user } = useAuth();
     const navigate = useNavigate();
     const { data: resp, mutate } = useSWR<ServerResponseMany<ProgramsOverviewTable>>(
-        '/api/programs/detailed-list?include_archived=true'
+        '/api/programs/detailed-list?include_archived=true&per_page=100'
     );
     const programs = resp?.data ?? [];
 
@@ -610,7 +610,7 @@ export default function ProgramsPage() {
                     </div>
                 ) : (
                     <>
-                        <div className="grid grid-cols-2 gap-6">
+                        <div className="grid grid-cols-2 gap-6 mb-4">
                             {paginatedPrograms.map((program) => (
                                 <ProgramCard
                                     key={program.program_id}
@@ -728,8 +728,13 @@ function ProgramCard({
                     />
                     <MetricBox
                         label="Classes"
-                        primaryValue={program.total_classes ?? 0}
-                        primaryLabel="total classes"
+                        primaryValue={program.total_active_classes ?? 0}
+                        primaryLabel="active"
+                        secondaryLines={[
+                            {
+                                value: `${program.total_classes ?? 0} total class${(program.total_classes ?? 0) !== 1 ? 'es' : ''}`
+                            }
+                        ]}
                     />
                 </div>
                 {/* Credit & Funding Type */}

frontend-v2/src/types/program.ts

@@ -117,6 +117,7 @@ export interface ProgramsOverviewTable {
     total_enrollments: number;
     total_active_enrollments: number;
     total_classes: number;
+    total_active_classes: number;
     total_capacity: number;
     completion_rate: number;
     attendance_rate: number;