better user list

Author: thiennn

src/Modules/SimplCommerce.Module.Core/Controllers/UserApiController.cs

@@ -51,16 +51,16 @@ public IActionResult List([FromBody] SmartTableParam param)
                     query = query.Where(x => x.FullName.Contains(fullName));
                 }
 
-                if (search.Role != null)
+                if (search.RoleId != null)
                 {
-                    string roleName = search.Role;
-                    query = query.Where(x => x.Roles.Any(r => r.Role.Name.Contains(roleName)));
+                    long roleId = search.RoleId;
+                    query = query.Where(x => x.Roles.Any(r => r.RoleId == roleId));
                 }
 
-                if (search.CustomerGroup != null)
+                if (search.CustomerGroupId != null)
                 {
-                    string customerGroupName = search.CustomerGroup;
-                    query = query.Where(x => x.CustomerGroups.Any(g => g.CustomerGroup.Name.Contains(customerGroupName)));
+                    long customerGroupId = search.CustomerGroupId;
+                    query = query.Where(x => x.CustomerGroups.Any(g => g.CustomerGroupId == customerGroupId));
                 }
 
                 if (search.CreatedOn != null)

src/Modules/SimplCommerce.Module.Core/wwwroot/admin/user/user-list.html

@@ -32,17 +32,26 @@ <h2>{{::vm.translate.get('Users')}}</h2>
             </th>
             <th>
                 <div class="form-group">
-                    <input class="form-control" st-search="Role" />
+                    <select class="form-control" st-search="RoleId">
+                        <option value="">{{::vm.translate.get('All')}}</option>
+                        <option ng-repeat="role in vm.roles" value="{{role.id}}">{{role.name}}</option>
+                    </select>
                 </div>
             </th>
             <th>
                 <div class="form-group">
-                    <input class="form-control" st-search="CustomerGroup" />
+                    <select class="form-control" st-search="CustomerGroupId">
+                        <option value="">{{::vm.translate.get('All')}}</option>
+                        <option ng-repeat="group in vm.customerGroups" value="{{group.id}}">{{group.name}}</option>
+                    </select>
                 </div>
             </th>
             <th><st-date-range predicate="CreatedOn" before="query.before" after="query.after"></st-date-range></th>
             <th></th>
         </tr>
+        <tr>
+            <th ng-show="!vm.isLoading" colspan="6">{{vm.tableStateRef.pagination.totalItemCount | number:0}} records found</th>
+        </tr>
     </thead>
     <tbody ng-show="!vm.isLoading">
         <tr ng-repeat="user in vm.users">
@@ -59,12 +68,12 @@ <h2>{{::vm.translate.get('Users')}}</h2>
     </tbody>
     <tbody ng-show="vm.isLoading">
         <tr>
-            <td colspan="5" class="text-center">Loading ... </td>
+            <td colspan="6" class="text-center">Loading ... </td>
         </tr>
     </tbody>
     <tfoot>
         <tr>
-            <td class="text-center" st-pagination="" st-items-by-page="50" st-displayed-pages="10" colspan="5"></td>
+            <td class="text-center" st-pagination="" st-items-by-page="50" st-displayed-pages="10" colspan="6"></td>
         </tr>
     </tfoot>
 </table>	

src/Modules/SimplCommerce.Module.Core/wwwroot/admin/user/user-list.js

@@ -6,16 +6,19 @@
 
     /* @ngInject */
     function UserListCtrl(userService, translateService) {
-        var vm = this,
-            tableStateRef;
+        var vm = this;
+        vm.tableStateRef;
         vm.users = [];
+        vm.roles = [];
+        vm.customerGroups = [];
         vm.translate = translateService;
 
         vm.getUsers = function getUsers(tableState) {
-            tableStateRef = tableState;
+            vm.tableStateRef = tableState;
             vm.isLoading = true;
             userService.getUsers(tableState).then(function (result) {
                 vm.users = result.data.items;
+                tableState.pagination.totalItemCount = result.data.totalRecord;
                 tableState.pagination.numberOfPages = result.data.numberOfPages;
                 vm.isLoading = false;
             });
@@ -26,7 +29,7 @@
                 if (result) {
                     userService.deleteUser(user)
                         .then(function (result) {
-                            vm.getUsers(tableStateRef);
+                            vm.getUsers(vm.tableStateRef);
                             toastr.success(user.fullName + ' has been deleted');
                         })
                         .catch(function (response) {
@@ -35,5 +38,17 @@
                 }
             });
         };
+
+        function init() {
+            userService.getRoles().then(function (result) {
+                vm.roles = result.data;
+            });
+
+            userService.getCustomerGroups().then(function (result) {
+                vm.getCustomerGroups = result.data;
+            });
+        }
+
+        init();
     }
 })();