added query filter for users component

Author: darryldecode

src/Darryldecode/Backend/Components/User/Commands/QueryUsersCommand.php

@@ -121,41 +121,26 @@ public function handle(User $user, Group $group, Dispatcher $dispatcher)
 
         $results = null;
 
-        // if group Id has been provided, we will query
-        // the users by group, or else, we will query
-        // users regardless of its group
+        $q = $user->with(array_merge(array('groups'),$this->with))
+            ->ofFirstName($this->firstName)
+            ->ofLastName($this->lastName)
+            ->ofEmail($this->email);
+
         if( is_int($this->groupId) )
         {
-            $q = $this->app['db']->table('user_group_pivot_table')
-                ->select('*')
-                ->where('group_id',$this->groupId)
-                ->join('users','user_group_pivot_table.user_id','=','users.id')
-                ->join('groups','user_group_pivot_table.group_id','=','groups.id');
-
-            if( $this->paginated )
-            {
-                $results = $q->paginate($this->perPage);
-            }
-            else
+            $q->whereHas('groups', function($q)
             {
-                $results = $q->get();
-            }
+                $q->where('groups.id',$this->groupId);
+            });
+        }
+
+        if( $this->paginated )
+        {
+            $results = $q->paginate($this->perPage);
         }
         else
         {
-            $q = $user->with(array_merge(array('groups'),$this->with))
-                ->ofFirstName($this->firstName)
-                ->ofLastName($this->lastName)
-                ->ofEmail($this->email);
-
-            if( $this->paginated )
-            {
-                $results = $q->paginate($this->perPage);
-            }
-            else
-            {
-                $results = $q->get();
-            }
+            $results = $q->get();
         }
 
         // fire after query event

src/Darryldecode/Backend/Components/User/Models/User.php

@@ -296,19 +296,19 @@ public function getValidationRules()
 
 	public function scopeOfFirstName($query, $firstName)
 	{
-		if( $firstName === null ) return false;
+		if( $firstName === null || $firstName === '' ) return false;
 
-		return $query->where('first_name','like',"%{$firstName}%");
+		return $query->where('first_name','LIKE',"%{$firstName}%");
 	}
 	public function scopeOfLastName($query, $lastName)
 	{
-		if( $lastName === null ) return false;
+		if( $lastName === null || $lastName === '' ) return false;
 
-		return $query->where('last_name','like',"%{$lastName}%");
+		return $query->where('last_name','LIKE',"%{$lastName}%");
 	}
 	public function scopeOfEmail($query, $email)
 	{
-		if( $email === null ) return false;
+		if( $email === null || $email === '' ) return false;
 
 		return $query->where('email','=',$email);
 	}

src/Darryldecode/Backend/Components/User/Views/users.blade.php

@@ -16,9 +16,27 @@
                         <div class="control-panel text-right">
                             <button data-ng-click="drawer.show('drawer-create')" class="btn btn-default"><i class="fa fa-plus"></i> New User</button>
                             <a href="{{route('backend.groups')}}" class="btn btn-default"><i class="fa fa-wrench"></i> Manage Groups</a>
+                            <button data-ng-click="filter.toggle()" class="btn btn-default" title="Open Query Filter"><i class="fa fa-filter"></i></button>
                         </div>
                     </div>
                 </div>
+                <div class="row" data-ng-if="filter.isOpen">
+                    <div class="col-lg-12 col-md-12">
+                        <table class="table">
+                            <tr>
+                                <td><input data-ng-model="filter.firstName" type="text" class="form-control" placeholder="First Name"></td>
+                                <td><input data-ng-model="filter.lastName" type="text" class="form-control" placeholder="Last Name"></td>
+                                <td><input data-ng-model="filter.email" type="text" class="form-control" placeholder="Email"></td>
+                                <td>
+                                    <select data-ng-model="filter.group" data-ng-options="g.id as g.name for g in groups">
+                                        <option value="">--group--</option>
+                                    </select>
+                                </td>
+                                <td><button class="btn btn-default" data-ng-click="filter.filter()" data-ng-disabled="filter.isQuerying">Filter</button></td>
+                            </tr>
+                        </table>
+                    </div>
+                </div>
                 <div class="table-responsive animated fadeIn">
                     <table class="table table-hover">
                         <tr>
@@ -28,7 +46,7 @@
                             <th colspan="2" class="action text-center"><i class="fa fa-bolt"></i></th>
                         </tr>
                         <tr data-ng-show="!users.data.length">
-                            <td colspan="4" class="text-center">Loading <i class="fa fa-spinner fa-spin"></i></td>
+                            <td colspan="4" class="text-center">No Results Found.</td>
                         </tr>
                         <tr data-ng-repeat="u in users.data" class="user-item-@{{::$index}}" >
                             <td>[@{{::u.id}}]</td>

src/Darryldecode/Backend/Public/backend/cb/app/users/controller.manage.js

@@ -198,6 +198,35 @@ angular.module('cb.user').controller('ManageUsersController', ['$scope','$window
         });
     };
 
+    // filter results
+    $scope.filter = {};
+    $scope.filter.isQuerying = false;
+    $scope.filter.isOpen = false;
+    $scope.filter.firstName = '';
+    $scope.filter.lastName = '';
+    $scope.filter.email = '';
+    $scope.filter.group = '';
+    $scope.filter.toggle = function () {
+        if( $scope.filter.isOpen ) queryInitialData();
+        $scope.filter.isOpen = !$scope.filter.isOpen;
+    };
+    $scope.filter.filter = function () {
+        $scope.filter.isQuerying = true;
+        UsersFactory.get({
+            perPage: $scope.pagination.perPage,
+            groupId: $scope.filter.group,
+            firstName: $scope.filter.firstName,
+            lastName: $scope.filter.lastName,
+            email: $scope.filter.email
+        }).then(function (success) {
+            $scope.filter.isQuerying = false;
+            $scope.pagination.current = 1;
+            $scope.users = success.data.data;
+        }, function (error) {
+            GlobalLoaderService.show(error.data.message || 'An error has occurred.', 'danger').hide(4000);
+        });
+    };
+
     // watch if password match
     $scope.$watch('user.passwordConfirm', function () {
         if( $scope.user.password == '' ) return;