updates

1 files changed, 78 insertions, 75 deletions

diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js
index 11f7543b..6b5e9259 100644
--- a/www/js/PortalLoginCtrl.js
+++ b/www/js/PortalLoginCtrl.js
@@ -3,109 +3,112 @@
 /*This is for the loop closure I am using in line 143 */
 /* jslint browser: true*/
 /* global vis,cordova,StatusBar,angular,console,moment */
-angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionicPlatform', '$scope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$rootScope', '$http', '$q', '$state', '$ionicLoading', '$ionicPopover', '$ionicScrollDelegate', '$ionicModal', '$timeout', 'zmAutoLogin', '$ionicHistory',function ($ionicPlatform, $scope, zm, ZMDataModel, $ionicSideMenuDelegate, $rootScope, $http, $q, $state, $ionicLoading, $ionicPopover, $ionicScrollDelegate, $ionicModal, $timeout, zmAutoLogin, $ionicHistory) {
-    
-    // Main
-    
-    
-    $ionicHistory.nextViewOptions({
-    disableBack: true
-  });
-    
-    $scope.pindata = {};
-    if ($ionicSideMenuDelegate.isOpen())
-    {
-        $ionicSideMenuDelegate.toggleLeft();
-        ZMDataModel.zmDebug("Sliding menu close");
-    }
+angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionicPlatform', '$scope', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$rootScope', '$http', '$q', '$state', '$ionicLoading', '$ionicPopover', '$ionicScrollDelegate', '$ionicModal', '$timeout', 'zmAutoLogin', '$ionicHistory', function ($ionicPlatform, $scope, zm, ZMDataModel, $ionicSideMenuDelegate, $rootScope, $http, $q, $state, $ionicLoading, $ionicPopover, $ionicScrollDelegate, $ionicModal, $timeout, zmAutoLogin, $ionicHistory) {
+
+   
+    //-------------------------------------------------------------------------------
+    // remove status is pin is empty
+    //-------------------------------------------------------------------------------
     
-    $scope.pinChange = function()
-    {
-        
-        console.log ($scope.pindata.pin);
-        if ($scope.pindata.pin == null)
-        {
-            console.log ("Empty");
-            $scope.pindata.status="";
+    $scope.pinChange = function () {
+        if ($scope.pindata.pin == null) {
+              $scope.pindata.status = "";
         }
     };
-    
-    $scope.unlock = function()
-    {
+
+    //-------------------------------------------------------------------------------
+    // unlock app if PIN is correct
+    //-------------------------------------------------------------------------------
+    $scope.unlock = function () {
         ZMDataModel.zmDebug("Trying to unlock PIN");
-        if ($scope.pindata.pin == loginData.pinCode)
-        {
-            ZMDataModel.zmDebug ("PIN code entered is correct");
+        if ($scope.pindata.pin == loginData.pinCode) {
+            ZMDataModel.zmDebug("PIN code entered is correct");
             $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
             zmAutoLogin.stop(); //safety
             zmAutoLogin.start();
             zmAutoLogin.doLogin("authenticating...")
-                .then (function(data) // success
-                       {
-                         ZMDataModel.zmDebug("PortalLogin: auth success");
-                         ZMDataModel.getKeyConfigParams(1);
+                .then(function (data) // success
+                    {
+                        ZMDataModel.zmDebug("PortalLogin: auth success");
+                        ZMDataModel.getKeyConfigParams(1);
                         $state.go('montage');
-                },
-                       // coming here means auth error
-                       // so go back to login
-                function (error)
-                {
+                    },
+                    // coming here means auth error
+                    // so go back to login
+                    function (error) {
                         ZMDataModel.zmDebug("PortalLogin: error authenticating " +
-                                            JSON.stringify(error));
+                            JSON.stringify(error));
                         $state.go('login');
-                });
-        }
-        else
-        {
+                    });
+        } else {
             $scope.pindata.status = "Invalid PIN";
+            
+            // wobble the input box on error
+            var element = angular.element(document.getElementById("pin-box"));
+           
+            element.addClass("animated shake")
+                .one('webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend', 
+                    function () {
+                                    element.removeClass("animated shake");
+                    });
         }
     };
     
+     
+    //-------------------------------------------------------------------------------
+    // Controller Main
+    //-------------------------------------------------------------------------------
+    
+
+    $ionicHistory.nextViewOptions({
+        disableBack: true
+    });
+
+    $scope.pindata = {};
+    if ($ionicSideMenuDelegate.isOpen()) {
+        $ionicSideMenuDelegate.toggleLeft();
+        ZMDataModel.zmDebug("Sliding menu close");
+    }
+
     var loginData = ZMDataModel.getLogin();
-    $scope.pinPrompt = false;
+    $scope.pinPrompt = false; // if true, then PIN is displayed else skip 
 
     if (ZMDataModel.isLoggedIn()) {
-        ZMDataModel.zmLog ("User credentials are provided");
-        
-        if (loginData.usePin)
-        {
+        ZMDataModel.zmLog("User credentials are provided");
+
+        if (loginData.usePin) {
             $scope.pinPrompt = true;
-            
-            
-        }
-        else{
-            
-            ZMDataModel.zmDebug ("PIN code not set");
+
+
+        } 
+        else // no PIN Code so skip
+        {
+
+            ZMDataModel.zmDebug("PIN code not set");
             $rootScope.rand = Math.floor((Math.random() * 100000) + 1);
             zmAutoLogin.stop(); //safety
             zmAutoLogin.start();
             zmAutoLogin.doLogin("authenticating...")
-                .then (function(data) // success
-                       {
-                         ZMDataModel.zmDebug("PortalLogin: auth success");
-                         ZMDataModel.getKeyConfigParams(1);
+                .then(function (data) // success
+                    {
+                        ZMDataModel.zmDebug("PortalLogin: auth success");
+                        ZMDataModel.getKeyConfigParams(1);
                         $state.go('montage');
-                },
-                       // coming here means auth error
-                       // so go back to login
-                function (error)
-                {
+                    },
+                    // coming here means auth error
+                    // so go back to login
+                    function (error) {
                         ZMDataModel.zmDebug("PortalLogin: error authenticating " +
-                                            JSON.stringify(error));
+                            JSON.stringify(error));
                         $state.go('login');
-                });
-            
-            
+                    });
         }
-        
-        
-    }
-    else
-    {
+
+    } else {
         ZMDataModel.zmDebug("PortalLogin: Not logged in, so going to login");
         $state.go('login');
-        
+
     }
-    
-    
+
+
     }]);
\ No newline at end of file