From 3fe3697a2907608a902567a2f1a4493dc1cde74a Mon Sep 17 00:00:00 2001 From: akemidx Date: Mon, 18 Dec 2023 18:26:47 -0500 Subject: [PATCH 1/2] adding column, needs table join --- app/Http/Controllers/Api/LicenseSeatsController.php | 2 +- app/Presenters/LicensePresenter.php | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Api/LicenseSeatsController.php b/app/Http/Controllers/Api/LicenseSeatsController.php index 5e79c49b23..78cf49fd9e 100644 --- a/app/Http/Controllers/Api/LicenseSeatsController.php +++ b/app/Http/Controllers/Api/LicenseSeatsController.php @@ -27,7 +27,7 @@ class LicenseSeatsController extends Controller if ($license = License::find($licenseId)) { $this->authorize('view', $license); - $seats = LicenseSeat::with('license', 'user', 'asset', 'user.department') + $seats = LicenseSeat::with('license', 'user', 'email', 'asset', 'user.department') ->where('license_seats.license_id', $licenseId); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php index e76c9152cb..8c827a1809 100644 --- a/app/Presenters/LicensePresenter.php +++ b/app/Presenters/LicensePresenter.php @@ -228,6 +228,14 @@ class LicensePresenter extends Presenter 'title' => trans('admin/licenses/general.user'), 'visible' => true, 'formatter' => 'usersLinkObjFormatter', + ], [ + 'field' => 'email', + 'searchable' => false, + 'sortable' => false, + 'switchable' => true, + 'title' => trans('admin/users/table.email'), + 'visible' => true, + 'formatter' => 'emailFormatter', ], [ 'field' => 'department', 'searchable' => false, @@ -236,8 +244,7 @@ class LicensePresenter extends Presenter 'title' => trans('general.department'), 'visible' => false, 'formatter' => 'departmentNameLinkFormatter', - ], - [ + ], [ 'field' => 'assigned_asset', 'searchable' => false, 'sortable' => false, From 85bfbf8bc4a9a59c1d25b92d17e8c0b87580d60c Mon Sep 17 00:00:00 2001 From: akemidx Date: Mon, 18 Dec 2023 20:15:06 -0500 Subject: [PATCH 2/2] email in table, shows in export --- app/Http/Controllers/Api/LicenseSeatsController.php | 2 +- app/Http/Transformers/LicenseSeatsTransformer.php | 1 + app/Presenters/LicensePresenter.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/LicenseSeatsController.php b/app/Http/Controllers/Api/LicenseSeatsController.php index 78cf49fd9e..5e79c49b23 100644 --- a/app/Http/Controllers/Api/LicenseSeatsController.php +++ b/app/Http/Controllers/Api/LicenseSeatsController.php @@ -27,7 +27,7 @@ class LicenseSeatsController extends Controller if ($license = License::find($licenseId)) { $this->authorize('view', $license); - $seats = LicenseSeat::with('license', 'user', 'email', 'asset', 'user.department') + $seats = LicenseSeat::with('license', 'user', 'asset', 'user.department') ->where('license_seats.license_id', $licenseId); $order = $request->input('order') === 'asc' ? 'asc' : 'desc'; diff --git a/app/Http/Transformers/LicenseSeatsTransformer.php b/app/Http/Transformers/LicenseSeatsTransformer.php index 62614db4d3..47133a9b95 100644 --- a/app/Http/Transformers/LicenseSeatsTransformer.php +++ b/app/Http/Transformers/LicenseSeatsTransformer.php @@ -29,6 +29,7 @@ class LicenseSeatsTransformer 'assigned_user' => ($seat->user) ? [ 'id' => (int) $seat->user->id, 'name'=> e($seat->user->present()->fullName), + 'email' => e($seat->user->email), 'department'=> ($seat->user->department) ? [ 'id' => (int) $seat->user->department->id, diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php index 8c827a1809..4b86a35069 100644 --- a/app/Presenters/LicensePresenter.php +++ b/app/Presenters/LicensePresenter.php @@ -229,7 +229,7 @@ class LicensePresenter extends Presenter 'visible' => true, 'formatter' => 'usersLinkObjFormatter', ], [ - 'field' => 'email', + 'field' => 'assigned_user.email', 'searchable' => false, 'sortable' => false, 'switchable' => true,