File tree 2 files changed +13
-2
lines changed
2 files changed +13
-2
lines changed Original file line number Diff line number Diff line change @@ -136,7 +136,7 @@ export default Ember.ObjectController.extend({
136
136
} ) ;
137
137
} ,
138
138
139
- renderChart : function ( downloads ) {
139
+ renderChart : function ( downloads , extra ) {
140
140
var dates = { } ;
141
141
var versions = [ ] ;
142
142
for ( var i = 0 ; i < 90 ; i ++ ) {
@@ -151,6 +151,13 @@ export default Ember.ObjectController.extend({
151
151
dates [ key ] . cnt [ version_id ] = prev + d . get ( 'downloads' ) ;
152
152
}
153
153
} ) ;
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
+ } ) ;
154
161
if ( this . get ( 'requestedVersion' ) ) {
155
162
versions . push ( {
156
163
id : this . get ( 'currentVersion.id' ) ,
@@ -162,6 +169,9 @@ export default Ember.ObjectController.extend({
162
169
versions . push ( { id : tmp [ i ] . get ( 'id' ) , num : tmp [ i ] . get ( 'num' ) } ) ;
163
170
}
164
171
}
172
+ if ( extra . length > 0 ) {
173
+ versions . push ( { id : null , num : 'Other' } ) ;
174
+ }
165
175
166
176
var headers = [ 'Date' ] ;
167
177
versions . sort ( function ( b ) { return b . num ; } ) . reverse ( ) ;
Original file line number Diff line number Diff line change @@ -57,8 +57,9 @@ export default Ember.Route.extend({
57
57
return controller . get ( 'model.version_downloads' ) ;
58
58
}
59
59
} ) . then ( function ( downloads ) {
60
+ var meta = controller . store . metadataFor ( 'version_download' ) ;
60
61
controller . set ( 'fetchingDownloads' , false ) ;
61
- controller . send ( 'renderChart' , downloads ) ;
62
+ controller . send ( 'renderChart' , downloads , meta . extra_downloads ) ;
62
63
} ) ;
63
64
} ,
64
65
} ) ;
You can’t perform that action at this time.
0 commit comments