diff --git a/site/controllers/program.php b/site/controllers/program.php
index 61ea71a..0fc9eff 100644
--- a/site/controllers/program.php
+++ b/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)
];
};
\ No newline at end of file
diff --git a/site/plugins/helpers/index.php b/site/plugins/helpers/index.php
index 9139197..d519e42 100644
--- a/site/plugins/helpers/index.php
+++ b/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) {
diff --git a/site/templates/program.php b/site/templates/program.php
index 5163fc0..868319c 100644
--- a/site/templates/program.php
+++ b/site/templates/program.php
@@ -107,12 +107,12 @@
Prochainement — = $page->children()->first()->title() ?>
- $futureEvents, 'columns' => 3]) ?>
- count() > 0): ?>
+ $events['next'], 'columns' => 3]) ?>
+ count() > 0): ?>
- $pastEvents, 'columns' => 3]) ?>
+ $events['previous'], 'columns' => 3]) ?>