diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 76b766a060..5919353eb1 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -422,6 +422,9 @@ class ReportsController extends Controller $header = []; + if ($request->filled('id')) { + $header[] = trans('general.id'); + } if ($request->filled('company')) { $header[] = trans('general.company'); @@ -568,6 +571,10 @@ class ReportsController extends Controller $header[] = trans('general.notes'); } + if ($request->filled('notes')) { + $header[] = trans('admin/manufacturers/table.url'); + } + foreach ($customfields as $customfield) { if ($request->input($customfield->db_column_name()) == '1') { @@ -662,7 +669,11 @@ class ReportsController extends Controller foreach ($assets as $asset) { $count++; $row = []; - + + if ($request->filled('id')) { + $row[] = ($asset->id) ? $asset->id : ''; + } + if ($request->filled('company')) { $row[] = ($asset->company) ? $asset->company->name : ''; } @@ -834,6 +845,10 @@ class ReportsController extends Controller $row[] = ($asset->notes) ? $asset->notes : ''; } + if ($request->filled('url')) { + $row[] = config('app.url').'/hardware/'.$asset->id ; + } + foreach ($customfields as $customfield) { $column_name = $customfield->db_column_name(); if ($request->filled($customfield->db_column_name())) { diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php index c81c7c8041..455b87dd02 100644 --- a/resources/views/reports/custom.blade.php +++ b/resources/views/reports/custom.blade.php @@ -37,6 +37,12 @@ {{ trans('general.select_all') }} +
+ +
-
+
+ +