diff --git a/app/Http/Transformers/UsersTransformer.php b/app/Http/Transformers/UsersTransformer.php index 64752d0445..8b3b94b64d 100644 --- a/app/Http/Transformers/UsersTransformer.php +++ b/app/Http/Transformers/UsersTransformer.php @@ -50,6 +50,10 @@ class UsersTransformer 'id' => (int) $user->department->id, 'name'=> e($user->department->name), ] : null, + 'department_manager' => ($user->department?->manager) ? [ + 'id' => (int) $user->department->manager->id, + 'name'=> e($user->department->manager->full_name), + ] : null, 'location' => ($user->userloc) ? [ 'id' => (int) $user->userloc->id, 'name'=> e($user->userloc->name), diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php index a5b99adb14..4b26f95f40 100644 --- a/app/Presenters/UserPresenter.php +++ b/app/Presenters/UserPresenter.php @@ -197,6 +197,15 @@ class UserPresenter extends Presenter 'visible' => true, 'formatter' => 'departmentsLinkObjFormatter', ], + [ + 'field' => 'department_manager', + 'searchable' => true, + 'sortable' => true, + 'switchable' => true, + 'title' => trans('admin/users/general.department_manager'), + 'visible' => true, + 'formatter' => 'usersLinkObjFormatter', + ], [ 'field' => 'location', 'searchable' => true, diff --git a/resources/lang/en-US/admin/users/general.php b/resources/lang/en-US/admin/users/general.php index b097ccec69..9c1042d44d 100644 --- a/resources/lang/en-US/admin/users/general.php +++ b/resources/lang/en-US/admin/users/general.php @@ -51,4 +51,5 @@ return [ 'next_save_user' => 'Next: Save User', 'all_assigned_list_generation' => 'Generated on:', 'email_user_creds_on_create' => 'Email this user their credentials?', + 'department_manager' => 'Department Manager', ]; diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 00bfc84df8..b090ca3dd8 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -51,7 +51,7 @@ + @@ -117,7 +117,7 @@ - + @@ -148,7 +148,7 @@
- + @if ($user->deleted_at!='')
@@ -161,22 +161,22 @@
- +
- + @if (($user->isSuperUser()) || ($user->hasAccess('admin')))
{{ ($user->isSuperUser()) ? strtolower(trans('general.superuser')) : strtolower(trans('general.admin')) }}
@endif - +
- {{ $user->present()->fullName() }} + {{ $user->present()->fullName() }}
- - + + @can('update', $user)
@@ -192,7 +192,7 @@ @can('view', $user)
- @if($user->allAssignedCount() != '0') + @if($user->allAssignedCount() != '0') {{ trans('admin/users/general.print_assigned') }} @else @@ -224,7 +224,7 @@ @else - + @endif
@endif @@ -264,16 +264,16 @@ @endcan

- + - +
- +
- +
{{ trans('admin/users/table.name') }}
@@ -283,7 +283,7 @@
- + @if (!is_null($user->company)) @@ -297,7 +297,7 @@
- + @endif @@ -326,7 +326,7 @@ {{ trans('general.address') }}
- + @if ($user->address) {{ $user->address }}
@endif @@ -418,7 +418,7 @@
{{ $user->employee_num }}
- +
@endif @@ -439,7 +439,7 @@ @endif - + @if ($user->email)
@@ -500,17 +500,29 @@ @if ($user->department) - -
-
- {{ trans('general.department') }} + +
+
+ {{ trans('general.department') }} +
+
- -
+ @if($user->department->manager) +
+
+ {{ trans('admin/users/general.department_manager') }} +
+ +
+ @endif @endif @if ($user->created_at) @@ -544,8 +556,8 @@
{!! ($user->vip=='1') ? ' '.trans('general.yes') : ' '.trans('general.no') !!}
-
- +
+
@@ -596,12 +608,12 @@ {{ trans('admin/users/general.two_factor_active') }}
- + {!! ($user->two_factor_active()) ? ' '.trans('general.yes') : ' '.trans('general.no') !!} - +
- +
@@ -612,16 +624,16 @@
- + @if ((Auth::user()->isSuperUser()) && ($user->two_factor_active_and_enrolled()) && ($snipeSettings->two_factor_enabled!='0') && ($snipeSettings->two_factor_enabled!='')) - +
- + {{ trans('admin/settings/general.two_factor_reset') }} @@ -633,13 +645,13 @@

{{ trans('admin/settings/general.two_factor_reset_help') }}

- - + +
- @endif + @endif @endif - + @if ($user->notes) @@ -1205,4 +1217,4 @@ $(function () { -@stop \ No newline at end of file +@stop