From b2a4df5be7943fcadccbbde3cabb64df3fc46f16 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Fri, 3 May 2024 14:48:17 +0200
Subject: [PATCH] =?UTF-8?q?On=20rend=20le=20site=20fonctionnel=20m=C3=AAme?=
 =?UTF-8?q?=20sans=20javascript=20Fix=20#88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/agenda_culturel/day-inc.html            |  4 ++--
 src/agenda_culturel/templatetags/event_extra.py       | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/agenda_culturel/templates/agenda_culturel/day-inc.html b/src/agenda_culturel/templates/agenda_culturel/day-inc.html
index 7de06f3..620dbde 100644
--- a/src/agenda_culturel/templates/agenda_culturel/day-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/day-inc.html
@@ -27,7 +27,7 @@
         <ul>
             {% for category, events in day.events_by_category.items %}
             <li>{{ events.0.category | circle_cat }} 
-                <a href="{{ daytag }}" data-target="{{ daytag }}-category-{{ events.0.category.pk }}" onClick="toggleModal(event)">{{ events | length }} {{ category }}</a></li>
+                <a href="{{ day.date | url_day }}?{{ filter.get_url|add_url_category:events.0.category }}" data-target="{{ daytag }}-category-{{ events.0.category.pk }}" onClick="toggleModal(event)">{{ events | length }} {{ category }}</a></li>
                 <dialog id="{{ daytag }}-category-{{ events.0.category.pk }}">
                     <article>
                         <header>
@@ -66,7 +66,7 @@
             {% if event.start_day == day.date and event.start_time %}
             {{ event.start_time }}
             {% endif %}
-            {{ event|picto_status }} <a href="{{ daytag }}" data-target="event-{{ event.id }}" onClick="toggleModal(event)">{{ event.title }}</a>
+            {{ event|picto_status }} <a href="{{ event.get_absolute_url }}" data-target="event-{{ event.id }}" onClick="toggleModal(event)">{{ event.title }}</a>
             <dialog id="event-{{ event.id }}">
                 {% include "agenda_culturel/single-event/event-modal-inc.html" with event=event filter=filter %}
             </dialog>
diff --git a/src/agenda_culturel/templatetags/event_extra.py b/src/agenda_culturel/templatetags/event_extra.py
index 93bebe8..8bc7ed4 100644
--- a/src/agenda_culturel/templatetags/event_extra.py
+++ b/src/agenda_culturel/templatetags/event_extra.py
@@ -4,7 +4,7 @@ from django.urls import reverse_lazy
 from django.template.defaultfilters import pluralize, linebreaks, urlize
 
 
-from agenda_culturel.models import Event
+from agenda_culturel.models import Event, Category
 from django.db.models import Q
 
 from .utils_extra import picto_from_name
@@ -125,3 +125,12 @@ def field_to_html(field, key):
             return "-"
     else:
         return field
+
+@register.filter
+def add_url_category(url, c):
+    if c is None:
+        return url
+    if url == "":
+        return "category=" + str(c.pk)
+    else:
+        return url + "&category=" + str(c.pk)
\ No newline at end of file