mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed calendar on air

This commit is contained in:
Mark McDowall 2013-08-21 21:30:26 -07:00
parent 0208ae8347
commit a00587dbd4
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
UI/Calendar/CalendarView.js
View File

@ -55,23 +55,23 @@ define(
_instance.collection.fetch({ _instance.collection.fetch({
data : { start: startDate, end: endDate }, data : { start: startDate, end: endDate },
success: function (calendarCollection) { success: function (calendarCollection) {
_.each(calendarCollection.models, function (element) { calendarCollection.each(function (element) {
var episodeTitle = element.get('title'); var episodeTitle = element.get('title');
var seriesTitle = element.get('series').title; var seriesTitle = element.get('series').title;
var start = element.get('airDateUtc'); var start = element.get('airDateUtc');
var statusLevel = _instance.getStatusLevel(element);
var runtime = element.get('series').runtime; var runtime = element.get('series').runtime;
var end = Moment(start).add('minutes', runtime); var end = Moment(start).add('minutes', runtime).toISOString();
element.set({ element.set({
title : seriesTitle, title : seriesTitle,
episodeTitle: episodeTitle, episodeTitle: episodeTitle,
start : start, start : start,
end : end, end : end,
allDay : false, allDay : false
statusLevel : statusLevel
}); });
element.set('statusLevel', _instance.getStatusLevel(element));
element.set('model', element); element.set('model', element);
}); });
@ -93,6 +93,10 @@ define(
} }
else if (currentTime.isAfter(start) && currentTime.isBefore(end)) { else if (currentTime.isAfter(start) && currentTime.isBefore(end)) {
var s = start.toISOString();
var e = end.toISOString();
var c = currentTime.toISOString();
statusLevel = 'warning'; statusLevel = 'warning';
} }

2
UI/Calendar/UpcomingItemView.js
View File

@ -20,7 +20,7 @@ define(
var end = Moment(start).add('minutes', runtime); var end = Moment(start).add('minutes', runtime);
this.model.set({ this.model.set({
end: end end: end.toISOString()
}) })
}, },