From 410dd2c6792337eb83c7f33f50bed7a16dc595d9 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Sun, 10 Dec 2017 21:26:54 +1030
Subject: [PATCH] Set default period to last 7 days
---
.../statistics/js/admin/dist/extension.js | 17 ++++++++++-------
.../js/admin/src/components/StatisticsWidget.js | 2 +-
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/extensions/statistics/js/admin/dist/extension.js b/extensions/statistics/js/admin/dist/extension.js
index e8163b122..0d14c96ef 100644
--- a/extensions/statistics/js/admin/dist/extension.js
+++ b/extensions/statistics/js/admin/dist/extension.js
@@ -2,10 +2,10 @@ var Chart=function(){"use strict";function t(t,e){return"string"==typeof t?(e||d
;
'use strict';
-System.register('flarum/statistics/components/StatisticsWidget', ['flarum/components/DashboardWidget', 'flarum/components/SelectDropdown', 'flarum/components/Button', 'flarum/helpers/icon', 'flarum/helpers/listItems', 'flarum/utils/ItemList'], function (_export, _context) {
+System.register('flarum/statistics/components/StatisticsWidget', ['flarum/components/DashboardWidget', 'flarum/components/SelectDropdown', 'flarum/components/Button', 'flarum/helpers/icon', 'flarum/helpers/listItems', 'flarum/utils/ItemList', 'flarum/utils/abbreviateNumber'], function (_export, _context) {
"use strict";
- var DashboardWidget, SelectDropdown, Button, icon, listItems, ItemList, StatisticsWidget;
+ var DashboardWidget, SelectDropdown, Button, icon, listItems, ItemList, abbreviateNumber, StatisticsWidget;
return {
setters: [function (_flarumComponentsDashboardWidget) {
DashboardWidget = _flarumComponentsDashboardWidget.default;
@@ -19,6 +19,8 @@ System.register('flarum/statistics/components/StatisticsWidget', ['flarum/compon
listItems = _flarumHelpersListItems.default;
}, function (_flarumUtilsItemList) {
ItemList = _flarumUtilsItemList.default;
+ }, function (_flarumUtilsAbbreviateNumber) {
+ abbreviateNumber = _flarumUtilsAbbreviateNumber.default;
}],
execute: function () {
StatisticsWidget = function (_DashboardWidget) {
@@ -44,7 +46,7 @@ System.register('flarum/statistics/components/StatisticsWidget', ['flarum/compon
};
this.selectedEntity = 'users';
- this.selectedPeriod = 'last_12_months';
+ this.selectedPeriod = 'last_7_days';
}
}, {
key: 'className',
@@ -86,6 +88,7 @@ System.register('flarum/statistics/components/StatisticsWidget', ['flarum/compon
)
),
this.entities.map(function (entity) {
+ var totalCount = _this2.getTotalCount(entity);
var thisPeriodCount = _this2.getPeriodCount(entity, thisPeriod);
var lastPeriodCount = _this2.getPeriodCount(entity, _this2.getLastPeriod(thisPeriod));
var periodChange = lastPeriodCount > 0 && (thisPeriodCount - lastPeriodCount) / lastPeriodCount * 100;
@@ -100,13 +103,13 @@ System.register('flarum/statistics/components/StatisticsWidget', ['flarum/compon
),
m(
'div',
- { className: 'StatisticsWidget-total' },
- _this2.getTotalCount(entity)
+ { className: 'StatisticsWidget-total', title: totalCount },
+ abbreviateNumber(totalCount)
),
m(
'div',
- { className: 'StatisticsWidget-period' },
- thisPeriodCount,
+ { className: 'StatisticsWidget-period', title: thisPeriodCount },
+ abbreviateNumber(thisPeriodCount),
' ',
periodChange ? m(
'span',
diff --git a/extensions/statistics/js/admin/src/components/StatisticsWidget.js b/extensions/statistics/js/admin/src/components/StatisticsWidget.js
index ae1f73f9b..52598817e 100644
--- a/extensions/statistics/js/admin/src/components/StatisticsWidget.js
+++ b/extensions/statistics/js/admin/src/components/StatisticsWidget.js
@@ -29,7 +29,7 @@ export default class StatisticsWidget extends DashboardWidget {
};
this.selectedEntity = 'users';
- this.selectedPeriod = 'last_12_months';
+ this.selectedPeriod = 'last_7_days';
}
className() {