From d59f434c0f5b878122b811f19cb87aebe7f99957 Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Mon, 22 Apr 2024 13:03:19 +0200
Subject: [PATCH] =?UTF-8?q?am=C3=A9ioration=20des=20cat=C3=A9gories=20d'un?=
 =?UTF-8?q?=20jour?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/agenda_culturel/models.py                       | 13 ++++++++++---
 .../templates/agenda_culturel/page-day.html         |  9 +++------
 src/agenda_culturel/views.py                        |  7 ++++++-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/agenda_culturel/models.py b/src/agenda_culturel/models.py
index 22cb6bc..0094568 100644
--- a/src/agenda_culturel/models.py
+++ b/src/agenda_culturel/models.py
@@ -83,18 +83,25 @@ class Category(models.Model):
 
         super(Category, self).save(*args, **kwargs)
 
-
-    def get_default_category_id():
+    def get_default_category():
         try:
             default, created = Category.objects.get_or_create(name=Category.default_name,
                 alt_name=Category.default_alt_name,
                 codename=Category.default_codename,
                 color=Category.default_color)
 
-            return default.id
+            return default
         except:
             return None
 
+
+    def get_default_category_id():
+        cat = Category.get_default_category()
+        if cat:
+            return cat.id
+        else:
+            return None
+
     def css_class(self):
         return "cat-" + str(self.id)
 
diff --git a/src/agenda_culturel/templates/agenda_culturel/page-day.html b/src/agenda_culturel/templates/agenda_culturel/page-day.html
index 451a269..0348b3f 100644
--- a/src/agenda_culturel/templates/agenda_culturel/page-day.html
+++ b/src/agenda_culturel/templates/agenda_culturel/page-day.html
@@ -73,17 +73,14 @@
                 {% if events|length == 0 %}
                 <p class="remarque">Il n'y a pas d'événement le {{ day }}</p>
                 {% else %}
-                    {% regroup events by category as events_by_category %}
                     <nav>
                         <ul>
-                        {% for category in events_by_category %}
-                        {% with category.grouper.id|stringformat:"i" as idcat %}
+                        {% for category in categories %}
+                        {% with category.0.name as idcat %}
                             {% with filter.get_url_without_filters|add:"?category="|add:idcat as cat_url %}
-                            {% with category.list|length as nb %}
                                 <li>
-                                    <a class="small-cat contrast selected" role="button" href="{{ cat_url }}"><span class="cat {{ category.grouper.css_class }}"></span>{{ category.grouper.name }}&nbsp;: {{ category.list|length }}</a>
+                                    <a class="small-cat contrast selected" role="button" href="{{ cat_url }}"><span class="cat {{ category.0.css_class }}"></span>{{ idcat }}&nbsp;: {{ category.1 }}</a>
                                 </li>
-                                {% endwith %}
                             {% endwith %}
                         {% endwith %}
                         {% endfor %}
diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py
index d416018..8f5dc93 100644
--- a/src/agenda_culturel/views.py
+++ b/src/agenda_culturel/views.py
@@ -10,6 +10,7 @@ from django.core.exceptions import PermissionDenied
 from django.http import HttpResponseRedirect, HttpResponse, HttpResponseNotFound
 from django.urls import reverse
 import urllib
+from collections import Counter
 
 from .forms import EventSubmissionForm, EventForm, BatchImportationForm, FixDuplicates, SelectEventInList, MergeDuplicates, RecurrentImportForm, CategorisationRuleImportForm, ModerationQuestionForm, ModerationAnswerForm, ModerateForm, CategorisationForm
 
@@ -201,7 +202,11 @@ def day_view(request, year = None, month = None, day = None):
     filter = EventFilter(request.GET, get_event_qs(request), request=request)
     cday = CalendarDay(day, filter)
 
-    context = {"day": day, "events": cday.get_events(), "filter": filter}
+    categories = Counter([e.category if e.category is not None else Category.get_default_category() for e in cday.get_events()])
+    categories = [(k, v) for k, v in categories.items()]
+    categories.sort(key=lambda k: -k[1])
+
+    context = {"day": day, "events": cday.get_events(), "filter": filter, "categories": categories}
     return render(request, 'agenda_culturel/page-day.html', context)