From 039f825798f2357dd1ef79ead8258ad23d8266f9 Mon Sep 17 00:00:00 2001 From: Mukul Date: Wed, 23 Aug 2017 11:03:56 +0530 Subject: [PATCH] this is again url paste on another browser with new QA --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js | 11 +++++++++-- 400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js | 5 ++++- 400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js | 6 +++++- 400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js | 9 ++++++++- 400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js | 12 ++++++++++-- 400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js | 5 ++++- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 5 ++++- 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 10 +++++++--- 400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js | 10 ++++++++-- 400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js | 7 +++++-- 400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js | 10 ++++++++-- 11 files changed, 72 insertions(+), 18 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js index 7eca9c1..8881992 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js @@ -6,7 +6,10 @@ 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( @@ -87,7 +90,11 @@ 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 57ce916..cec935c 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js @@ -12,7 +12,10 @@ 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 4760324..35db7c9 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js @@ -19,7 +19,11 @@ 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/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js index cfea5d5..5ec1cdf 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js @@ -29,6 +29,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 @@ -462,7 +465,11 @@ 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 aaa185e..b8f2bcc 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js @@ -32,7 +32,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 @@ -531,7 +534,12 @@ 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 abf8109..d6f0664 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js @@ -19,7 +19,10 @@ 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 6e2b55e..2f930cc 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -376,7 +376,10 @@ 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 4f15a9b..50da2ce 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -132,6 +132,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.userModules = UserModules; $rootScope.isVisibleLogin = false; + $location.path('/'); } else { @@ -139,8 +140,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.isVisibleLogin = true; // alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT); $rootScope.errorMessage = LoginMessageConstants.USER_OR_PASSWORD_INCORRECT; - $("#messageModal").modal('show'); - + $("#messageModal").modal('show'); } else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) { //alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS); @@ -167,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) {} @@ -181,6 +182,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 { @@ -193,7 +195,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.userModules = result.Modules; $rootScope.haveRoleAdmin = true; $rootScope.licenseeAccountNumber = result.License.AccountNumber; - localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); + localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); + $location.path('/'); } } else { @@ -203,6 +206,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.haveRoleAdmin = true; localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); $('#dvUserModulesInfo').modal('show'); + $location.path('/'); } } else if ((!result.IsSubscriptionExpired) && (result.License != null) && (result.License.IsActive) && !result.IsActive) { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js index 5587841..1831c0f 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js @@ -13,7 +13,10 @@ 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 @@ -89,7 +92,10 @@ 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 36df995..ba8cd07 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js @@ -1,6 +1,6 @@ 'use strict'; -AIA.controller("LinkController", ["$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; @@ -18,7 +18,10 @@ 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 diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 6f16da1..b9b9de7 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -105,7 +105,10 @@ 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,7 +208,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.openModuleItem = function () { - + + if ($rootScope.refreshcheck == null) { + $location.path('/'); + } var jsContentURL; var moduleItemViewDivId; -- libgit2 0.21.4