From c91cdf0c999bfb49285a033a23bfbef29e23af8a Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Mon, 9 Dec 2024 22:59:34 +0100 Subject: [PATCH] =?UTF-8?q?On=20ajoute=20la=20ligne=20now=20=C3=A0=20la=20?= =?UTF-8?q?fin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agenda_culturel/calendar.py | 8 ++++++++ .../templates/agenda_culturel/page-week.html | 3 +++ 2 files changed, 11 insertions(+) diff --git a/src/agenda_culturel/calendar.py b/src/agenda_culturel/calendar.py index c80a922..2a5d73b 100644 --- a/src/agenda_culturel/calendar.py +++ b/src/agenda_culturel/calendar.py @@ -117,15 +117,23 @@ class DayInCalendar: if e.start_time is None else e.start_time ) + self.today_night = False if self.is_today(): + self.today_night = True now = timezone.now() nday = now.date() ntime = now.time() + found = False for idx,e in enumerate(self.events): if (nday < e.start_day) or (nday == e.start_day and e.start_time and ntime <= e.start_time): self.events[idx].is_first_after_now = True + found = True break + if found: + self.today_night = False + def is_today_after_events(self): + return self.is_today() and self.today_night def events_by_category_ordered(self): from .models import Category diff --git a/src/agenda_culturel/templates/agenda_culturel/page-week.html b/src/agenda_culturel/templates/agenda_culturel/page-week.html index 2f1db3a..9136e32 100644 --- a/src/agenda_culturel/templates/agenda_culturel/page-week.html +++ b/src/agenda_culturel/templates/agenda_culturel/page-week.html @@ -150,6 +150,9 @@ {% endfor %} + {% if day.is_today_after_events %} +
  • {% now "H:i" %}
  • + {% endif %} {% endif %}