From 594cc292603625025149b99d5d88b15731b31264 Mon Sep 17 00:00:00 2001
From: Nils Steinger <git@n-st.de>
Date: Sun, 8 Nov 2020 01:37:52 +0100
Subject: [PATCH] Show AK start and end, not just start
---
AKModel/models.py | 9 +++++++++
AKSubmission/templates/AKSubmission/ak_detail.html | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/AKModel/models.py b/AKModel/models.py
index e581f00d..8eae767a 100644
--- a/AKModel/models.py
+++ b/AKModel/models.py
@@ -345,6 +345,15 @@ class AKSlot(models.Model):
return _("Not scheduled yet")
return self.start.astimezone(self.event.timezone).strftime('%a %H:%M')
+ @property
+ def time_simplified(self):
+ """
+ Display start and end time of slot in format weekday + time, e.g. "Fri 14:00 - 15:30"
+ """
+ if self.start is None:
+ return _("Not scheduled yet")
+ return self.start.astimezone(self.event.timezone).strftime('%a %H:%M') + ' - ' + self.end.astimezone(self.event.timezone).strftime('%H:%M')
+
@property
def end(self):
"""
diff --git a/AKSubmission/templates/AKSubmission/ak_detail.html b/AKSubmission/templates/AKSubmission/ak_detail.html
index e45444b9..bb8886fc 100644
--- a/AKSubmission/templates/AKSubmission/ak_detail.html
+++ b/AKSubmission/templates/AKSubmission/ak_detail.html
@@ -187,7 +187,7 @@
<tr>
<td>{{ slot.duration }}</td>
{% if not ak.event.plan_hidden or user.is_staff %}
- <td>{{ slot.start_simplified }}</td>
+ <td>{{ slot.time_simplified }}</td>
<td>
{% if "AKPlan"|check_app_installed and slot.room %}
<a href="{% url 'plan:plan_room' event_slug=ak.event.slug pk=slot.room.pk %}">{{ slot.room }}</a>
--
GitLab