From 79b07e1665f925e63205047a0b2d79c0fd4192d0 Mon Sep 17 00:00:00 2001
From: Nils Steinger <git@n-st.de>
Date: Sun, 8 Nov 2020 01:43:15 +0100
Subject: [PATCH] Handle AK timeslots that run past midnight
---
AKModel/models.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/AKModel/models.py b/AKModel/models.py
index 8eae767a..ff005a7a 100644
--- a/AKModel/models.py
+++ b/AKModel/models.py
@@ -348,11 +348,17 @@ class AKSlot(models.Model):
@property
def time_simplified(self):
"""
- Display start and end time of slot in format weekday + time, e.g. "Fri 14:00 - 15:30"
+ Display start and end time of slot in format weekday + time, e.g. "Fri 14:00 - 15:30" or "Fri 22:00 - Sat 02:00"
"""
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')
+ result = self.start.astimezone(self.event.timezone).strftime('%a %H:%M')
+ result += ' - '
+ if self.start.astimezone(self.event.timezone).day == self.end.astimezone(self.event.timezone).day:
+ result += self.end.astimezone(self.event.timezone).strftime('%H:%M')
+ else:
+ result += self.end.astimezone(self.event.timezone).strftime('%a %H:%M')
+ return result
@property
def end(self):
--
GitLab