From f309ad6ce34e1cd794065c8ccd639957814fd3e2 Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Sat, 18 Jan 2025 17:39:49 +0100 Subject: [PATCH] =?UTF-8?q?On=20ne=20garde=20que=20les=20=C3=A9v=C3=A9neme?= =?UTF-8?q?nts=20futurs=20pour=20le=20badge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agenda_culturel/templatetags/event_extra.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/agenda_culturel/templatetags/event_extra.py b/src/agenda_culturel/templatetags/event_extra.py index 5167b7e..111a032 100644 --- a/src/agenda_culturel/templatetags/event_extra.py +++ b/src/agenda_culturel/templatetags/event_extra.py @@ -69,9 +69,12 @@ def picto_visibility(event, visible=True): @register.simple_tag def show_badge_moderate(): first_day = datetime.now() - last_day = first_day + timedelta(days=7) + start_day = first_day.date() + start_time = first_day.time() + last_day = start_day + timedelta(days=7) nb = Event.objects.filter(~Q(status=Event.STATUS.TRASH)). \ - filter(Q(start_day__gte=first_day)&Q(start_day__lte=last_day)). \ + filter(Q(start_day__lte=last_day)). \ + filter(Q(start_day__gt=start_day)|(Q(start_day=start_day) & (Q(start_time__isnull=True)|Q(start_time__gt=start_time)))). \ filter(moderated_date__isnull=True). \ filter( Q(other_versions__isnull=True) |