CI / Tests (PHP 8.1) (pull_request) Successful in 6m39s
CI / Tests (PHP 8.2) (pull_request) Successful in 57s
CI / Tests (PHP 8.3) (pull_request) Successful in 2m59s
CI / Tests (PHP 8.5) (pull_request) Successful in 3m31s
CI / No Debug Code (pull_request) Successful in 3s
CI / Coding Standards & Static Analysis (pull_request) Successful in 3m28s
CI / Build Plugin Zip (pull_request) Skipped
Two related gaps, closed together because the second is created by the first. A private lesson could only be booked by the student or their guardian, so a booking taken over the phone had no way in — where group classes have had "Add students directly" all along. "Book a lesson for a student" is now a panel on Scheduler and My Lessons: student, open time, lesson type, with weekly term reservations and a no-charge option for make-up lessons. The booking core is extracted to Booking\LessonBooker and shared with POST /bookings, so the two paths cannot drift on offering rules, slot claiming, or billing. That leaves a registration with no intake answers and no policy acceptances, because nobody was at a keyboard to give them — already true of every directly added group-class student. Ticking the boxes on a student's behalf would be an audit trail that says something untrue, so instead the answers are collected another way and recorded afterwards, from a lesson's or an enrolment's detail page. Every recording must say how it was collected, which is stamped on each row along with who typed it and shown in a new "How it was given" column: a policy ticked online and one transcribed from paper must never look alike. Only staff-made registrations qualify (us_lessons.booked_by, us_group_enrollments.enrolled_by) — one the student made already holds their own answers. Only what is still missing can be recorded, re-checked at write time, so a stale or double-posted form cannot duplicate or overwrite. No IP is stored for a transcription, and accepted_by stays the student while recorded_by names the staff member. Intake is now generic over Registration\IntakeSubject, which Lesson and Enrollment both implement; LessonDetail became Registration\IntakeAudit and is shared by both detail views rather than duplicated. Closes #182 Co-Authored-By: Claude Opus 5 <[email protected]> Claude-Session: https://claude.ai/code/session_01QfHt6CyJHz6KkA4RuaS7WK
101 lines
3.9 KiB
PHP
101 lines
3.9 KiB
PHP
<?php
|
|
declare(strict_types=1);
|
|
|
|
namespace Unsupervised\Schedular\Registration;
|
|
|
|
use Unsupervised\Schedular\Auth\UserName;
|
|
use Unsupervised\Schedular\Policy\AcceptanceRepository;
|
|
use Unsupervised\Schedular\Policy\PolicyAcceptance;
|
|
use Unsupervised\Schedular\Policy\PolicyRepository;
|
|
use Unsupervised\Schedular\Policy\PolicyVersionRepository;
|
|
|
|
/**
|
|
* Builds the display rows for one registration's audit trail: the intake answers
|
|
* the student gave and the policy versions they accepted. Used by the admin
|
|
* lesson detail view and the group-class enrolment detail view alike, mirroring
|
|
* the per-student history in {@see \Unsupervised\Schedular\Auth\StudentHistory}.
|
|
*
|
|
* Which rows belong to the registration is the subject's own business
|
|
* ({@see IntakeSubject::intakeRegistrationId()}) — notably, a weekly lesson
|
|
* series is answered for and agreed to once, against its anchor, so every
|
|
* occurrence reads the same trail rather than only the first looking answered.
|
|
*/
|
|
class IntakeAudit {
|
|
|
|
public function __construct(
|
|
private AnswerRepository $answers,
|
|
private QuestionRepository $questions,
|
|
private AcceptanceRepository $acceptances,
|
|
private PolicyRepository $policies,
|
|
private PolicyVersionRepository $versions,
|
|
) {}
|
|
|
|
/**
|
|
* The intake-question answers recorded for this registration, in submission
|
|
* order.
|
|
*
|
|
* @return list<array{question: string, answer: string, source: string}>
|
|
*/
|
|
public function answers( IntakeSubject $subject ): array {
|
|
return array_map(
|
|
function ( Answer $answer ): array {
|
|
$question = $this->questions->findById( $answer->questionId );
|
|
$value = $answer->answerValue ?? '';
|
|
|
|
return [
|
|
'question' => $question ? $question->label : sprintf( '#%d', $answer->questionId ),
|
|
'answer' => '' === $value ? '—' : $value,
|
|
'source' => $this->source( $answer->collectedVia, $answer->collectedNote, $answer->recordedBy ),
|
|
];
|
|
},
|
|
$this->answers->findByRegistration( $subject->intakeRegistrationType(), $subject->intakeRegistrationId() )
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Where a recorded row came from: given online by the student, or collected
|
|
* some other way and typed in — in which case who typed it is named, since an
|
|
* unattributed transcription is worth much less than an attributed one.
|
|
*/
|
|
private function source( ?string $collectedVia, ?string $collectedNote, int $recordedBy ): string {
|
|
$described = IntakeProvenance::describe( $collectedVia, $collectedNote );
|
|
|
|
if ( null === $collectedVia || '' === $collectedVia || $recordedBy <= 0 ) {
|
|
return $described;
|
|
}
|
|
|
|
$user = get_userdata( $recordedBy );
|
|
|
|
return sprintf(
|
|
/* translators: 1: how the answer was collected, 2: name of the staff member who recorded it. */
|
|
__( '%1$s — recorded by %2$s', 'unsupervised-schedular' ),
|
|
$described,
|
|
UserName::format( $user instanceof \WP_User ? $user : null, $recordedBy )
|
|
);
|
|
}
|
|
|
|
/**
|
|
* The policy versions the student accepted for this registration, with the
|
|
* captured acceptance time and IP for the audit trail.
|
|
*
|
|
* @return list<array{policy: string, version: string, accepted_at: string, ip: string, source: string}>
|
|
*/
|
|
public function acceptances( IntakeSubject $subject ): array {
|
|
return array_map(
|
|
function ( PolicyAcceptance $acceptance ): array {
|
|
$version = $this->versions->findById( $acceptance->policyVersionId );
|
|
$policy = $version ? $this->policies->findById( $version->policyId ) : null;
|
|
|
|
return [
|
|
'policy' => $policy ? $policy->title : sprintf( '#%d', $acceptance->policyVersionId ),
|
|
'version' => $version ? sprintf( 'v%d', $version->versionNumber ) : '—',
|
|
'accepted_at' => $acceptance->acceptedAt ?? '',
|
|
'ip' => $acceptance->ipAddress ?? '',
|
|
'source' => $this->source( $acceptance->collectedVia, $acceptance->collectedNote, $acceptance->recordedBy ),
|
|
];
|
|
},
|
|
$this->acceptances->findByRegistration( $subject->intakeRegistrationType(), $subject->intakeRegistrationId() )
|
|
);
|
|
}
|
|
}
|