added cancelled element to json, used taavis start/end props
This commit is contained in:
parent
0ebcc2f124
commit
2b91a7296c
1 changed files with 3 additions and 2 deletions
|
@ -175,8 +175,8 @@ def schedule_json(request):
|
|||
slot_data = {
|
||||
"room": ", ".join(room["name"] for room in slot.rooms.values()),
|
||||
"rooms": [room["name"] for room in slot.rooms.values()],
|
||||
"start": datetime.combine(slot.day.date, slot.start).isoformat(),
|
||||
"end": datetime.combine(slot.day.date, slot.end).isoformat(),
|
||||
"start": slot.start_datetime.isoformat(),
|
||||
"end": slot.end_datetime.isoformat(),
|
||||
"duration": slot.length_in_minutes,
|
||||
"kind": slot.kind.label,
|
||||
"section": slot.day.schedule.section.slug,
|
||||
|
@ -195,6 +195,7 @@ def schedule_json(request):
|
|||
Site.objects.get_current().domain,
|
||||
reverse("schedule_presentation_detail", args=[slot.content.pk])
|
||||
),
|
||||
"cancelled": slot.content.cancelled,
|
||||
})
|
||||
else:
|
||||
slot_data.update({
|
||||
|
|
Loading…
Reference in a new issue