A free open source IT asset/license management system
Added user company to custom asset report
snipec4aa10baf8f5
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.phpindex 01cebbd014..4c569fbf9b 100644--- a/app/Http/Controllers/ReportsController.php+++ b/app/Http/Controllers/ReportsController.php@@ -550,6 +550,10 @@ class ReportsController extends Controller$header[] = 'Username';}+ if ($request->filled('user_company')) {+ $header[] = trans('admin/reports/general.custom_export.user_company');+ }+if ($request->filled('email')) {$header[] = 'Email';}@@ -768,7 +772,6 @@ class ReportsController extends Controller$assets->onlyTrashed();}- Log::debug($assets->toSql());$assets->orderBy('assets.id', 'ASC')->chunk(500, function ($assets) use ($handle, $customfields, $request) {$executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];@@ -887,6 +890,14 @@ class ReportsController extends Controller}}+ if ($request->filled('user_company')) {+ if ($asset->checkedOutToUser()) {+ $row[] = ($asset->assignedto->company) ? $asset->assignedto->company->display_name : '';+ } else {+ $row[] = ''; // Empty string if unassigned+ }+ }+if ($request->filled('email')) {// Only works if we're checked out to a user, not anything else.if ($asset->checkedOutToUser()) {diff --git a/resources/lang/en-US/admin/reports/general.php b/resources/lang/en-US/admin/reports/general.phpindex ed8bf1a156..b6b8106d52 100644--- a/resources/lang/en-US/admin/reports/general.php+++ b/resources/lang/en-US/admin/reports/general.php@@ -10,6 +10,7 @@ return ['acceptance_request' => 'Acceptance request','custom_export' => ['user_address' => 'User Address',+ 'user_company' => 'User Company','user_city' => 'User City','user_state' => 'User State','user_country' => 'User Country',diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.phpindex c23c565eb9..4d9f70e5be 100644--- a/resources/views/reports/custom.blade.php+++ b/resources/views/reports/custom.blade.php@@ -252,6 +252,11 @@{{ trans('admin/licenses/table.assigned_to') }}</label>+ <label class="form-control">+ <input type="checkbox" name="user_company" value="1" @checked($template->checkmarkValue('user_company')) />+ {{ trans('admin/reports/general.custom_export.user_company') }}+ </label>+<label class="form-control"><input type="checkbox" name="username" value="1" @checked($template->checkmarkValue('username')) />{{ trans('admin/users/table.username') }}@@ -282,8 +287,6 @@{{ trans('admin/users/table.title') }}</label>- <!-- new -->-<label class="form-control"><input type="checkbox" name="phone" value="1" @checked($template->checkmarkValue('phone')) />{{ trans('admin/users/table.phone') }}