From 18441aca03404ddc58e9208fa028015f87f181c9 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 3 Jun 2013 23:10:41 -0700 Subject: [PATCH] end added to EpisodeModel --- UI/Calendar/CalendarCollectionView.js | 2 -- UI/Series/EpisodeModel.js | 12 +++++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/UI/Calendar/CalendarCollectionView.js b/UI/Calendar/CalendarCollectionView.js index 85a837bbc..db35886a2 100644 --- a/UI/Calendar/CalendarCollectionView.js +++ b/UI/Calendar/CalendarCollectionView.js @@ -70,12 +70,10 @@ define(['app', 'Calendar/CalendarItemView'], function () { var episodeTitle = element.get('title'); var seriesTitle = element.get('series').title; var start = element.get('airDate'); - var end = element.get('endTime'); element.set('title', seriesTitle); element.set('episodeTitle', episodeTitle); element.set('start', start); - element.set('end', end); element.set('allDay', false); }); diff --git a/UI/Series/EpisodeModel.js b/UI/Series/EpisodeModel.js index c8f017b5c..a5b45d122 100644 --- a/UI/Series/EpisodeModel.js +++ b/UI/Series/EpisodeModel.js @@ -24,17 +24,23 @@ define(['app'], function () { return start.format('{h}.{mm}{tt}'); }, + end : function () { + var start = Date.create(this.get('airDate')); + var runtime = this.get('series').runtime; + + return start.addMinutes(runtime); + }, statusLevel : function () { - var status = this.get('status'); + var episodeFileId = this.get('episodeFileId'); var currentTime = Date.create(); - var start = Date.create(this.get('start')); + var start = Date.create(this.get('airDate')); var end = Date.create(this.get('end')); if (currentTime.isBetween(start, end)) { return 'warning'; } - if (start.isBefore(currentTime) || status === 'Missing') { + if (start.isBefore(currentTime) && episodeFileId === 0) { return 'danger'; }