169 - Add future and past event lists

Atmos4 · Feb 23, 2024 · c8f8d5a · c8f8d5a
1 parent ed30fc1
commit c8f8d5a
Show file tree

Hide file tree

Showing 2 changed files with 99 additions and 32 deletions.
diff --git a/app/pages/events/event_list.php b/app/pages/events/event_list.php
@@ -5,6 +5,8 @@
 formatter("d MMM");
 $user = User::getCurrent();
 $events = Event::listAllOpen($user->id);
+$past_events = Event::listAllPastOpen($user->id);
+$future_events = Event::listAllFutureOpen($user->id);
 if ($can_edit)
     $draft_events = Event::listDrafts();
 
@@ -95,39 +97,73 @@ function render_event(EventDto $event)
     </nav>
 <?php endif ?>
 
-<table role="grid">
-    <?php if (count($events) || ($can_edit && count($draft_events))): ?>
-        <thead class=header-responsive>
-            <tr>
-                <th></th>
-                <th>Nom</th>
-                <th colspan=2>Dates</th>
-            </tr>
-        </thead>
-        <tbody>
-
-            <?php
-            // Draft events
-            if ($can_edit && count($draft_events)): ?>
-                <tr class="delimiter">
-                    <td colspan="4">Événements en attente</td>
-                </tr>
-                <?php
-                foreach ($draft_events as $draft_event) {
-                    render_event($draft_event);
-                } ?>
-
-                <tr class="delimiter">
-                    <td colspan="4">Événements publiés</td>
-                </tr>
-            <?php endif ?>
+<?php if (count($events) || ($can_edit && count($draft_events))): ?>
+    <?php
+    // Draft events
+    if ($can_edit && count($draft_events)): ?>
+        <details open>
+            <summary>Événements en attente</summary>
+            <table role="grid">
+                <thead class=header-responsive>
+                    <tr>
+                        <th></th>
+                        <th>Nom</th>
+                        <th colspan=2>Dates</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php
+                    foreach ($draft_events as $draft_event) {
+                        render_event($draft_event);
+                    } ?>
+
+                </tbody>
+            </table>
+        </details>
+    <?php endif ?>
 
-            <?php foreach ($events as $event) {
-                render_event($event);
-            } ?>
+    <?php if (count($future_events)): ?>
+        <details open>
+            <summary>Événements à venir</summary>
+            <table role="grid">
+                <thead class=header-responsive>
+                    <tr>
+                        <th></th>
+                        <th>Nom</th>
+                        <th colspan=2>Dates</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php foreach ($future_events as $event) {
+                        render_event($event);
+                    } ?>
+
+                </tbody>
+            </table>
+        </details>
 
-        </tbody>
-    <?php else: ?>
-        <p class="center">Pas d'événement pour le moment 😴</p>
     <?php endif ?>
+
+    <?php if (count($past_events)): ?>
+        <details>
+            <summary>Événements passés</summary>
+            <table role="grid">
+                <thead class=header-responsive>
+                    <tr>
+                        <th></th>
+                        <th>Nom</th>
+                        <th colspan=2>Dates</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <?php foreach ($past_events as $event) {
+                        render_event($event);
+                    } ?>
+                </tbody>
+            </table>
+        </details>
+    <?php endif ?>
+<?php else: ?>
+    <p class="center">Pas d'événement pour le moment 😴</p>
+<?php endif ?>
 </table>
diff --git a/database/models/events.db.php b/database/models/events.db.php
@@ -170,6 +170,37 @@ static function listAllOpen($user_id)
         return EventDto::fromEventList($events);
     }
 
+    /** @return EventDto[] */
+    static function listAllFutureOpen($user_id)
+    {
+        $events = em()
+            ->createQuery("SELECT ev.id, ev.name, ev.start_date, ev.end_date, ev.deadline, ev.open, en.present FROM Event ev" .
+                " LEFT JOIN ev.entries en WITH en.user = ?1" .
+                " WHERE ev.open = 1" .
+                " AND ev.start_date > CURRENT_DATE()" .
+                " ORDER BY ev.start_date DESC")
+            ->setParameter(1, $user_id)
+            ->getArrayResult();
+
+        return EventDto::fromEventList($events);
+    }
+
+    /** @return EventDto[] */
+    static function listAllPastOpen($user_id)
+    {
+        $events = em()
+            ->createQuery("SELECT ev.id, ev.name, ev.start_date, ev.end_date, ev.deadline, ev.open, en.present FROM Event ev" .
+                " LEFT JOIN ev.entries en WITH en.user = ?1" .
+                " WHERE ev.open = 1" .
+                " AND ev.start_date <= CURRENT_DATE()" .
+                " ORDER BY ev.start_date DESC")
+            ->setParameter(1, $user_id)
+            ->getArrayResult();
+
+        return EventDto::fromEventList($events);
+    }
+
+
     static function getById($event_id, $user_id = 0)
     {
         return em()