jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393681 )
Change subject: Configurable target per campaign
......................................................................
Configurable target per campaign
Change-Id: I88f005eec9aa0a324270149130c73459f7a9d24c
---
M src/app/campaign.js
M src/components/widgets/totals-earned-chart/totals-earned-chart.js
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
XenoRyet: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/app/campaign.js b/src/app/campaign.js
index cd350cd..5f3f68e 100644
--- a/src/app/campaign.js
+++ b/src/app/campaign.js
@@ -12,6 +12,7 @@
this.endDate = new Date( params.endDate ||
Date.UTC( currentYear + 1, 0, 1 ) );
this.name = params.name || currentYear.toString();
+ this.target = params.target || 25000000;
}
Campaign.prototype.getDayOfYearOffset = function () {
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 c2c2277..8a12dbf 100644
--- a/src/components/widgets/totals-earned-chart/totals-earned-chart.js
+++ b/src/components/widgets/totals-earned-chart/totals-earned-chart.js
@@ -35,14 +35,14 @@
self.hourlyChart = ko.observable( false );
self.dailyChart = ko.observable( false );
- self.goal = params.sharedContext.goal = ko.observable(
self.config.goal || 25000000 );
self.majorDonationCutoff = ko.observable(
self.config.majorDonationCutoff || 1000 ).extend( { throttle: 500 } );
self.campaigns = [
new Campaign( {
name: '2017',
startDate: Date.UTC( 2017, 9, 2 ),
- endDate: Date.UTC( 2018, 0, 1 )
+ endDate: Date.UTC( 2018, 0, 1 ),
+ target: 55000000
} ),
new Campaign( {
name: '2016',
@@ -76,6 +76,7 @@
} )
];
self.campaign = ko.observable( self.campaigns[ 0 ] );
+ self.goal = params.sharedContext.goal = ko.observable(
self.config.goal || self.campaign().target );
self.isCurrentYear = ko.computed( function () {
return self.campaign() === self.campaigns[ 0 ];
@@ -94,6 +95,7 @@
} ) );
self.disposables.push( self.campaign.subscribe( function () {
+ self.goal( self.campaign().target );
self.logStateChange();
self.reloadData();
} ) );
--
To view, visit https://gerrit.wikimedia.org/r/393681
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I88f005eec9aa0a324270149130c73459f7a9d24c
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg <ej...@ejegg.com>
Gerrit-Reviewer: XenoRyet <dkozlow...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
