Skip to content
Snippets Groups Projects
Commit 7a1c5004 authored by Lorenzo Conti's avatar Lorenzo Conti
Browse files

Merge branch 'feature/ak-conflict-dependency' into 'main'

Implement export of AK conflicts and dependencies

See merge request !9
parents bb1179c7 c420f00e
No related branches found
No related tags found
5 merge requests!262[WIP] compatibility with koma solver import/export,!261[WIP] compatibility with koma solver import/export,!260[WIP] import/export merge,!237Draft: add tests on json export,!235Merge fork for interoperability of KoMa solver
This commit is part of merge request !235. Comments created here will be created in the context of that merge request.
......@@ -953,13 +953,19 @@ 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())
ceil_offet_eps = decimal.Decimal(1e-4)
# self.slots_in_an_hour is set in AKJSONExportView
data = {
"id": str(self.pk),
"duration": math.ceil(self.duration * self.slots_in_an_hour - ceil_offet_eps),
"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 [],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment