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]>
190 lines
9.6 KiB
PHP
190 lines
9.6 KiB
PHP
<?php
|
|
declare(strict_types=1);
|
|
|
|
if (! defined('ABSPATH')) {
|
|
exit;
|
|
}
|
|
|
|
/**
|
|
* @var array{id: int|null, title: string, when: string, capacity: int|null, enrolled: int, invite_only: bool, instructor: string, price: float, currency: string, duration: int|null, description: string|null, schedule_note: string|null, active: bool, roster: list<array{student: string, status: string, payment: string|null}>, invited: list<array{who: string, kind: string}>} $class
|
|
* @var list<array{id: int, name: string}> $students
|
|
* @var string $notice
|
|
* @var string $baseUrl
|
|
*/
|
|
?>
|
|
<div class="wrap">
|
|
<h1>
|
|
<?php echo esc_html($class['title']); ?>
|
|
<?php if ($class['invite_only']) : ?>
|
|
<span class="dashicons dashicons-lock" title="<?php esc_attr_e('Invite only', 'unsupervised-schedular'); ?>"></span>
|
|
<?php endif; ?>
|
|
</h1>
|
|
|
|
<p>
|
|
<a href="<?php echo esc_url($baseUrl); ?>">← <?php esc_html_e('Back to my group classes', 'unsupervised-schedular'); ?></a>
|
|
</p>
|
|
|
|
<?php if ('' !== $notice) : ?>
|
|
<div class="notice notice-info is-dismissible"><p><?php echo esc_html($notice); ?></p></div>
|
|
<?php endif; ?>
|
|
|
|
<h2><?php esc_html_e('Class details', 'unsupervised-schedular'); ?></h2>
|
|
<table class="widefat striped" style="max-width:40em;">
|
|
<tbody>
|
|
<tr>
|
|
<th scope="row"><?php esc_html_e('When', 'unsupervised-schedular'); ?></th>
|
|
<td><?php echo '' !== $class['when'] ? esc_html($class['when']) : '—'; ?></td>
|
|
</tr>
|
|
<tr>
|
|
<th scope="row"><?php esc_html_e('Instructor', 'unsupervised-schedular'); ?></th>
|
|
<td><?php echo esc_html($class['instructor']); ?></td>
|
|
</tr>
|
|
<tr>
|
|
<th scope="row"><?php esc_html_e('Enrolled', 'unsupervised-schedular'); ?></th>
|
|
<td>
|
|
<?php
|
|
if (null === $class['capacity']) {
|
|
printf(
|
|
/* translators: %d: number of enrolled students. */
|
|
esc_html__('%d enrolled', 'unsupervised-schedular'),
|
|
(int) $class['enrolled']
|
|
);
|
|
} else {
|
|
printf(
|
|
/* translators: 1: number of enrolled students, 2: class capacity. */
|
|
esc_html__('%1$d / %2$d enrolled', 'unsupervised-schedular'),
|
|
(int) $class['enrolled'],
|
|
(int) $class['capacity']
|
|
);
|
|
}
|
|
?>
|
|
</td>
|
|
</tr>
|
|
<?php if (null !== $class['duration']) : ?>
|
|
<tr>
|
|
<th scope="row"><?php esc_html_e('Duration', 'unsupervised-schedular'); ?></th>
|
|
<td>
|
|
<?php
|
|
printf(
|
|
/* translators: %d: session length in minutes. */
|
|
esc_html__('%d min', 'unsupervised-schedular'),
|
|
(int) $class['duration']
|
|
);
|
|
?>
|
|
</td>
|
|
</tr>
|
|
<?php endif; ?>
|
|
<tr>
|
|
<th scope="row"><?php esc_html_e('Price', 'unsupervised-schedular'); ?></th>
|
|
<td><?php echo esc_html(number_format($class['price'], 2) . ' ' . $class['currency']); ?></td>
|
|
</tr>
|
|
<?php if (null !== $class['schedule_note'] && '' !== $class['schedule_note']) : ?>
|
|
<tr>
|
|
<th scope="row"><?php esc_html_e('Schedule note', 'unsupervised-schedular'); ?></th>
|
|
<td><?php echo esc_html($class['schedule_note']); ?></td>
|
|
</tr>
|
|
<?php endif; ?>
|
|
<?php if (null !== $class['description'] && '' !== $class['description']) : ?>
|
|
<tr>
|
|
<th scope="row"><?php esc_html_e('Description', 'unsupervised-schedular'); ?></th>
|
|
<td><?php echo esc_html($class['description']); ?></td>
|
|
</tr>
|
|
<?php endif; ?>
|
|
<tr>
|
|
<th scope="row"><?php esc_html_e('Status', 'unsupervised-schedular'); ?></th>
|
|
<td>
|
|
<?php if ($class['active']) : ?>
|
|
<?php esc_html_e('Open for registration', 'unsupervised-schedular'); ?>
|
|
<?php else : ?>
|
|
<?php esc_html_e('Closed', 'unsupervised-schedular'); ?>
|
|
<?php endif; ?>
|
|
<?php if ($class['invite_only']) : ?>
|
|
· <?php esc_html_e('Invite only', 'unsupervised-schedular'); ?>
|
|
<?php endif; ?>
|
|
</td>
|
|
</tr>
|
|
</tbody>
|
|
</table>
|
|
|
|
<h2><?php esc_html_e('Enrolled students', 'unsupervised-schedular'); ?></h2>
|
|
<?php if (empty($class['roster'])) : ?>
|
|
<p><?php esc_html_e('No enrolments yet.', 'unsupervised-schedular'); ?></p>
|
|
<?php else : ?>
|
|
<table class="wp-list-table widefat fixed striped">
|
|
<thead>
|
|
<tr>
|
|
<th><?php esc_html_e('Student', 'unsupervised-schedular'); ?></th>
|
|
<th><?php esc_html_e('Enrolment', 'unsupervised-schedular'); ?></th>
|
|
<th><?php esc_html_e('Payment', 'unsupervised-schedular'); ?></th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
<?php foreach ($class['roster'] as $entry) : ?>
|
|
<tr>
|
|
<td><?php echo esc_html($entry['student']); ?></td>
|
|
<td><?php echo esc_html($entry['status']); ?></td>
|
|
<td><?php echo esc_html($entry['payment'] ?? '—'); ?></td>
|
|
</tr>
|
|
<?php endforeach; ?>
|
|
</tbody>
|
|
</table>
|
|
<?php endif; ?>
|
|
|
|
<?php if ($class['invite_only']) : ?>
|
|
<h2><?php esc_html_e('Invite & enrol students', 'unsupervised-schedular'); ?></h2>
|
|
<p class="description"><?php esc_html_e('This class is invite only, so students join only when you add or invite them here.', 'unsupervised-schedular'); ?></p>
|
|
|
|
<?php if (! empty($class['invited'])) : ?>
|
|
<h3><?php esc_html_e('Invited (not yet enrolled)', 'unsupervised-schedular'); ?></h3>
|
|
<ul class="ul-disc">
|
|
<?php foreach ($class['invited'] as $invitee) : ?>
|
|
<li><?php echo esc_html($invitee['who'] . ' — ' . $invitee['kind']); ?></li>
|
|
<?php endforeach; ?>
|
|
</ul>
|
|
<?php endif; ?>
|
|
|
|
<div class="us-group-invite-controls" style="display:flex; flex-wrap:wrap; gap:2em; margin:1em 0 2em;">
|
|
<form method="post">
|
|
<?php wp_nonce_field('usc_group_action'); ?>
|
|
<input type="hidden" name="offering_id" value="<?php echo esc_attr((string) $class['id']); ?>">
|
|
<h4><?php esc_html_e('Add students directly', 'unsupervised-schedular'); ?></h4>
|
|
<p class="description"><?php esc_html_e('Enrols them now with a pending payment.', 'unsupervised-schedular'); ?></p>
|
|
<select name="student_ids[]" multiple size="5" style="min-width:16em;">
|
|
<?php foreach ($students as $student) : ?>
|
|
<option value="<?php echo esc_attr((string) $student['id']); ?>"><?php echo esc_html($student['name']); ?></option>
|
|
<?php endforeach; ?>
|
|
</select>
|
|
<p>
|
|
<button type="submit" name="usc_action" value="add_direct" class="button"><?php esc_html_e('Add to class', 'unsupervised-schedular'); ?></button>
|
|
</p>
|
|
</form>
|
|
|
|
<form method="post">
|
|
<?php wp_nonce_field('usc_group_action'); ?>
|
|
<input type="hidden" name="offering_id" value="<?php echo esc_attr((string) $class['id']); ?>">
|
|
<h4><?php esc_html_e('Make available to students', 'unsupervised-schedular'); ?></h4>
|
|
<p class="description"><?php esc_html_e('Grants access so they can enrol themselves.', 'unsupervised-schedular'); ?></p>
|
|
<select name="student_ids[]" multiple size="5" style="min-width:16em;">
|
|
<?php foreach ($students as $student) : ?>
|
|
<option value="<?php echo esc_attr((string) $student['id']); ?>"><?php echo esc_html($student['name']); ?></option>
|
|
<?php endforeach; ?>
|
|
</select>
|
|
<p>
|
|
<button type="submit" name="usc_action" value="grant_access" class="button"><?php esc_html_e('Grant access', 'unsupervised-schedular'); ?></button>
|
|
</p>
|
|
</form>
|
|
|
|
<form method="post">
|
|
<?php wp_nonce_field('usc_group_action'); ?>
|
|
<input type="hidden" name="offering_id" value="<?php echo esc_attr((string) $class['id']); ?>">
|
|
<h4><?php esc_html_e('Invite by email', 'unsupervised-schedular'); ?></h4>
|
|
<p class="description"><?php esc_html_e('For someone without an account yet.', 'unsupervised-schedular'); ?></p>
|
|
<input type="email" name="email" class="regular-text" placeholder="<?php esc_attr_e('[email protected]', 'unsupervised-schedular'); ?>">
|
|
<p>
|
|
<button type="submit" name="usc_action" value="invite_email" class="button"><?php esc_html_e('Send invite', 'unsupervised-schedular'); ?></button>
|
|
</p>
|
|
</form>
|
|
</div>
|
|
<?php endif; ?>
|
|
</div>
|