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

Some refactoring.

Browse Source
This commit is contained in:
James Cole
2015-12-13 09:01:17 +01:00
parent 6cf8102de5
commit c4c3d0f07f
12 changed files with 25 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/ReportController.php
View File

@@ -68,7 +68,7 @@ class ReportController extends Controller
*
* @return View
*/
public function year($report_type, Carbon $start, Carbon $end, Collection $accounts)
public function defaultYear($report_type, Carbon $start, Carbon $end, Collection $accounts)
{
$subTitle = trans('firefly.reportForYear', ['year' => $start->year]);
$subTitleIcon = 'fa-bar-chart';
@@ -92,7 +92,7 @@ class ReportController extends Controller
$accountIds = join(';', $accountIds);
return view(
'reports.year',
'reports.default.year',
compact(
'start', 'accountReport', 'incomes', 'report_type', 'accountIds', 'end',
'expenses', 'subTitle', 'subTitleIcon', 'incomeTopLength', 'expenseTopLength'
@@ -109,7 +109,7 @@ class ReportController extends Controller
*
* @return View
*/
public function month($report_type, Carbon $start, Carbon $end, Collection $accounts)
public function defaultMonth($report_type, Carbon $start, Carbon $end, Collection $accounts)
{
// some fields for translation:
$subTitle = trans('firefly.reportForMonth', ['month' => $start->formatLocalized($this->monthFormat)]);
@@ -136,7 +136,7 @@ class ReportController extends Controller
// continue!
return view(
'reports.default',
'reports.default.month',
compact(
'start', 'end', 'report_type',
'subTitle', 'subTitleIcon',
@@ -168,10 +168,10 @@ class ReportController extends Controller
// more than two months date difference means year report.
if ($start->diffInMonths($end) > 1) {
return $this->year($report_type, $start, $end, $accounts);
return $this->defaultYear($report_type, $start, $end, $accounts);
}
return $this->month($report_type, $start, $end, $accounts);
return $this->defaultMonth($report_type, $start, $end, $accounts);
}