Ck 7vn/total refactor classes (#1087)

* feat: class page click to details

* feat: update Roster tab to fit redesign in classes

* fix: small screen handling

* feat: add breadcrumbs to class ecosystem

* feat: add class modal

* fix: class creation issues

* fix: room conflict modal fix

* feat: add pagintaion to class

* fix: requirements fixed

* feat: new requirements

* fix: PR comments header program filter

* fix: cancel by instructor modal

* fix: time display format

Author: CK-7vn

.gitignore

@@ -3,6 +3,7 @@
 .claude
 .idea
 .claude/*
+node_modules/
 frontend-v2/dist/
 Claude.md
 AGENTS.md

backend/src/database/events_attendance.go

@@ -561,7 +561,7 @@ func (db *DB) GetCumulativeAttendanceRatesForClasses(ctx context.Context, classI
 	GROUP BY class_id`
 
 	type row struct {
-		ClassID         uint    `gorm:"column:class_id"`
+		ClassID        uint    `gorm:"column:class_id"`
 		AttendanceRate float64 `gorm:"column:attendance_percentage"`
 	}
 	rows := []row{}

backend/src/database/program_classes.go

@@ -74,13 +74,26 @@ func (db *DB) GetClasses(args *models.QueryContext, facilityID *uint) ([]models.
 		return nil, newGetRecordsDBError(err, "program classes")
 	}
 
-	tx = tx.Preload("Events").Preload("Events.RoomRef")
+	tx = tx.Preload("Events").Preload("Events.RoomRef").Preload("Enrollments").Preload("Program").Preload("Facility")
 	if !args.All {
 		tx = tx.Limit(args.PerPage).Offset(args.CalcOffset())
 	}
 	if err := tx.Find(&content).Error; err != nil {
 		return nil, newGetRecordsDBError(err, "program classes")
 	}
+	for i := range content {
+		var enrollments, completed int
+		for _, e := range content[i].Enrollments {
+			switch e.EnrollmentStatus {
+			case models.Enrolled:
+				enrollments++
+			case models.EnrollmentCompleted:
+				completed++
+			}
+		}
+		content[i].Enrolled = int64(enrollments)
+		content[i].Completed = int64(completed)
+	}
 	return content, nil
 }
 
@@ -439,31 +452,55 @@ func (db *DB) GetClassesByInstructor(instructorID, facilityID int, startDate, en
 	}
 
 	for i := range classes {
-		totalSessions, upcomingSessions, cancelledSessions, err := db.calculateSessionCounts(classes[i].ID, start, end)
+		totalSessions, upcomingSessions, cancelledSessions, sessionDates, err := db.calculateSessionCounts(classes[i].ID, start, end)
 		if err != nil {
 			return nil, err
 		}
 
 		classes[i].SessionCount = totalSessions
 		classes[i].UpcomingSessions = upcomingSessions
 		classes[i].CancelledSessions = cancelledSessions
+		classes[i].SessionDates = sessionDates
+
+		var event struct {
+			RecurrenceRule string `gorm:"column:recurrence_rule"`
+			Duration       string `gorm:"column:duration"`
+			RoomName       string `gorm:"column:room_name"`
+		}
+		db.Table("program_class_events pce").
+			Select("pce.recurrence_rule, pce.duration, COALESCE(r.name, '') as room_name").
+			Joins("LEFT JOIN rooms r ON r.id = pce.room_id").
+			Where("pce.class_id = ?", classes[i].ID).
+			Order("pce.created_at ASC").
+			Limit(1).
+			Scan(&event)
+
+		if event.RecurrenceRule != "" {
+			rule, rErr := rrule.StrToRRule(event.RecurrenceRule)
+			if rErr == nil {
+				classes[i].StartTime = rule.GetDTStart().Format("15:04")
+			}
+		}
+		classes[i].Duration = event.Duration
+		classes[i].Room = event.RoomName
 	}
 
 	return classes, nil
 }
 
-func (db *DB) calculateSessionCounts(classID int, startDate, endDate time.Time) (int, int, int, error) {
+func (db *DB) calculateSessionCounts(classID int, startDate, endDate time.Time) (int, int, int, []string, error) {
 
 	var events []struct {
 		models.ProgramClassEvent
 		Overrides []models.ProgramClassEventOverride `gorm:"foreignKey:EventID;references:ID"`
 	}
 
 	if err := db.Preload("Overrides").Where("class_id = ?", classID).Find(&events).Error; err != nil {
-		return 0, 0, 0, newGetRecordsDBError(err, "class events")
+		return 0, 0, 0, nil, newGetRecordsDBError(err, "class events")
 	}
 
 	var totalSessions, upcomingSessions, cancelledSessions int
+	var sessionDates []string
 
 	for _, event := range events {
 		rule, err := rrule.StrToRRule(event.RecurrenceRule)
@@ -494,16 +531,18 @@ func (db *DB) calculateSessionCounts(classID int, startDate, endDate time.Time)
 
 		actualUpcoming := 0
 		for _, occurrence := range occurrences {
-			if !cancelledDates[occurrence.Format("2006-01-02")] {
+			dateStr := occurrence.Format("2006-01-02")
+			if !cancelledDates[dateStr] {
 				actualUpcoming++
+				sessionDates = append(sessionDates, dateStr)
 			}
 		}
 		upcomingSessions += actualUpcoming
 
 		cancelledSessions += cancelledInDateRange
 	}
 
-	return totalSessions, upcomingSessions, cancelledSessions, nil
+	return totalSessions, upcomingSessions, cancelledSessions, sessionDates, nil
 }
 
 func (db *DB) BulkCancelSessions(req *models.BulkCancelSessionsRequest, facilityID int, claims BulkCancelClaims) (*models.BulkCancelSessionsResponse, error) {

backend/src/database/programs.go

@@ -81,7 +81,8 @@ func (db *DB) GetPrograms(args *models.QueryContext) ([]models.Program, error) {
 	content := make([]models.Program, 0, args.PerPage)
 	tx := db.WithContext(args.Ctx).Model(&models.Program{}).
 		Preload("ProgramTypes").
-		Preload("ProgramCreditTypes")
+		Preload("ProgramCreditTypes").
+		Preload("FacilitiesPrograms.Facility")
 	if len(args.Tags) > 0 {
 		tx = tx.Joins("JOIN program_types t ON t.program_id = programs.id").Where("t.id IN (?)", args.Tags)
 	}
@@ -97,6 +98,13 @@ func (db *DB) GetPrograms(args *models.QueryContext) ([]models.Program, error) {
 	if err := tx.Limit(args.PerPage).Offset(args.CalcOffset()).Find(&content).Error; err != nil {
 		return nil, newGetRecordsDBError(err, "programs")
 	}
+	for i := range content {
+		for _, fp := range content[i].FacilitiesPrograms {
+			if fp.Facility != nil {
+				content[i].Facilities = append(content[i].Facilities, *fp.Facility)
+			}
+		}
+	}
 	return content, nil
 }
 

backend/src/models/program_classes.go

@@ -231,10 +231,10 @@ func IsTerminalEnrollment(s ProgramEnrollmentStatus) bool {
 
 type ProgramClassDetail struct {
 	ProgramClass
-	FacilityName string `json:"facility_name"`
-	Enrolled     int    `json:"enrolled"`
-	Schedule     string `json:"schedule"`
-	Room         string `json:"room"`
+	FacilityName   string  `json:"facility_name"`
+	Enrolled       int     `json:"enrolled"`
+	Schedule       string  `json:"schedule"`
+	Room           string  `json:"room"`
 	AttendanceRate float64 `json:"attendance_rate"`
 }
 
@@ -356,10 +356,14 @@ type Instructor struct {
 }
 
 type InstructorClassData struct {
-	ID                int    `json:"id"`
-	Name              string `json:"name"`
-	SessionCount      int    `json:"sessionCount"`
-	EnrolledCount     int    `json:"enrolledCount"`
-	UpcomingSessions  int    `json:"upcomingSessions"`
-	CancelledSessions int    `json:"cancelledSessions"`
+	ID                int      `json:"id"`
+	Name              string   `json:"name"`
+	SessionCount      int      `json:"sessionCount"`
+	EnrolledCount     int      `json:"enrolledCount"`
+	UpcomingSessions  int      `json:"upcomingSessions"`
+	CancelledSessions int      `json:"cancelledSessions"`
+	StartTime         string   `json:"startTime"`
+	Duration          string   `json:"duration"`
+	Room              string   `json:"room"`
+	SessionDates      []string `json:"sessionDates" gorm:"-"`
 }