From 9aede459188f4bf31b6bb299e55ea0f8fcf6ffdd Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 17 Mar 2025 14:43:23 -0700 Subject: [PATCH 01/22] Remove unneeded eager loads --- app/Http/Controllers/Users/UsersController.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php index 1387aa8a9..761093911 100755 --- a/app/Http/Controllers/Users/UsersController.php +++ b/app/Http/Controllers/Users/UsersController.php @@ -395,13 +395,22 @@ class UsersController extends Controller // Make sure the user can view users at all $this->authorize('view', User::class); - $user = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($user->id); + $user = User::with([ + 'consumables', + 'accessories', + 'licenses', + 'userloc', + ]) + ->withTrashed() + ->find($user->id); // Make sure they can view this particular user $this->authorize('view', $user); - $userlog = $user->userlog->load('item'); - return view('users/view', compact('user', 'userlog'))->with('settings', Setting::getSettings()); + return view('users/view', [ + 'user' => $user, + 'settings' => Setting::getSettings(), + ]); } From 5944034b8b324783609fed599a06729aabc10c21 Mon Sep 17 00:00:00 2001 From: akemidx Date: Wed, 19 Mar 2025 15:22:09 -0400 Subject: [PATCH 02/22] moving warranty/depreciation to be with the other cost/eol values --- app/Http/Controllers/ReportsController.php | 48 +++++++++++----------- resources/views/reports/custom.blade.php | 20 ++++----- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 05cc2e7df..bd22562a6 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -493,6 +493,17 @@ class ReportsController extends Controller $header[] = trans('admin/hardware/table.eol'); } + if ($request->filled('warranty')) { + $header[] = trans('admin/hardware/form.warranty'); + $header[] = trans('admin/hardware/form.warranty_expires'); + } + + if ($request->filled('depreciation')) { + $header[] = trans('admin/hardware/table.book_value'); + $header[] = trans('admin/hardware/table.diff'); + $header[] = trans('admin/hardware/form.fully_depreciated'); + } + if ($request->filled('order')) { $header[] = trans('admin/hardware/form.order'); } @@ -579,17 +590,6 @@ class ReportsController extends Controller $header[] = trans('general.status'); } - if ($request->filled('warranty')) { - $header[] = trans('admin/hardware/form.warranty'); - $header[] = trans('admin/hardware/form.warranty_expires'); - } - - if ($request->filled('depreciation')) { - $header[] = trans('admin/hardware/table.book_value'); - $header[] = trans('admin/hardware/table.diff'); - $header[] = trans('admin/hardware/form.fully_depreciated'); - } - if ($request->filled('checkout_date')) { $header[] = trans('admin/hardware/table.checkout_date'); } @@ -805,6 +805,19 @@ class ReportsController extends Controller $row[] = ($asset->purchase_date != '') ? $asset->asset_eol_date : ''; } + if ($request->filled('warranty')) { + $row[] = ($asset->warranty_months) ? $asset->warranty_months : ''; + $row[] = $asset->present()->warranty_expires(); + } + + if ($request->filled('depreciation')) { + $depreciation = $asset->getDepreciatedValue(); + $diff = ($asset->purchase_cost - $depreciation); + $row[] = Helper::formatCurrencyOutput($depreciation); + $row[] = Helper::formatCurrencyOutput($diff); + $row[] = (($asset->depreciation) && ($asset->depreciated_date())) ? $asset->depreciated_date()->format('Y-m-d') : ''; + } + if ($request->filled('order')) { $row[] = ($asset->order_number) ? $asset->order_number : ''; } @@ -938,19 +951,6 @@ class ReportsController extends Controller $row[] = ($asset->assetstatus) ? $asset->assetstatus->name.' ('.$asset->present()->statusMeta.')' : ''; } - if ($request->filled('warranty')) { - $row[] = ($asset->warranty_months) ? $asset->warranty_months : ''; - $row[] = $asset->present()->warranty_expires(); - } - - if ($request->filled('depreciation')) { - $depreciation = $asset->getDepreciatedValue(); - $diff = ($asset->purchase_cost - $depreciation); - $row[] = Helper::formatCurrencyOutput($depreciation); - $row[] = Helper::formatCurrencyOutput($diff); - $row[] = (($asset->depreciation) && ($asset->depreciated_date())) ? $asset->depreciated_date()->format('Y-m-d') : ''; - } - if ($request->filled('checkout_date')) { $row[] = ($asset->last_checkout) ? $asset->last_checkout : ''; } diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php index 2ef3acfd7..82db5fa4a 100644 --- a/resources/views/reports/custom.blade.php +++ b/resources/views/reports/custom.blade.php @@ -147,6 +147,16 @@ {{ trans('admin/hardware/form.eol_date') }} + + + + - - - -