jmtrivial/agenda_culturel
3
2
Fork 0
Code Issues 51 Pull Requests Projects Releases Wiki Activity

même ordre pour le jour

Browse Source
This commit is contained in:
Jean-Marie Favreau 2023-11-07 19:18:33 +01:00
parent 9377be0ae8
commit da403dfcf7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/agenda_culturel/views.py
View File

@ -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)