From ec1694fc844e2cacc61eba5369f0f13f79ec8053 Mon Sep 17 00:00:00 2001 From: Edward Betts Date: Sun, 29 Oct 2023 16:08:17 +0000 Subject: [PATCH] Show time and timezone in separate columns --- agenda/types.py | 18 ++++++++++++++++++ templates/index.html | 9 ++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/agenda/types.py b/agenda/types.py index a668a64..a2890bb 100644 --- a/agenda/types.py +++ b/agenda/types.py @@ -32,6 +32,24 @@ class Event: self.date.date() if isinstance(self.date, datetime.datetime) else self.date ) + @property + def display_time(self) -> str | None: + """Time for display on web page.""" + return ( + self.date.strftime("%H:%M") + if isinstance(self.date, datetime.datetime) + else None + ) + + @property + def display_timezone(self) -> str | None: + """Timezone for display on web page.""" + return ( + self.date.strftime("%z") + if isinstance(self.date, datetime.datetime) + else None + ) + def delta_days(self, today: datetime.date) -> str: """Return number of days from today as a string.""" delta = (self.as_date - today).days diff --git a/templates/index.html b/templates/index.html index 62147c5..33ebeb6 100644 --- a/templates/index.html +++ b/templates/index.html @@ -61,8 +61,15 @@ {% for event in events %} - {{event.display_date}} + {{event.as_date.strftime("%a, %d, %b %Y")}} + + {{event.display_time or ""}} + + + {{event.display_timezone or ""}} + + {% if event.url %}{% endif %} {{ event_labels.get(event.name) or event.name }}