From 4936365488491d27e907dfdd2d5310f5796a9524 Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Wed, 13 Nov 2024 00:36:14 +0100 Subject: [PATCH] =?UTF-8?q?On=20trie=20les=20entr=C3=A9es=20par=20ordre=20?= =?UTF-8?q?alphab=C3=A9tique=20"robuste"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agenda_culturel/calendar.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/agenda_culturel/calendar.py b/src/agenda_culturel/calendar.py index cd220b5..0727377 100644 --- a/src/agenda_culturel/calendar.py +++ b/src/agenda_culturel/calendar.py @@ -5,6 +5,10 @@ from django.utils import timezone from django.utils.translation import gettext_lazy as _ from django.template.defaultfilters import date as _date +from django.db.models import CharField +from django.db.models.functions import Lower + +CharField.register_lookup(Lower) import logging @@ -238,7 +242,7 @@ class CalendarList: Q(other_versions__isnull=True) | Q(other_versions__representative=F('pk')) | Q(other_versions__representative__isnull=True) - ).order_by("start_time", "title").prefetch_related("exact_location").prefetch_related("category").prefetch_related("other_versions") + ).order_by("start_time", "title__unaccent__lower").prefetch_related("exact_location").prefetch_related("category").prefetch_related("other_versions") firstdate = datetime.fromordinal(self.c_firstdate.toordinal()) if firstdate.tzinfo is None or firstdate.tzinfo.utcoffset(firstdate) is None: