fix next / previous events

site/controllers/program.php

@@ -82,8 +82,7 @@ return function($kirby, $page) {
   }
 
   return [
-    'pastEvents' => filterPastEvents($kirby->collection('ordered-season')),
-    'futureEvents' => filterFutureEvents($kirby->collection('ordered-season')),
+    'events' => splitNextAndPreviousEvents($kirby->collection('ordered-season')),
     'currentSeasonSessions' => sortByMonth($currentSeasonSessions)
   ];
 };

site/plugins/helpers/index.php

@@ -19,8 +19,9 @@ function getMonthNumber($month) {
   return $array[$month];
 }
 
-function filterFutureEvents($events) {
-  $futureEvents = new Pages();
+function splitNextAndPreviousEvents($events) {
+  $next = new Pages();
+  $previous = new Pages();
 
   foreach ($events as $event) {
     $sessions = $event->isMapadoEvent() == 'true' ? $event->remoteSessions()->toStructure() : $event->sessions()->toStructure();
@@ -41,11 +42,16 @@ function filterFutureEvents($events) {
     
 
     if (!empty($futureDates)) {
-      $futureEvents->add($event);
+      $next->add($event);
+    } else {
+      $previous->add($event);
     }
   }
 
-  return $futureEvents;
+  return [
+    'next' => $next,
+    'previous' => $previous,
+  ];
 }
 
 function filterPastEvents($events) {

site/templates/program.php

@@ -107,12 +107,12 @@
         <section class="yellow">
           <h2>Prochainement — <?= $page->children()->first()->title() ?></h2>
         </section>
-        <?php snippet('events-grid', ['events' => $futureEvents, 'columns' => 3])  ?>
-        <?php if ($pastEvents->count() > 0): ?>  
+        <?php snippet('events-grid', ['events' => $events['next'], 'columns' => 3])  ?>
+        <?php if ($events['previous']->count() > 0): ?>  
           <section class="yellow">
             <h2>Événements passés</h2>
           </section>
-          <?php snippet('events-grid', ['events' => $pastEvents, 'columns' => 3])  ?>
+          <?php snippet('events-grid', ['events' => $events['previous'], 'columns' => 3])  ?>
         <?php endif ?>
       </div>
     </template>