thatguygriffandClaude Opus 4.8
b066bef353
CI / Tests (PHP 8.2) (pull_request) Successful in 39s
CI / Tests (PHP 8.1) (pull_request) Successful in 46s
CI / No Debug Code (pull_request) Successful in 2s
CI / Coding Standards (pull_request) Successful in 2m52s
CI / PHPStan (pull_request) Successful in 2m50s
CI / Tests (PHP 8.3) (pull_request) Successful in 2m36s
CI / Build Plugin Zip (pull_request) Skipped
Group classes now carry a specific class time (alongside date and duration) and an assigned instructor: - Schema: add `class_time` (TIME) to `us_offerings`; `Offering` gains `normalizeTime`/`sessionWindows`. (Rides the pending 1.0.0->1.1.0 dbDelta upgrade, so no version bump.) - Offering form: class-time field, plus a studio-admin instructor picker (plain instructors always own their own classes). - `ClassSlotReconciler`: assigning an instructor clears their open booking slots overlapping each session and flags already-booked lessons that clash (a booked lesson is never deleted). Uses new `AvailabilityRepository::findOverlapping`. - Front end: `GET /offerings` exposes `instructor_name`; the enrolment page shows who teaches each class and when it meets. Back-office group-class views redesigned: - Instructor **My Group Classes** and studio-admin **Group Classes** are now per-class summaries with enrolment counts, not flat student lists. - Each links through (`?class_id=<id>`) to a per-class **details page** (schedule panel, roster with payment status, and — for invite-only classes — the add/make-available/invite-by-email controls). Invite-only membership is managed entirely from this page. - Invite actions are allowed for the class's owning instructor or any `view_all_lessons` studio admin, so an owner-operator (studio admin who also teaches) can reach every class's roster and invites from the Group Classes page. Tests: composer test (508), composer lint, composer cs all pass. Co-Authored-By: Claude Opus 4.8 <[email protected]>
329 lines
13 KiB
PHP
329 lines
13 KiB
PHP
<?php
|
|
declare(strict_types=1);
|
|
|
|
namespace Unsupervised\Schedular;
|
|
|
|
use Unsupervised\Schedular\Availability\AvailabilityController;
|
|
use Unsupervised\Schedular\Availability\AvailabilityRepository;
|
|
use Unsupervised\Schedular\Auth\AccessSettings;
|
|
use Unsupervised\Schedular\Auth\InstructorController;
|
|
use Unsupervised\Schedular\Auth\InviteRepository;
|
|
use Unsupervised\Schedular\Auth\RegistrationApprovalController;
|
|
use Unsupervised\Schedular\Auth\RegistrationController;
|
|
use Unsupervised\Schedular\Auth\RegistrationMailer;
|
|
use Unsupervised\Schedular\Auth\RoleManager;
|
|
use Unsupervised\Schedular\Auth\StudentActions;
|
|
use Unsupervised\Schedular\Auth\StudentController;
|
|
use Unsupervised\Schedular\Auth\StudentHistory;
|
|
use Unsupervised\Schedular\Booking\BookingRepository;
|
|
use Unsupervised\Schedular\Booking\LessonController;
|
|
use Unsupervised\Schedular\GroupClass\EnrollmentRepository;
|
|
use Unsupervised\Schedular\GroupClass\GroupAccessRepository;
|
|
use Unsupervised\Schedular\GroupClass\GroupClassController;
|
|
use Unsupervised\Schedular\Offering\ClassSlotReconciler;
|
|
use Unsupervised\Schedular\Offering\OfferingController;
|
|
use Unsupervised\Schedular\Offering\OfferingRepository;
|
|
use Unsupervised\Schedular\Payment\BillingMethodResolver;
|
|
use Unsupervised\Schedular\Payment\PaymentController;
|
|
use Unsupervised\Schedular\Payment\PaymentReportController;
|
|
use Unsupervised\Schedular\Payment\PaymentRepository;
|
|
use Unsupervised\Schedular\Payment\PaymentService;
|
|
use Unsupervised\Schedular\Payment\StudioSettings;
|
|
use Unsupervised\Schedular\Policy\AcceptanceRepository;
|
|
use Unsupervised\Schedular\Policy\PolicyController;
|
|
use Unsupervised\Schedular\Policy\PolicyRepository;
|
|
use Unsupervised\Schedular\Policy\PolicyService;
|
|
use Unsupervised\Schedular\Policy\PolicyVersionRepository;
|
|
use Unsupervised\Schedular\Registration\AnswerRepository;
|
|
use Unsupervised\Schedular\Registration\QuestionController;
|
|
use Unsupervised\Schedular\Registration\QuestionRepository;
|
|
|
|
class AdminMenu {
|
|
|
|
private AvailabilityController $availabilityController;
|
|
private LessonController $lessonController;
|
|
private OfferingController $offeringController;
|
|
private QuestionController $questionController;
|
|
private PolicyController $policyController;
|
|
private RegistrationController $registrationController;
|
|
private RegistrationApprovalController $registrationApprovalController;
|
|
private GroupClassController $groupClassController;
|
|
private StudentController $studentController;
|
|
private InstructorController $instructorController;
|
|
private StudioSettings $settings;
|
|
private AccessSettings $accessSettings;
|
|
private PaymentController $paymentController;
|
|
private PaymentReportController $paymentReportController;
|
|
|
|
public function __construct( AvailabilityRepository $availability, BookingRepository $bookings, OfferingRepository $offerings, QuestionRepository $questions, AnswerRepository $answers, PolicyRepository $policies, PolicyVersionRepository $policyVersions, PolicyService $policyService, AcceptanceRepository $acceptances, InviteRepository $invites, EnrollmentRepository $enrollments, GroupAccessRepository $groupAccess, StudioSettings $settings, PaymentRepository $payments, PaymentService $paymentService, BillingMethodResolver $resolver, RegistrationMailer $registrationMailer ) {
|
|
$this->availabilityController = new AvailabilityController( $availability, $offerings );
|
|
$this->lessonController = new LessonController( $bookings, $payments, $availability );
|
|
$this->offeringController = new OfferingController( $offerings, new ClassSlotReconciler( $availability ) );
|
|
$this->questionController = new QuestionController( $questions, $offerings );
|
|
$this->policyController = new PolicyController( $policies, $policyVersions, $policyService );
|
|
$this->registrationController = new RegistrationController( $invites );
|
|
$this->registrationApprovalController = new RegistrationApprovalController( $registrationMailer );
|
|
$this->groupClassController = new GroupClassController( $enrollments, $offerings, $payments, $groupAccess, $paymentService, $invites, $registrationMailer );
|
|
$this->studentController = new StudentController( $bookings, $availability, $offerings, $enrollments, $resolver, new StudentHistory( $acceptances, $policies, $policyVersions, $answers, $questions, $payments ), new StudentActions( $bookings, $availability, $enrollments, $paymentService ) );
|
|
$this->instructorController = new InstructorController();
|
|
$this->settings = $settings;
|
|
$this->accessSettings = new AccessSettings();
|
|
$this->paymentController = new PaymentController( $payments, $paymentService );
|
|
$this->paymentReportController = new PaymentReportController( $payments );
|
|
}
|
|
|
|
public function register(): void {
|
|
add_action( 'admin_menu', [ $this, 'addPages' ] );
|
|
add_action( 'admin_post_' . PaymentReportController::EXPORT_ACTION, [ $this->paymentReportController, 'export' ] );
|
|
}
|
|
|
|
public function addPages(): void {
|
|
$this->addStudioSeparators();
|
|
|
|
// Studio-wide dashboard: all upcoming lessons across instructors.
|
|
add_menu_page(
|
|
__( 'Scheduler', 'unsupervised-schedular' ),
|
|
__( 'Scheduler', 'unsupervised-schedular' ),
|
|
RoleManager::CAP_VIEW_ALL_LESSONS,
|
|
'us-scheduler',
|
|
[ $this->lessonController, 'renderAdminDashboard' ],
|
|
'dashicons-calendar-alt',
|
|
40
|
|
);
|
|
|
|
// Instructor: manage their own availability.
|
|
add_menu_page(
|
|
__( 'My Availability', 'unsupervised-schedular' ),
|
|
__( 'My Availability', 'unsupervised-schedular' ),
|
|
RoleManager::CAP_MANAGE_AVAILABILITY,
|
|
'us-availability',
|
|
[ $this->availabilityController, 'renderPage' ],
|
|
'dashicons-clock',
|
|
41
|
|
);
|
|
|
|
// Studio admin / instructor: manage offerings.
|
|
add_menu_page(
|
|
__( 'Offerings', 'unsupervised-schedular' ),
|
|
__( 'Offerings', 'unsupervised-schedular' ),
|
|
RoleManager::CAP_MANAGE_OFFERINGS,
|
|
'us-offerings',
|
|
[ $this->offeringController, 'renderPage' ],
|
|
'dashicons-tag',
|
|
33
|
|
);
|
|
|
|
// Studio admin / instructor: manage per-offering intake questions.
|
|
add_submenu_page(
|
|
'us-offerings',
|
|
__( 'Questions', 'unsupervised-schedular' ),
|
|
__( 'Questions', 'unsupervised-schedular' ),
|
|
RoleManager::CAP_MANAGE_QUESTIONS,
|
|
'us-questions',
|
|
[ $this->questionController, 'renderPage' ]
|
|
);
|
|
|
|
// Studio admin: draft, version, and publish policies.
|
|
add_menu_page(
|
|
__( 'Policies', 'unsupervised-schedular' ),
|
|
__( 'Policies', 'unsupervised-schedular' ),
|
|
RoleManager::CAP_MANAGE_POLICIES,
|
|
'us-policies',
|
|
[ $this->policyController, 'renderPage' ],
|
|
'dashicons-text-page',
|
|
31
|
|
);
|
|
|
|
// Studio admin: invite students to register.
|
|
add_menu_page(
|
|
__( 'Invites', 'unsupervised-schedular' ),
|
|
__( 'Invites', 'unsupervised-schedular' ),
|
|
RoleManager::CAP_MANAGE_STUDENTS,
|
|
'us-invites',
|
|
[ $this->registrationController, 'renderPage' ],
|
|
'dashicons-email',
|
|
32
|
|
);
|
|
|
|
// Studio admin: all group-class enrolments.
|
|
add_menu_page(
|
|
__( 'Group Classes', 'unsupervised-schedular' ),
|
|
__( 'Group Classes', 'unsupervised-schedular' ),
|
|
RoleManager::CAP_VIEW_ALL_LESSONS,
|
|
'us-group-classes',
|
|
[ $this->groupClassController, 'renderPage' ],
|
|
'dashicons-groups',
|
|
36
|
|
);
|
|
|
|
// Studio admin: create instructors and manage their capabilities.
|
|
add_menu_page(
|
|
__( 'Instructors', 'unsupervised-schedular' ),
|
|
__( 'Instructors', 'unsupervised-schedular' ),
|
|
RoleManager::CAP_MANAGE_INSTRUCTORS,
|
|
InstructorController::PAGE_SLUG,
|
|
[ $this->instructorController, 'renderPage' ],
|
|
'dashicons-businessperson',
|
|
34.5
|
|
);
|
|
|
|
// Studio admin: browse students and their activity.
|
|
add_menu_page(
|
|
__( 'Students', 'unsupervised-schedular' ),
|
|
__( 'Students', 'unsupervised-schedular' ),
|
|
RoleManager::CAP_MANAGE_STUDENTS,
|
|
'us-students',
|
|
[ $this->studentController, 'renderPage' ],
|
|
'dashicons-id',
|
|
35
|
|
);
|
|
|
|
// Studio admin: approve or reject self-signup students (open registration).
|
|
add_submenu_page(
|
|
'us-students',
|
|
__( 'Pending Students', 'unsupervised-schedular' ),
|
|
__( 'Pending Students', 'unsupervised-schedular' ),
|
|
RoleManager::CAP_MANAGE_STUDENTS,
|
|
RegistrationApprovalController::PAGE_SLUG,
|
|
[ $this->registrationApprovalController, 'renderPage' ]
|
|
);
|
|
|
|
// Studio admin: confirm pending (e-transfer) payments.
|
|
add_menu_page(
|
|
__( 'Payments', 'unsupervised-schedular' ),
|
|
__( 'Payments', 'unsupervised-schedular' ),
|
|
RoleManager::CAP_MANAGE_BILLING,
|
|
'us-payments',
|
|
[ $this->paymentController, 'renderPage' ],
|
|
'dashicons-money-alt',
|
|
37
|
|
);
|
|
|
|
// Studio admin (all) / instructor (own): monthly payments report with HST.
|
|
// Gated on export so instructors — who lack manage_billing — can still see it.
|
|
add_menu_page(
|
|
__( 'Payment Report', 'unsupervised-schedular' ),
|
|
__( 'Payment Report', 'unsupervised-schedular' ),
|
|
RoleManager::CAP_EXPORT_PAYMENTS,
|
|
'us-reports',
|
|
[ $this->paymentReportController, 'renderPage' ],
|
|
'dashicons-chart-bar',
|
|
38
|
|
);
|
|
|
|
// Studio admin: Stripe credentials and billing settings.
|
|
add_menu_page(
|
|
__( 'Studio Settings', 'unsupervised-schedular' ),
|
|
__( 'Studio Settings', 'unsupervised-schedular' ),
|
|
RoleManager::CAP_MANAGE_BILLING,
|
|
'us-settings',
|
|
[ $this->settings, 'renderPage' ],
|
|
'dashicons-admin-settings',
|
|
30
|
|
);
|
|
|
|
// Site owner: whether WordPress administrators are studio admins / instructors.
|
|
// Gated on the core manage_options capability — never the plugin's own grants —
|
|
// so an administrator can always reach it to re-enable a disabled grant.
|
|
add_menu_page(
|
|
__( 'Access', 'unsupervised-schedular' ),
|
|
__( 'Access', 'unsupervised-schedular' ),
|
|
'manage_options',
|
|
'us-access',
|
|
[ $this->accessSettings, 'renderPage' ],
|
|
'dashicons-admin-network',
|
|
30.5
|
|
);
|
|
|
|
// Instructor: view their upcoming lessons. Hidden for anyone who can
|
|
// already see the Scheduler — it shows every instructor's lessons
|
|
// (including their own, with the same payment edit forms), so the two
|
|
// menu items would just duplicate each other for an owner-operator.
|
|
if ( ! current_user_can( RoleManager::CAP_VIEW_ALL_LESSONS ) ) {
|
|
add_menu_page(
|
|
__( 'My Lessons', 'unsupervised-schedular' ),
|
|
__( 'My Lessons', 'unsupervised-schedular' ),
|
|
RoleManager::CAP_VIEW_LESSONS,
|
|
'us-my-lessons',
|
|
[ $this->lessonController, 'renderInstructorLessons' ],
|
|
'dashicons-welcome-learn-more',
|
|
42
|
|
);
|
|
|
|
// Instructor: their own group classes with per-class rosters.
|
|
add_submenu_page(
|
|
'us-my-lessons',
|
|
__( 'My Group Classes', 'unsupervised-schedular' ),
|
|
__( 'My Group Classes', 'unsupervised-schedular' ),
|
|
RoleManager::CAP_VIEW_LESSONS,
|
|
'us-my-group-classes',
|
|
[ $this->groupClassController, 'renderInstructorPage' ]
|
|
);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Insert sidebar separators around the studio menus so they sit visually
|
|
* apart from the core WordPress items and split into three sections —
|
|
* mirroring the dividers core uses. Each separator is only added when the user
|
|
* can see a menu in the following section, to avoid orphaned dividers.
|
|
*
|
|
* Layout: [29] · setup (Settings/Policies/Invites/Offerings) · [34] ·
|
|
* people & money (Students/Group Classes/Payments/Payment Report) · [39] ·
|
|
* operations (Scheduler) and instructor menus.
|
|
*/
|
|
private function addStudioSeparators(): void {
|
|
$this->addSeparatorAt( 29, $this->userSeesStudioMenu() );
|
|
$this->addSeparatorAt( 34, $this->userSeesPeopleSection() );
|
|
$this->addSeparatorAt( 39, current_user_can( RoleManager::CAP_VIEW_ALL_LESSONS ) );
|
|
}
|
|
|
|
private function addSeparatorAt( int $position, bool $visible ): void {
|
|
if ( ! $visible ) {
|
|
return;
|
|
}
|
|
|
|
global $menu;
|
|
if ( ! is_array( $menu ) || isset( $menu[ $position ] ) ) {
|
|
return;
|
|
}
|
|
|
|
// phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited -- writing to $menu is the supported way to add an admin sidebar separator.
|
|
$menu[ $position ] = [ '', 'read', 'us-studio-separator-' . $position, '', 'wp-menu-separator' ];
|
|
}
|
|
|
|
private function userSeesPeopleSection(): bool {
|
|
return current_user_can( RoleManager::CAP_MANAGE_INSTRUCTORS )
|
|
|| current_user_can( RoleManager::CAP_MANAGE_STUDENTS )
|
|
|| current_user_can( RoleManager::CAP_VIEW_ALL_LESSONS )
|
|
|| current_user_can( RoleManager::CAP_MANAGE_BILLING );
|
|
}
|
|
|
|
private function userSeesStudioMenu(): bool {
|
|
// Administrators always see the Access page, so the leading separator
|
|
// should show for them even if both capability grants are disabled.
|
|
if ( current_user_can( 'manage_options' ) ) {
|
|
return true;
|
|
}
|
|
|
|
$caps = [
|
|
RoleManager::CAP_VIEW_ALL_LESSONS,
|
|
RoleManager::CAP_VIEW_LESSONS,
|
|
RoleManager::CAP_MANAGE_AVAILABILITY,
|
|
RoleManager::CAP_MANAGE_OFFERINGS,
|
|
RoleManager::CAP_MANAGE_QUESTIONS,
|
|
RoleManager::CAP_MANAGE_POLICIES,
|
|
RoleManager::CAP_MANAGE_STUDENTS,
|
|
RoleManager::CAP_MANAGE_BILLING,
|
|
];
|
|
|
|
foreach ( $caps as $cap ) {
|
|
if ( current_user_can( $cap ) ) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
}
|