From 3213fb576a0aec19527f44237fbcfe4b65af6f29 Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jans.tuomi@gmail.com>
Date: Thu, 29 Feb 2024 16:14:57 +0200
Subject: Show end datetime if not the same date

---
 db.py                             |  3 +++
 templates/poll_vote_list.html.j2  | 15 ++++++++++++++-
 templates/poll_vote_table.html.j2 | 14 +++++++++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/db.py b/db.py
index 42680cb..f660d94 100644
--- a/db.py
+++ b/db.py
@@ -70,6 +70,9 @@ class Choice:
   def end_datetime_notz(self):
     return self.end_datetime.replace(tzinfo=None)
 
+  def ends_on_same_day(self):
+    return self.start_datetime.date() == self.end_datetime.date()
+
 @dataclass
 class Poll:
   id: str
diff --git a/templates/poll_vote_list.html.j2 b/templates/poll_vote_list.html.j2
index 2170d40..c18b3e0 100644
--- a/templates/poll_vote_list.html.j2
+++ b/templates/poll_vote_list.html.j2
@@ -9,7 +9,20 @@
           {% if now.year != choice.start_datetime.year %}.{{choice.start_datetime.year}}{% endif %}
         </span>
         <span>
-          {{ choice.start_datetime.strftime("%H:%M") }} &ndash; {{ choice.end_datetime.strftime("%H:%M") }}
+          {{ choice.start_datetime.strftime("%H:%M") }}
+        </span>
+        <span>&mdash;</span>
+        {% if not choice.ends_on_same_day() %}
+        <span>
+          {{ choice.end_datetime.strftime("%a %d.%m") }}
+        </span>
+        <span>
+          {% if now.year != choice.end_datetime.year %}.{{choice.end_datetime.year}}{% endif %}
+        </span>
+        {% endif %}
+        <span>
+        {{ choice.end_datetime.strftime("%H:%M") }}
+        </span>
         </span>
       </strong>
       <span>
diff --git a/templates/poll_vote_table.html.j2 b/templates/poll_vote_table.html.j2
index 072d17a..cfa336a 100644
--- a/templates/poll_vote_table.html.j2
+++ b/templates/poll_vote_table.html.j2
@@ -8,7 +8,19 @@
         {% if now.year != choice.start_datetime.year %}.{{choice.start_datetime.year}}{% endif %}
       </span>
       <span>
-        {{ choice.start_datetime.strftime("%H:%M") }} &ndash; {{ choice.end_datetime.strftime("%H:%M") }}
+        {{ choice.start_datetime.strftime("%H:%M") }}
+      </span>
+      <span>&mdash;</span>
+      {% if not choice.ends_on_same_day() %}
+      <span>
+        {{ choice.end_datetime.strftime("%a %d.%m") }}
+      </span>
+      <span>
+        {% if now.year != choice.end_datetime.year %}.{{choice.end_datetime.year}}{% endif %}
+      </span>
+      {% endif %}
+      <span>
+        {{ choice.end_datetime.strftime("%H:%M") }}
       </span>
       <span>
         <i>{{ choice.votes | length }} votes</i>
-- 
cgit v1.3