Users ready

public/js/lib/modules/modals/userModal.js

@@ -16,6 +16,7 @@ $( function () {
         username  : ko.observable(),
         email     : ko.observable(),
         role      : ko.observable(),
+        callback  : null,
 
         init: function () {
             var vm = dbo.editUserModal;
@@ -25,10 +26,13 @@ $( function () {
             } );
         },
 
-        newUser: function () {
+        newEditUser: function ( user, callback ) {
             var vm = dbo.editUserModal;
+            vm.callback = typeof(callback) == 'function' ? callback : null;
 
-            vm.setUser();
+            vm.showUserModal();
+
+            vm.setUser( user );
         },
 
         setRole: function () {
@@ -42,8 +46,6 @@ $( function () {
 
             if ( vm.formValid == false ) return;
 
-            dbo.userDataService.checkUsername()
-
             var submitDATA = {
                 id        : vm.id,
                 firstname : vm.firstname(),
@@ -55,35 +57,54 @@ $( function () {
             }
 
             dbo.userDataService.saveUser( submitDATA, function ( data ) {
-                if ( data.succes ) {
+                if ( data.success ) {
                     tellMe( {
                         title     : 'gebruiker aangemaakt',
-                        message   : 'gebuiker is succesvol aangemaakt',
+                        message   : 'gebuiker is succesvol opgeslagen',
                         modalClass: 'modal-success'
+                    }, function(){
+                        vm.hideUserModal();
+
+                        if( typeof(vm.callback) == 'function') vm.callback();
                     } );
+
                     return;
                 }
 
-                tellMe({
+                var errorMessage = '<ul>';
+                $.each( data.messages, function ( i, p ) {
+                    if ( p[0] ) {
+                        errorMessage += '<li>' + i + ': ' + p[0] + '</li>';
+                    }
+                } );
+                errorMessage += '</ul>';
+                tellMe( {
                     title     : 'fout aanmaken gebruiker',
-                    message   : data.errorMessages,
+                    message   : errorMessage,
                     modalClass: 'modal-danger'
-                });
-            } )
-
-
+                } );
+            } );
         },
 
-        setUser: function ( user = false ) {
+        setUser: function ( user ) {
             var vm = dbo.editUserModal;
+            var role = isNaN( user.role ) ? null : user.role;
 
             vm.id = user.id || 0;
             vm.firstname( user.firstname || '' );
-            vm.lastname( user.firstname || '' );
-            vm.middlename( user.firstname || '' );
+            vm.lastname( user.lastname || '' );
+            vm.middlename( user.middlename || '' );
             vm.username( user.username || '' );
             vm.email( user.email || '' );
             vm.role( user.role || null );
+        },
+
+        showUserModal: function () {
+            $( "#user-modal" ).modal( 'show' );
+        },
+
+        hideUserModal: function () {
+            $( "#user-modal" ).modal( 'hide' );
         }
     };
 
@@ -91,7 +112,6 @@ $( function () {
 
     dbo.editUserModal.lastnameInvalid = ko.pureComputed( function () {
         if ( !this.lastname() ) return true;
-        console.log( this.lastname() );
 
         if ( this.lastname().length < 2 ) return true;