jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/383708 )
Change subject: Label dates better in Big English chart ...................................................................... Label dates better in Big English chart Now that it's not just one month Change-Id: I4973b0a259e0cc0311ba41647f946b9b3162e7f2 --- M bower.json M src/app/campaign.js M src/components/widgets/totals-earned-chart/totals-earned-chart.js 3 files changed, 22 insertions(+), 5 deletions(-) Approvals: Mepps: Looks good to me, but someone else must approve XenoRyet: Looks good to me, approved jenkins-bot: Verified diff --git a/bower.json b/bower.json index 45e3044..5f4874b 100644 --- a/bower.json +++ b/bower.json @@ -33,7 +33,7 @@ "hasher": "1.2.0", "knockout-projections": "1.1.0-pre", "knockout": "3.2.0", - "moment": "2.7.0", + "moment": "2.19.1", "raphael": "2.1.2", "requirejs": "2.1.15", "lato": "0.2.1", diff --git a/src/app/campaign.js b/src/app/campaign.js index 8ebe71e..cd350cd 100644 --- a/src/app/campaign.js +++ b/src/app/campaign.js @@ -46,5 +46,13 @@ return msToDays( diff ); }; + Campaign.prototype.getStartDate = function () { + return this.startDate; + }; + + Campaign.prototype.getEndDate = function () { + return this.endDate; + }; + return Campaign; } ); 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 d9fc523..c2c2277 100644 --- a/src/components/widgets/totals-earned-chart/totals-earned-chart.js +++ b/src/components/widgets/totals-earned-chart/totals-earned-chart.js @@ -21,7 +21,9 @@ function TotalsEarnedChartViewModel( params ) { var self = this, - timeFormat = 'dddd, MMMM Do YYYY, h:mm:ss a'; + timeFormat = 'dddd, MMMM Do YYYY, h:mm:ss a', + getDay, + localUtcOffset = moment().utcOffset(); WidgetBase.call( this, params ); @@ -234,6 +236,13 @@ self.showChart( 'daily' ); }; + getDay = function ( dayNum ) { + var result = moment( self.campaign().getStartDate() ); + result.subtract( localUtcOffset, 'm' ); + result.add( dayNum, 'd' ); + return result.format( 'MMM D' ); + }; + self.makeHourlyChart = function ( d, i ) { var hourlyData = params.sharedContext.dayObj[ d.x + 1 ], hourlyCountArray = [ 'Hourly Count' ], @@ -274,7 +283,7 @@ axis: { x: { label: { - text: 'Day ' + ( d.x + 1 ), + text: getDay( d.x ), position: 'outer-left' }, tick: { @@ -347,7 +356,7 @@ axis: { x: { tick: { - format: function ( x ) { return 'Day ' + ( x + 1 ); } + format: function ( x ) { return getDay( x ); } } }, y: { @@ -364,7 +373,7 @@ }, tooltip: { format: { - title: function ( d ) { return 'Day ' + ( d + 1 ); }, + title: function ( d ) { return getDay( d ); }, value: function ( value, ratio, id ) { var display; if ( id === 'Daily Total' ) { -- To view, visit https://gerrit.wikimedia.org/r/383708 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4973b0a259e0cc0311ba41647f946b9b3162e7f2 Gerrit-PatchSet: 4 Gerrit-Project: wikimedia/fundraising/dash Gerrit-Branch: master Gerrit-Owner: Ejegg <ej...@ejegg.com> Gerrit-Reviewer: AndyRussG <andrew.green...@gmail.com> Gerrit-Reviewer: Cdentinger <cdentin...@wikimedia.org> Gerrit-Reviewer: Eileen <emcnaugh...@wikimedia.org> Gerrit-Reviewer: Katie Horn <kh...@wikimedia.org> Gerrit-Reviewer: Mepps <me...@wikimedia.org> 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