ui fixes

luticate/controllers/modals/groupedit.controller.js

@@ -19,15 +19,23 @@ angular.module('luticate')
             $scope.submitForm = function()
             {
                 if ($scope.group.Id != null) {
+                    var promiseEditGroup = {
+                        id: "promiseEditGroup",
+                        loaderGroups: ["modal"]
+                    };
                     return luticateAuthGroups.edit({
                         group_id: $scope.group.Id,
                         group_name: $scope.group.Name
-                    });
+                    }, promiseEditGroup);
                 }
                 else {
+                    var promiseAddGroup = {
+                        id: "promiseAddGroup",
+                        loaderGroups: ["modal"]
+                    };
                     return luticateAuthGroups.add({
                         group_name: $scope.group.Name
-                    });
+                    }, promiseAddGroup);
                 }
             };
 

luticate/controllers/modals/groupusers.controller.js

@@ -3,8 +3,8 @@
  */
 
 angular.module('luticate')
-    .controller('GroupUsersController', ['$scope', 'luticateAuthGroups', 'data',
-        function($scope, luticateAuthGroups, data) {
+    .controller('GroupUsersController', ['$scope', 'luticateAuthGroups', 'data', 'dialogs',
+        function($scope, luticateAuthGroups, data, dialogs) {
 
             $scope.group = data;
 
@@ -37,9 +37,20 @@ angular.module('luticate')
                     }
                 ],
 
-                permissions: {
-                    add: 'LU_GROUP_USER_ADD',
-                    del: 'LU_GROUP_USER_DEL'
+                onItemClicked: function(item)
+                {
+                    $scope.itemPicker.luBasicTableScope.toggleCheckedItem(item);
+                },
+
+                editData: $scope.group,
+
+                canAdd: 'LU_GROUP_USER_ADD',
+
+                canDel: 'LU_GROUP_USER_DEL',
+
+                canEdit: function()
+                {
+                    return true;
                 },
 
                 getLoadPagePromise: function (page, perPage, promise) {
@@ -58,20 +69,12 @@ angular.module('luticate')
                 },
 
                 getEditController: function () {
-                    return "UserPicker";
-                },
-
-                onEdited: function(item) {
-
-                },
-
-                onItemSelectionChanged: function(item, selected) {
-
+                    return "GroupUsersAdd";
                 },
 
-                displayItem: function(item, scope)
+                getItemText: function(item)
                 {
-                    scope.toggleSelectedItem(item);
+                    return item.Username;
                 }
             };
 

luticate/controllers/modals/groupusersadd.controller.js

@@ -0,0 +1,89 @@
+/**
+ * Created by robin on 11/6/15.
+ */
+
+angular.module('luticate')
+    .controller('GroupUsersAddController', ['$scope', 'luticateAuthUsers', 'data', '$q', 'dialogs', 'luticateAuthGroups',
+        function($scope, luticateAuthUsers, data, $q, dialogs, luticateAuthGroups) {
+            $scope.selectedUsers = [];
+            $scope.group = data;
+            $scope.userPicker = {
+                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;
+                        }
+                    }
+                ],
+
+                canAdd: 'LU_USER_ADD',
+
+                canDel: 'LU_USER_DEL',
+
+                canEdit: 'LU_USER_EDIT',
+
+                getLoadPagePromise: function (page, perPage, promise) {
+                    return luticateAuthUsers.getAll({page: page, perPage: perPage}, promise);
+                },
+
+                getItemText: function(item)
+                {
+                    return item.Username;
+                }
+            };
+
+            $scope.addUser = function(defer)
+            {
+                if ($scope.userPicker.pickedItems.length == 0) {
+                    defer.resolve();
+                    return;
+                }
+
+                var promiseAddUser = {
+                    id: "promiseAddUser",
+                    loaderGroups: ["modal"]
+                };
+
+                var user = $scope.userPicker.pickedItems[0];
+                luticateAuthGroups.usersAdd({
+                    group_id: $scope.group.Id,
+                    user_id: user.Id
+                }, promiseAddUser).then(function(data)
+                {
+                    $scope.userPicker.pickedItems.splice(0, 1);
+                    $scope.addUser(defer);
+                }, function(error)
+                {
+                    defer.reject(error);
+                });
+            };
+
+            $scope.submitForm = function()
+            {
+                var defer = $q.defer();
+
+                $scope.addUser(defer);
+
+                return defer.promise;
+            };
+        }]);

luticate/controllers/modals/permissionedit.controller.js

@@ -26,10 +26,18 @@ angular.module('luticate')
                     permission_value: $scope.permission.Value
                 };
                 if (!$scope.permission.IsNew) {
-                    return luticateAuthPermissions.edit(perm);
+                    var promiseEditPermission = {
+                        id: "promiseEditPermission",
+                        loaderGroups: ["modal"]
+                    };
+                    return luticateAuthPermissions.edit(perm, promiseEditPermission);
                 }
                 else {
-                    return luticateAuthPermissions.add(perm);
+                    var promiseAddPermission = {
+                        id: "promiseAddPermission",
+                        loaderGroups: ["modal"]
+                    };
+                    return luticateAuthPermissions.add(perm, promiseAddPermission);
                 }
             }
         }]);

luticate/controllers/modals/useredit.controller.js

@@ -31,22 +31,13 @@ angular.module('luticate')
                 same_passwords: 'userPassword.value==$value'
             };
 
