CI / Tests (PHP 8.2) (pull_request) Successful in 1m15s
CI / Tests (PHP 8.1) (pull_request) Successful in 1m16s
CI / No Debug Code (pull_request) Successful in 2s
CI / Coding Standards (pull_request) Successful in 3m15s
CI / PHPStan (pull_request) Successful in 3m14s
CI / Tests (PHP 8.3) (pull_request) Successful in 2m37s
CI / Build Plugin Zip (pull_request) Skipped
The front-end booking calendar now opens in the Week view (anchored to the week of the earliest open slot) with List still available. The Scheduler and My Lessons admin pages gain a week calendar (usc_view/usc_week, bucketed via a new generic WeekCalendar::bucket()) and open in it by default; the original table remains as the List view since it carries the HST / e-transfer forms. Closes #76 Co-Authored-By: Claude Fable 5 <[email protected]>
127 lines
7.2 KiB
PHP
127 lines
7.2 KiB
PHP
<?php
|
|
declare(strict_types=1);
|
|
|
|
if (! defined('ABSPATH')) {
|
|
exit;
|
|
}
|
|
|
|
/**
|
|
* @var list<array{student: string, instructor: string, time: string, day: string, time_short: string, status: string, notes: string, payment_id: int, currency: string, amount: float, tax_rate: float, tax_amount: float, total: float, etransfer_email: string, etransfer_editable: bool, tax_editable: bool}> $rows
|
|
* @var 'list'|'week' $view
|
|
* @var string $weekStart
|
|
* @var list<array{date: string, items: list<array{student: string, time_short: string, status: string}>}> $weekDays
|
|
* @var string $prevWeek
|
|
* @var string $nextWeek
|
|
* @var string $baseUrl
|
|
*/
|
|
?>
|
|
<div class="wrap">
|
|
<h1><?php esc_html_e('Lessons', 'unsupervised-schedular'); ?></h1>
|
|
|
|
<ul class="subsubsub" style="margin-bottom:12px;">
|
|
<li>
|
|
<a href="<?php echo esc_url($baseUrl); ?>" <?php echo 'week' === $view ? 'class="current"' : ''; ?>><?php esc_html_e('Week', 'unsupervised-schedular'); ?></a> |
|
|
</li>
|
|
<li>
|
|
<a href="<?php echo esc_url(add_query_arg('usc_view', 'list', $baseUrl)); ?>" <?php echo 'list' === $view ? 'class="current"' : ''; ?>><?php esc_html_e('List', 'unsupervised-schedular'); ?></a>
|
|
</li>
|
|
</ul>
|
|
<div class="clear"></div>
|
|
|
|
<?php if ('week' === $view) : ?>
|
|
<p>
|
|
<a class="button" href="<?php echo esc_url(add_query_arg('usc_week', $prevWeek, $baseUrl)); ?>">‹ <?php esc_html_e('Previous week', 'unsupervised-schedular'); ?></a>
|
|
<strong style="margin:0 12px;">
|
|
<?php
|
|
/* translators: %s: date of the first day of the displayed week */
|
|
echo esc_html(sprintf(__('Week of %s', 'unsupervised-schedular'), (string) mysql2date('M j, Y', $weekStart)));
|
|
?>
|
|
</strong>
|
|
<a class="button" href="<?php echo esc_url(add_query_arg('usc_week', $nextWeek, $baseUrl)); ?>"><?php esc_html_e('Next week', 'unsupervised-schedular'); ?> ›</a>
|
|
</p>
|
|
<table class="wp-list-table widefat fixed">
|
|
<thead>
|
|
<tr>
|
|
<?php foreach ($weekDays as $day) : ?>
|
|
<th><?php echo esc_html((string) mysql2date('D M j', $day['date'])); ?></th>
|
|
<?php endforeach; ?>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
<tr>
|
|
<?php foreach ($weekDays as $day) : ?>
|
|
<td style="vertical-align:top;">
|
|
<?php if (empty($day['items'])) : ?>
|
|
<span aria-hidden="true">—</span>
|
|
<?php endif; ?>
|
|
<?php foreach ($day['items'] as $item) : ?>
|
|
<p style="margin:0 0 8px;">
|
|
<strong><?php echo esc_html($item['time_short']); ?></strong><br>
|
|
<?php echo esc_html($item['student']); ?><br>
|
|
<em><?php echo esc_html($item['status']); ?></em>
|
|
</p>
|
|
<?php endforeach; ?>
|
|
</td>
|
|
<?php endforeach; ?>
|
|
</tr>
|
|
</tbody>
|
|
</table>
|
|
<?php elseif (empty($rows)) : ?>
|
|
<p><?php esc_html_e('No upcoming lessons.', '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('Instructor', 'unsupervised-schedular'); ?></th>
|
|
<th><?php esc_html_e('Date/Time', 'unsupervised-schedular'); ?></th>
|
|
<th><?php esc_html_e('Status', 'unsupervised-schedular'); ?></th>
|
|
<th><?php esc_html_e('HST', 'unsupervised-schedular'); ?></th>
|
|
<th><?php esc_html_e('Total', 'unsupervised-schedular'); ?></th>
|
|
<th><?php esc_html_e('E-transfer email', 'unsupervised-schedular'); ?></th>
|
|
<th><?php esc_html_e('Notes', 'unsupervised-schedular'); ?></th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
<?php foreach ($rows as $row) : ?>
|
|
<tr>
|
|
<td><?php echo esc_html($row['student']); ?></td>
|
|
<td><?php echo esc_html($row['instructor']); ?></td>
|
|
<td><?php echo esc_html($row['time']); ?></td>
|
|
<td><?php echo esc_html($row['status']); ?></td>
|
|
<td>
|
|
<?php if ($row['tax_editable']) : ?>
|
|
<form method="post" style="display:flex; gap:4px; align-items:center;">
|
|
<?php wp_nonce_field('usc_lesson_action'); ?>
|
|
<input type="hidden" name="usc_action" value="set_tax">
|
|
<input type="hidden" name="payment_id" value="<?php echo esc_attr((string) $row['payment_id']); ?>">
|
|
<input type="number" name="tax_rate" min="0" max="100" step="0.01" style="width:5em;" value="<?php echo esc_attr(number_format($row['tax_rate'], 2)); ?>">
|
|
<span>%</span>
|
|
<button type="submit" class="button button-small"><?php esc_html_e('Save', 'unsupervised-schedular'); ?></button>
|
|
</form>
|
|
<?php else : ?>
|
|
<?php echo esc_html(number_format($row['tax_rate'], 2) . '% (' . $row['currency'] . ' ' . number_format($row['tax_amount'], 2) . ')'); ?>
|
|
<?php endif; ?>
|
|
</td>
|
|
<td><?php echo $row['payment_id'] > 0 ? esc_html($row['currency'] . ' ' . number_format($row['total'], 2)) : esc_html('—'); ?></td>
|
|
<td>
|
|
<?php if ($row['etransfer_editable']) : ?>
|
|
<form method="post" style="display:flex; gap:4px;">
|
|
<?php wp_nonce_field('usc_lesson_action'); ?>
|
|
<input type="hidden" name="usc_action" value="set_etransfer">
|
|
<input type="hidden" name="payment_id" value="<?php echo esc_attr((string) $row['payment_id']); ?>">
|
|
<input type="email" name="etransfer_email" value="<?php echo esc_attr($row['etransfer_email']); ?>">
|
|
<button type="submit" class="button button-small"><?php esc_html_e('Save', 'unsupervised-schedular'); ?></button>
|
|
</form>
|
|
<?php else : ?>
|
|
<?php echo esc_html('' !== $row['etransfer_email'] ? $row['etransfer_email'] : '—'); ?>
|
|
<?php endif; ?>
|
|
</td>
|
|
<td><?php echo esc_html($row['notes']); ?></td>
|
|
</tr>
|
|
<?php endforeach; ?>
|
|
</tbody>
|
|
</table>
|
|
<?php endif; ?>
|
|
</div>
|