From da403dfcf70d6d853ac459491bdb71002d2f0595 Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Tue, 7 Nov 2023 19:18:33 +0100 Subject: [PATCH] =?UTF-8?q?m=C3=AAme=20ordre=20pour=20le=20jour?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agenda_culturel/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py index c8f264b..c004efb 100644 --- a/src/agenda_culturel/views.py +++ b/src/agenda_culturel/views.py @@ -13,7 +13,7 @@ from django.utils import timezone from enum import StrEnum from datetime import datetime, timedelta, date, time import calendar -from django.db.models import Q +from django.db.models import Q, F from django.urls import reverse_lazy from django.utils.translation import gettext_lazy as _ @@ -248,7 +248,7 @@ def day_view(request, year = None, month = None, day = None): day = date(year, month, day) filter = EventFilter(request.GET, Event.objects.all()) - events = filter.qs.filter(start_day__lte=day, start_day__gte=day).order_by("start_day", "start_time") + events = filter.qs.filter((Q(start_day__lte=day) & (Q(end_day__gte=day)) | Q(start_day=day))).order_by("start_day", F("start_time").desc(nulls_last=True)) context = {"day": day, "events": events, "filter": filter} return render(request, 'agenda_culturel/page-day.html', context)