Calendar now using EpisodeResource

This commit is contained in:
Mark McDowall 2013-04-30 18:54:15 -07:00
commit 11cef70406
10 changed files with 61 additions and 93 deletions

View file

@ -1,8 +1,8 @@
"use strict";
define(['app', 'Calendar/CalendarModel'], function () {
define(['app', 'Series/EpisodeModel'], function () {
NzbDrone.Calendar.CalendarCollection = Backbone.Collection.extend({
url : NzbDrone.Constants.ApiRoot + '/calendar',
model : NzbDrone.Calendar.CalendarModel,
model : NzbDrone.Series.EpisodeModel,
comparator: function (model) {
return model.get('start');
}

View file

@ -36,7 +36,7 @@ define(['app', 'Calendar/CalendarItemView'], function () {
element.popover({
title : '{seriesTitle} - {season}x{episode} - {episodeTitle}'.assign({
seriesTitle : event.seriesTitle,
seriesTitle : event.title,
season : event.seasonNumber,
episode : event.episodeNumber.pad(2),
episodeTitle: event.episodeTitle
@ -65,6 +65,14 @@ define(['app', 'Calendar/CalendarItemView'], function () {
bbView.calendar.fetch({
data : { start: startDate, end: endDate },
success: function (calendarCollection) {
_.each(calendarCollection.models, function(element) {
var episodeTitle = element.get('title');
var seriesTitle = element.get('series').title;
element.set('title', seriesTitle);
element.set('episodeTitle', episodeTitle);
});
callback(calendarCollection.toJSON());
}
});

View file

@ -3,6 +3,6 @@
<h1>{{day}}</h1>
<h4>{{month}}</h4>
</div>
<h4>{{seriesTitle}}</h4>
<h4>{{series.title}}</h4>
<p>{{startTime}} {{bestDateString}}<span class="pull-right">{{seasonNumber}}x{{paddedEpisodeNumber}}</span><br>{{episodeTitle}}</p>
</div>

View file

@ -1,57 +0,0 @@
"use strict";
define(['app'], function () {
NzbDrone.Calendar.CalendarModel = Backbone.Model.extend({
mutators: {
title : function () {
return this.get('seriesTitle');
},
allDay : function () {
return false;
},
day : function () {
return Date.create(this.get('start')).format('{dd}');
},
month : function () {
return Date.create(this.get('start')).format('{MON}');
},
startTime : function () {
var start = Date.create(this.get('start'));
if (start.format('{mm}') === '00') {
return start.format('{h}{tt}');
}
return start.format('{h}.{mm}{tt}');
},
paddedEpisodeNumber: function () {
return this.get('episodeNumber');
},
statusLevel : function () {
var status = this.get('status');
var currentTime = Date.create();
var start = Date.create(this.get('start'));
var end = Date.create(this.get('end'));
if (currentTime.isBetween(start, end)) {
return 'warning';
}
if (start.isBefore(currentTime) || status === 'Missing') {
return 'danger';
}
if (status === 'Ready') {
return 'success';
}
return 'primary';
},
bestDateString : function () {
return bestDateString(this.get('start'));
}
},
defaults: {
status: 0
}
});
});