From 8cc695b65fe91303351d60434e92c78652b10fd8 Mon Sep 17 00:00:00 2001 From: Daniel Meltzer Date: Thu, 29 Dec 2016 09:31:16 -0500 Subject: [PATCH] Port more assignedUser to assignedTo. --- app/Helpers/Helper.php | 4 ++-- app/Http/Controllers/AssetsController.php | 4 ++-- app/Http/Controllers/CategoriesController.php | 2 +- app/Http/Controllers/ManufacturersController.php | 2 +- app/Http/Controllers/ReportsController.php | 8 ++++---- app/Http/Controllers/ViewAssetsController.php | 2 +- app/Models/Asset.php | 13 ++++++++----- app/Models/CheckoutRequest.php | 4 +--- .../views/account/requestable-assets.blade.php | 4 ---- resources/views/hardware/bulk-delete.blade.php | 4 ++-- resources/views/hardware/qr-view.blade.php | 3 ++- resources/views/hardware/view.blade.php | 4 ++-- resources/views/licenses/view.blade.php | 6 ++---- resources/views/reports/depreciation.blade.php | 10 ++++------ resources/views/reports/index.blade.php | 9 +++------ resources/views/reports/unaccepted_assets.blade.php | 4 ++-- 16 files changed, 37 insertions(+), 46 deletions(-) diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 833278efae..abaabfbf1e 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -337,11 +337,11 @@ class Helper * * @author [A. Gianotto] [] * @since [v2.5] - * @return Array + * @return array */ public static function detailedAssetList() { - $assets = array('' => trans('general.select_asset')) + Company::scopeCompanyables(Asset::with('assignedUser', 'model'), 'assets.company_id')->get()->pluck('detailed_name', 'id')->toArray(); + $assets = array('' => trans('general.select_asset')) + Company::scopeCompanyables(Asset::with('assignedTo', 'model'), 'assets.company_id')->get()->pluck('detailed_name', 'id')->toArray(); return $assets; } diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php index b9bb6b09d2..e5263babfa 100755 --- a/app/Http/Controllers/AssetsController.php +++ b/app/Http/Controllers/AssetsController.php @@ -1164,7 +1164,7 @@ class AssetsController extends Controller return View::make('hardware/labels')->with('assets', Asset::find($asset_ids))->with('settings', Setting::getSettings())->with('count', $count)->with('settings', Setting::getSettings()); } elseif (Input::get('bulk_actions')=='delete') { - $assets = Asset::with('assigneduser', 'assetloc')->find($asset_ids); + $assets = Asset::with('assignedTo', 'assetloc')->find($asset_ids); $assets->each(function($asset) { $this->authorize('delete',$asset); }); @@ -1317,7 +1317,7 @@ class AssetsController extends Controller public function getDatatable(Request $request, $status = null) { $this->authorize('index', Asset::class); - $assets = Company::scopeCompanyables(Asset::select('assets.*'))->with('model', 'assigneduser', 'assigneduser.userloc', 'assetstatus', 'defaultLoc', 'assetlog', 'model', 'model.category', 'model.manufacturer', 'model.fieldset', 'assetstatus', 'assetloc', 'company') + $assets = Company::scopeCompanyables(Asset::select('assets.*'))->with('model', 'assignedTo', 'assetLoc', 'assetstatus', 'defaultLoc', 'assetlog', 'model', 'model.category', 'model.manufacturer', 'model.fieldset', 'assetstatus', 'company') ->Hardware(); if ($request->has('search')) { diff --git a/app/Http/Controllers/CategoriesController.php b/app/Http/Controllers/CategoriesController.php index 5599dd5e42..84fcedfba7 100755 --- a/app/Http/Controllers/CategoriesController.php +++ b/app/Http/Controllers/CategoriesController.php @@ -247,7 +247,7 @@ class CategoriesController extends Controller public function getDataViewAssets(Request $request, $categoryID) { $category = Category::find($categoryID); - $category = $category->load('assets.company', 'assets.model', 'assets.assetstatus', 'assets.assigneduser'); + $category = $category->load('assets.company', 'assets.model', 'assets.assetstatus', 'assets.assignedTo'); $category_assets = $category->assets(); if (Input::has('search')) { $category_assets = $category_assets->TextSearch(e($request->input('search'))); diff --git a/app/Http/Controllers/ManufacturersController.php b/app/Http/Controllers/ManufacturersController.php index f2afea9b19..6a28fa2743 100755 --- a/app/Http/Controllers/ManufacturersController.php +++ b/app/Http/Controllers/ManufacturersController.php @@ -246,7 +246,7 @@ class ManufacturersController extends Controller protected function getDataAssetsView(Manufacturer $manufacturer, Request $request) { - $manufacturer = $manufacturer->load('assets.model', 'assets.assigneduser', 'assets.assetstatus', 'assets.company'); + $manufacturer = $manufacturer->load('assets.model', 'assets.assignedTo', 'assets.assetstatus', 'assets.company'); $manufacturer_assets = $manufacturer->assets(); if ($request->has('search')) { diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index e14eacff09..1c29de936d 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -121,7 +121,7 @@ class ReportsController extends Controller // Open output stream $handle = fopen('php://output', 'w'); - Asset::with('assignedTo', 'assetLoc','defaultLoc','assigneduser.userloc','model','supplier','assetstatus','model.manufacturer')->orderBy('created_at', 'DESC')->chunk(500, function($assets) use($handle, $customfields) { + Asset::with('assignedTo', 'assetLoc','defaultLoc','assignedTo','model','supplier','assetstatus','model.manufacturer')->orderBy('created_at', 'DESC')->chunk(500, function($assets) use($handle, $customfields) { $headers=[ trans('general.company'), trans('admin/hardware/table.asset_tag'), @@ -194,7 +194,7 @@ class ReportsController extends Controller { // Grab all the assets - $assets = Asset::with('model', 'assigneduser', 'assetstatus', 'defaultLoc', 'assetlog', 'company') + $assets = Asset::with('model', 'assignedTo', 'assetstatus', 'defaultLoc', 'assetlog', 'company') ->orderBy('created_at', 'DESC')->get(); return View::make('reports/depreciation', compact('assets')); @@ -212,7 +212,7 @@ class ReportsController extends Controller { // Grab all the assets - $assets = Asset::with('model', 'assigneduser', 'assetstatus', 'defaultLoc', 'assetlog') + $assets = Asset::with('model', 'assignedTo', 'assetstatus', 'defaultLoc', 'assetlog') ->orderBy('created_at', 'DESC')->get(); $csv = \League\Csv\Writer::createFromFileObject(new \SplTempFileObject()); @@ -488,7 +488,7 @@ class ReportsController extends Controller */ public function postCustom() { - $assets = Asset::orderBy('created_at', 'DESC')->with('company','assigneduser', 'assetloc','defaultLoc','assigneduser.userloc','model','supplier','assetstatus','model.manufacturer')->get(); + $assets = Asset::orderBy('created_at', 'DESC')->with('company','assignedTo', 'assetloc','defaultLoc','assigneduser.userloc','model','supplier','assetstatus','model.manufacturer')->get(); $customfields = CustomField::get(); $rows = [ ]; diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php index 76e13ce632..4d2c8f52be 100755 --- a/app/Http/Controllers/ViewAssetsController.php +++ b/app/Http/Controllers/ViewAssetsController.php @@ -69,7 +69,7 @@ class ViewAssetsController extends Controller public function getRequestableIndex() { - $assets = Asset::with('model', 'defaultLoc', 'assetloc', 'assigneduser')->Hardware()->RequestableAssets()->get(); + $assets = Asset::with('model', 'defaultLoc', 'assetloc', 'assignedTo')->Hardware()->RequestableAssets()->get(); $models = AssetModel::with('category')->RequestableModels()->get(); return View::make('account/requestable-assets', compact('user', 'assets', 'models')); diff --git a/app/Models/Asset.php b/app/Models/Asset.php index ff4cd7aea6..4007612486 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -154,8 +154,8 @@ class Asset extends Depreciable public function getDetailedNameAttribute() { - if ($this->assignedUser) { - $user_name = $this->assignedUser->present()->fullName(); + if ($this->assignedTo) { + $user_name = $this->assignedTo->present()->name(); } else { $user_name = "Unassigned"; } @@ -204,6 +204,12 @@ class Asset extends Depreciable ->orderBy('created_at', 'desc'); } + + /** + * Even though we allow allow for checkout to things beyond users + * this method is an easy way of seeing if we are checked out to a user. + * @return mixed + */ public function assigneduser() { return $this->belongsTo('\App\Models\User', 'assigned_to') @@ -233,9 +239,6 @@ class Asset extends Depreciable } // Default to User // var_dump($this); - if(!$this->assignedTo) { - dd($this); - } return $this->assignedTo->userLoc(); } return $this->defaultLoc(); diff --git a/app/Models/CheckoutRequest.php b/app/Models/CheckoutRequest.php index 94d1cffb25..39d046a9f8 100644 --- a/app/Models/CheckoutRequest.php +++ b/app/Models/CheckoutRequest.php @@ -39,10 +39,8 @@ class CheckoutRequest extends Model { if ($this->itemType() == "asset") { $asset = $this->itemRequested(); - if ($asset->assigneduser && $asset->assetloc) { + if ($asset->assignedTo) { return $asset->assetloc; - } elseif ($asset->defaultLoc) { - return $asset->defaultLoc; } } return $this->itemRequested()->location; diff --git a/resources/views/account/requestable-assets.blade.php b/resources/views/account/requestable-assets.blade.php index 68718d72a7..a615ece5e7 100644 --- a/resources/views/account/requestable-assets.blade.php +++ b/resources/views/account/requestable-assets.blade.php @@ -60,11 +60,7 @@ {{ $asset->serial }} - @if ($asset->assigneduser && $asset->assetloc) {{ $asset->assetloc->name }} - @elseif ($asset->defaultLoc) - {{ $asset->defaultLoc->name }} - @endif @if ($asset->assigned_to != '' && $asset->assigned_to > 0) Checked out diff --git a/resources/views/hardware/bulk-delete.blade.php b/resources/views/hardware/bulk-delete.blade.php index d60b67e429..a9cbf6e037 100644 --- a/resources/views/hardware/bulk-delete.blade.php +++ b/resources/views/hardware/bulk-delete.blade.php @@ -47,8 +47,8 @@ @endif - @if ($asset->assigneduser) - {{ $asset->assigneduser->present()->fullName() }} ({{ $asset->assigneduser->username }}) + @if ($asset->assignedTo) + {{ $asset->assignedTo->present()->name().' ' .$asset->assigneduser ? '('.$asset->assigneduser->username. ')' : ''}} @endif diff --git a/resources/views/hardware/qr-view.blade.php b/resources/views/hardware/qr-view.blade.php index 44fea31017..d002c23023 100644 --- a/resources/views/hardware/qr-view.blade.php +++ b/resources/views/hardware/qr-view.blade.php @@ -336,13 +336,14 @@ @endif @if (($asset->assigneduser) && ($asset->assigned_to > 0) && ($asset->deleted_at=='')) + {{-- @TODO This should be extnded for details about non users --}}

{{ trans('admin/hardware/form.checkedout_to') }}