From b9ecde46e5ce5a9ee77d34da9a476e64bd000d7c Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Sun, 17 Dec 2023 15:21:10 +0100
Subject: [PATCH] =?UTF-8?q?On=20ajoute=20une=20l=C3=A9gende=20en=20pied=20?=
 =?UTF-8?q?de=20page=20Fix=20#51?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/agenda_culturel/static/style.scss              |  3 ++-
 .../templates/agenda_culturel/filter-inc.html      |  2 +-
 .../templates/agenda_culturel/home.html            | 14 --------------
 .../templates/agenda_culturel/page-month.html      |  4 ++++
 .../templates/agenda_culturel/page-week.html       |  4 ++++
 src/agenda_culturel/templatetags/cat_extra.py      | 14 ++++++++++----
 src/agenda_culturel/templatetags/event_extra.py    |  3 ++-
 src/agenda_culturel/views.py                       | 10 ++++++++--
 8 files changed, 31 insertions(+), 23 deletions(-)
 delete mode 100644 src/agenda_culturel/templates/agenda_culturel/home.html

diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss
index 22c34e1..5020e0a 100644
--- a/src/agenda_culturel/static/style.scss
+++ b/src/agenda_culturel/static/style.scss
@@ -171,7 +171,7 @@ footer {
     overflow: auto;
     .grid {
         grid-template-columns: repeat(auto-fit, minmax(0%, 1fr));
-        min-width: 1200px;
+        min-width: 1500px;
     }
     .grid.week-in-month {
         grid-template-columns: 2.5em repeat(auto-fit, minmax(0%, 1fr));
@@ -212,6 +212,7 @@ footer {
 article.day {
     margin: 0;
     padding: 0 0 0.3em 0;
+    min-height: 12em;
 }
 
 article.day>header {
diff --git a/src/agenda_culturel/templates/agenda_culturel/filter-inc.html b/src/agenda_culturel/templates/agenda_culturel/filter-inc.html
index ab165cf..837ba65 100644
--- a/src/agenda_culturel/templates/agenda_culturel/filter-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/filter-inc.html
@@ -5,7 +5,7 @@
     <details>
 <summary role="button" class="contrast outline">
     {% if filter.is_active %}
-        Filtres&nbsp;: 
+        Filtre&nbsp;: 
         {% for c in filter.get_categories %}
             {{ c | small_cat }}
         {% endfor %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/home.html b/src/agenda_culturel/templates/agenda_culturel/home.html
deleted file mode 100644
index 213d7ed..0000000
--- a/src/agenda_culturel/templates/agenda_culturel/home.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "agenda_culturel/page_event.html" %}
-
-{% block title %}Accueil{% endblock %}
-
-{% block events %}
-<h1>Événements</h1>
-<ul>
-{% for event in object_list %}
-    <li><a href="{{ BASE_URL }}{{ event.get_absolute_url }}">{{ event.start_day|date }} : {{ event.title }}</a></li>
-{% empty %}
-    <li>Il n'y a pas d'événement.</li>
-{% endfor %}
-</ul>
-{% endblock %}
\ No newline at end of file
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-month.html b/src/agenda_culturel/templates/agenda_culturel/page-month.html
index fd3b93e..e4e2439 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-month.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-month.html
@@ -52,6 +52,10 @@
         {% endfor %}
         </div>
     </div>
+    <div>
+        Légende&nbsp;: {% show_legend filter=filter %}
+    </div>
+
 
     <footer>
         {% if calendar.today_in_calendar %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-week.html b/src/agenda_culturel/templates/agenda_culturel/page-week.html
index d489be4..b4b8bc5 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-week.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-week.html
@@ -51,9 +51,13 @@
         {% endfor %}
         </div>
     </div>
+    <div>
+        Légende&nbsp;: {% show_legend filter=filter %}
+    </div>
 
 
     <footer>
+
         {% if calendar.today_in_calendar %}
         <a role="button" href="{% url 'aujourdhui' %}?{{ filter.get_url }}">Aujourd'hui</a>
         {% endif %}
diff --git a/src/agenda_culturel/templatetags/cat_extra.py b/src/agenda_culturel/templatetags/cat_extra.py
index 5453a8c..239af6a 100644
--- a/src/agenda_culturel/templatetags/cat_extra.py
+++ b/src/agenda_culturel/templatetags/cat_extra.py
@@ -89,7 +89,7 @@ def css_categories():
     return mark_safe(result)
 
 @register.filter
-def small_cat(category, url=None, contrast=True, close_url=None):
+def small_cat(category, url=None, contrast=True):
 
     name = Category.default_name if category is None else category.name
     css_class = Category.default_css_class if category is None else category.css_class()
@@ -107,6 +107,12 @@ def circle_cat(category):
     else:
         return mark_safe('<span class="cat ' + category.css_class() + ' circ-cat" data-tooltip="' + category.name + '"></span>')
 
-@register.filter
-def small_cat_close(category, close_url=None, contrast=True):
-    return small_cat(category, close_url=close_url, contrast=contrast)
\ No newline at end of file
+
+@register.simple_tag
+def show_legend(filter):
+    current_url = filter.get_url_without_filters()
+    cats = Category.objects.all()
+    if filter.is_active(only_categories=True):
+        return mark_safe(" ".join([small_cat(c, current_url + "?category=" + str(c.pk) if not filter.is_selected(c) else None, contrast=filter.is_selected(c)) for c in cats]))
+    else:
+        return mark_safe(" ".join([small_cat(c, current_url + "?category=" + str(c.pk)) for c in cats]))
\ No newline at end of file
diff --git a/src/agenda_culturel/templatetags/event_extra.py b/src/agenda_culturel/templatetags/event_extra.py
index f83b7e8..28c3b9c 100644
--- a/src/agenda_culturel/templatetags/event_extra.py
+++ b/src/agenda_culturel/templatetags/event_extra.py
@@ -42,4 +42,5 @@ def show_badges_events():
     if nb_drafts != 0:
         return mark_safe('<a href="' + reverse_lazy("moderation") + '?status=draft" class="badge" data-tooltip="' + str(nb_drafts) + ' brouillon' + pluralize(nb_drafts) + ' à valider">' + picto_from_name("calendar") + " " + str(nb_drafts) + '</a>')
     else:
-        return ""
\ No newline at end of file
+        return ""
+    
\ No newline at end of file
diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py
index 6f0add3..bc83d9a 100644
--- a/src/agenda_culturel/views.py
+++ b/src/agenda_culturel/views.py
@@ -88,8 +88,14 @@ class EventFilter(django_filters.FilterSet):
     def get_tags(self):
         return self.form.cleaned_data["tags"]
 
-    def is_active(self):
-        return len(self.form.cleaned_data["category"]) != 0 or len(self.form.cleaned_data["tags"]) != 0
+    def is_active(self, only_categories=False):
+        if only_categories:
+            return len(self.form.cleaned_data["category"]) != 0
+        else:    
+            return len(self.form.cleaned_data["category"]) != 0 or len(self.form.cleaned_data["tags"]) != 0
+
+    def is_selected(self, cat):
+        return cat in self.form.cleaned_data["category"]
 
 
 def mentions_legales(request):