diff --git a/app/Http/ViewComposers/Index.php b/app/Http/ViewComposers/Index.php index 9d231adfa..0c21c1f9c 100644 --- a/app/Http/ViewComposers/Index.php +++ b/app/Http/ViewComposers/Index.php @@ -2,6 +2,7 @@ namespace App\Http\ViewComposers; +use Date; use Illuminate\View\View; class Index @@ -15,9 +16,18 @@ class Index public function compose(View $view) { $limits = ['10' => '10', '25' => '25', '50' => '50', '100' => '100']; - - $years = ['2017' => '2017', '2016' => '2016', '2015' => '2015', '2014' => '2014']; - $view->with(['limits' => $limits, 'years' => $years]); + $now = Date::now(); + + $this_year = $now->year; + + $years = []; + $y = $now->addYears(5); + for ($i = 0; $i < 10; $i++) { + $years[$y->year] = $y->year; + $y->subYear(); + } + + $view->with(['limits' => $limits, 'this_year' => $this_year, 'years' => $years]); } } diff --git a/resources/views/reports/expense_summary/index.blade.php b/resources/views/reports/expense_summary/index.blade.php index 273ddb956..b5504c7a9 100644 --- a/resources/views/reports/expense_summary/index.blade.php +++ b/resources/views/reports/expense_summary/index.blade.php @@ -7,13 +7,13 @@
{!! Form::open(['url' => 'reports/expense-summary', 'role' => 'form', 'method' => 'GET']) !!}
- {!! Form::select('year', $years, request('year', Date::now()->year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} + {!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!}
{!! Form::close() !!}
diff --git a/resources/views/reports/income_expense_summary/index.blade.php b/resources/views/reports/income_expense_summary/index.blade.php index c36c726c0..d8d1cd3c6 100644 --- a/resources/views/reports/income_expense_summary/index.blade.php +++ b/resources/views/reports/income_expense_summary/index.blade.php @@ -7,13 +7,13 @@
{!! Form::open(['url' => 'reports/income-expense-summary', 'role' => 'form', 'method' => 'GET']) !!}
- {!! Form::select('year', $years, request('year', Date::now()->year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} + {!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!}
{!! Form::close() !!}
diff --git a/resources/views/reports/income_summary/index.blade.php b/resources/views/reports/income_summary/index.blade.php index fff7ee468..c29a7f83e 100644 --- a/resources/views/reports/income_summary/index.blade.php +++ b/resources/views/reports/income_summary/index.blade.php @@ -7,13 +7,13 @@
{!! Form::open(['url' => 'reports/income-summary', 'role' => 'form', 'method' => 'GET']) !!}
- {!! Form::select('year', $years, request('year', Date::now()->year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} + {!! Form::select('year', $years, request('year', $this_year), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!}
{!! Form::close() !!}