Ejegg has submitted this change and it was merged.
Change subject: Fix negative number issue
......................................................................
Fix negative number issue
Change-Id: I4bcc4c0a2022b9d742089b238c3f3aaaf7a6f4a9
---
M src/components/boards/bigEnglish/bigEnglishBoard.js
M src/components/widgets/distance-to-goal-chart/distance-to-goal-chart.js
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.js
b/src/components/boards/bigEnglish/bigEnglishBoard.js
index 02f7d4d..eca7819 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.js
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.js
@@ -27,7 +27,7 @@
self.totalRemainingToDate = ko.computed( function(){
var trtd = self.goal() - self.raised();
- return numeral(trtd).format('$0,0');
+ return numeral(trtd >= 0 ? trtd : 0).format('$0,0');
});
self.secondsByHourDonationData = ['Donations Per Second'];
@@ -43,7 +43,7 @@
self.dataChanged = ko.computed(function() {
// For now, we only want to trigger if new money has
come in or the
// goal has been reset. So the total remaining is a good proxy
- return self.totalRemainingToDate();
+ return self.goal() - self.raised();
});
// Only recalculate child boards once per half second
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 eb4d94d..05f31be 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
@@ -17,7 +17,7 @@
self.neededArray = ['Needed'];
for(var d = 1; d < params.dailyDataArray.length; d++) {
self.updatedGoal = self.updatedGoal -
params.dailyDataArray[d];
- self.neededArray[d] = self.updatedGoal;
+ self.neededArray[d] = self.updatedGoal >= 0 ?
self.updatedGoal : 0;
}
self.distanceToGoalChart = c3.generate({
--
To view, visit https://gerrit.wikimedia.org/r/180096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4bcc4c0a2022b9d742089b238c3f3aaaf7a6f4a9
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ssmith <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
