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

Fix sorting and order for account lists.

Browse Source
This commit is contained in:
James Cole
2024-04-29 20:20:11 +02:00
parent c02c027f4f
commit 69d839997a
3 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Transformers/V2/AccountTransformer.php
View File

@@ -63,6 +63,10 @@ class AccountTransformer extends AbstractTransformer
$this->convertedBalances = [];
$this->balanceDifferences = [];
// first collect all the "heavy" stuff that relies on ALL data to be present.
// get last activity:
$this->getLastActivity($objects);
// get balances of all accounts
$this->getMetaBalances($objects);
@@ -75,17 +79,21 @@ class AccountTransformer extends AbstractTransformer
// get account types:
$this->collectAccountTypes($objects);
// get last activity:
$this->getLastActivity($objects);
// add balance difference
if (null !== $this->parameters->get('start') && null !== $this->parameters->get('end')) {
$this->getBalanceDifference($objects, $this->parameters->get('start'), $this->parameters->get('end'));
}
// get object groups"
// get object groups
$this->getObjectGroups($objects);
// if pagination is disabled, do it now:
if(true === $this->parameters->get('disablePagination')) {
$page = (int) $this->parameters->get('page');
$size = (int) $this->parameters->get('pageSize');
$objects = $objects->slice(($page-1) * $size, $size);
}
return $this->sortAccounts($objects);
}