More magic words.

This commit is contained in:
James Cole 2016-01-22 10:10:51 +01:00
parent f5cbed7c0c
commit f5a21f64c0
3 changed files with 21 additions and 26 deletions

View File

@ -45,14 +45,6 @@ class ReportController extends Controller
{ {
$start = Session::get('first'); $start = Session::get('first');
$months = $this->helper->listOfMonths($start); $months = $this->helper->listOfMonths($start);
$startOfMonth = clone Session::get('start');
$endOfMonth = clone Session::get('start');
$startOfYear = clone Session::get('start');
$endOfYear = clone Session::get('start');
$startOfMonth->startOfMonth();
$endOfMonth->endOfMonth();
$startOfYear->startOfYear();
$endOfYear->endOfYear();
// does the user have shared accounts? // does the user have shared accounts?
$accounts = $repository->getAccounts(['Default account', 'Asset account']); $accounts = $repository->getAccounts(['Default account', 'Asset account']);
@ -67,8 +59,7 @@ class ReportController extends Controller
return view( return view(
'reports.index', compact( 'reports.index', compact(
'months', 'accounts', 'start', 'accountList', 'months', 'accounts', 'start', 'accountList'
'startOfMonth', 'endOfMonth', 'startOfYear', 'endOfYear'
) )
); );
} }

View File

@ -32,21 +32,25 @@ class Date implements BinderInterface
*/ */
public static function routeBinder($value, $route) public static function routeBinder($value, $route)
{ {
if($value === 'currentMonthStart') { switch ($value) {
return Carbon::now()->startOfMonth(); default:
} try {
if($value === 'currentMonthEnd') { $date = new Carbon($value);
return Carbon::now()->endOfMonth(); } catch (Exception $e) {
} Log::error('Could not parse date "' . $value . '" for user #' . Auth::user()->id);
throw new NotFoundHttpException;
}
return $date;
case 'currentMonthStart':
return Carbon::now()->startOfMonth();
case 'currentMonthEnd':
return Carbon::now()->endOfMonth();
case 'currentYearStart':
return Carbon::now()->startOfYear();
case 'currentYearEnd':
return Carbon::now()->endOfYear();
try {
$date = new Carbon($value);
} catch (Exception $e) {
Log::error('Could not parse date "' . $value . '" for user #' . Auth::user()->id);
throw new NotFoundHttpException;
} }
return $date;
} }
} }

View File

@ -103,8 +103,8 @@
<li> <li>
<a href="{{ route('reports.report', <a href="{{ route('reports.report',
['default', ['default',
startOfYear.format('Ymd'), 'currentYearStart',
endOfYear.format('Ymd'), 'currentYearEnd',
accountList accountList
]) }}">{{ 'report_this_year_quick'|_ }}</a> ]) }}">{{ 'report_this_year_quick'|_ }}</a>
</li> </li>
@ -112,7 +112,7 @@
<a href="{{ route('reports.report', <a href="{{ route('reports.report',
['default', ['default',
start.format('Ymd'), start.format('Ymd'),
endOfMonth.format('Ymd'), 'currentMonthEnd',
accountList accountList
]) }}">{{ 'report_all_time_quick'|_ }}</a> ]) }}">{{ 'report_all_time_quick'|_ }}</a>
</li> </li>