set password ui

bower.json

@@ -15,6 +15,7 @@
     "luticate-utils": "https://git.rthoni.com/repos/luticate-front/utils.git",
     "luticate-auth": "https://git.rthoni.com/repos/luticate-front/auth.git",
     "angular-dialog-service": "~5.2.8",
-    "ngSanitize": "~0.0.2"
+    "ngSanitize": "~0.0.2",
+    "angular-ui-validate": "~1.2.1"
   }
 }

luticate/app.js

@@ -9,7 +9,8 @@ var luticate = angular.module('luticate', [
     'luticateAuth',
     'LocalStorageModule',
     'dialogs.main',
-    'ngSanitize'
+    'ngSanitize',
+    'ui.validate'
 ]);
 
 luticate.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',

luticate/controllers/directives/dialogokcancel.js

@@ -14,6 +14,7 @@ angular.module('luticate')
                     $scope.title = attrs.title;
                     $scope.model = {};
                     $scope.pending = false;
+
                     $scope.__submit = function()
                     {
                         if ($scope.form.$valid) {
@@ -25,7 +26,7 @@ angular.module('luticate')
                                     if ($scope.onDone) {
                                         $scope.onDone(data);
                                     }
-                                    $scope.$dismiss();
+                                    $scope.$close(data);
                                     $scope.pending = false;
                                 })
                                     .catch(function(error)
@@ -37,11 +38,12 @@ angular.module('luticate')
                                     });
                             }
                             else {
-                                $scope.$dismiss();
+                                $scope.$close();
                                 $scope.pending = false;
                             }
                         }
                     };
+
                     $scope.__cancel = function()
                     {
                         if ($scope.onCanceled) {

luticate/controllers/login.controller.js

@@ -10,7 +10,8 @@ angular.module('luticate')
                 loaderGroups: ["loginForm"]
             };
 
-            if (luticateAuthCache.getUser() != null) {
+            var user = luticateAuthCache.getUser();
+            if (user != null) {
                 $state.go('home');
                 return;
             }

luticate/controllers/modals/useredit.controller.js

@@ -5,7 +5,18 @@
 angular.module('luticate')
     .controller('UserEditController', ['$scope', 'luticateAuthUsers', 'data',
         function($scope, luticateAuthUsers, data) {
-            $scope.user = data;
+            if (data != null) {
+                $scope.user = data;
+            }
+            else {
+                $scope.user = {
+                    Username: "",
+                    Email: "",
+                    Firstname: "",
+                    Lastname: "",
+                    Password: ""
+                };
+            }
             var promiseEditUser = {
                 id: "promiseEditUser",
                 loaderGroups: ["modal"]
@@ -13,11 +24,25 @@ angular.module('luticate')
 
             $scope.submitForm = function()
             {
-                return luticateAuthUsers.edit({
-                    user_id: $scope.user.Id,
-                    email: $scope.user.Email,
-                    firstname: $scope.user.Firstname,
-                    lastname: $scope.user.Lastname
-                }, promiseEditUser);
+                if ($scope.user.Id != null) {
+                    return luticateAuthUsers.edit({
+                        user_id: $scope.user.Id,
+                        email: $scope.user.Email,
+                        firstname: $scope.user.Firstname,
+                        lastname: $scope.user.Lastname
+                    }, promiseEditUser);
+                }
+                else {
+                    var user = {
+                        username: $scope.user.Username,
+                        email: $scope.user.Email,
+                        firstname: $scope.user.Firstname,
+                        lastname: $scope.user.Lastname,
+                        password: $scope.user.Password
+                    };
+                    console.log(user);
+                    return;
+                    return luticateAuthUsers.add(user, promiseEditUser);
+                }
             };
         }]);

luticate/controllers/users.controller.js

@@ -5,6 +5,7 @@ angular.module('luticate')
             $scope.perPage = 15;
             $scope.users = [];
             $scope.pages = [];
+            $scope.selectedUsers = [];
 
             var promiseUsers = {
                 id: "promiseUsers",
@@ -33,11 +34,46 @@ angular.module('luticate')
             {
                 dialogs.create('views/modals/useredit.html', 'UserEditController', user)
                     .result.then(function (data) {
-                        console.log(data);
-                    }, function (error) {
-                        console.log(error);
+                        $scope.loadPage($scope.page);
                     });
             };
 
+            $scope.removeUsers = function()
+            {
+                console.log($scope.selectedUsers);
+            };
+
+            $scope.addUser = function()
+            {
+                dialogs.create('views/modals/useredit.html', 'UserEditController', null)
+                    .result.then(function (data) {
+                        $scope.loadPage($scope.page);
+                    });
+            };
+
+            $scope.toggleSelectedUser = function(id)
+            {
+                var idx = $scope.selectedUsers.indexOf(id);
+                if (idx > -1) {
+                    $scope.selectedUsers.splice(idx, 1);
+                }
+                else {
+                    $scope.selectedUsers.push(id);
+                }
+            };
+
+            $scope.toggleSelectAll = 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);
+                    }
+                }
+            };
+
             $scope.loadPage($scope.page);
     }]);

