mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-06 00:17:31 +02:00
Code Issues Releases Wiki Activity

Update frappe-charts, use Frontend extender, fix color & comparison CSS

Browse Source
This commit is contained in:
David Sevilla Martín
2018-10-21 10:06:37 -04:00
parent 6d2ebadcbf
commit f4a4f0defa
4 changed files with 529 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

893
extensions/statistics/js/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
extensions/statistics/js/package.json
View File

@@ -3,9 +3,9 @@
"version": "0.0.0",
"dependencies": {
"flarum-webpack-config": "^0.1.0-beta.8",
"frappe-charts": "0.0.8",
"webpack": "^4.0.0",
"webpack-cli": "^3.0.7"
"frappe-charts": "^1.1.0",
"webpack": "^4.22.0",
"webpack-cli": "^3.1.2"
},
"scripts": {
"build": "webpack --mode production",

27
extensions/statistics/js/src/admin/components/StatisticsWidget.js
View File

@@ -11,10 +11,10 @@ import DashboardWidget from 'flarum/components/DashboardWidget';
import SelectDropdown from 'flarum/components/SelectDropdown';
import Button from 'flarum/components/Button';
import icon from 'flarum/helpers/icon';
import listItems from 'flarum/helpers/listItems';
import ItemList from 'flarum/utils/ItemList';
import abbreviateNumber from 'flarum/utils/abbreviateNumber';
import { Chart } from 'frappe-charts/dist/frappe-charts.esm.js';
export default class StatisticsWidget extends DashboardWidget {
init() {
super.init();
@@ -59,7 +59,7 @@ export default class StatisticsWidget extends DashboardWidget {
active={period === this.selectedPeriod}
onclick={this.changePeriod.bind(this, period)}
icon={period === this.selectedPeriod ? 'fas fa-check' : true}>
{app.translator.trans('flarum-statistics.admin.statistics.'+period+'_label')}
{app.translator.trans(`flarum-statistics.admin.statistics.${period}_label`)}
</Button>
))}
</SelectDropdown>
@@ -130,21 +130,24 @@ export default class StatisticsWidget extends DashboardWidget {
{values: lastPeriod},
{values: thisPeriod}
];
const data = {
labels,
datasets
};
if (!context.chart) {
context.chart = new Chart({
parent: elm,
data: {labels, datasets},
context.chart = new Chart(elm, {
data,
type: 'line',
height: 200,
x_axis_mode: 'tick',
y_axis_mode: 'span',
is_series: 1,
show_dots: 0,
colors: ['rgba(127, 127, 127, 0.2)', app.forum.attribute('themePrimaryColor')]
axisOptions: {
xAxisMode: 'tick',
yAxisMode: 'span'
},
colors: ['black', app.forum.attribute('themePrimaryColor')]
});
} else {
context.chart.update_values(datasets, labels);
context.chart.update(data);
}
context.entity = this.selectedEntity;