diff --git a/src/agenda_culturel/calendar.py b/src/agenda_culturel/calendar.py index a62e9ac..e9df9ff 100644 --- a/src/agenda_culturel/calendar.py +++ b/src/agenda_culturel/calendar.py @@ -117,6 +117,15 @@ class DayInCalendar: if e.start_time is None else e.start_time ) + if self.is_today(): + now = timezone.now() + nday = now.date() + ntime = now.time() + 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 + break + def events_by_category_ordered(self): from .models import Category diff --git a/src/agenda_culturel/settings/base.py b/src/agenda_culturel/settings/base.py index 646507b..f00aef2 100644 --- a/src/agenda_culturel/settings/base.py +++ b/src/agenda_culturel/settings/base.py @@ -148,7 +148,7 @@ TIME_ZONE = "Europe/Paris" USE_I18N = True -USE_TZ = True +USE_TZ = False LANGUAGES = ( ("fr", _("French")), diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss index 260b4ee..f5abd0a 100644 --- a/src/agenda_culturel/static/style.scss +++ b/src/agenda_culturel/static/style.scss @@ -329,6 +329,7 @@ footer [data-tooltip] { scroll-behavior: smooth; transition-duration: 200ms; + .cat { margin-right: 0; } @@ -1551,4 +1552,20 @@ label.required::after { grid-column: 1 / 3; } } +} + +.line-now { + font-size: 60%; + div { + display: grid; + grid-template-columns: fit-content(2em) auto; + column-gap: .2em; + color: red; + .line { + margin-top: .6em; + border-top: 1px solid red; + } + } + margin-bottom: 0; + } \ No newline at end of file diff --git a/src/agenda_culturel/templates/agenda_culturel/page-week.html b/src/agenda_culturel/templates/agenda_culturel/page-week.html index c078f32..2f1db3a 100644 --- a/src/agenda_culturel/templates/agenda_culturel/page-week.html +++ b/src/agenda_culturel/templates/agenda_culturel/page-week.html @@ -85,6 +85,9 @@ {% if day.events %}