diff --git a/AKModel/models.py b/AKModel/models.py index d30912d3046b8ce4a874e775398cf7b6afbace81..4c6d61880e6ad3267e76abe0fda61112d86f48b4 100644 --- a/AKModel/models.py +++ b/AKModel/models.py @@ -934,11 +934,17 @@ class AKSlot(models.Model): return [] return [f"availability-person-{owner.pk}"] + conflict_slots = AKSlot.objects.filter(ak__in=self.ak.conflicts.all()) + dependency_slots = AKSlot.objects.filter(ak__in=self.ak.prerequisites.all()) + # self.slots_in_an_hour is set in AKJSONExportView data = { "id": str(self.pk), "duration": round(self.duration * self.slots_in_an_hour), - "properties": {}, + "properties": { + "conflicts": [str(conflict.pk) for conflict in conflict_slots.all()], + "dependencies": [str(dep.pk) for dep in dependency_slots.all()], + }, "room_constraints": [constraint.name for constraint in self.ak.requirements.all()], "time_constraints": ["resolution"] if self.ak.reso else [],