Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- a/jsapp/components/author/charts/reports_chart.js
- +++ b/jsapp/components/author/charts/reports_chart.js
- @@ -122,29 +122,27 @@ GetSmart.ReportsChartComponent = Ember.Component.extend({
- // (day data might be way too much)
- aggregateData: function (data) {
- function resetWk() {
- - return { count: 0 };
- + return { count: 0, length: 0 };
- }
- function averageWk(wk, numDays) {
- return wk.count / numDays;
- }
- - var week = resetWk();
- + var week;
- var aggregatedData = [];
- - var lastWkNum = -1;
- - var numDaysInWeek = 0;
- data.forEach(function (datum) {
- var wkNum = moment(datum.date).week();
- - if (lastWkNum > -1 && wkNum !== lastWkNum) {
- - week.count = averageWk(week, numDaysInWeek);
- + if (!week || wkNum !== week.number) {
- + week = resetWk();
- + week.number = wkNum;
- week.date = aggregatedData.length + 1;
- aggregatedData.push(week);
- -
- - week = resetWk();
- - numDaysInWeek = 0;
- }
- week.count += datum.count;
- - lastWkNum = wkNum;
- - numDaysInWeek++;
- + week.length++;
- + });
- + aggregatedData.forEach(function(week) {
- + week.count /= week.length;
- });
- return aggregatedData;
- },
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement