Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/177150
Change subject: Skip graphing all zeros before data appears
......................................................................
Skip graphing all zeros before data appears
Don't make the 1200+ point graph of zeros before we have any data
Change-Id: Ia24909ffd587220d4914cb820ca6864ba435eae0
---
M src/components/boards/bigEnglish/bigEnglishBoard.js
M src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
M src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
M src/components/widgets/totals-earned-chart/totals-earned-chart.js
4 files changed, 13 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/50/177150/1
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.js
b/src/components/boards/bigEnglish/bigEnglishBoard.js
index 1519129..0bb7718 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.js
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.js
@@ -45,16 +45,9 @@
self.secondsByHourDonationData = ['Donations Per Second'];
self.dailyDonationData = {};
//initialize day/hour data
- self.dayObj = {};
+ self.dayObj = [];
self.dailyDataArray = ['Daily Total'];
- for (var d = 1; d < 32; d++) {
- self.dailyDataArray[d] = 0;
- self.dayObj[d] = [ 'Hourly Totals' ];
- for (var h = 1; h < 25; h++) {
- self.dayObj[d][h] = 0;
- self.secondsByHourDonationData[(d - 1) * 24 +
h] = 0;
- }
- }
+
// Allows components in the board to subscribe to a single
property
// and get notified of any changes to the available data.
self.dataChanged = ko.computed(function() {
@@ -69,6 +62,15 @@
$.get( '/data/big-english' , function ( dataget ) {
self.decemberData = dataget.results;
var runningTotal = 0;
+ for (var d = 1; d < 32; d++) {
+ self.dailyDataArray[d] = 0;
+ self.dayObj[d] = Array(25);
+ self.dayObj[d][0] = 'Hourly Totals';
+ for (var h = 1; h < 25; h++) {
+ self.dayObj[d][h] = 0;
+ self.secondsByHourDonationData[(d - 1)
* 24 + h] = 0;
+ }
+ }
$.each(self.decemberData, function(el, i){
var d = self.decemberData[el].day, h =
self.decemberData[el].hour;
self.dayObj[d][h + 1] =
self.decemberData[el].usd_total;
diff --git
a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
index 73f9162..634e1e9 100644
--- a/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
+++ b/src/components/widgets/amt-per-second-chart/amt-per-second-chart.js
@@ -15,7 +15,7 @@
self.updatedGoal = params.goal();
self.needPerSecond = ['Needed Per Second'];
- for( var d = 1; d < 32; d++ ) {
+ for( var d = 1; d < params.dayObj.length; d++ ) {
for ( var h = 1; h < 25; h++ ) {
self.updatedGoal = self.updatedGoal -
params.dayObj[d][h];
var hoursLeft = ( 31 - d) * 24 + ( 24 -
h );
diff --git
a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
index 3857b78..63af1fc 100644
--- a/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
+++ b/src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
@@ -15,7 +15,7 @@
self.updatedGoal = params.goal();
self.neededArray = ['Needed'];
- for(var d = 1; d < 32; d++) {
+ for(var d = 1; d < params.dailyDataArray.length; d++) {
self.updatedGoal = self.updatedGoal -
params.dailyDataArray[d];
self.neededArray[d] = self.updatedGoal;
}
diff --git a/src/components/widgets/totals-earned-chart/totals-earned-chart.js
b/src/components/widgets/totals-earned-chart/totals-earned-chart.js
index f441668..188450c 100644
--- a/src/components/widgets/totals-earned-chart/totals-earned-chart.js
+++ b/src/components/widgets/totals-earned-chart/totals-earned-chart.js
@@ -14,9 +14,6 @@
self.makeCharts();
});
self.makeCharts = function() {
- if (params.dailyDataArray.length < 2) {
- return;
- }
self.hourlyChart = function(d,i){
return {
bindto: '#totalsEarnedChart',
--
To view, visit https://gerrit.wikimedia.org/r/177150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia24909ffd587220d4914cb820ca6864ba435eae0
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
