diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php index a5b99adb14..d0f5c13fec 100644 --- a/app/Presenters/UserPresenter.php +++ b/app/Presenters/UserPresenter.php @@ -223,6 +223,7 @@ class UserPresenter extends Presenter 'class' => 'css-barcode', 'title' => trans('general.assets'), 'visible' => true, + 'formatter' => 'linkNumberToUserAssetsFormatter', ], [ 'field' => 'licenses_count', @@ -232,6 +233,7 @@ class UserPresenter extends Presenter 'class' => 'css-license', 'title' => trans('general.licenses'), 'visible' => true, + 'formatter' => 'linkNumberToUserLicensesFormatter', ], [ 'field' => 'consumables_count', @@ -241,6 +243,7 @@ class UserPresenter extends Presenter 'class' => 'css-consumable', 'title' => trans('general.consumables'), 'visible' => true, + 'formatter' => 'linkNumberToUserConsumablesFormatter', ], [ 'field' => 'accessories_count', @@ -250,6 +253,7 @@ class UserPresenter extends Presenter 'class' => 'css-accessory', 'title' => trans('general.accessories'), 'visible' => true, + 'formatter' => 'linkNumberToUserAccessoriesFormatter', ], [ 'field' => 'manages_users_count', @@ -259,6 +263,7 @@ class UserPresenter extends Presenter 'class' => 'css-users', 'title' => trans('admin/users/table.managed_users'), 'visible' => true, + 'formatter' => 'linkNumberToUserManagedUsersFormatter', ], [ 'field' => 'manages_locations_count', @@ -268,6 +273,7 @@ class UserPresenter extends Presenter 'class' => 'css-location', 'title' => trans('admin/users/table.managed_locations'), 'visible' => true, + 'formatter' => 'linkNumberToUserManagedLocationsFormatter', ], [ 'field' => 'notes', diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index fc1f0bedcc..c908adcaae 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -804,6 +804,38 @@ } } + function linkToUserSectionBasedOnCount (count, id, section) { + if (count) { + return '' + count + ''; + } + + return count; + } + + function linkNumberToUserAssetsFormatter(value, row) { + return linkToUserSectionBasedOnCount(value, row.id, 'asset'); + } + + function linkNumberToUserLicensesFormatter(value, row) { + return linkToUserSectionBasedOnCount(value, row.id, 'licenses'); + } + + function linkNumberToUserConsumablesFormatter(value, row) { + return linkToUserSectionBasedOnCount(value, row.id, 'consumables'); + } + + function linkNumberToUserAccessoriesFormatter(value, row) { + return linkToUserSectionBasedOnCount(value, row.id, 'accessories'); + } + + function linkNumberToUserManagedUsersFormatter(value, row) { + return linkToUserSectionBasedOnCount(value, row.id, 'managed-users'); + } + + function linkNumberToUserManagedLocationsFormatter(value, row) { + return linkToUserSectionBasedOnCount(value, row.id, 'managed-locations'); + } + function labelPerPageFormatter(value, row, index, field) { if (row) { if (!row.hasOwnProperty('sheet_info')) { return 1; } @@ -937,4 +969,4 @@ -@endpush \ No newline at end of file +@endpush