Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199752
Change subject: Ignore bogus future donations.
......................................................................
Ignore bogus future donations.
Change-Id: I0ff958df1ddca79d8526b2a87b43a6b52e2926c7
---
M src/app/widgetBase.js
M src/components/widgets/x-by-y/x-by-y.js
2 files changed, 16 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/52/199752/1
diff --git a/src/app/widgetBase.js b/src/app/widgetBase.js
index 4a395d0..b27bdc1 100644
--- a/src/app/widgetBase.js
+++ b/src/app/widgetBase.js
@@ -75,7 +75,7 @@
};
- self.processData = function(rawdata, timescale){
+ self.processData = function( rawdata, timescale, timestamp ){
var timeWord = ( timescale === 'Day' ? 'Dai' :
timescale ) + 'ly',
totals = [ timeWord + ' Total'],
@@ -83,16 +83,25 @@
xs = [ 'x' ],
defaultYear = new Date().getFullYear(),
defaultMonth = new Date().getMonth() + 1,
- tempDate, timeFormat;
+ tempDate, timeFormat, now = new Date( timestamp
),
+ year, month, day, hour;
$.each( rawdata, function( index, dataPoint ) {
+ year = dataPoint.Year || defaultYear;
+ month = dataPoint.Month || defaultMonth;
+ day = dataPoint.Day || 1;
+ hour = dataPoint.Hour || 0;
+ // Skip bogus future donations
+ if ( new Date( year, month - 1, day, hour ) >
now ) {
+ return;
+ }
totals.push( dataPoint.usd_total );
counts.push( dataPoint.donations );
- tempDate = ( dataPoint.Year || defaultYear ) +
'-';
- tempDate += zeroPad( dataPoint.Month ||
defaultMonth ) + '-';
- tempDate += zeroPad( dataPoint.Day || 1 );
- tempDate += ' ' + zeroPad( dataPoint.Hour || 0
);
+ tempDate = year + '-';
+ tempDate += zeroPad( month ) + '-';
+ tempDate += zeroPad( day );
+ tempDate += ' ' + zeroPad( hour );
xs.push( tempDate );
} );
diff --git a/src/components/widgets/x-by-y/x-by-y.js
b/src/components/widgets/x-by-y/x-by-y.js
index 01eaeac..e3e8846 100644
--- a/src/components/widgets/x-by-y/x-by-y.js
+++ b/src/components/widgets/x-by-y/x-by-y.js
@@ -179,7 +179,7 @@
self.displayedTimeChoice(self.timeChoice());
self.retrievedResults(dataArray.results);
- self.chartData =
self.processData(self.retrievedResults(), self.timeChoice());
+ self.chartData = self.processData(
self.retrievedResults(), self.timeChoice(), dataArray.timestamp );
self.makeChart(self.chartData);
--
To view, visit https://gerrit.wikimedia.org/r/199752
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ff958df1ddca79d8526b2a87b43a6b52e2926c7
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
