group list

luticate/controllers/groups.controller.js

@@ -1,5 +1,29 @@
 angular.module('luticate')
-    .controller('GroupsController', ['$scope', '$state', 'luticatePromises',
-        function($scope, $state, luticatePromises) {
+    .controller('GroupsController', ['$scope', 'luticateAuthGroups',
+        function($scope, luticateAuthGroups) {
 
-    }]);
+            $scope.columns = [
+                {
+                    name: "Name",
+                    width: 11,
+                    getValue: function(item) {
+                        return item.Name;
+                    }
+                }
+            ];
+
+            $scope.getLoadPagePromise = function(page, perPage, promise)
+            {
+                return luticateAuthGroups.getAll({page: page, perPage: perPage}, promise);
+            };
+
+            $scope.getDelPromise = function(id, promise)
+            {
+                return luticateAuthGroups.del({group_id: id}, promise);
+            };
+
+            $scope.getEditController = function()
+            {
+                return "GroupEdit";
+            };
+        }]);

luticate/controllers/users.controller.js

@@ -1,99 +1,49 @@
 angular.module('luticate')
-    .controller('UsersController', ['$scope', '$state', 'luticateAuthUsers', 'dialogs', '$q', 'luticateDialogErrorHelper',
-        function($scope, $state, luticateAuthUsers, dialogs, $q, luticateDialogErrorHelper) {
-            $scope.page = 0;
-            $scope.perPage = 15;
-            $scope.users = [];
-            $scope.pages = [];
-            $scope.selectedUsers = [];
-
-            var promiseLoadUsers = {
-                id: "promiseLoadUsers",
-                groups: ['userList']
-            };
-            var promiseDelUsers = {
-                id: "promiseDelUsers",
-                loadGroups: ['userList']
-            };
-
-            $scope.loadPage = function(page)
-            {
-                luticateAuthUsers.getAll({page: page, perPage: $scope.perPage}, promiseLoadUsers)
-                    .then(function(users)
-                    {
-                        $scope.page = page;
-                        $scope.users = users;
-                        $scope.pages = [];
-                        var start = Math.max(0, $scope.page - 5);
-                        var end = Math.min(start + 10, (users.Count / $scope.perPage) + (users.Count % $scope.perPage == 0 ? -1 : 0));
-                        for (var i = start; i < end; ++i) {
-                            $scope.pages.push(i);
-                        }
-                    }, function(error)
-                    {
-                    });
-            };
-
-            $scope.displayUser = function(user)
-            {
-                dialogs.create('views/modals/useredit.html', 'UserEditController', user)
-                    .result.then(function (data) {
-                        $scope.loadPage($scope.page);
-                    });
-            };
-
-            $scope.removeUsers = function()
-            {
-                if ($scope.selectedUsers.length == 0) {
-                    $scope.loadPage($scope.page);
-                    return;
+    .controller('UsersController', ['$scope', 'luticateAuthUsers',
+        function($scope, luticateAuthUsers) {
+
+            $scope.columns = [
+                {
+                    name: "Username",
+                    width: 3,
+                    getValue: function(item) {
+                        return item.Username;
+                    }
+                }, {
+                    name: "Email",
+                    width: 3,
+                    getValue: function(item) {
+                        return item.Email;
+                    }
+                }, {
+                    name: "Firstname",
+                    width: 3,
+                    getValue: function(item) {
+                        return item.Firstname;
+                    }
+                }, {
+                    name: "Lastname",
+                    width: 3,
+                    getValue: function(item) {
+                        return item.Lastname;
+                    }
                 }
-                luticateAuthUsers.del({user_id: $scope.selectedUsers[0]}, promiseDelUsers)
-                    .then(function(data)
-                    {
-                        $scope.selectedUsers.splice(0, 1);
-                        $scope.removeUsers();
-                    }, function(error)
-                    {
-                        luticateDialogErrorHelper.errorDialog(error)
-                            .result.then(function(data)
-                            {
-                                $scope.loadPage($scope.page);
-                            }, function(error) {});
-                    });
-            };
+            ];
 
-            $scope.addUser = function()
+            $scope.getLoadPagePromise = function(page, perPage, promise)
             {
-                dialogs.create('views/modals/useredit.html', 'UserEditController', null)
-                    .result.then(function (data) {
-                        $scope.loadPage($scope.page);
-                    });
+                return luticateAuthUsers.getAll({page: page, perPage: perPage}, promise);
             };
 
-            $scope.toggleSelectedUser = function(id)
+            $scope.getDelPromise = function(id, promise)
             {
-                var idx = $scope.selectedUsers.indexOf(id);
-                if (idx > -1) {
-                    $scope.selectedUsers.splice(idx, 1);
-                }
-                else {
-                    $scope.selectedUsers.push(id);
-                }
+                return luticateAuthUsers.del({user_id: id}, promise);
             };
 
-            $scope.toggleSelectAll = function()
+            $scope.getEditController = function()
             {
-                if ($scope.selectedUsers.length == $scope.users.Data.length) {
-                    $scope.selectedUsers = [];
-                }
-                else {
-                    $scope.selectedUsers = [];
-                    for (var i = 0; i < $scope.users.Data.length; ++i) {
-                        $scope.selectedUsers.push($scope.users.Data[i].Id);
-                    }
-                }
+                return "UserEdit";
             };
 
-            $scope.loadPage($scope.page);
+
     }]);

luticate/index.html

@@ -27,11 +27,13 @@
     <script src="../bower_components/luticate-utils/src/promises.js"></script>
     <script src="../bower_components/luticate-utils/src/request.js"></script>
     <script src="../bower_components/luticate-utils/src/lubusy.js"></script>
+    <script src="../bower_components/luticate-utils/src/lutable.js"></script>
     <script src="../bower_components/luticate-utils/src/modals/dialogerror.js"></script>
     <script src="../bower_components/luticate-utils/src/modals/dialogerrorhelper.js"></script>
     <script src="../bower_components/luticate-utils/src/modals/dialogokcancel.js"></script>
     <script src="../bower_components/luticate-auth/src/luticateauth.js"></script>
     <script src="../bower_components/luticate-auth/src/users.js"></script>
+    <script src="../bower_components/luticate-auth/src/groups.js"></script>
     <script src="../bower_components/luticate-auth/src/cache.js"></script>
 
     <!-- scripts -->

luticate/views/groups.html

@@ -1,7 +1,5 @@
 <!-- Page Content -->
 <div class="container">
-
-    <div class="row">
-
-    </div>
+    <lu-table class="row col-sm-8 col-sm-offset-2" ></lu-table>
 </div>
+

luticate/views/users.html

@@ -1,41 +1,4 @@
 <!-- Page Content -->
 <div class="container">
-    <div class="row col-sm-8 col-sm-offset-2" lu-busy="userList">
-        <table class="col-sm-12 table table-hover">
-            <thead>
-                <tr>
-                    <th class="col-sm-3">
-                        <input type="checkbox" ng-click="toggleSelectAll()"
-                               ng-checked="selectedUsers.length == users.Data.length && users.Data.length != 0">
-                        Username
-                    </th>
-                    <th class="col-sm-3">Email</th>
-                    <th class="col-sm-3">Firstname</th>
-                    <th class="col-sm-3">Lastname</th>
-                </tr>
-            </thead>
-            <tbody>
-                <tr ng-repeat="user in users.Data" style="cursor: pointer" ng-click="displayUser(user)">
-                    <td><input name="selectedUsers[]" type="checkbox" ng-checked="selectedUsers.indexOf(user.Id) > -1"
-                               ng-click="$event.stopPropagation();toggleSelectedUser(user.Id)" >&nbsp;{{ user.Username }}</td>
-                    <td>{{ user.Email }}</td>
-                    <td>{{ user.Firstname }}</td>
-                    <td>{{ user.Lastname }}</td>
-                </tr>
-            </tbody>
-        </table>
-
-        <div class="col-sm-12 text-center">
-            <a class="{{ p == page ? 'pagination-current' : 'pagination-not-current'}}" href="" ng-repeat="p in pages" ng-click="loadPage(p)">{{ p + 1 }}&nbsp;</a>
-        </div>
-
-        <div class="col-sm-12">
-            <button class="btn btn-default" type="button" ng-click="removeUsers()" ng-disabled="selectedUsers.length == 0">
-                <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Remove
-            </button>
-            <button class="btn btn-default" type="button" ng-click="addUser()">
-                <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add
-            </button>
-        </div>
-    </div>
+    <lu-table class="row col-sm-8 col-sm-offset-2" ></lu-table>
 </div>