Demo follow-ups: editable policy name, one-page signup, group classes in upcoming lessons, deletion cleanup
CI / Tests (PHP 8.1) (pull_request) Successful in 1m0s
CI / Tests (PHP 8.2) (pull_request) Successful in 1m0s
CI / No Debug Code (pull_request) Successful in 3s
CI / Coding Standards (pull_request) Successful in 3m8s
CI / Build Plugin Zip (pull_request) Skipped
CI / PHPStan (pull_request) Successful in 2m49s
CI / Tests (PHP 8.3) (pull_request) Successful in 2m44s

Five items from the latest demo pass:

- A policy's title can be edited from the Policies screen. Only the title
  moves; the slug is what the gates resolve policies by, so a rename can
  never detach a policy from acceptances already recorded against it.
- Signup is one page again. The studio's registration questions move from
  a second step behind "Next" onto the main form, in an "About you" panel
  above the students being added, and that panel also asks an adult
  student for their birth year (the same us_birth_year meta a child's
  uses). register.js disables and hides the whole panel for a pure
  guardian, since the questions describe a student.
- The password is re-scored on submit, not only as it is typed. zxcvbn's
  dictionary arrives after page load, so a password typed straight away
  was never scored at all and the first the student heard of it was the
  server rejecting the whole form.
- Group-class sessions appear alongside lessons wherever upcoming lessons
  are listed: the [us_scheduler] panel (students and instructors) and the
  admin student detail page. GroupClass\SessionSchedule derives them from
  Offering::sessionWindows(), the same derivation the billing scan uses.
  They carry kind = 'group_class' and no Cancel action - a session is one
  date in a term, not a booked slot.
- Deleting a user releases what the account was holding: each upcoming
  lesson is cancelled, its slot freed for rebooking, its pending payment
  voided, and active class enrolments cancelled. Past lessons and paid
  history are left alone.

Tests: composer test (851), composer lint, composer cs all pass.

Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
2026-07-30 11:45:04 -03:00
co-authored by Claude Opus 5
parent 258468093b
commit cb347ffca0
33 changed files with 1419 additions and 291 deletions
+39 -1
View File
@@ -8,6 +8,7 @@ use Unsupervised\Schedular\Booking\BookingRepository;
use Unsupervised\Schedular\Booking\Lesson;
use Unsupervised\Schedular\GroupClass\Enrollment;
use Unsupervised\Schedular\GroupClass\EnrollmentRepository;
use Unsupervised\Schedular\GroupClass\SessionSchedule;
use Unsupervised\Schedular\Guardian\GuardianService;
use Unsupervised\Schedular\Offering\OfferingRepository;
use Unsupervised\Schedular\Payment\BillingMethodResolver;
@@ -25,6 +26,7 @@ class StudentController {
private StudentHistory $history,
private StudentActions $actions,
private GuardianService $guardians,
private SessionSchedule $sessions,
) {}
public function renderPage(): void {
@@ -134,7 +136,15 @@ class StudentController {
$this->bookings->findByStudent( (int) $student->ID )
);
$schedule = StudentSchedule::partition( $rows, $now );
// Group classes join the upcoming table so "what is this student booked
// into next week?" has one answer instead of two. Only their upcoming
// sessions are added: the enrolment table below already records the whole
// history, and a term's worth of past dates would bury the lessons under
// "Past lessons".
$schedule = StudentSchedule::partition(
array_merge( $rows, $this->groupSessionRows( (int) $student->ID, $now ) ),
$now
);
$upcoming = $schedule['upcoming'];
$past = $schedule['past'];
@@ -194,6 +204,7 @@ class StudentController {
return [
'id' => (int) $lesson->id,
'kind' => 'lesson',
'start_dt' => $slot ? $slot->startDt : '',
'end_dt' => $slot ? $slot->endDt : '',
'offering' => $offering ? $offering->title : '—',
@@ -201,4 +212,31 @@ class StudentController {
'status' => $lesson->status,
];
}
/**
* The student's upcoming group-class sessions, shaped like the lesson rows
* they sit beside. `kind` is what keeps the table honest: a session is a date
* in a term, not a booked slot, so the row offers no "Cancel" — withdrawing
* is done from the enrolment table, which removes the whole class at once.
*
* @return list<array<string, mixed>>
*/
private function groupSessionRows( int $studentId, string $now ): array {
return array_map(
static function ( array $session ): array {
$instructor = get_userdata( $session['instructor_id'] );
return [
'id' => $session['enrollment_id'],
'kind' => SessionSchedule::KIND,
'start_dt' => $session['start_dt'],
'end_dt' => $session['end_dt'],
'offering' => $session['offering_title'],
'instructor' => $instructor ? $instructor->display_name : (string) $session['instructor_id'],
'status' => $session['status'],
];
},
$this->sessions->upcomingForStudent( $studentId, $now )
);
}
}