From a00587dbd40de5905343c65d88e95d65475eb35f Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Wed, 21 Aug 2013 21:30:26 -0700 Subject: [PATCH] Fixed calendar on air --- UI/Calendar/CalendarView.js | 14 +++++++++----- UI/Calendar/UpcomingItemView.js | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/UI/Calendar/CalendarView.js b/UI/Calendar/CalendarView.js index 4c85e7325..38c3affea 100644 --- a/UI/Calendar/CalendarView.js +++ b/UI/Calendar/CalendarView.js @@ -55,23 +55,23 @@ define( _instance.collection.fetch({ data : { start: startDate, end: endDate }, success: function (calendarCollection) { - _.each(calendarCollection.models, function (element) { + calendarCollection.each(function (element) { var episodeTitle = element.get('title'); var seriesTitle = element.get('series').title; var start = element.get('airDateUtc'); - var statusLevel = _instance.getStatusLevel(element); var runtime = element.get('series').runtime; - var end = Moment(start).add('minutes', runtime); + var end = Moment(start).add('minutes', runtime).toISOString(); + element.set({ title : seriesTitle, episodeTitle: episodeTitle, start : start, end : end, - allDay : false, - statusLevel : statusLevel + allDay : false }); + element.set('statusLevel', _instance.getStatusLevel(element)); element.set('model', element); }); @@ -93,6 +93,10 @@ define( } else if (currentTime.isAfter(start) && currentTime.isBefore(end)) { + var s = start.toISOString(); + var e = end.toISOString(); + var c = currentTime.toISOString(); + statusLevel = 'warning'; } diff --git a/UI/Calendar/UpcomingItemView.js b/UI/Calendar/UpcomingItemView.js index 1419bbb20..b2abd380b 100644 --- a/UI/Calendar/UpcomingItemView.js +++ b/UI/Calendar/UpcomingItemView.js @@ -20,7 +20,7 @@ define( var end = Moment(start).add('minutes', runtime); this.model.set({ - end: end + end: end.toISOString() }) },