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

Clean up report code.

Browse Source
This commit is contained in:
James Cole
2016-12-27 15:31:17 +01:00
parent d520849ce1
commit be201e811d
4 changed files with 72 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Http/Controllers/Report/OperationsController.php
View File

@@ -48,8 +48,9 @@ class OperationsController extends Controller
if ($cache->has()) {
return $cache->get();
}
$expenses = $this->getExpenseReport($start, $end, $accounts);
$result = view('reports.partials.expenses', compact('expenses'))->render();
$entries = $this->getExpenseReport($start, $end, $accounts);
$type = 'expense-entry';
$result = view('reports.partials.income-expenses', compact('entries', 'type'))->render();
$cache->store($result);
return $result;
@@ -74,9 +75,10 @@ class OperationsController extends Controller
if ($cache->has()) {
return $cache->get();
}
$income = $this->getIncomeReport($start, $end, $accounts);
$entries = $this->getIncomeReport($start, $end, $accounts);
$type = 'income-entry';
$result = view('reports.partials.income-expenses', compact('entries', 'type'))->render();
$result = view('reports.partials.income', compact('income'))->render();
$cache->store($result);
return $result;
@@ -227,15 +229,22 @@ class OperationsController extends Controller
$name = $transaction->opposing_account_name;
if (!isset($expenses[$opposingId])) {
$expenses[$opposingId] = [
'id' => $opposingId,
'name' => $name,
'sum' => '0',
'count' => 0,
'id' => $opposingId,
'name' => $name,
'sum' => '0',
'average' => '0',
'count' => 0,
];
}
$expenses[$opposingId]['sum'] = bcadd($expenses[$opposingId]['sum'], $transaction->transaction_amount);
$expenses[$opposingId]['count']++;
}
// do averages:
foreach ($expenses as $key => $entry) {
if ($expenses[$key]['count'] > 1) {
$expenses[$key]['average'] = bcdiv($expenses[$key]['sum'], strval($expenses[$key]['count']));
}
}
return $expenses;