Commit 039f825798f2357dd1ef79ead8258ad23d8266f9
1 parent
9c3f0aab
this is again url paste on another browser with new QA
Showing
11 changed files
with
72 additions
and
18 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
@@ -6,7 +6,10 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -6,7 +6,10 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
6 | $scope.threeDAnatomyData; | 6 | $scope.threeDAnatomyData; |
7 | $scope.Id; | 7 | $scope.Id; |
8 | $scope.$on('$viewContentLoaded', function (event) { | 8 | $scope.$on('$viewContentLoaded', function (event) { |
9 | - | 9 | + |
10 | + if ($rootScope.refreshcheck == null) { | ||
11 | + $location.path('/'); | ||
12 | + } | ||
10 | $scope.scroll(); | 13 | $scope.scroll(); |
11 | var promise = DataService.getJson('~/../content/data/json/3da/3da_dat_contentlist.json') | 14 | var promise = DataService.getJson('~/../content/data/json/3da/3da_dat_contentlist.json') |
12 | promise.then( | 15 | promise.then( |
@@ -87,7 +90,11 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -87,7 +90,11 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
87 | } | 90 | } |
88 | 91 | ||
89 | $scope.Open3DModelBody = function () { | 92 | $scope.Open3DModelBody = function () { |
90 | - | 93 | + |
94 | + if ($rootScope.refreshcheck == null) { | ||
95 | + $location.path('/'); | ||
96 | + | ||
97 | + } | ||
91 | $rootScope.isLoading = true; | 98 | $rootScope.isLoading = true; |
92 | $('#spinner').css('visibility', 'visible'); | 99 | $('#spinner').css('visibility', 'visible'); |
93 | //alert(localStorage.getItem("currentBodyViewId")); | 100 | //alert(localStorage.getItem("currentBodyViewId")); |
400-SOURCECODE/AIAHTML5.Web/app/controllers/ADAMImgController.js
@@ -12,7 +12,10 @@ function ($scope, $rootScope, pages, log, $location) { | @@ -12,7 +12,10 @@ function ($scope, $rootScope, pages, log, $location) { | ||
12 | //alert("scroll"); | 12 | //alert("scroll"); |
13 | } | 13 | } |
14 | $scope.$on('$viewContentLoaded', function (event) { | 14 | $scope.$on('$viewContentLoaded', function (event) { |
15 | - | 15 | + |
16 | + if ($rootScope.refreshcheck == null) { | ||
17 | + $location.path('/'); | ||
18 | + } | ||
16 | // code that will be executed ... | 19 | // code that will be executed ... |
17 | // every time this view is loaded | 20 | // every time this view is loaded |
18 | 21 |
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
@@ -19,7 +19,11 @@ function ($scope, $rootScope, pages, log, $location) { | @@ -19,7 +19,11 @@ function ($scope, $rootScope, pages, log, $location) { | ||
19 | //$rootScope.currentActiveModuleTitle = pages[10].name; | 19 | //$rootScope.currentActiveModuleTitle = pages[10].name; |
20 | 20 | ||
21 | $scope.$on('$viewContentLoaded', function (event) { | 21 | $scope.$on('$viewContentLoaded', function (event) { |
22 | - | 22 | + |
23 | + if ($rootScope.refreshcheck == null) { | ||
24 | + $location.path('/'); | ||
25 | + } | ||
26 | + | ||
23 | // code that will be executed ... | 27 | // code that will be executed ... |
24 | // every time this view is loaded | 28 | // every time this view is loaded |
25 | 29 |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
@@ -29,6 +29,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -29,6 +29,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
29 | $scope.$on('$viewContentLoaded', function (event) { | 29 | $scope.$on('$viewContentLoaded', function (event) { |
30 | 30 | ||
31 | 31 | ||
32 | + if ($rootScope.refreshcheck == null) { | ||
33 | + $location.path('/'); | ||
34 | + } | ||
32 | // code that will be executed ... | 35 | // code that will be executed ... |
33 | // every time this view is loaded | 36 | // every time this view is loaded |
34 | 37 | ||
@@ -462,7 +465,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -462,7 +465,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
462 | } | 465 | } |
463 | 466 | ||
464 | $scope.openBodyView = function () { | 467 | $scope.openBodyView = function () { |
465 | - | 468 | + |
469 | + if ($rootScope.refreshcheck == null) { | ||
470 | + $location.path('/'); | ||
471 | + } | ||
472 | + | ||
466 | if ($rootScope.disableAnnotationTB == true) | 473 | if ($rootScope.disableAnnotationTB == true) |
467 | { | 474 | { |
468 | $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled'); | 475 | $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled'); |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -32,7 +32,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -32,7 +32,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
32 | }; | 32 | }; |
33 | 33 | ||
34 | $scope.$on('$viewContentLoaded', function (event) { | 34 | $scope.$on('$viewContentLoaded', function (event) { |
35 | - | 35 | + |
36 | + if ($rootScope.refreshcheck == null) { | ||
37 | + $location.path('/'); | ||
38 | + } | ||
36 | // code that will be executed ... | 39 | // code that will be executed ... |
37 | // every time this view is loaded | 40 | // every time this view is loaded |
38 | 41 | ||
@@ -531,7 +534,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -531,7 +534,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
531 | } | 534 | } |
532 | 535 | ||
533 | $scope.openBodyView = function () { | 536 | $scope.openBodyView = function () { |
534 | - | 537 | + |
538 | + | ||
539 | + if ($rootScope.refreshcheck == null) { | ||
540 | + $location.path('/'); | ||
541 | + } | ||
542 | + | ||
535 | $rootScope.isLoading = true; | 543 | $rootScope.isLoading = true; |
536 | $('#spinner').css('visibility', 'visible'); | 544 | $('#spinner').css('visibility', 'visible'); |
537 | $scope.voId = localStorage.getItem("currentBodyViewId"); | 545 | $scope.voId = localStorage.getItem("currentBodyViewId"); |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
@@ -19,7 +19,10 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location) { | @@ -19,7 +19,10 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location) { | ||
19 | } | 19 | } |
20 | //load json data | 20 | //load json data |
21 | $scope.loadCurriculumBuiderData = function () { | 21 | $scope.loadCurriculumBuiderData = function () { |
22 | - | 22 | + |
23 | + if ($rootScope.refreshcheck == null) { | ||
24 | + $location.path('/'); | ||
25 | + } | ||
23 | //get current path | 26 | //get current path |
24 | var currentURL = $location.path(); | 27 | var currentURL = $location.path(); |
25 | var selectedModuleName = ''; | 28 | var selectedModuleName = ''; |
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -376,7 +376,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -376,7 +376,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
376 | 376 | ||
377 | //load json data for body view | 377 | //load json data for body view |
378 | $scope.loadDissectibleAnatomyData = function () { | 378 | $scope.loadDissectibleAnatomyData = function () { |
379 | - | 379 | + |
380 | + if ($rootScope.refreshcheck == null) { | ||
381 | + $location.path('/'); | ||
382 | + } | ||
380 | //get current path | 383 | //get current path |
381 | var currentURL = $location.path(); | 384 | var currentURL = $location.path(); |
382 | var selectedModuleName = ''; | 385 | var selectedModuleName = ''; |
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -132,6 +132,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -132,6 +132,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
132 | 132 | ||
133 | $rootScope.userModules = UserModules; | 133 | $rootScope.userModules = UserModules; |
134 | $rootScope.isVisibleLogin = false; | 134 | $rootScope.isVisibleLogin = false; |
135 | + $location.path('/'); | ||
135 | 136 | ||
136 | } | 137 | } |
137 | else { | 138 | else { |
@@ -139,8 +140,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -139,8 +140,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
139 | $rootScope.isVisibleLogin = true; | 140 | $rootScope.isVisibleLogin = true; |
140 | // alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT); | 141 | // alert(LoginMessageConstants.USER_OR_PASSWORD_INCORRECT); |
141 | $rootScope.errorMessage = LoginMessageConstants.USER_OR_PASSWORD_INCORRECT; | 142 | $rootScope.errorMessage = LoginMessageConstants.USER_OR_PASSWORD_INCORRECT; |
142 | - $("#messageModal").modal('show'); | ||
143 | - | 143 | + $("#messageModal").modal('show'); |
144 | } | 144 | } |
145 | else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) { | 145 | else if (result == LoginConstants.ERROR_IN_FECTHING_DETAILS) { |
146 | //alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS); | 146 | //alert(LoginMessageConstants.ERROR_IN_FECTHING_DETAILS); |
@@ -167,6 +167,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -167,6 +167,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
167 | $rootScope.haveRoleAdmin = false; | 167 | $rootScope.haveRoleAdmin = false; |
168 | localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); | 168 | localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); |
169 | $('#dvUserModulesInfo').modal('show'); | 169 | $('#dvUserModulesInfo').modal('show'); |
170 | + $location.path('/'); | ||
170 | 171 | ||
171 | } | 172 | } |
172 | //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) {} | 173 | //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 | @@ -181,6 +182,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
181 | $rootScope.licenseeAccountNumber = result.License.AccountNumber; | 182 | $rootScope.licenseeAccountNumber = result.License.AccountNumber; |
182 | localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); | 183 | localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); |
183 | $('#dvUserModulesInfo').modal('show'); | 184 | $('#dvUserModulesInfo').modal('show'); |
185 | + $location.path('/'); | ||
184 | 186 | ||
185 | } | 187 | } |
186 | else { | 188 | else { |
@@ -193,7 +195,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -193,7 +195,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
193 | $rootScope.userModules = result.Modules; | 195 | $rootScope.userModules = result.Modules; |
194 | $rootScope.haveRoleAdmin = true; | 196 | $rootScope.haveRoleAdmin = true; |
195 | $rootScope.licenseeAccountNumber = result.License.AccountNumber; | 197 | $rootScope.licenseeAccountNumber = result.License.AccountNumber; |
196 | - localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); | 198 | + localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); |
199 | + $location.path('/'); | ||
197 | } | 200 | } |
198 | } | 201 | } |
199 | else { | 202 | else { |
@@ -203,6 +206,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | @@ -203,6 +206,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic | ||
203 | $rootScope.haveRoleAdmin = true; | 206 | $rootScope.haveRoleAdmin = true; |
204 | localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); | 207 | localStorage.setItem('loggedInUserDetails', JSON.stringify(result)); |
205 | $('#dvUserModulesInfo').modal('show'); | 208 | $('#dvUserModulesInfo').modal('show'); |
209 | + $location.path('/'); | ||
206 | } | 210 | } |
207 | } | 211 | } |
208 | else if ((!result.IsSubscriptionExpired) && (result.License != null) && (result.License.IsActive) && !result.IsActive) { | 212 | else if ((!result.IsSubscriptionExpired) && (result.License != null) && (result.License.IsActive) && !result.IsActive) { |
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
@@ -13,7 +13,10 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -13,7 +13,10 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
13 | $scope.dragableId = ""; | 13 | $scope.dragableId = ""; |
14 | $scope.blReviewAttempt = false; | 14 | $scope.blReviewAttempt = false; |
15 | $scope.$on('$viewContentLoaded', function (event) { | 15 | $scope.$on('$viewContentLoaded', function (event) { |
16 | - | 16 | + |
17 | + if ($rootScope.refreshcheck == null) { | ||
18 | + $location.path('/'); | ||
19 | + } | ||
17 | // code that will be executed ... | 20 | // code that will be executed ... |
18 | // every time this view is loaded | 21 | // every time this view is loaded |
19 | 22 | ||
@@ -89,7 +92,10 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -89,7 +92,10 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
89 | 92 | ||
90 | 93 | ||
91 | $scope.GetQuizByTopic = function () { | 94 | $scope.GetQuizByTopic = function () { |
92 | - | 95 | + |
96 | + if ($rootScope.refreshcheck == null) { | ||
97 | + $location.path('/'); | ||
98 | + } | ||
93 | var keywords = $location.search(); | 99 | var keywords = $location.search(); |
94 | $scope.LabExerciseName = keywords.labexercise; | 100 | $scope.LabExerciseName = keywords.labexercise; |
95 | $scope.LabExerciseModules = null; | 101 | $scope.LabExerciseModules = null; |
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
1 | 'use strict'; | 1 | 'use strict'; |
2 | 2 | ||
3 | -AIA.controller("LinkController", ["$scope", "$rootScope", "$log", "pages", "$routeParams", | 3 | +AIA.controller("LinkController", ["$scope", "$rootScope", "$log", "$location", "pages", "$routeParams", |
4 | function ($scope, $rootScope, log, $location, pages, $routeParams) { | 4 | function ($scope, $rootScope, log, $location, pages, $routeParams) { |
5 | 5 | ||
6 | //$rootScope.currentActiveModuleTitle = Modules[10].Name; | 6 | //$rootScope.currentActiveModuleTitle = Modules[10].Name; |
@@ -18,7 +18,10 @@ function ($scope, $rootScope, log, $location, pages, $routeParams) { | @@ -18,7 +18,10 @@ function ($scope, $rootScope, log, $location, pages, $routeParams) { | ||
18 | 18 | ||
19 | $scope.$on('$viewContentLoaded', function (event) { | 19 | $scope.$on('$viewContentLoaded', function (event) { |
20 | 20 | ||
21 | - | 21 | + |
22 | + if ($rootScope.refreshcheck == null) { | ||
23 | + $location.path('/'); | ||
24 | + } | ||
22 | // code that will be executed ... | 25 | // code that will be executed ... |
23 | // every time this view is loaded | 26 | // every time this view is loaded |
24 | 27 |
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -105,7 +105,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -105,7 +105,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
105 | }; | 105 | }; |
106 | 106 | ||
107 | $scope.loadForModuleById = function (moduleId) { | 107 | $scope.loadForModuleById = function (moduleId) { |
108 | - | 108 | + |
109 | + if ($rootScope.refreshcheck == null) { | ||
110 | + $location.path('/'); | ||
111 | + } | ||
109 | $scope.moduleId = moduleId; | 112 | $scope.moduleId = moduleId; |
110 | $scope.activeTab = 1; | 113 | $scope.activeTab = 1; |
111 | console.log('loadForModuleById is called') | 114 | console.log('loadForModuleById is called') |
@@ -205,7 +208,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -205,7 +208,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
205 | 208 | ||
206 | 209 | ||
207 | $scope.openModuleItem = function () { | 210 | $scope.openModuleItem = function () { |
208 | - | 211 | + |
212 | + if ($rootScope.refreshcheck == null) { | ||
213 | + $location.path('/'); | ||
214 | + } | ||
209 | var jsContentURL; | 215 | var jsContentURL; |
210 | var moduleItemViewDivId; | 216 | var moduleItemViewDivId; |
211 | 217 |