From 44b40bcbf15a7b33073ccb31a100740dbca18e65 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Fri, 1 Nov 2024 23:53:27 +0100
Subject: [PATCH] Les liens du menu en haut conservent les filtres

Fix #179
---
 .../templates/agenda_culturel/page-month.html               | 3 +++
 .../templates/agenda_culturel/page-upcoming.html            | 3 +++
 .../templates/agenda_culturel/page-week.html                | 2 ++
 src/agenda_culturel/templates/agenda_culturel/page.html     | 6 +++---
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/agenda_culturel/templates/agenda_culturel/page-month.html b/src/agenda_culturel/templates/agenda_culturel/page-month.html
index 5d1affb..d879cac 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-month.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-month.html
@@ -21,6 +21,9 @@
 {{ calendar.firstdate | date:"F o" }}
 {% endblock %}{% endblock %}
 
+{% block ce_mois_ci_parameters %}{% block cette_semaine_parameters %}{% block a_venir_parameters %}?{{ filter.get_url }}{% endblock %}{% endblock %}{% endblock %}
+
+
  {% block content %}
  
  {% get_current_language as LANGUAGE_CODE %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html b/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html
index e3c60a0..26236d2 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-upcoming.html
@@ -15,6 +15,9 @@
     <script src="{% static 'js/filters.js' %}"></script>
 {% endblock %}
 
+{% block ce_mois_ci_parameters %}{% block cette_semaine_parameters %}{% block a_venir_parameters %}?{{ filter.get_url }}{% endblock %}{% endblock %}{% endblock %}
+
+
 {% block body-class %}a-venir{% endblock %}
 
  {% block content %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-week.html b/src/agenda_culturel/templates/agenda_culturel/page-week.html
index 721b0f6..748542d 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-week.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-week.html
@@ -18,6 +18,8 @@
 
 {% block title %}{% block og_title %}Semaine du {{ calendar.firstdate|date|frdate }}{% endblock %}{% endblock %}
 
+{% block ce_mois_ci_parameters %}{% block cette_semaine_parameters %}{% block a_venir_parameters %}?{{ filter.get_url }}{% endblock %}{% endblock %}{% endblock %}
+
  {% block content %}
 
  {% get_current_language as LANGUAGE_CODE %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/page.html b/src/agenda_culturel/templates/agenda_culturel/page.html
index 13e9d92..3eb8178 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page.html
@@ -50,9 +50,9 @@
                 {% if user.is_authenticated %}{% block configurer-menu %}<li id="menu-configurer" class="configurer-bouton"><a href="{% url 'moderation' %}">Administrer {% picto_from_name "settings" %}</a></li>{% endblock %}{% endif %}
                 {% block ajouter-menu %}<li id="menu-ajouter" class="ajouter-bouton"><a href="{% url 'add_event' %}">Ajouter un événement {% picto_from_name "plus-circle" %}</a></li>{% endblock %}
                 {% block rechercher-menu %}<li id="menu-rechercher" class="rechercher-bouton"><a href="{% url 'event_search' %}">Rechercher {% picto_from_name "search" %}</a></li>{% endblock %}
-                <li><a href="{% url 'a_venir' %}">À venir</a></li>
-                <li><a href="{% url 'cette_semaine' %}">Cette semaine</a></li>
-                <li><a href="{% url 'ce_mois_ci' %}">Ce mois-ci</a></li>
+                <li><a href="{% url 'a_venir' %}{% block a_venir_parameters %}{% endblock %}">À venir</a></li>
+                <li><a href="{% url 'cette_semaine' %}{% block cette_semaine_parameters %}{% endblock %}">Cette semaine</a></li>
+                <li><a href="{% url 'ce_mois_ci' %}{% block ce_mois_ci_parameters %}{% endblock %}">Ce mois-ci</a></li>
             </ul>
         </div>
         <nav class="container-fluid">