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

Fix old category chart

Browse Source
This commit is contained in:
James Cole
2019-01-27 07:48:17 +01:00
parent 62ce9660b4
commit 4866b9dabb
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Chart/CategoryController.php
View File

@@ -185,7 +185,9 @@ class CategoryController extends Controller
/** @var Category $category */ /** @var Category $category */
foreach ($categories as $category) { foreach ($categories as $category) {
$spentArray = $repository->spentInPeriodPerCurrency(new Collection([$category]), $accounts, $start, $end); $spentArray = $repository->spentInPeriodPerCurrency(new Collection([$category]), $accounts, $start, $end);
foreach ($spentArray as $currencyId => $spent) { foreach ($spentArray as $categoryId => $spentInfo) {
foreach($spentInfo['spent'] as $currencyId => $row) {
$spent= $row['spent'];
if (bccomp($spent, '0') === -1) { if (bccomp($spent, '0') === -1) {
$currencies[$currencyId] = $currencies[$currencyId] ?? $currencyRepository->findNull((int)$currencyId); $currencies[$currencyId] = $currencies[$currencyId] ?? $currencyRepository->findNull((int)$currencyId);
$tempData[] = [ $tempData[] = [
@@ -197,6 +199,7 @@ class CategoryController extends Controller
} }
} }
} }
}
// no category per currency: // no category per currency:
$noCategory = $repository->spentInPeriodPcWoCategory(new Collection, $start, $end); $noCategory = $repository->spentInPeriodPcWoCategory(new Collection, $start, $end);
foreach ($noCategory as $currencyId => $spent) { foreach ($noCategory as $currencyId => $spent) {