diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index cc45c03e45..7d7519561e 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -878,28 +878,37 @@ class AssetsController extends AdminController } - public function getDatatable() + public function getDatatable($status = null) { - //return Datatable::collection(Asset::all(array('id', 'name', 'asset_tag', 'serial'))) $assets = Asset::with('model','assigneduser','assetstatus','defaultLoc','assetlog','model')->Hardware(); - // Filter results - if (Input::get('Pending')) { - $assets->Pending(); - } elseif (Input::get('RTD')) { - $assets->RTD(); - } elseif (Input::get('Undeployable')) { - $assets->Undeployable(); - } elseif (Input::get('Archived')) { - $assets->Archived(); - } elseif (Input::get('Requestable')) { - $assets->RequestableAssets(); - } elseif (Input::get('Deployed')) { - $assets->Deployed(); - } elseif (Input::get('Deleted')) { - $assets->withTrashed()->Deleted(); - } + + switch ($status) { + case 'Pending': + $assets->Pending(); + break; + case 'RTD': + $assets->RTD(); + break; + case 'Undeployable': + $assets->Undeployable(); + break; + case 'Archived': + $assets->Archived(); + break; + case 'Requestable': + $assets->RequestableAssets(); + break; + case 'Deployed': + $assets->Deployed(); + break; + case 'Deleted': + $assets->withTrashed()->Deleted(); + break; + } + + $assets = $assets->orderBy('asset_tag', 'ASC')->get(); $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($assets) diff --git a/app/routes.php b/app/routes.php index a7d098d73a..b2d5c6c200 100755 --- a/app/routes.php +++ b/app/routes.php @@ -19,7 +19,7 @@ Route::group(array('prefix' => 'hardware', 'namespace' => 'Controllers\Admin', ' ); Route::resource('hardware', 'AssetsController'); - Route::get('api/hardware', array('as'=>'api.hardware', 'uses'=>'AssetsController@getDatatable')); + Route::get('api/hardware/{status?}', array('as'=>'api.hardware', 'uses'=>'AssetsController@getDatatable')); Route::get('create/{model?}', array( 'as' => 'create/hardware', diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php index dfa3a75252..bf25ea03e4 100755 --- a/app/views/backend/hardware/index.blade.php +++ b/app/views/backend/hardware/index.blade.php @@ -1,20 +1,21 @@ @extends('backend/layouts/default') @section('title0') - @if (Input::get('Pending') || Input::get('Undeployable') || Input::get('Deleted') || Input::get('Requestable') || Input::get('RTD') || Input::get('Deployed') || Input::get('Archived')) - @if (Input::get('Pending')) + + @if (Input::get('status')) + @if (Input::get('status')=='Pending') @lang('general.pending') - @elseif (Input::get('RTD')) + @elseif (Input::get('status')=='RTD') @lang('general.ready_to_deploy') - @elseif (Input::get('Undeployable')) + @elseif (Input::get('status')=='Undeployable') @lang('general.undeployable') - @elseif (Input::get('Deployed')) + @elseif (Input::get('status')=='Deployable') @lang('general.deployed') - @elseif (Input::get('Requestable')) + @elseif (Input::get('status')=='Requestable') @lang('admin/hardware/general.requestable') - @elseif (Input::get('Archived')) + @elseif (Input::get('status')=='Archived') @lang('general.archived') - @elseif (Input::get('Deleted')) + @elseif (Input::get('status')=='Deleted') @lang('general.deleted') @endif @else @@ -61,7 +62,7 @@ Lang::get('admin/hardware/table.checkout_date'), Lang::get('admin/hardware/table.change'), Lang::get('table.actions')) - ->setUrl(route('api.hardware')) // this is the route where data will be retrieved + ->setUrl(route('api.hardware', Input::get('status'))) // this is the route where data will be retrieved ->setOptions('deferRender', true) ->setOptions('stateSave', true) ->setOptions( diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php index bbdd58f7c5..474a2c9867 100644 --- a/app/views/backend/layouts/default.blade.php +++ b/app/views/backend/layouts/default.blade.php @@ -259,12 +259,12 @@