A free open source IT asset/license management system
Added user email to exportable field in custom report
snipe025fb303356a
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.phpindex fb0fc3c225..c191afcf4c 100644--- a/app/Http/Controllers/ReportsController.php+++ b/app/Http/Controllers/ReportsController.php@@ -549,6 +549,10 @@ class ReportsController extends Controller$header[] = 'Username';}+ if ($request->filled('email')) {+ $header[] = 'Email';+ }+if ($request->filled('employee_num')) {$header[] = 'Employee No.';}@@ -882,6 +886,15 @@ class ReportsController extends Controller}}+ if ($request->filled('email')) {+ // Only works if we're checked out to a user, not anything else.+ if ($asset->checkedOutToUser()) {+ $row[] = ($asset->assignedto) ? $asset->assignedto->email : '';+ } else {+ $row[] = ''; // Empty string if unassigned+ }+ }+if ($request->filled('employee_num')) {// Only works if we're checked out to a user, not anything else.if ($asset->checkedOutToUser()) {diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.phpindex 326f23e672..c23c565eb9 100644--- a/resources/views/reports/custom.blade.php+++ b/resources/views/reports/custom.blade.php@@ -257,6 +257,11 @@{{ trans('admin/users/table.username') }}</label>+ <label class="form-control">+ <input type="checkbox" name="email" value="1" @checked($template->checkmarkValue('email')) />+ {{ trans('admin/users/table.email') }}+ </label>+<label class="form-control"><input type="checkbox" name="employee_num" value="1" @checked($template->checkmarkValue('employee_num')) />{{ trans('general.employee_number') }}