Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added cancelled element to json, used taavis start/end props

Browse source
This commit is contained in:
Sheila Miguez 2014-09-21 21:25:18 -05:00
parent 0ebcc2f124
commit 2b91a7296c
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
symposion/schedule/views.py
View file

@ -175,8 +175,8 @@ def schedule_json(request):
slot_data = { slot_data = {
"room": ", ".join(room["name"] for room in slot.rooms.values()), "room": ", ".join(room["name"] for room in slot.rooms.values()),
"rooms": [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(), "start": slot.start_datetime.isoformat(),
"end": datetime.combine(slot.day.date, slot.end).isoformat(), "end": slot.end_datetime.isoformat(),
"duration": slot.length_in_minutes, "duration": slot.length_in_minutes,
"kind": slot.kind.label, "kind": slot.kind.label,
"section": slot.day.schedule.section.slug, "section": slot.day.schedule.section.slug,
@ -195,6 +195,7 @@ def schedule_json(request):
Site.objects.get_current().domain, Site.objects.get_current().domain,
reverse("schedule_presentation_detail", args=[slot.content.pk]) reverse("schedule_presentation_detail", args=[slot.content.pk])
), ),
"cancelled": slot.content.cancelled,
}) })
else: else:
slot_data.update({ slot_data.update({