From c4bb86dab454e89a0d15134aa9aba09384a4603a Mon Sep 17 00:00:00 2001
From: Jean-Marie Favreau <j-marie.favreau@uca.fr>
Date: Wed, 20 Nov 2024 13:07:08 +0100
Subject: [PATCH] =?UTF-8?q?on=20trie=20les=20tags=20sur=20les=20=C3=A9v?=
 =?UTF-8?q?=C3=A9nements?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/agenda_culturel/models.py                             | 8 ++++++++
 .../templates/agenda_culturel/categorise_events_form.html | 2 +-
 .../agenda_culturel/single-event/event-elegant-inc.html   | 2 +-
 .../single-event/event-in-flat-list-inc.html              | 2 +-
 .../single-event/event-in-unknown-place-list-inc.html     | 2 +-
 .../agenda_culturel/single-event/event-modal-inc.html     | 2 +-
 .../agenda_culturel/single-event/event-single-inc.html    | 2 +-
 7 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/agenda_culturel/models.py b/src/agenda_culturel/models.py
index 04f2bff..49c1ee8 100644
--- a/src/agenda_culturel/models.py
+++ b/src/agenda_culturel/models.py
@@ -689,6 +689,14 @@ class Event(models.Model):
         verbose_name_plural = _("Events")
         permissions = [("set_duplicated_event", "Can set an event as duplicated")]
 
+    def sorted_tags(self):
+        if self.tags is None:
+            return []
+        else:
+            result = self.tags
+            result.sort(key=lambda x: emoji.demojize(remove_accents(x.lower()), delimiters=('000', '')))
+            return result
+
     def get_all_tags(sort=True):
         cursor = connection.cursor()
         raw_query = """
diff --git a/src/agenda_culturel/templates/agenda_culturel/categorise_events_form.html b/src/agenda_culturel/templates/agenda_culturel/categorise_events_form.html
index dd864cd..f477b8a 100644
--- a/src/agenda_culturel/templates/agenda_culturel/categorise_events_form.html
+++ b/src/agenda_culturel/templates/agenda_culturel/categorise_events_form.html
@@ -55,7 +55,7 @@
                 
                 
                     <p>
-                        {% for tag in event.tags %}
+                        {% for tag in event.sorted_tags %}
                         {{ tag | tag_button }}
                         {% endfor %}
                     </p>
diff --git a/src/agenda_culturel/templates/agenda_culturel/single-event/event-elegant-inc.html b/src/agenda_culturel/templates/agenda_culturel/single-event/event-elegant-inc.html
index 1d3a7a5..7511d29 100644
--- a/src/agenda_culturel/templates/agenda_culturel/single-event/event-elegant-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/single-event/event-elegant-inc.html
@@ -56,7 +56,7 @@
         {% endif %}
         <div class="infos">
             <p>
-                {% for tag in event.tags %}
+                {% for tag in event.sorted_tags %}
                 <a href="{% url 'view_tag' tag|prepare_tag %}" role="button" class="small-cat">{{ tag|tw_highlight }}</a>
                 {% endfor %}
             </p>
diff --git a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html
index c9e569b..b5b6f7f 100644
--- a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-flat-list-inc.html
@@ -36,7 +36,7 @@
     {% if event.tags %}
     <p class="subentry-search">
         {% picto_from_name "tag" %}
-        {% for tag in event.tags %}
+        {% for tag in event.sorted_tags %}
         <a href="{% url 'view_tag' tag|prepare_tag %}">{{ tag|tw_highlight }}</a>
         {% if not forloop.last %}, {% endif %}
         {% endfor %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-unknown-place-list-inc.html b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-unknown-place-list-inc.html
index c5fb096..df86f53 100644
--- a/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-unknown-place-list-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/single-event/event-in-unknown-place-list-inc.html
@@ -38,7 +38,7 @@
     {% if event.tags and event.tags|length > 0 %} 
     <p>
         {% picto_from_name "tag" %}
-        {% for tag in event.tags %}
+        {% for tag in event.sorted_tags %}
         <a href="{% url 'view_tag' tag|prepare_tag %}">{{ tag|tw_highlight }}</a>
         {% if not forloop.last %}, {% endif %}
         {% endfor %}
diff --git a/src/agenda_culturel/templates/agenda_culturel/single-event/event-modal-inc.html b/src/agenda_culturel/templates/agenda_culturel/single-event/event-modal-inc.html
index b8fbcc7..51dfbf2 100644
--- a/src/agenda_culturel/templates/agenda_culturel/single-event/event-modal-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/single-event/event-modal-inc.html
@@ -28,7 +28,7 @@
 
 
     <p>
-        {% for tag in event.tags %}
+        {% for tag in event.sorted_tags %}
         {{ tag | tag_button }}
         {% endfor %}
     </p>
diff --git a/src/agenda_culturel/templates/agenda_culturel/single-event/event-single-inc.html b/src/agenda_culturel/templates/agenda_culturel/single-event/event-single-inc.html
index 18f04e6..f799ad9 100644
--- a/src/agenda_culturel/templates/agenda_culturel/single-event/event-single-inc.html
+++ b/src/agenda_culturel/templates/agenda_culturel/single-event/event-single-inc.html
@@ -65,7 +65,7 @@
         <div class="infos">
 
         <p>
-                {% for tag in event.tags %}
+                {% for tag in event.sorted_tags %}
                 <a href="{% url 'view_tag' tag|prepare_tag %}" role="button" class="small-cat">{{ tag|tw_highlight }}</a>
                 {% endfor %}
             </p>