diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php index c1ed67183d..fe1fb443d3 100644 --- a/app/Http/Transformers/AssetsTransformer.php +++ b/app/Http/Transformers/AssetsTransformer.php @@ -66,7 +66,8 @@ class AssetsTransformer 'id' => (int) $asset->assigneduser->id, 'name' => e($asset->assigneduser->getFullNameAttribute()), 'first_name'=> e($asset->assigneduser->first_name), - 'last_name'=> e($asset->assigneduser->last_name) + 'last_name'=> e($asset->assigneduser->last_name), + 'employee_number' => e($asset->assigneduser->employee_num), ] : null, 'warranty' => ($asset->warranty_months > 0) ? e($asset->warranty_months . ' ' . trans('admin/hardware/form.months')) : null, 'warranty_expires' => ($asset->warranty_months > 0) ? Helper::getFormattedDateObject($asset->warranty_expires, 'date') : null, diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php index 47bdaa1fb8..d731dbe70e 100644 --- a/app/Presenters/AssetPresenter.php +++ b/app/Presenters/AssetPresenter.php @@ -99,6 +99,13 @@ class AssetPresenter extends Presenter "title" => trans('admin/hardware/form.checkedout_to'), "visible" => true, "formatter" => "usersLinkObjFormatter" + ], [ + "field" => "assigned_to.employee_number", + "searchable" => false, + "sortable" => false, + "title" => trans('admin/users/table.employee_num'), + "visible" => false, + ],[ "field" => "location", "searchable" => true, diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php index 03ef62873a..24aa20aa1a 100755 --- a/resources/views/hardware/index.blade.php +++ b/resources/views/hardware/index.blade.php @@ -40,7 +40,9 @@ @stop @section('header_right') - {{ trans('general.create') }} + + {{ trans('admin/hardware/table.dl_csv') }} + {{ trans('general.create') }} @stop {{-- Page content --}} diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index df6d4a98d7..c4d18eb174 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -530,7 +530,6 @@
  • @lang('general.depreciation_report')
  • @lang('general.license_report')
  • @lang('general.asset_maintenance_report')
  • -
  • @lang('general.asset_report')
  • @lang('general.unaccepted_asset_report')
  • @lang('general.accessory_report')
  • @lang('general.custom_report')