summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
Diffstat (limited to 'program')
-rw-r--r--program/views.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/program/views.py b/program/views.py
index c8796c6..29253c0 100644
--- a/program/views.py
+++ b/program/views.py
@@ -198,11 +198,12 @@ def json_day_schedule(request, year=None, month=None, day=None):
timeslots = TimeSlot.objects.get_24h_timeslots(today)
schedule = []
for ts in timeslots:
+ entry = { 'start': ts.start.strftime('%H:%M:%S'), 'title': ts.programslot.show.name, 'id': -1 }
if ts.programslot.automation_id:
- schedule.append((ts.start.strftime('%H:%M:%S'), ts.programslot.show.name, ts.programslot.automation_id))
+ entry['id'] = ts.programslot.automation_id
elif ts.programslot.show.automation_id:
- schedule.append((ts.start.strftime('%H:%M:%S'), ts.programslot.show.name, ts.programslot.show.automation_id))
- else:
- schedule.append((ts.start.strftime('%H:%M:%S'), ts.programslot.show.name, -1))
+ entry['id'] = ts.programslot.show.automation_id
+
+ schedule.append(entry)
return HttpResponse(json.dumps(schedule, ensure_ascii=False, encoding='utf8').encode('utf8'), content_type="application/json; charset=utf-8")