From 4bb91184efba69f67179773eb9df630eae244a23 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Mon, 30 Oct 2023 22:46:47 +0100
Subject: [PATCH] =?UTF-8?q?D=C3=A9but=20d'affichage=20de=20la=20liste=20de?=
 =?UTF-8?q?s=20=C3=A9v=C3=A9nements?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/agenda_culturel/static/css/style.css      | 21 +++++++++++++-
 .../agenda_culturel/page-events.html          | 28 +++++++++++++++++++
 src/agenda_culturel/templatetags/cat_extra.py |  7 +++++
 .../templatetags/event_extra.py               | 11 ++++++++
 src/agenda_culturel/views.py                  | 11 ++++----
 5 files changed, 72 insertions(+), 6 deletions(-)
 create mode 100644 src/agenda_culturel/templatetags/event_extra.py

diff --git a/src/agenda_culturel/static/css/style.css b/src/agenda_culturel/static/css/style.css
index 7f1e3cd..fdc30d7 100644
--- a/src/agenda_culturel/static/css/style.css
+++ b/src/agenda_culturel/static/css/style.css
@@ -34,7 +34,7 @@ span.cat, span.mode {
 }
 
 .mode {
-    background-color: #999;
+    background-color: #CCC;
 }
 
 a.mode:hover {
@@ -63,4 +63,23 @@ a.mode:hover {
 }
 .cat a.close:hover {
     background: #fff;
+}
+
+.small-cat {
+    font-weight: bold;
+    text-decoration: none;
+    font-size: 80%;
+    display: inline-block;
+    padding: 0.1em 0.8em;
+    border-radius: .4em;
+}
+
+.warning-simple {
+    font-style: italic;
+}
+
+.warning {
+    background: #EEE;
+    padding: 1em;
+    border-radius: 1.5em;
 }
\ No newline at end of file
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-events.html b/src/agenda_culturel/templates/agenda_culturel/page-events.html
index d944a28..2befe26 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-events.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-events.html
@@ -5,6 +5,7 @@
 {% load i18n %}
 
 {% load cat_extra %}
+{% load event_extra %}
 
 {% block entete_header %}
     {% css_categories %}
@@ -43,6 +44,33 @@
             {% else %}
             {{ selected_mode | capfirst  }}
             {% endif %}</h2>
+            
+            {% if events %}
+                {% for date in dates %}
+                    
+                <h3>{{ date |date:"DATE_FORMAT" }}</h3>
+                {% with events_date=events|in_date:date %}
+                {% if events_date %}
+                <lu>
+                    {% for event in events_date %}
+                        <li>{% if category %}
+                            {{ event.category | small_cat }}
+                            {% else %}
+                            {% url 'view_mode_cat' selected_mode.name event.category.pk as url_cat %}
+                            {{ event.category | small_cat:url_cat }}
+                            {% endif %} {{ event.title }}
+                        </li>
+                    {% endfor %}
+                </lu>
+                {% else %}
+                <p class="warning-simple">Aucun événement ce jour-là.</p>
+                {% endif %}
+                {% endwith %}
+                {% endfor %}
+            </ul>
+            {% else %}
+            <p class="warning">Aucun événement ne correspond à la recherche.</p>
+            {% endif %}
         {% endblock %}
     </section>
     <footer id="tags">
diff --git a/src/agenda_culturel/templatetags/cat_extra.py b/src/agenda_culturel/templatetags/cat_extra.py
index 37e35e9..4c3080e 100644
--- a/src/agenda_culturel/templatetags/cat_extra.py
+++ b/src/agenda_culturel/templatetags/cat_extra.py
@@ -82,3 +82,10 @@ def css_categories():
 
     result += '</style>'
     return mark_safe(result)
+
+@register.filter
+def small_cat(category, url=None):
+    if url is None:
+        return mark_safe('<span class="small-cat selected ' + category.css_class() + '">' + category.name + "</span>")
+    else:
+        return mark_safe('<a class="small-cat selected ' + category.css_class() + '" href="' + url + '">' + category.name + "</a>")
\ No newline at end of file
diff --git a/src/agenda_culturel/templatetags/event_extra.py b/src/agenda_culturel/templatetags/event_extra.py
new file mode 100644
index 0000000..d0dce34
--- /dev/null
+++ b/src/agenda_culturel/templatetags/event_extra.py
@@ -0,0 +1,11 @@
+from django import template
+from django.utils.safestring import mark_safe
+
+from agenda_culturel.models import Event
+from django.db.models import Q
+
+register = template.Library()
+
+@register.filter
+def in_date(event, date):
+    return event.filter((Q(start_day__lte=date) & Q(end_day__gte=date)) | (Q(end_day=None) & Q(start_day=date)))
diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py
index 6c3f902..45654e9 100644
--- a/src/agenda_culturel/views.py
+++ b/src/agenda_culturel/views.py
@@ -8,6 +8,7 @@ from .models import Event, Category
 from django.utils import timezone
 from enum import StrEnum
 from datetime import datetime, timedelta
+from django.db.models import Q
 
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import activate, get_language_info
@@ -60,17 +61,17 @@ def home(request):
 def view_mode(request, mode):
     categories = Category.objects.all()
     dates = DisplayMode[mode].get_dates()
-    activate("fr")
-    context = {"modes": list(DisplayMode), "selected_mode": DisplayMode[mode], "categories": categories }
-    # TODO: select matching events
+    events = Event.objects.filter(Q(start_day__lte=dates[-1]) & Q(start_day__gte=dates[0])).order_by("start_day", "start_time")
+    context = {"modes": list(DisplayMode), "selected_mode": DisplayMode[mode], "categories": categories, "events": events, "dates": dates}
     return render(request, 'agenda_culturel/page-events.html', context)
 
 
 def view_mode_cat(request, mode, cat_id):
     category = get_object_or_404(Category, pk=cat_id)
     categories = Category.objects.all()
-    # TODO: select matching events
-    context = {"modes": list(DisplayMode), "selected_mode": DisplayMode[mode], "category": category, "categories": categories}
+    dates = DisplayMode[mode].get_dates()
+    events = Event.objects.filter(start_day__lte=dates[-1], start_day__gte=dates[0], category=category).order_by("start_day", "start_time")
+    context = {"modes": list(DisplayMode), "selected_mode": DisplayMode[mode], "category": category, "categories": categories, "events": events, "dates": dates}
     return render(request, 'agenda_culturel/page-events.html', context)