diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js index b6c6639..6c83fcd 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js @@ -6,6 +6,9 @@ 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( @@ -86,7 +89,9 @@ 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")); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js index 534d59f..d44bcaf 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js @@ -12,6 +12,9 @@ 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 diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js index 720cff7..981a878 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js @@ -19,6 +19,9 @@ 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 diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js index f1fde94..0f90b7d 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js @@ -13,6 +13,9 @@ 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 diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js index dd23d74..33cf1da 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js @@ -27,6 +27,10 @@ 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 @@ -460,7 +464,9 @@ 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'); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js index 04f6c24..f2600fe 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js @@ -32,6 +32,9 @@ 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 @@ -530,7 +533,9 @@ 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"); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js index 5dc50cd..35d4e9b 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js @@ -19,7 +19,9 @@ 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 = ''; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 510b42f..6c80624 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -376,7 +376,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$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 = ''; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 0b95a11..e1e571a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -129,8 +129,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic function (result) { if (result == 'true') { + $rootScope.userModules = UserModules; $rootScope.isVisibleLogin = false; + $location.path('/'); } else { if (result == LoginConstants.USER_NOT_FOUND) { @@ -165,6 +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) {} @@ -178,6 +181,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.licenseeAccountNumber = result.License.AccountNumber; localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); $('#dvUserModulesInfo').modal('show'); + $location.path('/'); } else { if ($('#dvTerms').length > 0) { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js index 035f97e..467b1bb 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js @@ -13,6 +13,9 @@ 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 @@ -88,6 +91,9 @@ 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; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js index c493351..6669f06 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js @@ -1,7 +1,7 @@ 'use strict'; -AIA.controller("LinkController", ["$scope", "$rootScope","$log", "pages", "$routeParams", -function ($scope, $rootScope, log, pages, $routeParams) { +AIA.controller("LinkController", ["$scope", "$rootScope", "$log", "$location", "pages", "$routeParams", +function ($scope, $rootScope, log, $location, pages, $routeParams) { //$rootScope.currentActiveModuleTitle = Modules[10].Name; //$rootScope.currentActiveModuleTitle = $routeParams.modname; @@ -17,6 +17,10 @@ function ($scope, $rootScope, log, pages, $routeParams) { ]; $scope.$on('$viewContentLoaded', function (event) { + + if ($rootScope.refreshcheck == null) { + $location.path('/'); + } // code that will be executed ... // every time this view is loaded diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 5dfc945..48bbd55 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -105,7 +105,9 @@ 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') @@ -205,6 +207,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.openModuleItem = function () { + if ($rootScope.refreshcheck == null) { + $location.path('/'); + } var jsContentURL; var moduleItemViewDivId;