From 35d65873795164b473d8f43f3acc0bfd0cb004b4 Mon Sep 17 00:00:00 2001
From: isUnknown <adrien.payet@outlook.com>
Date: Mon, 16 Sep 2024 16:28:12 +0200
Subject: [PATCH] fix months order

---
 site/controllers/program.php | 22 ++++++++++++++++++----
 site/templates/program.php   |  6 ++++--
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/site/controllers/program.php b/site/controllers/program.php
index 3a71d10..a99cf53 100644
--- a/site/controllers/program.php
+++ b/site/controllers/program.php
@@ -1,22 +1,36 @@
 <?php
 
 function sortByMonth($sessions) {
-  $months = array(
+  $currentMonth = date('F');
+  $frenchMonths = array(
     'janvier', 'février', 'mars', 'avril', 'mai', 'juin',
     'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'
   );
+  $englishMonths = array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December');
+
+  $currentMonthIndex = date('n');
+  
+  
+  $frenchMonths = array_merge(
+    array_slice($frenchMonths, $currentMonthIndex - 1, 12),
+    array_slice($frenchMonths, 0, $currentMonthIndex - 1)
+  );
+  $englishMonths = array_merge(
+    array_slice($englishMonths, $currentMonthIndex - 1, 12),
+    array_slice($englishMonths, 0, $currentMonthIndex - 1)
+  );
 
   $orderedSessions = array();
 
-  foreach ($months as $month) {
+  foreach ($frenchMonths as $month) {
     $orderedSessions[$month] = array();
   }
 
   foreach ($sessions as $item) {
     $month = date('F', strtotime($item['date']));
     $month = str_replace(
-        array('January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'),
-        $months,
+        $englishMonths,
+        $frenchMonths,
         $month
     );
     $orderedSessions[$month][] = $item;
diff --git a/site/templates/program.php b/site/templates/program.php
index 2ec5601..24e164d 100644
--- a/site/templates/program.php
+++ b/site/templates/program.php
@@ -82,7 +82,9 @@
     <template x-if="tab.includes('Calendrier')">
       <div class="program-content__events">
         <section class="collapsable-sections">
-          <?php foreach($currentSeasonSessions as $month => $sessions): ?>
+          <?php 
+          
+          foreach($currentSeasonSessions as $month => $sessions): ?>
             <?php if (count($sessions) > 0): ?>
               <?php snippet('collapsable-section', ['title' => $month, 'padding' => false], slots: true) ?>
                 <?php slot('content') ?>
@@ -95,7 +97,7 @@
 
                       try {
                         $endTime = strlen($session['duration']) > 0 ? getEndTime($session) : false;
-                      } catch (\Throwable $th) {https://ntb-full.adrien-payet.fr/
+                      } catch (\Throwable $th) {
                         throw new Exception($session['title'] .' - ' . $th->getMessage(), 1);
                       }
                   ?>