Skip to content

Commit c5b6735

Browse files
committed
Render extra downloads for other versions
Closes #133
1 parent 60f88c6 commit c5b6735

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

app/controllers/crate/index.js

+11-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export default Ember.ObjectController.extend({
136136
});
137137
},
138138

139-
renderChart: function(downloads) {
139+
renderChart: function(downloads, extra) {
140140
var dates = {};
141141
var versions = [];
142142
for (var i = 0; i < 90; i++) {
@@ -151,6 +151,13 @@ export default Ember.ObjectController.extend({
151151
dates[key].cnt[version_id] = prev + d.get('downloads');
152152
}
153153
});
154+
extra.forEach(function(d) {
155+
var key = moment(d.date).utc().format('MMM D');
156+
if (dates[key]) {
157+
var prev = dates[key].cnt[null] || 0;
158+
dates[key].cnt[null] = prev + d.downloads;
159+
}
160+
});
154161
if (this.get('requestedVersion')) {
155162
versions.push({
156163
id: this.get('currentVersion.id'),
@@ -162,6 +169,9 @@ export default Ember.ObjectController.extend({
162169
versions.push({id: tmp[i].get('id'), num: tmp[i].get('num')});
163170
}
164171
}
172+
if (extra.length > 0) {
173+
versions.push({ id: null, num: 'Other' });
174+
}
165175

166176
var headers = ['Date'];
167177
versions.sort(function(b) { return b.num; }).reverse();

app/routes/crate/index.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ export default Ember.Route.extend({
5757
return controller.get('model.version_downloads');
5858
}
5959
}).then(function(downloads) {
60+
var meta = controller.store.metadataFor('version_download');
6061
controller.set('fetchingDownloads', false);
61-
controller.send('renderChart', downloads);
62+
controller.send('renderChart', downloads, meta.extra_downloads);
6263
});
6364
},
6465
});

0 commit comments

Comments
 (0)