Merge branch 'Develop' into QA

Amrita Vishnoi
2 parents e082e3cd c80c88f8
Showing 12 changed files with 21 additions and 53 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -6,9 +6,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
     $scope.threeDAnatomyData;
     $scope.Id;
     $scope.$on('$viewContentLoaded', function (event) {
-        if ($rootScope.refreshcheck == null) {
-            $location.path('/');
-        }
+        
         $scope.scroll();
         var promise = DataService.getJson('~/../content/data/json/3da/3da_dat_contentlist.json')
         promise.then(
@@ -89,9 +87,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
     }
     $scope.Open3DModelBody = function () {
-        if ($rootScope.refreshcheck == null) {
-            $location.path('/');
-        }
+        
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
         //alert(localStorage.getItem("currentBodyViewId"));
@@ -12,9 +12,7 @@ function ($scope, $rootScope, pages, log, $location) {
         //alert("scroll");
     }
     $scope.$on('$viewContentLoaded', function (event) {
-        if ($rootScope.refreshcheck == null) {
-            $location.path('/');
-        }
+      
         // code that will be executed ... 
         // every time this view is loaded
@@ -19,9 +19,7 @@ function ($scope, $rootScope, pages, log, $location) {
     //$rootScope.currentActiveModuleTitle = pages[10].name;
     $scope.$on('$viewContentLoaded', function (event) {
-        if ($rootScope.refreshcheck == null) {
-            $location.path('/');
-        }
+       
         // code that will be executed ... 
         // every time this view is loaded
@@ -13,9 +13,7 @@ function ($scope, $rootScope, pages, log, $location) {
     }
     $scope.$on('$viewContentLoaded', function (event) {
-        if ($rootScope.refreshcheck == null) {
-            $location.path('/');
-        }
+        
         // code that will be executed ... 
         // every time this view is loaded
@@ -27,9 +27,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     };
     $scope.$on('$viewContentLoaded', function (event) {
-        if ($rootScope.refreshcheck == null) {
-            $location.path('/');
-        }
+        
         // code that will be executed ... 
         // every time this view is loaded
@@ -464,9 +462,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     }
     $scope.openBodyView = function () {
-        if ($rootScope.refreshcheck == null) {
-            $location.path('/');
-        }
+       
         if ($rootScope.disableAnnotationTB == true)
         {
             $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
@@ -32,9 +32,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     };
     $scope.$on('$viewContentLoaded', function (event) {
-        if ($rootScope.refreshcheck == null) {
-            $location.path('/');
-        }
+      
         // code that will be executed ... 
         // every time this view is loaded
@@ -533,9 +531,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     }
     $scope.openBodyView = function () {
-        if ($rootScope.refreshcheck == null) {
-            $location.path('/');
-        }
+       
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
         $scope.voId = localStorage.getItem("currentBodyViewId");
@@ -19,9 +19,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location) {
     }
     //load json data
     $scope.loadCurriculumBuiderData = function () {
-        if ($rootScope.refreshcheck == null) {
-            $location.path('/');
-        }
+      
         //get current path
         var currentURL = $location.path();
         var selectedModuleName = '';
@@ -376,9 +376,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
     //load json data for body view
     $scope.loadDissectibleAnatomyData = function () {
-        if ($rootScope.refreshcheck == null) {
-            $location.path('/');
-        }
+       
         //get current path
         var currentURL = $location.path();
         var selectedModuleName = '';
@@ -132,7 +132,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                      $rootScope.userModules = UserModules;
                      $rootScope.isVisibleLogin = false;
-                     $location.path('/');
+                    
                  }
                  else {
                      if (result == LoginConstants.USER_NOT_FOUND) {
@@ -167,7 +167,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                                      $rootScope.haveRoleAdmin = false;
                                      localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
                                      $('#dvUserModulesInfo').modal('show');
-                                     $location.path('/');
+                                     
                                  }
                                  //else if ((!result.IsSubscriptionExpired) && (result.UserType== UserTypeConstants.CLIENT_ADMIN || result.UserType== UserTypeConstants.DISTRICT_ADMIN || result.UserType== UserTypeConstants.SINGLE_USER ||result.UserType== UserTypeConstants.RESELLER) && result.License.IsTermAccepted) {}
@@ -177,11 +177,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                                              $rootScope.userData = result;
                                              $rootScope.userModules = result.Modules;
                                              $rootScope.isVisibleLogin = false;
-                                             $rootScope.haveRoleAdmin = true;
+                                             $rootScope.haveRoleAdmin = true;   
                                              $rootScope.licenseeAccountNumber = result.License.AccountNumber;
                                              localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
                                              $('#dvUserModulesInfo').modal('show');
-                                     $location.path('/');
+                                    
                                          }
                                          else {
                                              if ($('#dvTerms').length > 0) {
@@ -13,9 +13,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
     $scope.dragableId = "";
     $scope.blReviewAttempt = false;
     $scope.$on('$viewContentLoaded', function (event) {
-        if ($rootScope.refreshcheck == null) {
-            $location.path('/');
-        }
+       
         // code that will be executed ... 
         // every time this view is loaded
@@ -91,9 +89,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
     $scope.GetQuizByTopic = function () {
-        if ($rootScope.refreshcheck == null) {
-            $location.path('/');
-        }
+      
         var keywords = $location.search();
         $scope.LabExerciseName = keywords.labexercise;
         $scope.LabExerciseModules = null;
 'use strict';
-AIA.controller("LinkController", ["$scope", "$rootScope", "$log", "$location", "pages", "$routeParams",
+AIA.controller("LinkController", ["$scope", "$rootScope", "$log", "pages", "$routeParams",
 function ($scope, $rootScope, log, $location, pages, $routeParams) {
      //$rootScope.currentActiveModuleTitle = Modules[10].Name;
@@ -18,9 +18,7 @@ function ($scope, $rootScope, log, $location, pages, $routeParams) {
     $scope.$on('$viewContentLoaded', function (event) {
-        if ($rootScope.refreshcheck == null) {
-            $location.path('/');
-        }
+       
         // code that will be executed ... 
         // every time this view is loaded
@@ -105,9 +105,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     };
     $scope.loadForModuleById = function (moduleId) {
-        if ($rootScope.refreshcheck == null) {
-            $location.path('/');
-        }
+       
         $scope.moduleId = moduleId;
         $scope.activeTab = 1;
         console.log('loadForModuleById is called')
@@ -207,9 +205,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     $scope.openModuleItem = function () {
-        if ($rootScope.refreshcheck == null) {
-            $location.path('/');
-        }
+        
         var jsContentURL;
         var moduleItemViewDivId;