diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index a9ad614d9..b2b9bf358 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -122,7 +122,7 @@ class UserController extends Controller $users = User::where('role', '=', 'agent')->where('is_delete', '=', 0); } elseif ($type === 'users') { $users = User::where('role', '=', 'user')->where('is_delete', '=', 0); - } elseif ($type === 'active') { + } elseif ($type === 'active-users') { $users = User::where('role', '!=', 'admin')->where('active', '=', 1); } elseif ($type === 'inactive') { $users = User::where('role', '!=', 'admin')->where('active', '=', 0); diff --git a/resources/views/vendor/Chumper/user-javascript.blade.php b/resources/views/vendor/Chumper/user-javascript.blade.php index 53bfe4e41..f1f55b214 100644 --- a/resources/views/vendor/Chumper/user-javascript.blade.php +++ b/resources/views/vendor/Chumper/user-javascript.blade.php @@ -39,44 +39,52 @@ foreach($segments as $seg){ $('.all').on('click', function(){ show = 'all'; - $("#chumper").dataTable().fnDestroy(); - myFunction(show, searchTerm); + classname = '.'+show; + filterTable(show); + toggleActiveClass(classname); }); $('.active-users').on('click', function(){ - show = 'active'; - $("#chumper").dataTable().fnDestroy(); - myFunction(show, searchTerm); + show = 'active-users'; + classname = '.'+show; + filterTable(show); + toggleActiveClass(classname); + }); $('.inactive').on('click', function(){ show = 'inactive'; - $("#chumper").dataTable().fnDestroy(); - myFunction(show, searchTerm); + classname = '.'+show; + filterTable(show); + toggleActiveClass(classname); }); $('.agents').on('click', function(){ show = 'agents'; - $("#chumper").dataTable().fnDestroy(); - myFunction(show, searchTerm); + classname = '.'+show; + filterTable(show); + toggleActiveClass(classname); }); $('.users').on('click', function(){ show = 'users'; - $("#chumper").dataTable().fnDestroy(); - myFunction(show, searchTerm); + classname = '.'+show; + filterTable(show); + toggleActiveClass(classname); }); $('.banned').on('click', function(){ show = 'banned'; - $("#chumper").dataTable().fnDestroy(); - myFunction(show, searchTerm); + classname = '.'+show; + filterTable(show); + toggleActiveClass(classname); }); $('.deleted').on('click', function(){ show = 'deleted'; - $("#chumper").dataTable().fnDestroy(); - myFunction(show, searchTerm); + classname = '.'+show; + filterTable(show); + toggleActiveClass(classname); }); document.getElementById('search-text').onkeypress = function(e){ @@ -88,5 +96,15 @@ foreach($segments as $seg){ myFunction(show, searchTerm); } } + + function filterTable(show) { + $("#chumper").dataTable().fnDestroy(); + myFunction(show, searchTerm); + } + + function toggleActiveClass(classname) { + $('.active').removeClass('active'); + $(classname).parent('li').addClass('active'); + } }); \ No newline at end of file