From a8ef6652398a57714a3f92b6069cc5eb1f8d6f2a Mon Sep 17 00:00:00 2001
From: root <melabidi@alrahmaisgl.org>
Date: Sat, 16 May 2026 16:03:46 -0400
Subject: [PATCH] fix event  parent list

---
 app/Controllers/View/EventController.php      | 11 ++++++
 .../administrator/events/event_charges.php    | 39 +++++++++++++++++--
 2 files changed, 47 insertions(+), 3 deletions(-)

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
                                     </span>
                                 </div>
-                                <p class="mb-1 text-muted small">
-                                    <?= esc($selectedEvent['description'] ?: 'No description provided for this event.') ?>
-                                </p>
+                                <?php $eventDescription = trim((string) ($selectedEvent['description'] ?? '')); ?>
+                                <div class="mb-1">
+                                    <button type="button"
+                                            class="btn btn-link btn-sm px-0 py-0 text-decoration-none event-description-toggle"
+                                            data-bs-toggle="collapse"
+                                            data-bs-target="#selectedEventDescription"
+                                            aria-expanded="false"
+                                            aria-controls="selectedEventDescription"
+                                            data-label-collapsed="Show description"
+                                            data-label-expanded="Hide description">
+                                        Show description
+                                    </button>
+                                    <div class="collapse mt-2" id="selectedEventDescription">
+                                        <div class="text-muted small" style="white-space: pre-line;">
+                                            <?= esc($eventDescription !== '' ? $eventDescription : 'No description provided for this event.') ?>
+                                        </div>
+                                    </div>
+                                </div>
                                 <?php if (!empty($selectedEvent['expiration_date'])): ?>
                                     <small class="text-secondary">
                                         Expires: <?= esc(local_date($selectedEvent['expiration_date'], 'm-d-Y')) ?>
@@ -465,6 +480,24 @@
 
 <?= $this->section('scripts') ?>
 <script>
+document.addEventListener('DOMContentLoaded', function () {
+    document.querySelectorAll('.event-description-toggle').forEach(function (button) {
+        const targetSelector = button.getAttribute('data-bs-target');
+        const target = targetSelector ? document.querySelector(targetSelector) : null;
+        if (!target) {
+            return;
+        }
+
+        target.addEventListener('show.bs.collapse', function () {
+            button.textContent = button.dataset.labelExpanded || 'Hide description';
+        });
+
+        target.addEventListener('hide.bs.collapse', function () {
+            button.textContent = button.dataset.labelCollapsed || 'Show description';
+        });
+    });
+});
+
 function loadStudentsWithCharges() {
     let parentId = $('#parent_id').val();
     let eventId = $('#event_id').val();