From fc828997d079b7fa6b1c16214df3367b407954d0 Mon Sep 17 00:00:00 2001
From: antonin gallon <antoningallon@gmail.com>
Date: Wed, 28 Jan 2026 19:07:18 +0100
Subject: [PATCH] =?UTF-8?q?vue=20programme=20fonctionne=20avec=20les=20fil?=
 =?UTF-8?q?tre=20de=20categorie.=20Plus=20de=20switch=20vers=20vu=20calend?=
 =?UTF-8?q?rier.=20Pour=20autant=20si=20d=C3=A9j=C3=A0=20dans=20calendrier?=
 =?UTF-8?q?=20=C3=A7a=20continu=20de=20fonctionner=20comme=20avant?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/src/vanilla.css    |  3 ++
 site/snippets/events-grid.php | 14 ++++++--
 site/templates/program.php    | 67 +++++++++++++++++++++++++++--------
 3 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/assets/css/src/vanilla.css b/assets/css/src/vanilla.css
index 6da7406..474bc28 100644
--- a/assets/css/src/vanilla.css
+++ b/assets/css/src/vanilla.css
@@ -10,6 +10,9 @@ footer {
 section:not(:last-child, .collapsable, .collapsable-sections) {
   border-bottom: var(--border);
 }
+.temporality-wrapper:not(:last-of-type) section.forced-border{
+  border-bottom: var(--border);
+}
 
 picture {
   background-color: var(--color);
diff --git a/site/snippets/events-grid.php b/site/snippets/events-grid.php
index 32196bd..ddaee6d 100644
--- a/site/snippets/events-grid.php
+++ b/site/snippets/events-grid.php
@@ -1,4 +1,4 @@
-<section class="events-grid">
+<section class="events-grid forced-border">
   <?php if (isset($title)): ?>
     <h4><?= $title ?></h4>
   <?php endif ?>
@@ -13,9 +13,17 @@
             if ($events->count() === 4) {
               $span = 3;
             }
-          }
-          snippet('event-card', ["event" => $event, "span" => $span, "color" => $event->color()->isNotEmpty() == 'true' ? $event->color() : null]) 
+          };
         ?>
+        <?php 
+          $categories = $event->categories();
+        ?>
+        <template 
+          x-if=" tab === 'Programme' || ('<?= $categories ?>'.length > 0 && '<?= $categories ?>'.includes(tab))"
+        >
+          <?php snippet('event-card', ["event" => $event, "span" => $span, "color" => $event->color()->isNotEmpty() == 'true' ? $event->color() : null]) ?>
+        </template>
+
     <?php endforeach ?>
   </div>
 </section>
\ No newline at end of file
diff --git a/site/templates/program.php b/site/templates/program.php
index 4229470..ec86b98 100644
--- a/site/templates/program.php
+++ b/site/templates/program.php
@@ -82,18 +82,24 @@
           x-data="{
             title: '<?= $filter ?>',
             get filterTitle() {
-              return 'Calendrier — ' + this.title
+              if(tab.includes('Calendrier')){
+                return 'Calendrier — ' + this.title
+              }
+              else{
+                return this.title
+              }
             }
           }"
           x-text="title"
           :class="tab === filterTitle ? 'strong' : ''"
           @click="
-            tab = filterTitle; filter = title 
-            
+            tab = filterTitle;
+            filter = title; /* où est utiliser cette vriable ? */
             const url = new URL(window.location.href);
             url.searchParams.set('tab', tab);
             window.history.pushState({}, '', url);
-            setTimeout(scrollToNextClosestDate, 100)
+            setTimeout(scrollToNextClosestDate, 100);
+
           "
         ></button>
       <?php endforeach ?>
@@ -101,20 +107,53 @@
     <section class="page-title">
       <h1 x-text="tab"></h1>
     </section>
-    
     <!-- Programme -->
-    <template x-if="tab === 'Programme'">
+    <template x-if="!tab.includes('Calendrier')">
       <div class="program-content__events">
-        <section class="yellow">
-          <h2>Prochainement — <?= $page->children()->first()->title() ?></h2>
-        </section>
-        <?php snippet('events-grid', ['events' => $events['next'], 'columns' => 3])  ?>
-        <?php if ($events['previous']->count() > 0): ?>  
+
+      <?php
+        $categoriesInNextEvents = [];
+        foreach($events['next'] as $event) {
+          foreach($event->categories()->split() as $cat) {
+            $categoriesInNextEvents[] = $cat;
+          }
+        }
+        $categoriesInNextEvents = array_values(array_unique($categoriesInNextEvents));
+        $hasNextEvents = count($events['next']) > 0;
+      ?>
+
+      <template
+        x-if="<?= $hasNextEvents ? 'true' : 'false' ?> && (tab === 'Programme' || <?= htmlspecialchars(json_encode($categoriesInNextEvents)) ?>.includes(tab))"
+      >
+        <div class="temporality-wrapper">
           <section class="yellow">
-            <h2>Événements passés</h2>
+            <h2>Prochainement — <?= $page->children()->first()->title() ?></h2>
           </section>
-          <?php snippet('events-grid', ['events' => $events['previous'], 'columns' => 3])  ?>
-        <?php endif ?>
+          <?php snippet('events-grid', ['events' => $events['next'], 'columns' => 3]) ?>
+        </div>
+      </template>
+
+        <?php
+          $categoriesInPrevEvents = [];
+          foreach($events['previous'] as $event) {
+            foreach($event->categories()->split() as $cat) {
+              $categoriesInPrevEvents[] = $cat;
+            }
+          }
+          $categoriesInPrevEvents = array_values(array_unique($categoriesInPrevEvents));
+          $hasPrevEvents = $events['previous']->count() > 0;
+        ?>
+
+        <template
+          x-if="<?= $hasPrevEvents ? 'true' : 'false' ?> && (tab === 'Programme' || <?= htmlspecialchars(json_encode($categoriesInPrevEvents)) ?>.includes(tab))"
+        >
+          <div class="temporality-wrapper">
+            <section class="yellow">
+              <h2>Événements passés</h2>
+            </section>
+            <?php snippet('events-grid', ['events' => $events['previous'], 'columns' => 3]) ?>
+          </div>
+        </template>
       </div>
     </template>