From 417e8151154d2848112fda9374fb2bb25b9c1857 Mon Sep 17 00:00:00 2001
From: Felix Blanke <info@fblanke.de>
Date: Thu, 23 Jan 2025 16:55:06 +0100
Subject: [PATCH] Add other slots of same AK to conflict list
---
AKModel/models.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/AKModel/models.py b/AKModel/models.py
index 267f0bb0..7cca95c1 100644
--- a/AKModel/models.py
+++ b/AKModel/models.py
@@ -955,6 +955,7 @@ class AKSlot(models.Model):
conflict_slots = AKSlot.objects.filter(ak__in=self.ak.conflicts.all())
dependency_slots = AKSlot.objects.filter(ak__in=self.ak.prerequisites.all())
+ other_ak_slots = AKSlot.objects.filter(ak=self.ak).exclude(pk=self.pk)
ceil_offet_eps = decimal.Decimal(1e-4)
@@ -963,7 +964,9 @@ class AKSlot(models.Model):
"id": str(self.pk),
"duration": math.ceil(self.duration * self.slots_in_an_hour - ceil_offet_eps),
"properties": {
- "conflicts": [str(conflict.pk) for conflict in conflict_slots.all()],
+ "conflicts":
+ [str(conflict.pk) for conflict in conflict_slots.all()]
+ + [str(second_slot.pk) for second_slot in other_ak_slots.all()],
"dependencies": [str(dep.pk) for dep in dependency_slots.all()],
},
"room_constraints": [constraint.name
--
GitLab