luticate/index.html

@@ -16,6 +16,7 @@
     <script src="../bower_components/angular-bootstrap/ui-bootstrap.js"></script>
     <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
     <script src="../bower_components/angular-local-storage/dist/angular-local-storage.js"></script>
+    <script src="../bower_components/angular-ui-validate/dist/validate.js"></script>
     <script src="../bower_components/bootstrap/js/collapse.js"></script>
     <script src="../bower_components/bootstrap/js/transition.js"></script>
     <script src="../bower_components/bootstrap/js/dropdown.js"></script>

luticate/views/login.html

@@ -9,7 +9,7 @@
                 <input id="login" ng-model="username" class="form-control" />
 
                 <label for="password">Password</label><br />
-                <input id="password" ng-model="password" class="form-control" />
+                <input id="password" ng-model="password" type="password" class="form-control" />
 
                 <br />
                 <div class="col-sm-12 center-block">

luticate/views/modals/useredit.html

@@ -1,18 +1,42 @@
-<dialog-ok-cancel title="Edit user {{ user.Username }}">
+<dialog-ok-cancel title="{{ user.Id == null ? 'Add' : 'Edit'}} user {{ user.Username }}">
     <div class="form-group">
         <label for="username" class="col-sm-2 control-label">Username</label>
-        <div class="col-sm-9"><input id="username" class="form-control" ng-model="user.Username" readonly/></div>
+        <div class="col-sm-9">
+            <input id="username" class="form-control" ng-model="user.Username" ng-readonly="user.Id != null" required/>
+        </div>
     </div>
     <div class="form-group">
         <label for="email" class="col-sm-2 control-label">Email</label>
-        <div class="col-sm-9"><input id="email" class="form-control" ng-model="user.Email" /></div>
+        <div class="col-sm-9">
+            <input id="email" class="form-control" ng-model="user.Email" />
+        </div>
     </div>
     <div class="form-group">
         <label for="firstname" class="col-sm-2 control-label">Firstname</label>
-        <div class="col-sm-9"><input id="firstname" class="form-control" ng-model="user.Firstname" /></div>
+        <div class="col-sm-9">
+            <input id="firstname" class="form-control" ng-model="user.Firstname" />
+        </div>
     </div>
     <div class="form-group">
         <label for="lastname" class="col-sm-2 control-label">Lastname</label>
-        <div class="col-sm-9"><input id="lastname" class="form-control" ng-model="user.Lastname" /></div>
+        <div class="col-sm-9">
+            <input id="lastname" class="form-control" ng-model="user.Lastname" />
+        </div>
+    </div>
+    <div class="form-group">
+        <label for="password" class="col-sm-2 control-label">Password</label>
+        <div class="col-sm-9">
+            <input id="password" class="form-control" type="password" ng-model="user.Password" />
+        </div>
+        <div class="clearfix"></div>
+        <label for="password" class="col-sm-2 control-label">Confirmation</label>
+        <div class="col-sm-9">
+            <input id="password2" class="form-control" type="password" ng-model="password2"
+                   name="password2" ui-validate="{ same_passwords: '$value==user.Password' }"/>
+        </div>
+        <div class="clearfix"></div>
+        <div class="col-sm-offset-2 col-sm-9">
+            <p class="error" ng-show="form.password2.$error.same_passwords && user.Password != ''">Passwords do not match</p>
+        </div>
     </div>
 </dialog-ok-cancel>

luticate/views/users.html

@@ -4,18 +4,23 @@
         <table class="col-sm-12 table table-hover">
             <thead>
                 <tr>
-                    <th class="col-sm-1">Id</th>
-                    <th class="col-sm-4">Username</th>
-                    <th class="col-sm-5">Email</th>
-                    <th class="col-sm-2">Profile Id</th>
+                    <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>{{ user.Id }}</td>
-                    <td>{{ user.Username }}</td>
+                    <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.ProfileId }}</td>
+                    <td>{{ user.Firstname }}</td>
+                    <td>{{ user.Lastname }}</td>
                 </tr>
             </tbody>
         </table>
@@ -23,5 +28,14 @@
         <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>
 </div>