From 0148f1deaae7529904cba99204fdfd3862352116 Mon Sep 17 00:00:00 2001 From: James Morris Date: Mon, 9 May 2022 11:25:38 +0100 Subject: [PATCH] Added in the year to the date formats for anchor chart and tooltips for new Dashboard refs: https://github.com/TryGhost/Team/issues/1531 --- ghost/admin/app/components/dashboard/v5/charts/anchor.js | 2 +- ghost/admin/app/components/dashboard/v5/charts/mrr.js | 2 +- .../admin/app/components/dashboard/v5/charts/paid-breakdown.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ghost/admin/app/components/dashboard/v5/charts/anchor.js b/ghost/admin/app/components/dashboard/v5/charts/anchor.js index 13ccea2f8f..ae829ca565 100644 --- a/ghost/admin/app/components/dashboard/v5/charts/anchor.js +++ b/ghost/admin/app/components/dashboard/v5/charts/anchor.js @@ -7,7 +7,7 @@ import {getSymbol} from 'ghost-admin/utils/currency'; import {inject as service} from '@ember/service'; import {tracked} from '@glimmer/tracking'; -const DATE_FORMAT = 'D MMM'; +const DATE_FORMAT = 'D MMM, YYYY'; const DAYS_OPTIONS = [{ name: '7 Days', diff --git a/ghost/admin/app/components/dashboard/v5/charts/mrr.js b/ghost/admin/app/components/dashboard/v5/charts/mrr.js index 5be1e42d16..891ff9c19f 100644 --- a/ghost/admin/app/components/dashboard/v5/charts/mrr.js +++ b/ghost/admin/app/components/dashboard/v5/charts/mrr.js @@ -6,7 +6,7 @@ import {getSymbol} from 'ghost-admin/utils/currency'; import {ghPriceAmount} from '../../../../helpers/gh-price-amount'; import {inject as service} from '@ember/service'; -const DATE_FORMAT = 'D MMM'; +const DATE_FORMAT = 'D MMM, YYYY'; // custom ChartJS draw function Chart.defaults.hoverLine = Chart.defaults.line; diff --git a/ghost/admin/app/components/dashboard/v5/charts/paid-breakdown.js b/ghost/admin/app/components/dashboard/v5/charts/paid-breakdown.js index a4d35b4e0e..97155fd0de 100644 --- a/ghost/admin/app/components/dashboard/v5/charts/paid-breakdown.js +++ b/ghost/admin/app/components/dashboard/v5/charts/paid-breakdown.js @@ -5,7 +5,7 @@ import moment from 'moment'; import {action} from '@ember/object'; import {inject as service} from '@ember/service'; -const DATE_FORMAT = 'D MMM'; +const DATE_FORMAT = 'D MMM, YYYY'; // custom ChartJS draw function Chart.defaults.hoverBar = Chart.defaults.bar;