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

Merge branch 'develop' into adminlte4

Browse Source 
# Conflicts:
#	yarn.lock
This commit is contained in:
James Cole
2023-07-25 16:12:58 +02:00
parent a6503fda39 dde7bcfc4c
commit 8796168580
15 changed files with 681 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,12 @@ export default () => ({
loading: false,
loadingAccounts: false,
accountList: [],
autoConvert: false,
chart: null,
switchConversion() {
this.autoConvert = !this.autoConvert;
this.loadChart();
},
loadChart() {
if (this.loading) {
return;
@@ -91,8 +96,18 @@ export default () => ({
if (response.data.hasOwnProperty(i)) {
let current = response.data[i];
let entry = [];
window.currencies.push(current.currency_code);
for (const [ii, value] of Object.entries(current.entries)) {
let collection = [];
// use the "native" currency code and use the "converted_entries" as array
if (this.autoConvert) {
window.currencies.push(current.native_code);
collection = current.converted_entries;
}
if (!this.autoConvert) {
window.currencies.push(current.currency_code);
collection = current.entries;
}
for (const [ii, value] of Object.entries(collection)) {
entry.push({x: format(new Date(ii), 'yyyy-MM-dd'), y: parseFloat(value)});
}
options.series.push({name: current.label, data: entry});