Various code cleanup.

This commit is contained in:
James Cole
2021-09-18 10:21:29 +02:00
parent 3589c9f60f
commit e829d79589
107 changed files with 225 additions and 220 deletions

View File

@@ -260,6 +260,7 @@ class ReportController extends Controller
* @param AccountRepositoryInterface $repository
*
* @return Factory|View
* @throws FireflyException
*/
public function index(AccountRepositoryInterface $repository)
{
@@ -305,23 +306,13 @@ class ReportController extends Controller
*/
public function options(string $reportType)
{
switch ($reportType) {
default:
$result = $this->noReportOptions();
break;
case 'category':
$result = $this->categoryReportOptions();
break;
case 'budget':
$result = $this->budgetReportOptions();
break;
case 'tag':
$result = $this->tagReportOptions();
break;
case 'double':
$result = $this->doubleReportOptions();
break;
}
$result = match ($reportType) {
default => $this->noReportOptions(),
'category' => $this->categoryReportOptions(),
'budget' => $this->budgetReportOptions(),
'tag' => $this->tagReportOptions(),
'double' => $this->doubleReportOptions(),
};
return response()->json(['html' => $result]);
}
@@ -383,27 +374,14 @@ class ReportController extends Controller
return prefixView('error')->with('message', (string)trans('firefly.end_after_start_date'));
}
switch ($reportType) {
default:
case 'default':
$uri = route('reports.report.default', [$accounts, $start, $end]);
break;
case 'category':
$uri = route('reports.report.category', [$accounts, $categories, $start, $end]);
break;
case 'audit':
$uri = route('reports.report.audit', [$accounts, $start, $end]);
break;
case 'budget':
$uri = route('reports.report.budget', [$accounts, $budgets, $start, $end]);
break;
case 'tag':
$uri = route('reports.report.tag', [$accounts, $tags, $start, $end]);
break;
case 'double':
$uri = route('reports.report.double', [$accounts, $double, $start, $end]);
break;
}
$uri = match ($reportType) {
default => route('reports.report.default', [$accounts, $start, $end]),
'category' => route('reports.report.category', [$accounts, $categories, $start, $end]),
'audit' => route('reports.report.audit', [$accounts, $start, $end]),
'budget' => route('reports.report.budget', [$accounts, $budgets, $start, $end]),
'tag' => route('reports.report.tag', [$accounts, $tags, $start, $end]),
'double' => route('reports.report.double', [$accounts, $double, $start, $end]),
};
return redirect($uri);
}