diff options
| author | Jan Tuomi <jans.tuomi@gmail.com> | 2024-02-29 16:14:57 +0200 |
|---|---|---|
| committer | Jan Tuomi <jan@jantuomi.fi> | 2024-12-21 19:43:13 +0200 |
| commit | 3213fb576a0aec19527f44237fbcfe4b65af6f29 (patch) | |
| tree | db3ac7ce2c883335cd5bc6d07f51d1b906a79a7d | |
| parent | e02adca954f7689745f69f33f9f5f80174848836 (diff) | |
Show end datetime if not the same date
| -rw-r--r-- | db.py | 3 | ||||
| -rw-r--r-- | templates/poll_vote_list.html.j2 | 15 | ||||
| -rw-r--r-- | templates/poll_vote_table.html.j2 | 14 |
3 files changed, 30 insertions, 2 deletions
@@ -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") }} – {{ choice.end_datetime.strftime("%H:%M") }} + {{ choice.start_datetime.strftime("%H:%M") }} + </span> + <span>—</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") }} – {{ choice.end_datetime.strftime("%H:%M") }} + {{ choice.start_datetime.strftime("%H:%M") }} + </span> + <span>—</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> |