kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-18 10:16:49 +00:00
Code Issues Projects Releases Wiki Activity

Various color fixes.

Browse Source
This commit is contained in:
James Cole
2023-08-27 18:45:06 +02:00
parent 83d94cb792
commit b2364d26ec
7 changed files with 91 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
resources/assets/v2/pages/dashboard/accounts.js
View File

@@ -25,6 +25,7 @@ import formatMoney from "../../util/format-money.js";
import Get from "../../api/v2/model/account/get.js";
import {Chart} from 'chart.js';
import {getDefaultChartSettings} from "../../support/default-chart-settings.js";
import {getColors} from "../../support/get-colors.js";
// this is very ugly, but I have no better ideas at the moment to save the currency info
// for each series.
@@ -50,8 +51,7 @@ export default () => ({
let cachedData = window.store.get(CHART_CACHE_KEY);
if (cacheValid && typeof cachedData !== 'undefined') {
let options = window.store.get(CHART_CACHE_KEY);
this.drawChart(options);
this.drawChart(this.generateOptions(cachedData));
this.loading = false;
return;
}
@@ -59,9 +59,8 @@ export default () => ({
dashboard.dashboard(new Date(window.store.get('start')), new Date(window.store.get('end')), null).then((response) => {
this.chartData = response.data;
// cache generated options:
let options = this.generateOptions(this.chartData);
window.store.set(CHART_CACHE_KEY, options);
this.drawChart(options);
window.store.set(CHART_CACHE_KEY, response.data);
this.drawChart(this.generateOptions(this.chartData));
this.loading = false;
});
@@ -99,6 +98,10 @@ export default () => ({
dataset.yAxisID = yAxis;
dataset.data = collection;
// add colors:
//dataset.backgroundColor = getColors(null, 'background');
//dataset.borderColor = getColors(null, 'background');
// add data set to the correct Y Axis:
options.data.datasets.push(dataset);