diff --git a/app/Controllers/View/EventController.php b/app/Controllers/View/EventController.php index d44b2a6..659a41f 100644 --- a/app/Controllers/View/EventController.php +++ b/app/Controllers/View/EventController.php @@ -480,6 +480,17 @@ class EventController extends ResourceController $semester = $this->request->getGet('semester') ?? $this->semester; $parents = $this->userModel->getParents(); + usort($parents, static function (array $a, array $b): int { + $aLabel = trim(preg_replace('/\s+/', ' ', (string) ($a['firstname'] ?? '') . ' ' . (string) ($a['lastname'] ?? ''))); + $bLabel = trim(preg_replace('/\s+/', ' ', (string) ($b['firstname'] ?? '') . ' ' . (string) ($b['lastname'] ?? ''))); + + $nameCmp = strnatcasecmp($aLabel, $bLabel); + if ($nameCmp !== 0) { + return $nameCmp; + } + + return strnatcasecmp((string) ($a['school_id'] ?? ''), (string) ($b['school_id'] ?? '')); + }); $events = $this->eventModel->getActiveEvents($schoolYear); $filterEventId = (int) ($this->request->getGet('event_id') ?? 0); $filterParentId = (int) ($this->request->getGet('parent_id') ?? 0); diff --git a/app/Views/administrator/events/event_charges.php b/app/Views/administrator/events/event_charges.php index cdbc817..cbd530a 100644 --- a/app/Views/administrator/events/event_charges.php +++ b/app/Views/administrator/events/event_charges.php @@ -145,9 +145,24 @@ $= esc(number_format($selectedEvent['amount'] ?? 0, 2)) ?> fee -
- = esc($selectedEvent['description'] ?: 'No description provided for this event.') ?> -
+ +