Make login part dynamic

1 files changed, 24 insertions, 14 deletions

diff --git a/client/js/controllers/login.js b/client/js/controllers/login.js
index d08a9f2..07f1d19 100644
--- a/client/js/controllers/login.js
+++ b/client/js/controllers/login.js
@@ -3,7 +3,7 @@
  * Represents a book.
  * @constructor
  */
-mainApp.controller('loginCtrl', function ($scope,$interval,$sce)
+mainApp.controller('loginCtrl', function ($scope,$interval,$sce, $http)
 {
     // Define default states
     $('#loginModal').modal({backdrop: 'static', keyboard: false});
@@ -12,30 +12,40 @@ mainApp.controller('loginCtrl', function ($scope,$interval,$sce)
      
      
     $('#loginButton').click(function(){
-    $('#loginButton').hide();
-    $('#loadingLoginButton').show();
-    $('#failedToLoginAlert').hide();
-
-    var result=identity.login($("#loginFormUsername").val(), $("#loginFormProjectname").val(), $("#loginFormPassword").val());
+        $('#loginButton').hide();
+        $('#loadingLoginButton').show();
+        $('#failedToLoginAlert').hide();
 
-
-    $interval(
-        function() 
-        {
+        var result=identity.request.login($http,$("#loginFormUsername").val(), $("#loginFormProjectname").val(), $("#loginFormPassword").val());
+        
+        
+        result.then(function (response){
+            
+            // Parser result
+            var requestResultObject=identity.requestParser.parseLoginAnswer(response);
+            
             // Check for error
-            if(!errors.checkForLogin(result)){
+            if(requestResultObject.status!==0){
+                //alert(result.data)
                 $('#failedToLoginAlert').show();
             }
             else {
                 $('#loginModal').modal('hide');
             }
-            
+
             // Reset button state
             $('#loginButton').show();
             $('#loadingLoginButton').hide();
-        }, 2000,1);
-
+        },function(response){
+           
+            $('#failedToLoginAlert').show();
 
+            // Reset button state
+            $('#loginButton').show();
+            $('#loadingLoginButton').hide();
+        });
+        
+      
         
      });
 });