Manual Merge against - Merge Request #908

Amrita Vishnoi
2 parents 3b7a7b9e 74b70f97
Showing 3 changed files with 154 additions and 39 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/index.html
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
 'use strict';
-AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", "$timeout", "DataService", "AuthenticationService", "LoginConstants", "UserModules", "LoginMessageConstants", "AdminService", "$http", "AdminConstants", "UserTypeConstants", "AIAConstants",
-function ($rootScope, Modules, $log, $location, $timeout, DataService, AuthenticationService, LoginConstants, UserModules, LoginMessageConstants, AdminService, $http, AdminConstants, UserTypeConstants,AIAConstants) {
+AIA.controller("HomeController", ["$rootScope", "$scope", "Modules", "$log", "$location", "$timeout", "DataService", "AuthenticationService", "LoginConstants", "UserModules", "LoginMessageConstants", "AdminService", "$http", "AdminConstants", "UserTypeConstants", "AIAConstants",
+function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, AuthenticationService, LoginConstants, UserModules, LoginMessageConstants, AdminService, $http, AdminConstants, UserTypeConstants,AIAConstants) {
     //$scope.pageToOpen = {
     //    name: 'MainMenu'
@@ -42,6 +42,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $rootScope.current_year = AIAConstants.current_year;
     // on refersh this variable will also get null that is why we are only checking this variable on initialize that if it is null that means page gets refershed.
     $rootScope.refreshcheck = null;
+    var isCommingSoonModel = true;
+   
     $rootScope.isCloseSettingClicked = false;
@@ -140,9 +142,26 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 $rootScope.isVisibleResetPass = true;
             }
             else {
-                $rootScope.isVisibleLogin = true;
-                $rootScope.isVisibleResetPass = false;
-                getUserDetails();
+
+                    $rootScope.isVisibleLogin = true;
+                    $rootScope.isVisibleResetPass = false;
+
+                    //get user is already loggedin or not
+                    $scope.currentUserDetails = $rootScope.getLocalStorageValue('loggedInUserDetails');
+                    if ($scope.currentUserDetails != undefined) {
+                        AuthenticateAlreadyLoggedInUser();
+                    }
+                    var isRememberChecked = $rootScope.getLocalStorageValue('isRememberMeChecked');
+                  
+                    if ($rootScope.getLocalStorageValue('isRememberMeChecked') != "" && sessionStorage.getItem("loginSession") == null) {
+                        sessionStorage.setItem("loginSession", "true");
+                    }
+                    if (isRememberChecked == "true" && sessionStorage.getItem("loginSession") == "true" && $rootScope.isVisibleLogin == true) {
+
+                        $timeout(function () {
+                            $rootScope.userInfo = { username: $rootScope.getLocalStorageValue('RememberMeLoginId'), password: $rootScope.getLocalStorageValue('RememberMePassword'), rememberChk: true };
+                        }, 800);
+                    }
             }
         }
@@ -158,21 +177,24 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $rootScope.AuthenticateUser = function (userInfo)
     {
+       
+       
         if (navigator.cookieEnabled) {
-
             $rootScope.errorMessage = "";
-            if (userInfo.username == "" || userInfo.username == null || userInfo.password == "" || userInfo.password == null) {
+            if (userInfo.username == "" || userInfo.username == null || userInfo.username == undefined || userInfo.password == "" || userInfo.password == null || userInfo.password == undefined) {
                 // alert(LoginMessageConstants.USER_CREDENTIALS_MISSING);
                 $rootScope.errorMessage = LoginMessageConstants.USER_CREDENTIALS_MISSING;
                 $("#messageModal").modal('show');
             }
             else {
-
+              
+              
                 AuthenticationService.authenticateUser(userInfo)
                  .then(
                  function (result) {
+                    
                      if (result == LoginConstants.USER_NOT_FOUND) {
                          $rootScope.isVisibleLogin = true;
                          // alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT);
@@ -180,6 +202,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                          $("#messageModal").modal('show');
                      }
                      else {
+
                          if (typeof result.LoginId != undefined || result.LoginId != "" || result.LoginId != null) {
                              if ($("#messageModal").length > 0) {
@@ -241,25 +264,76 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                              }
                              else {
-                                 //if (result.UserType == UserTypeConstants.SUPER_ADMIN && result.IsActive) { //(!result.IsSubscriptionExpired) && 
-                                 if (result.LicenseId == 0 && result.IsActive) {
-                                     $rootScope.userData = result;
-                                     $rootScope.userModules = result.Modules;
-                                     $rootScope.isVisibleLogin = false;
+                                 //LicenseId would be zero for admin that is why we set the haveRoleAdmin = true
+                                 if (result.LicenseId == 0 && result.IsActive)
+                                 {
                                      $rootScope.haveRoleAdmin = true;
-                                     localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
-                                     ShowAssignedModulesPopup(result.Modules);
+
+                                     $rootScope.userData = result;
+                                     $rootScope.userModules = result.Modules;                                
+                                     
+                                     if ($scope.currentUserDetails == null || $scope.currentUserDetails == undefined || $scope.currentUserDetails == "") {
+                                         localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
+                                     }
+                                     
+                                     if (isCommingSoonModel == true)
+                                     {
+                                        
+                                         ShowAssignedModulesPopup(result.Modules);
+
+                                         if (userInfo.rememberChk) {
+                                           
+                                             $scope.saveRemeberMeDetails(result, userInfo);
+                                         }
+
+                                         sessionStorage.setItem("loginSession", "true");
+                                         localStorage.setItem('isCommingSoonModel', false);
+
+                                         $rootScope.isVisibleLogin = false;
+                                     }
+                                   
+                                     
                                      $location.path('/');
                                  }
                                  else {
-                                     if (result.LicenseInfo != null && result.LicenseInfo.IsTermAccepted) {
+                                     if (result.LicenseInfo != null && result.LicenseInfo.IsTermAccepted)
+                                     {
+                                         //0.
                                          $rootScope.userData = result;
                                          $rootScope.userModules = result.Modules;
-                                         $rootScope.isVisibleLogin = false;
+                                        
+                                         //1. set haveRoleAdmin = false because LicenseInfo is not null
                                          $rootScope.haveRoleAdmin = false;
-                                         localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
-                                         ShowAssignedModulesPopup(result.Modules);
+
+                                         //2.
+                                         if ($scope.currentUserDetails == null || $scope.currentUserDetails == undefined || $scope.currentUserDetails == "") {
+
+                                             localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
+                                         }
+
+                                         // 3.ShowAssignedModulesPopup
+                                         //isCommingSoonModel =true only when user comes first time on application and login
+                                         if (isCommingSoonModel == true) 
+                                         {
+
+                                             ShowAssignedModulesPopup(result.Modules);
+                                         }
+
+                                         //4.
+                                         if($scope.rememberChk)
+                                         {
+                                            
+                                             $scope.saveRemeberMeDetails(result, userInfo);
+                                         }
+                                         
+                                         //5.                                             
+                                             sessionStorage.setItem("loginSession", "true");
+                                             $rootScope.isVisibleLogin = false;
+                                         
+                                         //6. reset the isCommingSoonModel to false in local storage so that upcomming module pop up would not show again to the user after firts time
+                                             localStorage.setItem('isCommingSoonModel', false);
+                                                                                                                        
                                          $location.path('/');
                                      }
@@ -275,6 +349,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                                          $location.path('/');
                                      }
                                  }
+                                 
+                                       
                              }
@@ -297,7 +373,15 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             $rootScope.promptUserForCookies();
         }
-   } 
+    }
+
+    $scope.saveRemeberMeDetails = function (result, userInfo) {
+
+        localStorage.setItem('RememberMeLoginId', result.LoginId);
+        localStorage.setItem('RememberMePassword', result.Password);
+        localStorage.setItem("isRememberMeChecked", userInfo.rememberChk);
+    }
+
     function ShowAssignedModulesPopup(userModules) {
         var allModules = Modules;
@@ -335,6 +419,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             $('#dvPendingModules').show();
         }
     }
+
     $rootScope.UpdateLicenseTermStatus = function () {
         $('#dvTermCondition').fadeOut();
         var currentUserDetails = $rootScope.getLocalStorageValue('loggedInUserDetails');
@@ -382,34 +467,54 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                  });
         }
     };
+    $rootScope.RememberMe = function (isRememberMeChecked)
+    {
+        if (localStorage.getItem('isRememberMeChecked') != null)
+        {
+                localStorage.removeItem('loggedInUserDetails');
+                localStorage.removeItem('isRememberMeChecked');
+                localStorage.removeItem('RememberMeLoginId');
+                localStorage.removeItem('RememberMePassword');
+        
+            }
+      
+    }
     $rootScope.LogoutUser = function () {
         localStorage.removeItem('loggedInUserDetails');
-        localStorage.clear();
+       // localStorage.clear();
         document.location = '/';
         $rootScope.isVisibleLogin = true;
     }
-    function getUserDetails() {  //Retain logged in user details
-        var currentUserDetails = $rootScope.getLocalStorageValue('loggedInUserDetails');
-        if (currentUserDetails) {
+    function AuthenticateAlreadyLoggedInUser()
+    {
+        
+         isCommingSoonModel = $rootScope.getLocalStorageValue('isCommingSoonModel');
+         
             try {
-                var userInfo = JSON.parse(currentUserDetails);
+                var userInfo = JSON.parse($scope.currentUserDetails);
                 if (userInfo.LoginId != undefined || userInfo.LoginId != "" || userInfo.LoginId != null) {
-                    if (userInfo.UserType == UserTypeConstants.SUPER_ADMIN && userInfo.IsActive) { //(!result.IsSubscriptionExpired) && 
-                      
-                        $rootScope.userData = userInfo;
-                       
+                    if (userInfo.UserType == UserTypeConstants.SUPER_ADMIN && userInfo.IsActive) { 
+
+                        //0
+                        $rootScope.userData = userInfo;                       
                         $rootScope.userModules = userInfo.Modules;
-                       
-                        $rootScope.isVisibleLogin = false;
+
+                        //1.
+                        userInfo["username"] = userInfo.LoginId;
+                        userInfo["password"] = userInfo.Password;
+
+                        //2.
+                        $rootScope.AuthenticateUser(userInfo);
+
                         $rootScope.haveRoleAdmin = true;
                         if ($rootScope.refreshcheck == null) {
-
+                       
                             if ($location.path() == "/lab-exercises-detail") {
                                 $location.url('/');
@@ -418,7 +523,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                                 $location.path('/');
                             }
-
+                            $rootScope.isVisibleLogin = false;
                         }
                               }
@@ -427,11 +532,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                     {
                         $rootScope.haveRoleAdmin = false;
-                        if (userInfo.LicenseInfo.IsTermAccepted) {
+                        if (userInfo.LicenseInfo.IsTermAccepted)
+                        {
                             $rootScope.userData = userInfo;
                             $rootScope.userModules = userInfo.Modules;
                             $rootScope.isVisibleLogin = false;
-                            //$rootScope.haveRoleAdmin = true;
+                        
                             if ($rootScope.refreshcheck == null) {
                                 $location.path('/');
@@ -451,11 +557,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                         }
                     }
                 }
+                
             }
             catch (e) {
                 localStorage.removeItem('loggedInUserDetails');
             }
-        }
+        
     }
     $rootScope.SendMailToUser = function (userInfo, isMailForForgotPassword) {
@@ -205,9 +205,12 @@
                                         <span class="help-block text-right small "><a href="#" class="color-white">Forgot Password?</a></span>-->
                                         <div class="input-group">
                                             <span class="input-group-addon"><i class="fa fa-key"></i></span>
-                                            <input type="password" class="form-control" placeholder="Password" ng-model="userInfo.password">
+                                            <input type="password" id="UserPassword"  class="form-control" placeholder="Password" ng-model="userInfo.password">
                                         </div>
                                         <span class="help-block text-right small "><a class="color-white" style="cursor: pointer;" id="forgotPasswordAnchor" data-toggle="modal" ng-click="forgotPwdModalShow();" data-target=".forgot-sm1">Forgot Password?</a></span> <!--#resetpass" href="/app/views/Home/resetPwd.html"-->
+                                        <div class="checkbox">
+                                        <label style="font-size: 85%;color:#fff !important;"><input type="checkbox" ng-model="userInfo.rememberChk" ng-click="RememberMe(this.userInfo.rememberChk)">Remember me</label>
+                                        </div>
                                     </div>
                                     <div class="form-group">
                                         <button class="btn btn-primary pull-right" ng-click="AuthenticateUser(userInfo)">Log In</button>
@@ -30,7 +30,7 @@ body {
 footer {
 	color: #303030;
 	font: 12px/30px 'Open Sans';
-	margin-top: -55px;
+	margin-top: -30px;
 }
 footer.dark {
 	color: #ccc;
@@ -1276,4 +1276,9 @@ footer .browserIcons
     width:70%;
     margin-left:15%;
     margin-top:25%;
-}
 \ No newline at end of file
+}
+
+#UserPassword
+ {
+   -webkit-text-security: disc;
+ }
 \ No newline at end of file