Skip to content
Snippets Groups Projects
Commit 12bce444 authored by Felix Blanke's avatar Felix Blanke
Browse files

refactor

parent 8ac9cd0b
Branches remove-tags
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
...@@ -86,16 +86,14 @@ class AKJSONExportView(AdminViewMixin, FilterByEventSlugMixin, ListView): ...@@ -86,16 +86,14 @@ class AKJSONExportView(AdminViewMixin, FilterByEventSlugMixin, ListView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
data = {}
rooms = Room.objects.filter(event=self.event)
data["rooms"] = [r.as_json_dict() for r in rooms]
timeslots = { timeslots = {
"info": {"duration": float(self.event.export_slot)}, "info": {"duration": float(self.event.export_slot)},
"blocks": [], "blocks": [],
} }
rooms = Room.objects.filter(event=self.event)
ak_availabilities = { ak_availabilities = {
ak.pk: Availability.union(ak.availabilities.all()) ak.pk: Availability.union(ak.availabilities.all())
for ak in AK.objects.filter(event=self.event).all() for ak in AK.objects.filter(event=self.event).all()
...@@ -188,10 +186,13 @@ class AKJSONExportView(AdminViewMixin, FilterByEventSlugMixin, ListView): ...@@ -188,10 +186,13 @@ class AKJSONExportView(AdminViewMixin, FilterByEventSlugMixin, ListView):
if hasattr(self.event, attr) and getattr(self.event, attr): if hasattr(self.event, attr) and getattr(self.event, attr):
info_dict[attr] = getattr(self.event, attr) info_dict[attr] = getattr(self.event, attr)
data["timeslots"] = timeslots data = {
data["info"] = info_dict "participants": [],
data["participants"] = [] "rooms": [r.as_json_dict() for r in rooms],
data["aks"] = [ak.as_json_dict() for ak in context["slots"]] "timeslots": timeslots,
"info": info_dict,
"aks": [ak.as_json_dict() for ak in context["slots"]],
}
context["json_data_oneline"] = json.dumps(data) context["json_data_oneline"] = json.dumps(data)
context["json_data"] = json.dumps(data, indent=2) context["json_data"] = json.dumps(data, indent=2)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment