diff --git a/AKModel/models.py b/AKModel/models.py index e581f00d2679cd7972540eca0d543384ddde1d94..8eae767ae8a393bfcef1cacd9d919464e60cc0f7 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 e45444b94e29350d1d3dfbb0fddaa07cb3d93ff7..bb8886fc114ad380b1fe0aa67baca1239211fad3 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>