diff --git a/app/Http/Controllers/Report/ExpenseController.php b/app/Http/Controllers/Report/ExpenseController.php index 5d40104f28..ccaad3cd78 100644 --- a/app/Http/Controllers/Report/ExpenseController.php +++ b/app/Http/Controllers/Report/ExpenseController.php @@ -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 = []; diff --git a/public/js/ff/reports/account/month.js b/public/js/ff/reports/account/month.js index 914908f4a1..099cf9a906 100644 --- a/public/js/ff/reports/account/month.js +++ b/public/js/ff/reports/account/month.js @@ -24,7 +24,6 @@ $(function () { drawChart(); loadAjaxPartial('inOutAccounts', spentUri); - loadAjaxPartial('inOutPeriod', groupedUri); loadAjaxPartial('inOutCategory', categoryUri); loadAjaxPartial('inOutBudget', budgetUri); loadAjaxPartial('topXexpense', expenseUri); diff --git a/resources/views/reports/account/report.twig b/resources/views/reports/account/report.twig index 9f84f39170..4dbaf2b5f1 100644 --- a/resources/views/reports/account/report.twig +++ b/resources/views/reports/account/report.twig @@ -21,20 +21,6 @@ - -
{{ 'name'|_ }} | -{{ 'period'|_ }} | -{{ 'spent'|_ }} | -{{ 'earned'|_ }} | -
---|---|---|---|
{{ name }} | -{{ period.period }} | -
- {% if period.spent|length == 0%}
- {{ '0'|formatAmount }}
- {% endif %}
- {% for expense in period.spent %}
- {{ formatAmountBySymbol(expense.sum, expense.currency.symbol, expense.currency.dp) }} - {% endfor %} - |
-
- {% if period.earned|length == 0 %}
- {{ '0'|formatAmount }}
- {% endif %}
- {% for income in period.earned %}
- {{ formatAmountBySymbol(income.sum, income.currency.symbol, income.currency.dp) }} - {% endfor %} - |
-