cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug-fix-patch-6

Browse Source 
# Style and UI enhancement in users table for view filteration option.
This commit is contained in:
Manish Verma
2016-12-21 15:25:30 +05:30
parent a3c6467e34
commit d29ca0e626
2 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Agent/helpdesk/UserController.php
View File

@@ -122,7 +122,7 @@ class UserController extends Controller
$users = User::where('role', '=', 'agent')->where('is_delete', '=', 0); $users = User::where('role', '=', 'agent')->where('is_delete', '=', 0);
} elseif ($type === 'users') { } elseif ($type === 'users') {
$users = User::where('role', '=', 'user')->where('is_delete', '=', 0); $users = User::where('role', '=', 'user')->where('is_delete', '=', 0);
} elseif ($type === 'active') { } elseif ($type === 'active-users') {
$users = User::where('role', '!=', 'admin')->where('active', '=', 1); $users = User::where('role', '!=', 'admin')->where('active', '=', 1);
} elseif ($type === 'inactive') { } elseif ($type === 'inactive') {
$users = User::where('role', '!=', 'admin')->where('active', '=', 0); $users = User::where('role', '!=', 'admin')->where('active', '=', 0);

48
resources/views/vendor/Chumper/user-javascript.blade.php vendored
View File

@@ -39,44 +39,52 @@ foreach($segments as $seg){
$('.all').on('click', function(){ $('.all').on('click', function(){
show = 'all'; show = 'all';
$("#chumper").dataTable().fnDestroy(); classname = '.'+show;
myFunction(show, searchTerm); filterTable(show);
toggleActiveClass(classname);
}); });
$('.active-users').on('click', function(){ $('.active-users').on('click', function(){
show = 'active'; show = 'active-users';
$("#chumper").dataTable().fnDestroy(); classname = '.'+show;
myFunction(show, searchTerm); filterTable(show);
toggleActiveClass(classname);
}); });
$('.inactive').on('click', function(){ $('.inactive').on('click', function(){
show = 'inactive'; show = 'inactive';
$("#chumper").dataTable().fnDestroy(); classname = '.'+show;
myFunction(show, searchTerm); filterTable(show);
toggleActiveClass(classname);
}); });
$('.agents').on('click', function(){ $('.agents').on('click', function(){
show = 'agents'; show = 'agents';
$("#chumper").dataTable().fnDestroy(); classname = '.'+show;
myFunction(show, searchTerm); filterTable(show);
toggleActiveClass(classname);
}); });
$('.users').on('click', function(){ $('.users').on('click', function(){
show = 'users'; show = 'users';
$("#chumper").dataTable().fnDestroy(); classname = '.'+show;
myFunction(show, searchTerm); filterTable(show);
toggleActiveClass(classname);
}); });
$('.banned').on('click', function(){ $('.banned').on('click', function(){
show = 'banned'; show = 'banned';
$("#chumper").dataTable().fnDestroy(); classname = '.'+show;
myFunction(show, searchTerm); filterTable(show);
toggleActiveClass(classname);
}); });
$('.deleted').on('click', function(){ $('.deleted').on('click', function(){
show = 'deleted'; show = 'deleted';
$("#chumper").dataTable().fnDestroy(); classname = '.'+show;
myFunction(show, searchTerm); filterTable(show);
toggleActiveClass(classname);
}); });
document.getElementById('search-text').onkeypress = function(e){ document.getElementById('search-text').onkeypress = function(e){
@@ -88,5 +96,15 @@ foreach($segments as $seg){
myFunction(show, searchTerm); myFunction(show, searchTerm);
} }
} }
function filterTable(show) {
$("#chumper").dataTable().fnDestroy();
myFunction(show, searchTerm);
}
function toggleActiveClass(classname) {
$('.active').removeClass('active');
$(classname).parent('li').addClass('active');
}
}); });
</script> </script>