1
0
mirror of https://github.com/flarum/core.git synced 2025-08-05 07:57:46 +02:00

fix: statistics previous period chart is unclear (#3654)

Signed-off-by: Sami Mazouz <sychocouldy@gmail.com>
This commit is contained in:
Sami Mazouz
2022-10-02 19:43:47 +01:00
committed by GitHub
parent d33f1abffc
commit bd0577f435
3 changed files with 21 additions and 10 deletions

View File

@@ -17,13 +17,12 @@ import type Mithril from 'mithril';
import dayjs from 'dayjs';
import dayjsUtc from 'dayjs/plugin/utc';
import dayjsLocalizedFormat from 'dayjs/plugin/localizedFormat';
// @ts-expect-error No typings available
import { Chart } from 'frappe-charts';
dayjs.extend(dayjsUtc);
dayjs.extend(dayjsLocalizedFormat);
// @ts-expect-error No typings available
import { Chart } from 'frappe-charts';
interface IPeriodDeclaration {
start: number;
end: number;
@@ -374,7 +373,16 @@ export default class StatisticsWidget extends DashboardWidget {
m.redraw();
}
const datasets = [{ values: lastPeriod }, { values: thisPeriod }];
const datasets = [
{
name: extractText(app.translator.trans('flarum-statistics.admin.statistics.current_period')),
values: thisPeriod,
},
{
name: extractText(app.translator.trans('flarum-statistics.admin.statistics.previous_period')),
values: lastPeriod,
},
];
const data = {
labels,
datasets,
@@ -394,8 +402,9 @@ export default class StatisticsWidget extends DashboardWidget {
},
lineOptions: {
hideDots: 1,
regionFill: 1,
},
colors: ['black', app.forum.attribute('themePrimaryColor')],
colors: [app.forum.attribute('themePrimaryColor'), 'black'],
});
} else {
this.chart.update(data);