From 09297a8ca040c63395d2a2377c6a634f39867763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Mon, 11 May 2020 01:48:58 +0200
Subject: [PATCH 1/3] Restrict AKWall to dates belonging to the corresponding
event
---
AKPlan/views.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/AKPlan/views.py b/AKPlan/views.py
index f96a9726..cc33ebd2 100644
--- a/AKPlan/views.py
+++ b/AKPlan/views.py
@@ -60,8 +60,11 @@ class PlanScreenView(PlanIndexView):
def get_queryset(self):
# Determine interesting range (some hours ago until some hours in the future as specified in the settings)
- self.start = datetime.now().astimezone(self.event.timezone) - timedelta(hours=settings.PLAN_WALL_HOURS_RETROSPECT)
- self.end = self.start + timedelta(hours=(settings.PLAN_WALL_HOURS_RETROSPECT + settings.PLAN_WALL_HOURS_FUTURE))
+ if self.event.start < datetime.now().astimezone(self.event.timezone) < self.event.end:
+ self.start = datetime.now().astimezone(self.event.timezone) - timedelta(hours=settings.PLAN_WALL_HOURS_RETROSPECT)
+ else:
+ self.start = self.event.start
+ self.end = self.event.end
# Restrict AK slots to relevant ones
# This will automatically filter all rooms not needed for the selected range in the orginal get_context method
--
GitLab
From 3be4dac966956d76366752a858972a440b46da24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Mon, 11 May 2020 01:53:44 +0200
Subject: [PATCH 2/3] Calculate current timezone-aware time only once in AKWall
view
---
AKPlan/views.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/AKPlan/views.py b/AKPlan/views.py
index cc33ebd2..b8dca7ea 100644
--- a/AKPlan/views.py
+++ b/AKPlan/views.py
@@ -60,8 +60,9 @@ class PlanScreenView(PlanIndexView):
def get_queryset(self):
# Determine interesting range (some hours ago until some hours in the future as specified in the settings)
- if self.event.start < datetime.now().astimezone(self.event.timezone) < self.event.end:
- self.start = datetime.now().astimezone(self.event.timezone) - timedelta(hours=settings.PLAN_WALL_HOURS_RETROSPECT)
+ now = datetime.now().astimezone(self.event.timezone)
+ if self.event.start < now < self.event.end:
+ self.start = now - timedelta(hours=settings.PLAN_WALL_HOURS_RETROSPECT)
else:
self.start = self.event.start
self.end = self.event.end
--
GitLab
From 062ceb9e3b5600cd431b8a89d7e3cc103a044798 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Mon, 11 May 2020 01:55:20 +0200
Subject: [PATCH 3/3] Remove obsolete AKWall setting
---
AKPlanning/settings.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/AKPlanning/settings.py b/AKPlanning/settings.py
index 621abaaa..90d06a00 100644
--- a/AKPlanning/settings.py
+++ b/AKPlanning/settings.py
@@ -161,7 +161,6 @@ FOOTER_INFO = {
PLAN_MAX_NEXT_AKS = 10
# Specify range of plan for screen/projector view
PLAN_WALL_HOURS_RETROSPECT = 3
-PLAN_WALL_HOURS_FUTURE = 18
# Should the plan use a hierarchy of buildings and rooms?
PLAN_SHOW_HIERARCHY = True
# For which time (in seconds) should changes of akslots be highlighted in plan?
--
GitLab