Skip to content

A free open source IT asset/license management system

Fixed #18659 - added more data to user export

snipe42bf43d68d4b
diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php
index b4b7203bb1..b3553110a8 100755
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -544,8 +544,17 @@ class UsersController extends Controller
trans('admin/users/table.first_name'),
trans('admin/users/table.last_name'),
trans('admin/users/table.name'),
+ trans('admin/users/table.display_name'),
trans('admin/users/table.username'),
trans('admin/users/table.email'),
+ trans('admin/users/table.phone'),
+ trans('admin/users/table.mobile'),
+ trans('general.website'),
+ trans('general.address'),
+ trans('general.city'),
+ trans('general.state'),
+ trans('general.country'),
+ trans('general.zip'),
trans('admin/users/table.manager'),
trans('admin/users/table.location'),
trans('general.department'),
@@ -558,6 +567,22 @@ class UsersController extends Controller
trans('general.notes'),
trans('admin/users/table.activated'),
trans('general.created_at'),
+ trans('general.importer.vip'),
+ trans('admin/users/general.remote'),
+ trans('general.language'),
+ trans('general.autoassign_licenses'),
+ trans('general.ldap_sync'),
+ trans('admin/users/general.two_factor_enrolled'),
+ trans('admin/users/general.two_factor_active'),
+ trans('admin/users/table.managed_users'),
+ trans('admin/users/table.managed_locations'),
+ trans('admin/users/general.department_manager'),
+ trans('general.created_by'),
+ trans('general.updated_at'),
+ trans('general.start_date'),
+ trans('general.end_date'),
+ trans('admin/users/table.last_login'),
+ trans('admin/licenses/table.deleted_at'),
];
fputcsv($handle, $headers);
@@ -566,13 +591,15 @@ class UsersController extends Controller
'assets',
'accessories',
'consumables',
- 'department',
+ 'department.manager',
'licenses',
'manager',
'groups',
'userloc',
- 'company'
- )->orderBy('created_at', 'DESC')
+ 'company',
+ 'createdBy'
+ )->withCount(['managesUsers as manages_users_count', 'managedLocations as manages_locations_count'])
+ ->orderBy('created_at', 'DESC')
->chunk(500, function ($users) use ($handle) {
$formatter = new EscapeFormula('`');
@@ -596,9 +623,18 @@ class UsersController extends Controller
$user->employee_num,
$user->first_name,
$user->last_name,
- $user->display_name,
+ $user->getFullNameAttribute(),
+ $user->getRawOriginal('display_name'),
$user->username,
$user->email,
+ $user->phone,
+ $user->mobile,
+ $user->website,
+ $user->address,
+ $user->city,
+ $user->state,
+ $user->country,
+ $user->zip,
($user->manager) ? $user->manager->display_name : '',
($user->userloc) ? $user->userloc->name : '',
($user->department) ? $user->department->name : '',
@@ -611,6 +647,22 @@ class UsersController extends Controller
$user->notes,
($user->activated == '1') ? trans('general.yes') : trans('general.no'),
$user->created_at,
+ ($user->vip == '1') ? trans('general.yes') : trans('general.no'),
+ ($user->remote == '1') ? trans('general.yes') : trans('general.no'),
+ $user->locale,
+ ($user->autoassign_licenses == '1') ? trans('general.yes') : trans('general.no'),
+ ($user->ldap_import == '1') ? trans('general.yes') : trans('general.no'),
+ ($user->two_factor_active_and_enrolled()) ? trans('general.yes') : trans('general.no'),
+ ($user->two_factor_active()) ? trans('general.yes') : trans('general.no'),
+ $user->manages_users_count,
+ $user->manages_locations_count,
+ ($user->department && $user->department->manager) ? $user->department->manager->display_name : '',
+ ($user->createdBy) ? $user->createdBy->display_name : '',
+ $user->updated_at,
+ $user->start_date,
+ $user->end_date,
+ $user->last_login,
+ $user->deleted_at,
];
// CSV_ESCAPE_FORMULAS is set to false in the .env
diff --git a/tests/Feature/Users/Ui/ExportUsersTest.php b/tests/Feature/Users/Ui/ExportUsersTest.php
index 8c75538aad..1ebc54db15 100644
--- a/tests/Feature/Users/Ui/ExportUsersTest.php
+++ b/tests/Feature/Users/Ui/ExportUsersTest.php
@@ -7,6 +7,7 @@ use App\Models\Asset;
use App\Models\Consumable;
use App\Models\Group;
use App\Models\LicenseSeat;
+use App\Models\Location;
use App\Models\User;
use Tests\TestCase;
@@ -21,20 +22,38 @@ class ExportUsersTest extends TestCase
public function test_can_export_users_to_csv()
{
+ $creator = User::factory()->create(['first_name' => 'Han', 'last_name' => 'Solo']);
+ $deptManager = User::factory()->create(['first_name' => 'Mace', 'last_name' => 'Windu']);
+
$luke = User::factory()
->forCompany(['name' => 'Jedi'])
->forManager(['first_name' => 'Ben', 'last_name' => 'Kenobi'])
->forLocation(['name' => 'Space'])
- ->forDepartment(['name' => 'Lightsaber Fighting Dept'])
-
+ ->forDepartment(['name' => 'Lightsaber Fighting Dept', 'manager_id' => $deptManager->id])
->create([
'jobtitle' => 'Jedi Master',
'employee_num' => '789',
'first_name' => 'Luke',
'last_name' => 'Skywalker',
+ 'display_name' => 'Master Luke',
'username' => 'lskywalker',
'email' => '[email protected]',
+ 'phone' => '555-1234',
+ 'mobile' => '555-5678',
+ 'website' => 'https://jedi.com',
+ 'address' => '123 Moisture Farm',
+ 'city' => 'Anchorhead',
+ 'state' => 'TA',
+ 'country' => 'Outer Rim',
+ 'zip' => '12345',
'notes' => 'Nice guy...',
+ 'vip' => 1,
+ 'remote' => 1,
+ 'autoassign_licenses' => 1,
+ 'ldap_import' => 1,
+ 'start_date' => '2020-01-01',
+ 'end_date' => '2030-12-31',
+ 'created_by' => $creator->id,
]);
$luke->groups()->sync(
@@ -48,6 +67,8 @@ class ExportUsersTest extends TestCase
LicenseSeat::factory()->assignedToUser($luke)->count(2)->create();
Accessory::factory()->checkedOutToUser($luke)->count(2)->create();
Consumable::factory()->checkedOutToUser($luke)->count(2)->create();
+ User::factory()->count(3)->create(['manager_id' => $luke->id]);
+ Location::factory()->count(2)->create(['manager_id' => $luke->id]);
$this->actingAs(User::factory()->viewUsers()->create())
->get(route('users.export'))
@@ -72,22 +93,41 @@ class ExportUsersTest extends TestCase
trans('general.yes'),
])
->assertSeePairsInStreamedResponse([
- 'First Name' => 'Luke',
- 'Last Name' => 'Skywalker',
- 'Username' => 'lskywalker',
- 'Email' => '[email protected]',
- 'Company' => 'Jedi',
- 'Groups' => 'Jedi, Jedi Dance Crew',
- 'Title' => 'Jedi Master',
- 'Employee Number' => '789',
- 'Manager' => 'Ben Kenobi',
- 'Location' => 'Space',
- 'Department' => 'Lightsaber Fighting Dept',
- 'Assets' => '2',
- 'Accessories' => '2',
- 'Consumables' => '2',
- 'Licenses' => '2',
- 'Notes' => 'Nice guy...',
+ trans('admin/users/table.first_name') => 'Luke',
+ trans('admin/users/table.last_name') => 'Skywalker',
+ trans('admin/users/table.display_name') => 'Master Luke',
+ trans('admin/users/table.username') => 'lskywalker',
+ trans('admin/users/table.email') => '[email protected]',
+ trans('admin/companies/table.title') => 'Jedi',
+ trans('general.groups') => 'Jedi, Jedi Dance Crew',
+ trans('admin/users/table.title') => 'Jedi Master',
+ trans('general.employee_number') => '789',
+ trans('admin/users/table.manager') => 'Ben Kenobi',
+ trans('admin/users/table.location') => 'Space',
+ trans('general.department') => 'Lightsaber Fighting Dept',
+ trans('general.assets') => '2',
+ trans('general.accessories') => '2',
+ trans('general.consumables') => '2',
+ trans('general.licenses') => '2',
+ trans('general.notes') => 'Nice guy...',
+ trans('admin/users/table.phone') => '555-1234',
+ trans('admin/users/table.mobile') => '555-5678',
+ trans('general.website') => 'https://jedi.com',
+ trans('general.address') => '123 Moisture Farm',
+ trans('general.city') => 'Anchorhead',
+ trans('general.state') => 'TA',
+ trans('general.country') => 'Outer Rim',
+ trans('general.zip') => '12345',
+ trans('general.importer.vip') => trans('general.yes'),
+ trans('admin/users/general.remote') => trans('general.yes'),
+ trans('general.autoassign_licenses') => trans('general.yes'),
+ trans('general.ldap_sync') => trans('general.yes'),
+ trans('admin/users/table.managed_users') => '3',
+ trans('admin/users/table.managed_locations') => '2',
+ trans('admin/users/general.department_manager') => 'Mace Windu',
+ trans('general.created_by') => 'Han Solo',
+ trans('general.start_date') => '2020-01-01',
+ trans('general.end_date') => '2030-12-31',
]);
}
}