From 79f754466b9b2f4b3166f71d40ba230f45e114ae Mon Sep 17 00:00:00 2001
From: isUnknown <adrien.payet@outlook.com>
Date: Fri, 1 Aug 2025 16:15:26 +0200
Subject: [PATCH] program > calendar : fix months sorting

---
 site/controllers/program.php | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/site/controllers/program.php b/site/controllers/program.php
index 51697ed..0db4f70 100644
--- a/site/controllers/program.php
+++ b/site/controllers/program.php
@@ -1,37 +1,45 @@
 <?php
 
 function sortByMonth($sessions) {
-  $frenchMonths = array(
+  $frenchMonths = [
       'janvier', 'février', 'mars', 'avril', 'mai', 'juin',
       'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'
-  );
-  $englishMonths = array(
+  ];
+  $englishMonths = [
       'January', 'February', 'March', 'April', 'May', 'June',
       'July', 'August', 'September', 'October', 'November', 'December'
-  );
+  ];
 
-  $currentMonthIndex = date('n') - 1;
+  $grouped = [];
 
-  $orderedSessions = [];
   foreach ($sessions as $item) {
       $monthIndex = date('n', strtotime($item['date'])) - 1;
+      $month = date('F', strtotime($item['date']));
+      $monthInFrench = str_replace($englishMonths, $frenchMonths, $month);
 
-      if ($monthIndex >= $currentMonthIndex || $monthIndex < 8) {
-          $month = date('F', strtotime($item['date']));
-          $monthInFrench = str_replace($englishMonths, $frenchMonths, $month);
+      // Décalage pour commencer par septembre (index 8)
+      $shiftedIndex = ($monthIndex + 12 - 8) % 12;
 
-          if (!isset($orderedSessions[$monthInFrench])) {
-              $orderedSessions[$monthInFrench] = [];
-          }
-
-          $orderedSessions[$monthInFrench][] = $item;
+      if (!isset($grouped[$shiftedIndex])) {
+          $grouped[$shiftedIndex] = ['name' => $monthInFrench, 'sessions' => []];
       }
+
+      $grouped[$shiftedIndex]['sessions'][] = $item;
+  }
+
+  ksort($grouped); // Trie en commençant par septembre
+
+  $orderedSessions = [];
+  foreach ($grouped as $month) {
+      $orderedSessions[$month['name']] = $month['sessions'];
   }
 
   return $orderedSessions;
 }
 
 
+
+
 function createArraySession($event, $session) {
   $isMapadoEvent = $event->isMapadoEvent() == 'true';
   $arraySession = $session->toArray();