diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 1665ef3d1..3b242f093 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -513,6 +513,10 @@ class ReportsController extends Controller $header[] = trans('general.department'); } + if ($request->filled('title')) { + $header[] = trans('admin/users/table.title'); + } + if ($request->filled('status')) { $header[] = trans('general.status'); } @@ -756,6 +760,14 @@ class ReportsController extends Controller } } + if ($request->filled('title')) { + if ($asset->checkedOutToUser()) { + $row[] = ($asset->assignedto) ? $asset->assignedto->jobtitle : ''; + } else { + $row[] = ''; // Empty string if unassigned + } + } + if ($request->filled('status')) { $row[] = ($asset->assetstatus) ? $asset->assetstatus->name.' ('.$asset->present()->statusMeta.')' : ''; } diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php index 23851e0a8..ab9a4074b 100644 --- a/resources/views/reports/custom.blade.php +++ b/resources/views/reports/custom.blade.php @@ -235,6 +235,13 @@ +
+ +
+