From 0a1f09c0862f2b26bd411d12e9ad7a6f376408e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20K=C3=BCnsem=C3=B6ller?=
<jkuensem@physik.uni-bielefeld.de>
Date: Thu, 28 Oct 2021 19:49:05 +0200
Subject: [PATCH] TMSS-605: fix filter for overlap of reservation and SUB times
after merge with master
---
SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py b/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py
index d28d2747f3d..621c1f82ff7 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/models/specification.py
@@ -1699,7 +1699,7 @@ class Reservation(NamedCommon, TemplateSchemaMixin):
active_subs = [x for x in subs if (x.status in [SchedulingUnitBlueprint.Status.OBSERVING.value, SchedulingUnitBlueprint.Status.SCHEDULED.value]
and x.scheduled_on_sky_stop_time >= self.start_time)]
if self.stop_time:
- active_subs = [x for x in active_subs if self.scheduled_on_sky_start_time <= self.stop_time]
+ active_subs = [x for x in active_subs if x.scheduled_on_sky_start_time <= self.stop_time]
# Raise an exception if any of these scheduling units uses a station that shall be reserved
if "resources" in self.specifications_doc and "stations" in self.specifications_doc["resources"]:
--
GitLab