Skip to content
Snippets Groups Projects
Commit 444e2206 authored by Felix Blanke's avatar Felix Blanke Committed by Lorenzo Conti
Browse files

Expand block info in JSON export

parent 6ad0b9f9
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,!259Add view to clear schedule,!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.
Hide whitespace changes
Inline Side-by-side
AKModel/tests/test_json_export.py
+ 125
− 62
Edit View file @ 444e2206
...@@ -248,7 +248,7 @@ class JSONExportTest(TestCase): ...@@ -248,7 +248,7 @@ class JSONExportTest(TestCase):
) )
self.assertEqual( self.assertEqual(
self.export_dict["timeslots"]["info"].keys(), self.export_dict["timeslots"]["info"].keys(),
{"duration"}, {"duration", "blocknames"},
"timeslot info keys not as expected", "timeslot info keys not as expected",
) )
self._check_type( self._check_type(
...@@ -257,6 +257,21 @@ class JSONExportTest(TestCase): ...@@ -257,6 +257,21 @@ class JSONExportTest(TestCase):
"info/duration", "info/duration",
item=item, item=item,
) )
self._check_lst(
self.export_dict["timeslots"]["info"]["blocknames"],
"info/blocknames",
item=item,
contained_type=list,
)
for blockname in self.export_dict["timeslots"]["info"]["blocknames"]:
self.assertEqual(len(blockname), 2)
self._check_lst(
blockname,
"info/blocknames/entry",
item=item,
contained_type=str,
)
self._check_lst( self._check_lst(
self.export_dict["timeslots"]["blocks"], self.export_dict["timeslots"]["blocks"],
"blocks", "blocks",
...@@ -710,72 +725,120 @@ class JSONExportTest(TestCase): ...@@ -710,72 +725,120 @@ class JSONExportTest(TestCase):
self.set_up_event(event=event) self.set_up_event(event=event)
cat_avails = self._get_cat_availability() cat_avails = self._get_cat_availability()
for timeslot in chain.from_iterable( num_blocks = len(self.export_dict["timeslots"]["blocks"])
for block_idx, block in enumerate(
self.export_dict["timeslots"]["blocks"] self.export_dict["timeslots"]["blocks"]
): ):
start, end = self._get_timeslot_start_end(timeslot) for timeslot in block:
timeslot_avail = Availability( start, end = self._get_timeslot_start_end(timeslot)
event=self.event, start=start, end=end timeslot_avail = Availability(
) event=self.event, start=start, end=end
)
fulfilled_time_constraints = set()
# reso deadline fulfilled_time_constraints = set()
if self.event.reso_deadline is not None:
# timeslot ends before deadline # reso deadline
if end < self.event.reso_deadline.astimezone( if self.event.reso_deadline is not None:
self.event.timezone # timeslot ends before deadline
): if end < self.event.reso_deadline.astimezone(
fulfilled_time_constraints.add("resolution") self.event.timezone
):
# add category constraints fulfilled_time_constraints.add("resolution")
fulfilled_time_constraints |= (
AKCategory.create_category_constraints( # add category constraints
[ fulfilled_time_constraints |= (
cat AKCategory.create_category_constraints(
for cat in AKCategory.objects.filter( [
event=self.event cat
).all() for cat in AKCategory.objects.filter(
if timeslot_avail.is_covered(cat_avails[cat.name]) event=self.event
] ).all()
if timeslot_avail.is_covered(cat_avails[cat.name])
]
)
) )
)
# add owner constraints # add owner constraints
fulfilled_time_constraints |= { fulfilled_time_constraints |= {
f"availability-person-{owner.id}" f"availability-person-{owner.id}"
for owner in AKOwner.objects.filter(event=self.event).all() for owner in AKOwner.objects.filter(event=self.event).all()
if self._is_restricted_and_contained_slot( if self._is_restricted_and_contained_slot(
timeslot_avail, timeslot_avail,
Availability.union(owner.availabilities.all()), Availability.union(owner.availabilities.all()),
)
}
# add room constraints
fulfilled_time_constraints |= {
f"availability-room-{room.id}"
for room in self.rooms
if self._is_restricted_and_contained_slot(
timeslot_avail,
Availability.union(room.availabilities.all()),
)
}
# add ak constraints
fulfilled_time_constraints |= {
f"availability-ak-{ak.id}"
for ak in AK.objects.filter(event=event)
if self._is_restricted_and_contained_slot(
timeslot_avail,
Availability.union(ak.availabilities.all()),
)
}
fulfilled_time_constraints |= {
f"fixed-akslot-{slot.id}"
for slot in self.ak_slots
if self._is_ak_fixed_in_slot(slot, timeslot_avail)
}
fulfilled_time_constraints |= {
f"notblock{idx}"
for idx in range(num_blocks)
if idx != block_idx
}
self.assertEqual(
fulfilled_time_constraints,
set(timeslot["fulfilled_time_constraints"]),
) )
}
def test_timeslots_info(self):
# add room constraints """Test timeslots info dict"""
fulfilled_time_constraints |= { for event in Event.objects.all():
f"availability-room-{room.id}" with self.subTest(event=event):
for room in self.rooms self.set_up_event(event=event)
if self._is_restricted_and_contained_slot(
timeslot_avail, self.assertAlmostEqual(
Availability.union(room.availabilities.all()), self.export_dict["timeslots"]["info"]["duration"],
float(self.event.export_slot),
)
block_names = []
for block in self.export_dict["timeslots"]["blocks"]:
if not block:
continue
block_start, _ = self._get_timeslot_start_end(block[0])
_, block_end = self._get_timeslot_start_end(block[-1])
start_day = block_start.strftime("%A, %d. %b")
if block_start.date() == block_end.date():
# same day
time_str = (
block_start.strftime("%H:%M")
+ " – "
+ block_end.strftime("%H:%M")
) )
} else:
# different days
# add ak constraints time_str = (
fulfilled_time_constraints |= { block_start.strftime("%a %H:%M")
f"availability-ak-{ak.id}" + " – "
for ak in AK.objects.filter(event=event) + block_end.strftime("%a %H:%M")
if self._is_restricted_and_contained_slot(
timeslot_avail, Availability.union(ak.availabilities.all())
) )
} block_names.append([start_day, time_str])
fulfilled_time_constraints |= { self.assertEqual(
f"fixed-akslot-{slot.id}" block_names, self.export_dict["timeslots"]["info"]["blocknames"]
for slot in self.ak_slots )
if self._is_ak_fixed_in_slot(slot, timeslot_avail)
}
self.assertEqual(
fulfilled_time_constraints,
set(timeslot["fulfilled_time_constraints"]),
)
AKModel/views/ak.py
+ 25
− 2
Edit View file @ 444e2206
import json import json
from datetime import datetime
from typing import List from typing import List
from django.contrib import messages from django.contrib import messages
...@@ -109,11 +110,30 @@ class AKJSONExportView(AdminViewMixin, FilterByEventSlugMixin, ListView): ...@@ -109,11 +110,30 @@ class AKJSONExportView(AdminViewMixin, FilterByEventSlugMixin, ListView):
for person in AKOwner.objects.filter(event=self.event) for person in AKOwner.objects.filter(event=self.event)
} }
blocks = self.event.discretize_timeslots() blocks = list(self.event.discretize_timeslots())
for block in blocks: block_names = []
for block_idx, block in enumerate(blocks):
current_block = [] current_block = []
if not block:
continue
block_start = block[0].avail.start.astimezone(self.event.timezone)
block_end = block[-1].avail.end.astimezone(self.event.timezone)
start_day = block_start.strftime("%A, %d. %b")
if block_start.date() == block_end.date():
# same day
time_str = block_start.strftime("%H:%M") + " – " + block_end.strftime("%H:%M")
else:
# different days
time_str = block_start.strftime("%a %H:%M") + " – " + block_end.strftime("%a %H:%M")
block_names.append([start_day, time_str])
block_timeconstraints = [f"notblock{idx}" for idx in range(len(blocks)) if idx != block_idx]
for timeslot in block: for timeslot in block:
time_constraints = [] time_constraints = []
# if reso_deadline is set and timeslot ends before it, # if reso_deadline is set and timeslot ends before it,
...@@ -145,6 +165,7 @@ class AKJSONExportView(AdminViewMixin, FilterByEventSlugMixin, ListView): ...@@ -145,6 +165,7 @@ class AKJSONExportView(AdminViewMixin, FilterByEventSlugMixin, ListView):
]) ])
time_constraints.extend(timeslot.constraints) time_constraints.extend(timeslot.constraints)
time_constraints.extend(block_timeconstraints)
current_block.append({ current_block.append({
"id": str(timeslot.idx), "id": str(timeslot.idx),
...@@ -157,6 +178,8 @@ class AKJSONExportView(AdminViewMixin, FilterByEventSlugMixin, ListView): ...@@ -157,6 +178,8 @@ class AKJSONExportView(AdminViewMixin, FilterByEventSlugMixin, ListView):
timeslots["blocks"].append(current_block) timeslots["blocks"].append(current_block)
timeslots["info"]["blocknames"] = block_names
context["timeslots"] = json.dumps(timeslots) context["timeslots"] = json.dumps(timeslots)
info_dict = { info_dict = {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment