Skip to content
Snippets Groups Projects

AKs with multiple slots in JSON export

Merged Felix Blanke requested to merge feature/multiple-ak-occurrence into main
1 file
+ 5
1
Compare changes
  • Side-by-side
  • Inline
+ 5
1
@@ -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
@@ -976,6 +979,7 @@ class AKSlot(models.Model):
"description": self.ak.description,
"reso": self.ak.reso,
"duration_in_hours": float(self.duration),
"django_ak_id": str(self.ak.pk),
},
}
Loading