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