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

Expand view.

Browse Source
This commit is contained in:
James Cole
2024-08-03 18:27:19 +02:00
parent 762d898fee
commit 3811aff206
7 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/v2/src/pages/accounts/index.js
View File

@@ -345,7 +345,7 @@ let index = function () {
this.pageOptions.isLoading = true;
// sort instructions (only one column)
let sorting = this.pageOptions.sortingColumn;
if('asc' === this.pageOptions.sortDirection) {
if('asc' === this.pageOptions.sortDirection && '' !== sorting) {
sorting = '-' + sorting;
}
//const sorting = [{column: this.pageOptions.sortingColumn, direction: this.pageOptions.sortDirection}];

6
resources/assets/v2/src/pages/dashboard/accounts.js
View File

@@ -243,10 +243,8 @@ export default () => ({
name: parent.attributes.name,
order: parent.attributes.order,
id: parent.id,
balance_raw: parseFloat(parent.attributes.current_balance),
balance: formatMoney(parent.attributes.current_balance, parent.attributes.currency_code),
native_balance_raw: parseFloat(parent.attributes.native_current_balance),
native_balance: formatMoney(parent.attributes.native_current_balance, parent.attributes.native_currency_code),
balance: parent.attributes.balance,
native_balance: parent.attributes.native_balance,
groups: groups,
});
// console.log(parent.attributes);

4
resources/assets/v2/src/pages/dashboard/dashboard.js
View File

@@ -45,6 +45,8 @@ import {
Tooltip
} from "chart.js";
import 'chartjs-adapter-date-fns';
import {showInternalsButton} from "../../support/page-settings/show-internals-button.js";
import {showWizardButton} from "../../support/page-settings/show-wizard-button.js";
// register things
Chart.register({
@@ -75,6 +77,8 @@ const comps = {
piggies
};
showInternalsButton();
//let i18n;
function loadPage(comps) {