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

Remove unused overview #384

Browse Source
This commit is contained in:
James Cole
2017-12-11 05:57:07 +01:00
parent 12c15ea590
commit d7f2b7cd63
5 changed files with 2 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
app/Http/Controllers/Report/ExpenseController.php
View File

@@ -207,58 +207,9 @@ class ExpenseController extends Controller
/**
* @param Collection $accounts
* @param Collection $expense
* @param Carbon $start
* @param Carbon $end
*
* @return array|mixed|string
* @throws \Throwable
* @return array
*/
public function spentGrouped(Collection $accounts, Collection $expense, Carbon $start, Carbon $end)
{
// Properties for cache:
$cache = new CacheProperties;
$cache->addProperty($start);
$cache->addProperty($end);
$cache->addProperty('expense-spent-grouped');
$cache->addProperty($accounts->pluck('id')->toArray());
$cache->addProperty($expense->pluck('id')->toArray());
if ($cache->has()) {
return $cache->get(); // @codeCoverageIgnore
}
$combined = $this->combineAccounts($expense);
$format = app('navigation')->preferredRangeFormat($start, $end);
$result = [];
foreach ($combined as $name => $combi) {
$current = clone $start;
$combiSet = [];
while ($current <= $end) {
$period = $current->format('Ymd');
$periodName = app('navigation')->periodShow($current, $format);
$currentEnd = app('navigation')->endOfPeriod($current, $format);
/**
* @var string $name
* @var Collection $combi
*/
$spent = $this->spentInPeriod($accounts, $combi, $current, $currentEnd);
$earned = $this->earnedInPeriod($accounts, $combi, $current, $currentEnd);
$current = app('navigation')->addPeriod($current, $format, 0);
$combiSet[$period] = [
'period' => $periodName,
'spent' => $spent,
'earned' => $earned,
];
}
$result[$name] = $combiSet;
}
$result = view('reports.partials.exp-grouped', compact('result'))->render();
$cache->store($result);
return $result;
}
protected function combineAccounts(Collection $accounts): array
{
$combined = [];