diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 2a08713..d88e597 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -499,72 +499,89 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
isCommingSoonModel = $rootScope.getLocalStorageValue('isCommingSoonModel');
- try {
- var userInfo = JSON.parse($scope.currentUserDetails);
+ try {
+ var userInfo = JSON.parse($scope.currentUserDetails);
- if (userInfo.LoginId != undefined || userInfo.LoginId != "" || userInfo.LoginId != null) {
-
- if (userInfo.UserType == UserTypeConstants.SUPER_ADMIN && userInfo.IsActive) {
+ if (userInfo.LoginId != undefined || userInfo.LoginId != "" || userInfo.LoginId != null) {
- //0
- $rootScope.userData = userInfo;
- $rootScope.userModules = userInfo.Modules;
+ userInfo["username"] = userInfo.LoginId;
+ userInfo["password"] = userInfo.Password;
- //1.
- userInfo["username"] = userInfo.LoginId;
- userInfo["password"] = userInfo.Password;
+ //2.
+ $rootScope.AuthenticateUser(userInfo);
+ // if (userInfo.UserType == UserTypeConstants.SUPER_ADMIN && userInfo.IsActive) {
- //2.
- $rootScope.AuthenticateUser(userInfo);
+ ////0
+ //$rootScope.userData = userInfo;
+ //$rootScope.userModules = userInfo.Modules;
- $rootScope.haveRoleAdmin = true;
-
- if ($rootScope.refreshcheck == null) {
-
- if ($location.path() == "/lab-exercises-detail") {
+ //1.
+ //userInfo["username"] = userInfo.LoginId;
+ //userInfo["password"] = userInfo.Password;
- $location.url('/');
- }
- else {
+ //2.
+ // $rootScope.AuthenticateUser(userInfo);
- $location.path('/');
- }
- $rootScope.isVisibleLogin = false;
- }
-
- }
-
- else
- {
- $rootScope.haveRoleAdmin = false;
-
- if (userInfo.LicenseInfo.IsTermAccepted)
- {
- $rootScope.userData = userInfo;
- $rootScope.userModules = userInfo.Modules;
- $rootScope.isVisibleLogin = false;
-
-
- if ($rootScope.refreshcheck == null) {
- $location.path('/');
- }
+ // $rootScope.haveRoleAdmin = true;
+
+ // if ($rootScope.refreshcheck == null) {
+
+ // if ($location.path() == "/lab-exercises-detail") {
+
+ // $location.url('/');
+ // }
+ // else {
+
+ // $location.path('/');
+ // }
+ // $rootScope.isVisibleLogin = false;
+ // }
+
+ // }
+ //else
+ //{
+ // $rootScope.haveRoleAdmin = false;
+
+ // if (userInfo.LicenseInfo.IsTermAccepted)
+ // {
+ // $rootScope.userData = userInfo;
+ // $rootScope.userModules = userInfo.Modules;
+ // $rootScope.isVisibleLogin = false;
+
+
+ // if ($rootScope.refreshcheck == null) {
+ // $location.path('/');
+ // }
+
+ // }
+ // else {
+ // if ($('#dvTerms').length > 0) {
+ // $('#dvTerms').html(userInfo.TermsAndConditionsText);
+ // }
+ // $rootScope.isVisibleLogin = true;
+ // $('#dvTermCondition').fadeIn();
+ // $rootScope.userData = userInfo;
+ // $rootScope.userModules = userInfo.Modules;
+ // //$rootScope.haveRoleAdmin = true;
+ // $location.path('/');
+ // }
+ if ($rootScope.refreshcheck == null) {
+
+ if ($location.path() == "/lab-exercises-detail") {
+
+ $location.url('/');
}
else {
- if ($('#dvTerms').length > 0) {
- $('#dvTerms').html(userInfo.TermsAndConditionsText);
- }
- $rootScope.isVisibleLogin = true;
- $('#dvTermCondition').fadeIn();
- $rootScope.userData = userInfo;
- $rootScope.userModules = userInfo.Modules;
- //$rootScope.haveRoleAdmin = true;
+
$location.path('/');
}
+ $rootScope.isVisibleLogin = false;
}
}
-
- }
+
+
+ }
catch (e) {
localStorage.removeItem('loggedInUserDetails');
}