diff --git a/AKModel/views/ak.py b/AKModel/views/ak.py index b8b55ee8244b3e1d2251f74f1891064d03ca9b03..611cd619f9cad82c96ef212f6c047ac3fe46f359 100644 --- a/AKModel/views/ak.py +++ b/AKModel/views/ak.py @@ -86,9 +86,9 @@ class AKJSONExportView(AdminViewMixin, FilterByEventSlugMixin, ListView): } ak_fixed = { - ak: values.get() - for ak in ak_availabilities.keys() - if (values := AKSlot.objects.select_related().filter(ak__pk=ak, fixed=True)).exists() + ak_id: values.get() + for ak_id in ak_availabilities.keys() + if (values := AKSlot.objects.select_related().filter(ak__pk=ak_id, fixed=True)).exists() } def _test_slot_contained(slot: Availability, availabilities: List[Availability]) -> bool: @@ -97,11 +97,11 @@ class AKJSONExportView(AdminViewMixin, FilterByEventSlugMixin, ListView): def _test_event_covered(slot: Availability, availabilities: List[Availability]) -> bool: return not Availability.is_event_covered(self.event, availabilities) - def _test_fixed_ak(ak, slot) -> bool: - if not ak in ak_fixed: + def _test_fixed_ak(ak_id, slot: Availability) -> bool: + if not ak_id in ak_fixed: return False - fixed_slot = Availability(self.event, start=ak_fixed[ak].start, end=ak_fixed[ak].end) + fixed_slot = Availability(self.event, start=ak_fixed[ak_id].start, end=ak_fixed[ak_id].end) return fixed_slot.overlaps(slot, strict=True) def _test_add_constraint(slot: Availability, availabilities: List[Availability]) -> bool: @@ -118,17 +118,17 @@ class AKJSONExportView(AdminViewMixin, FilterByEventSlugMixin, ListView): if self.event.reso_deadline is None or slot.end < self.event.reso_deadline: constraints.append("resolution") - for ak, availabilities in ak_availabilities.items(): - if _test_add_constraint(slot, availabilities) or _test_fixed_ak(ak, slot): - constraints.append(f"availability-ak-{ak}") + for ak_id, availabilities in ak_availabilities.items(): + if _test_add_constraint(slot, availabilities) or _test_fixed_ak(ak_id, slot): + constraints.append(f"availability-ak-{ak_id}") - for person, availabilities in person_availabilities.items(): + for person_id, availabilities in person_availabilities.items(): if _test_add_constraint(slot, availabilities): - constraints.append(f"availability-person-{person}") + constraints.append(f"availability-person-{person_id}") - for person, availabilities in room_availabilities.items(): + for room_id, availabilities in room_availabilities.items(): if _test_add_constraint(slot, availabilities): - constraints.append(f"availability-room-{room}") + constraints.append(f"availability-room-{room_id}") current_block.append({ "id": str(slot_index),