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

Optimised budget year chart.

Browse Source
This commit is contained in:
James Cole
2015-12-28 17:57:03 +01:00
parent ad3defb071
commit 83de3482ce
3 changed files with 81 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/Http/Controllers/Chart/BudgetController.php
View File

@@ -283,9 +283,6 @@ class BudgetController extends Controller
*/
public function year(BudgetRepositoryInterface $repository, $report_type, Carbon $start, Carbon $end, Collection $accounts)
{
$allBudgets = $repository->getBudgets();
$budgets = new Collection;
// chart properties for cache:
$cache = new CacheProperties();
$cache->addProperty($start);
@@ -298,26 +295,30 @@ class BudgetController extends Controller
return Response::json($cache->get()); // @codeCoverageIgnore
}
// filter empty budgets:
foreach ($allBudgets as $budget) {
$spent = $repository->balanceInPeriod($budget, $start, $end, $accounts);
if ($spent != 0) {
$budgets->push($budget);
}
}
$budgetInformation = $repository->getBudgetsAndExpenses($start, $end);
$budgets = new Collection;
$entries = new Collection;
$entries = new Collection;
/** @var array $row */
foreach ($budgetInformation as $row) {
$budgets->push($row['budget']);
}
while ($start < $end) {
// month is the current end of the period:
$month = clone $start;
$month->endOfMonth();
$row = [clone $start];
$row = [clone $start];
$dateFormatted = $start->format('Y-m');
// each budget, fill the row:
foreach ($budgets as $budget) {
$spent = $repository->balanceInPeriod($budget, $start, $month, $accounts);
$row[] = $spent * -1;
// each budget, check if there is an entry for this month:
/** @var array $row */
foreach ($budgetInformation as $budgetRow) {
$spent = 0; // nothing spent.
if (isset($budgetRow['entries'][$dateFormatted])) {
$spent = $budgetRow['entries'][$dateFormatted] * -1; // to fit array
}
$row[] = $spent;
}
$entries->push($row);
$start->endOfMonth()->addDay();