-            var promiseEditUser = {
-                id: "promiseEditUser",
-                loaderGroups: ["modal"]
-            };
-            var promiseAddUser = {
-                id: "promiseAddUser",
-                loaderGroups: ["modal"]
-            };
-            var promiseSetPassword = {
-                id: "promiseSetPassword",
-                loaderGroups: ["modal"]
-            };
-
             $scope.submitForm = function()
             {
                 if ($scope.user.Id != null) {
+                    var promiseEditUser = {
+                        id: "promiseEditUser",
+                        loaderGroups: ["modal"]
+                    };
                     var defer = $q.defer();
                     if (luticateAuthCache.hasEffectivePermission("LU_USER_EDIT")) {
                         luticateAuthUsers.edit({
@@ -66,6 +57,10 @@ angular.module('luticate')
                     return defer.promise;
                 }
                 else {
+                    var promiseAddUser = {
+                        id: "promiseAddUser",
+                        loaderGroups: ["modal"]
+                    };
                     var user = {
                         username: $scope.user.Username,
                         email: $scope.user.Email,
@@ -79,6 +74,10 @@ angular.module('luticate')
 
             $scope.mayEditPassword = function(defer)
             {
+                var promiseSetPassword = {
+                    id: "promiseSetPassword",
+                    loaderGroups: ["modal"]
+                };
                 if ($scope.userPassword.value != ""
                     && luticateAuthCache.hasEffectivePermission("LU_USER_SET_PASSWORD")) {
                     luticateAuthUsers.setPassword({

luticate/controllers/modals/userpicker.controller.js

@@ -1,56 +0,0 @@
-/**
- * Created by robin on 11/6/15.
- */
-
-angular.module('luticate')
-    .controller('UserPickerController', ['$scope', 'luticateAuthUsers', 'data', '$q', 'dialogs', 'luticateAuthCache',
-        function($scope, luticateAuthUsers, data, $q, dialogs, luticateAuthCache) {
-            $scope.selectedUsers = [];
-            $scope.userPicker = {
-                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;
-                        }
-                    }
-                ],
-
-                permissions: {
-                    add: 'LU_USER_ADD',
-                    del: 'LU_USER_DEL',
-                    edit: 'LU_USER_EDIT'
-                },
-
-                getLoadPagePromise: function (page, perPage, promise) {
-                    return luticateAuthUsers.getAll({page: page, perPage: perPage}, promise);
-                },
-
-                getDelPromise: function (id, promise) {
-                    return luticateAuthUsers.del({user_id: id}, promise);
-                },
-
-                getEditController: function () {
-                    return "UserEdit";
-                }
-            };
-        }]);

luticate/css/app.less

@@ -39,15 +39,6 @@ footer {
   margin: 50px 0;
 }
 
-
-.pagination-current {
-  font-weight: bold;
-}
-
-.pagination-not-current {
-
-}
-
 .modal-header {
   font-weight: bold;
 }

luticate/index.html

@@ -8,6 +8,8 @@
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.css">
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.min.css">
     <link rel="stylesheet" href="../bower_components/luticate-utils/src/lubusy.css">
+    <link rel="stylesheet" href="../bower_components/luticate-utils/src/lubasictable.css">
+    <link rel="stylesheet" href="../bower_components/luticate-utils/src/lupickertable.css">
     <link rel="stylesheet/less" href="css/app.less">
     <!-- bower component -->
     <script src="../bower_components/jquery/dist/jquery.js"></script>
@@ -62,7 +64,7 @@
     <script src="controllers/modals/permissionedit.controller.js"></script>
     <script src="controllers/modals/userpermissions.controller.js"></script>
     <script src="controllers/modals/usereffectivepermissions.controller.js"></script>
-    <script src="controllers/modals/userpicker.controller.js"></script>
+    <script src="controllers/modals/groupusersadd.controller.js"></script>
     <script src="controllers/modals/grouppermissions.controller.js"></script>
     <script src="controllers/modals/groupusers.controller.js"></script>
 

luticate/views/lupickertable.html

@@ -1,5 +1,7 @@
 <div class="col-sm-3">
-    <div ng-repeat="item in pickerOptions.pickedItems">
+    Selected items:
+    <div ng-repeat="item in pickerOptions.pickedItems" ng-click="unPickItem(item)"
+         class="col-sm-12 lu-picker-table-picked-items">
         {{ pickerOptions.getItemText(item) }}
     </div>
 </div>

luticate/views/modals/groupusers.html

@@ -1,4 +1,4 @@
 <!-- Page Content -->
 <dialog-close title="Edit {{ group.Name }} users">
-    <lu-table options="itemPicker" class="row col-sm-8 col-sm-offset-2" ></lu-table>
+    <lu-edit-table options="itemPicker" class="row col-sm-8 col-sm-offset-2" ></lu-edit-table>
 </dialog-close>

luticate/views/modals/userpicker.html → luticate/views/modals/groupusersadd.html

@@ -1,3 +1,3 @@
-<dialog-close title="Select users">
+<dialog-ok-cancel title="Select users">
     <lu-picker-table options="userPicker" ></lu-picker-table>
-</dialog-close>
+</dialog-ok-cancel>

luticate/views/test.html

@@ -1,5 +1,7 @@
 <div class="container">
-    <!--<lu-basic-table options="luBasicTable" class="row col-sm-8 col-sm-offset-2" ></lu-basic-table>
-    <lu-edit-table options="luEditTable" class="row col-sm-8 col-sm-offset-2" ></lu-edit-table>-->
+    <lu-basic-table options="luBasicTable" class="row col-sm-8 col-sm-offset-2" ></lu-basic-table>
+    <lu-edit-table options="luEditTable" class="row col-sm-8 col-sm-offset-2" ></lu-edit-table>
+    <div class="clearfix"></div>
+    <br />
     <lu-picker-table options="luUserPicker" class="row col-sm-8 col-sm-offset-2"></lu-picker-table>
 </div>