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

Updated budget charts [skip ci]

Browse Source
This commit is contained in:
James Cole
2016-12-15 10:41:10 +01:00
parent 1d7119114d
commit f74c6c2d19
1 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,20 +242,19 @@ class BudgetController extends Controller
$cache->addProperty($end); $cache->addProperty($end);
$cache->addProperty($accounts); $cache->addProperty($accounts);
$cache->addProperty($budget->id); $cache->addProperty($budget->id);
$cache->addProperty('budget'); $cache->addProperty('chart.budget.period');
$cache->addProperty('period');
if ($cache->has()) { if ($cache->has()) {
return Response::json($cache->get()); //return Response::json($cache->get());
} }
// the expenses: // get the expenses
$periods = Navigation::listOfPeriods($start, $end);
$entries = $repository->getBudgetPeriodReport(new Collection([$budget]), $accounts, $start, $end, false);
$budgeted = []; $budgeted = [];
$periods = Navigation::listOfPeriods($start, $end);
$entries = $repository->getBudgetPeriodReport(new Collection([$budget]), $accounts, $start, $end);
$key = Navigation::preferredCarbonFormat($start, $end); $key = Navigation::preferredCarbonFormat($start, $end);
$range = Navigation::preferredRangeFormat($start, $end); $range = Navigation::preferredRangeFormat($start, $end);
// get budgeted: // get the budget limits (if any)
$repetitions = $repository->getAllBudgetLimitRepetitions($start, $end); $repetitions = $repository->getAllBudgetLimitRepetitions($start, $end);
$current = clone $start; $current = clone $start;
while ($current < $end) { while ($current < $end) {
@@ -276,18 +275,31 @@ class BudgetController extends Controller
$current = clone $currentEnd; $current = clone $currentEnd;
} }
// join them: // join them into one set of data:
$result = []; $chartData = [
[
'label' => strval(trans('firefly.spent')),
'type' => 'bar',
'entries' => [],
],
[
'label' => strval(trans('firefly.budgeted')),
'type' => 'bar',
'entries' => [],
],
];
foreach (array_keys($periods) as $period) { foreach (array_keys($periods) as $period) {
$nice = $periods[$period]; $label = $periods[$period];
$result[$nice] = [ $spent = isset($entries[$budget->id]['entries'][$period]) ? $entries[$budget->id]['entries'][$period] : '0';
'spent' => isset($entries[$budget->id]['entries'][$period]) ? $entries[$budget->id]['entries'][$period] : '0', $limit = isset($entries[$period]) ? $budgeted[$period] : 0;
'budgeted' => isset($entries[$period]) ? $budgeted[$period] : 0, $chartData[0]['entries'][$label] = bcmul($spent, '-1');
]; $chartData[1]['entries'][$label] = $limit;
} }
/** @var GeneratorInterface $generator */
$data = $this->generator->period($result); $generator = app(GeneratorInterface::class);
$data = $generator->multiSet($chartData);
$cache->store($data); $cache->store($data);
return Response::json($data); return Response::json($data);
@@ -308,27 +320,25 @@ class BudgetController extends Controller
$cache->addProperty($start); $cache->addProperty($start);
$cache->addProperty($end); $cache->addProperty($end);
$cache->addProperty($accounts); $cache->addProperty($accounts);
$cache->addProperty('no-budget'); $cache->addProperty('chart.budget.no-budget');
$cache->addProperty('period');
if ($cache->has()) { if ($cache->has()) {
return Response::json($cache->get()); // return Response::json($cache->get());
} }
// the expenses: // the expenses:
$periods = Navigation::listOfPeriods($start, $end); $periods = Navigation::listOfPeriods($start, $end);
$entries = $repository->getNoBudgetPeriodReport($accounts, $start, $end); $entries = $repository->getNoBudgetPeriodReport($accounts, $start, $end);
$chartData = [];
// join them: // join them:
$result = [];
foreach (array_keys($periods) as $period) { foreach (array_keys($periods) as $period) {
$nice = $periods[$period]; $label = $periods[$period];
$result[$nice] = [ $spent = isset($entries['entries'][$period]) ? $entries['entries'][$period] : '0';
'spent' => isset($entries['entries'][$period]) ? $entries['entries'][$period] : '0', $chartData[$label] = $spent;
];
} }
/** @var GeneratorInterface $generator */
$data = $this->generator->periodNoBudget($result); $generator = app(GeneratorInterface::class);
$data = $generator->singleSet(strval(trans('firefly.spent')), $chartData);
$cache->store($data); $cache->store($data);
return Response::json($data); return Response::json($data);