Advertisement
Guest User

Untitled

a guest
Dec 18th, 2014
161
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.26 KB | None | 0 0
  1. --- a/jsapp/components/author/charts/reports_chart.js
  2. +++ b/jsapp/components/author/charts/reports_chart.js
  3. @@ -122,29 +122,27 @@ GetSmart.ReportsChartComponent = Ember.Component.extend({
  4.    // (day data might be way too much)
  5.    aggregateData: function (data) {
  6.      function resetWk() {
  7. -      return { count: 0 };
  8. +      return { count: 0, length: 0 };
  9.      }
  10.      function averageWk(wk, numDays) {
  11.        return wk.count / numDays;
  12.      }
  13.  
  14. -    var week = resetWk();
  15. +    var week;
  16.      var aggregatedData = [];
  17. -    var lastWkNum = -1;
  18. -    var numDaysInWeek = 0;
  19.      data.forEach(function (datum) {
  20.        var wkNum = moment(datum.date).week();
  21. -      if (lastWkNum > -1 && wkNum !== lastWkNum) {
  22. -        week.count = averageWk(week, numDaysInWeek);
  23. +      if (!week || wkNum !== week.number) {
  24. +        week = resetWk();
  25. +        week.number = wkNum;
  26.          week.date = aggregatedData.length + 1;
  27.          aggregatedData.push(week);
  28. -
  29. -        week = resetWk();
  30. -        numDaysInWeek = 0;
  31.        }
  32.        week.count += datum.count;
  33. -      lastWkNum = wkNum;
  34. -      numDaysInWeek++;
  35. +      week.length++;
  36. +    });
  37. +    aggregatedData.forEach(function(week) {
  38. +      week.count /= week.length;
  39.      });
  40.      return aggregatedData;
  41.    },
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement