Commit f9489fa41e6e630c7f3889d373147499ab00ad61
1 parent
b5217ee7
add link for legacy app
Showing
6 changed files
with
93 additions
and
19 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
@@ -539,13 +539,6 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -539,13 +539,6 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
539 | 539 | ||
540 | $("#threedImage_" + windowviewid).css('background-color', 'aliceblue'); | 540 | $("#threedImage_" + windowviewid).css('background-color', 'aliceblue'); |
541 | 541 | ||
542 | - //incase onload not fire | ||
543 | - // call after 20 second | ||
544 | - setTimeout(() => { | ||
545 | - | ||
546 | - $scope.AnimationOnLoad(windowviewid); | ||
547 | - | ||
548 | - }, 30000); | ||
549 | } | 542 | } |
550 | 543 | ||
551 | $scope.AnimationOnLoad = function (windowviewid) { | 544 | $scope.AnimationOnLoad = function (windowviewid) { |
@@ -579,7 +572,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | @@ -579,7 +572,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location | ||
579 | { | 572 | { |
580 | $("#threedImage_" + windowviewid).css('pointer-events', 'auto'); | 573 | $("#threedImage_" + windowviewid).css('pointer-events', 'auto'); |
581 | $scope.stop3drefresh(timeintval); | 574 | $scope.stop3drefresh(timeintval); |
582 | - timeintval = $interval(PointerEventEnableDisable, 5000); | 575 | + timeintval = $interval(PointerEventEnableDisable, 10000); |
583 | } | 576 | } |
584 | else | 577 | else |
585 | { | 578 | { |
400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js
@@ -26,9 +26,33 @@ function ($scope, $rootScope, pages, log, $location) { | @@ -26,9 +26,33 @@ function ($scope, $rootScope, pages, log, $location) { | ||
26 | encryptedUserName = CryptoJS.AES.encrypt($rootScope.siteUrlInfo.username, key, { iv: iv }); | 26 | encryptedUserName = CryptoJS.AES.encrypt($rootScope.siteUrlInfo.username, key, { iv: iv }); |
27 | encryptedPassword = CryptoJS.AES.encrypt($rootScope.siteUrlInfo.password, key, { iv: iv }); | 27 | encryptedPassword = CryptoJS.AES.encrypt($rootScope.siteUrlInfo.password, key, { iv: iv }); |
28 | 28 | ||
29 | - $location.url('/'); | ||
30 | - | ||
31 | - window.open('http://legacy.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=8'); | 29 | + if($location.host()=="qa.beta.interactiveanatomy.com") |
30 | + { | ||
31 | + if($rootScope.accessOldCurriculum) | ||
32 | + { | ||
33 | + window.open('http://qa.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=7'); | ||
34 | + } | ||
35 | + else | ||
36 | + { | ||
37 | + window.open('http://qa.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=8'); | ||
38 | + } | ||
39 | + | ||
40 | + } | ||
41 | + else | ||
42 | + { | ||
43 | + if($rootScope.accessOldCurriculum) | ||
44 | + { | ||
45 | + window.open('http://legacy.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=7'); | ||
46 | + } | ||
47 | + else | ||
48 | + { | ||
49 | + window.open('http://legacy.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=8'); | ||
50 | + } | ||
51 | + | ||
52 | + } | ||
53 | + $rootScope.accessOldCurriculum=false; | ||
54 | + | ||
55 | + $location.url('/'); | ||
32 | 56 | ||
33 | } | 57 | } |
34 | else { | 58 | else { |
@@ -49,20 +73,69 @@ function ($scope, $rootScope, pages, log, $location) { | @@ -49,20 +73,69 @@ function ($scope, $rootScope, pages, log, $location) { | ||
49 | var encryptedRemoteIPAddress = CryptoJS.AES.encrypt($rootScope.siteUrlInfo.remoteIPAddress, key, { iv: iv }); | 73 | var encryptedRemoteIPAddress = CryptoJS.AES.encrypt($rootScope.siteUrlInfo.remoteIPAddress, key, { iv: iv }); |
50 | var encryptedSiteId = $rootscope.siteId;*/ | 74 | var encryptedSiteId = $rootscope.siteId;*/ |
51 | 75 | ||
76 | + | ||
77 | + if($location.host()=="qa.beta.interactiveanatomy.com") | ||
78 | + { | ||
79 | + if($rootScope.accessOldCurriculum) | ||
80 | + { | ||
81 | + window.open('http://qa.interactiveanatomy.com/Default.aspx?si=' + encryptedSiteIP + '&ac=' + encryptedAccountNumber + '&ed=' + encryptedEdition + '&rf=' + encryptedUrlReferer + '&rm=' + encryptedRemoteIPAddress + '&mod=7' + '&s=' + encryptedSiteId); | ||
82 | + } | ||
83 | + else | ||
84 | + { | ||
85 | + window.open('http://qa.interactiveanatomy.com/Default.aspx?si=' + encryptedSiteIP + '&ac=' + encryptedAccountNumber + '&ed=' + encryptedEdition + '&rf=' + encryptedUrlReferer + '&rm=' + encryptedRemoteIPAddress + '&mod=8' + '&s=' + encryptedSiteId); | ||
86 | + } | ||
87 | + | ||
88 | + } | ||
89 | + else | ||
90 | + { | ||
91 | + if($rootScope.accessOldCurriculum) | ||
92 | + { | ||
93 | + window.open('http://legacy.interactiveanatomy.com/Default.aspx?si=' + encryptedSiteIP + '&ac=' + encryptedAccountNumber + '&ed=' + encryptedEdition + '&rf=' + encryptedUrlReferer + '&rm=' + encryptedRemoteIPAddress + '&mod=7' + '&s=' + encryptedSiteId); | ||
94 | + } | ||
95 | + else | ||
96 | + { | ||
97 | + window.open('http://legacy.interactiveanatomy.com/Default.aspx?si=' + encryptedSiteIP + '&ac=' + encryptedAccountNumber + '&ed=' + encryptedEdition + '&rf=' + encryptedUrlReferer + '&rm=' + encryptedRemoteIPAddress + '&mod=8' + '&s=' + encryptedSiteId); | ||
98 | + } | ||
99 | + | ||
100 | + } | ||
101 | + | ||
102 | + $rootScope.accessOldCurriculum=false; | ||
52 | $location.url('/'); | 103 | $location.url('/'); |
53 | 104 | ||
54 | - window.open('http://legacy.interactiveanatomy.com/Default.aspx?si=' + encryptedSiteIP + '&ac=' + encryptedAccountNumber + '&ed=' + encryptedEdition + '&rf=' + encryptedUrlReferer + '&rm=' + encryptedRemoteIPAddress + '&mod=8' + '&s=' + encryptedSiteId); | ||
55 | - | ||
56 | - } | 105 | + } |
57 | } | 106 | } |
58 | else { | 107 | else { |
59 | userInfo = ($rootScope.userData); | 108 | userInfo = ($rootScope.userData); |
60 | var encryptedUserName = CryptoJS.AES.encrypt(userInfo.LoginId, key, { iv: iv }); | 109 | var encryptedUserName = CryptoJS.AES.encrypt(userInfo.LoginId, key, { iv: iv }); |
61 | var encryptedPassword = CryptoJS.AES.encrypt(userInfo.Password, key, { iv: iv }); | 110 | var encryptedPassword = CryptoJS.AES.encrypt(userInfo.Password, key, { iv: iv }); |
62 | 111 | ||
63 | - $location.url('/'); | 112 | + if($location.host()=="qa.beta.interactiveanatomy.com") |
113 | + { | ||
114 | + if($rootScope.accessOldCurriculum) | ||
115 | + { | ||
116 | + window.open('http://qa.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=7'); | ||
117 | + } | ||
118 | + else | ||
119 | + { | ||
120 | + window.open('http://qa.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=8'); | ||
121 | + } | ||
122 | + | ||
123 | + } | ||
124 | + else | ||
125 | + { | ||
126 | + if($rootScope.accessOldCurriculum) | ||
127 | + { | ||
128 | + window.open('http://legacy.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=7'); | ||
129 | + } | ||
130 | + else | ||
131 | + { | ||
132 | + window.open('http://legacy.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=8'); | ||
133 | + } | ||
134 | + | ||
135 | + } | ||
64 | 136 | ||
65 | - window.open('http://legacy.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=8'); | 137 | + $rootScope.accessOldCurriculum=false; |
138 | + $location.url('/'); | ||
66 | 139 | ||
67 | } | 140 | } |
68 | } | 141 | } |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
@@ -386,7 +386,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -386,7 +386,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
386 | var imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage; | 386 | var imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage; |
387 | 387 | ||
388 | 388 | ||
389 | - var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "'+ value._Title + '" data-ng-click="openView($event)">' | 389 | + var $el = $('<div id="' + value._id + '" class="col-sm-3 col-lg-2" title = "'+ value._Title + '" data-ng-click="openView($event)">' |
390 | + '<div class="thumbnail" ><a href="#">' | 390 | + '<div class="thumbnail" ><a href="#">' |
391 | + '<img id="' + value._Title + '" class="img-responsive" style="width:100%;height:100%;" ng-src="' + imagePath + '" alt="" title="" >' | 391 | + '<img id="' + value._Title + '" class="img-responsive" style="width:100%;height:100%;" ng-src="' + imagePath + '" alt="" title="" >' |
392 | + '<div class="caption" style="padding:0px"><p>'+'('+ value._id+') ' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view'); | 392 | + '<div class="caption" style="padding:0px"><p>'+'('+ value._id+') ' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view'); |
@@ -601,7 +601,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -601,7 +601,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
601 | 601 | ||
602 | $scope.imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage; | 602 | $scope.imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage; |
603 | 603 | ||
604 | - var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">' | 604 | + var $el = $('<div id="' + value._id + '" class="col-sm-3 col-lg-2" title = "' + value._Title + '" data-ng-click="openView($event)">' |
605 | + '<div class="thumbnail" ><a href="#">' | 605 | + '<div class="thumbnail" ><a href="#">' |
606 | + '<img id="' + value._Title + '" class="img-responsive" style="width:100%;height:100%;" ng-src="' + $scope.imagePath + '" alt="" title="" >' | 606 | + '<img id="' + value._Title + '" class="img-responsive" style="width:100%;height:100%;" ng-src="' + $scope.imagePath + '" alt="" title="" >' |
607 | + '<div class="caption"><p>'+'('+ value._id+')</p><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view'); | 607 | + '<div class="caption"><p>'+'('+ value._id+')</p><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view'); |
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -8055,6 +8055,11 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data | @@ -8055,6 +8055,11 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data | ||
8055 | $scope.UpdateUserExportImageData(userid,'ModuleName',moduleName); | 8055 | $scope.UpdateUserExportImageData(userid,'ModuleName',moduleName); |
8056 | 8056 | ||
8057 | } | 8057 | } |
8058 | + $rootScope.accessOldCurriculum=false; | ||
8059 | + $rootScope.LegacyLoginClick = function () { | ||
8060 | + | ||
8061 | + $rootScope.accessOldCurriculum=true; | ||
8062 | + } | ||
8058 | 8063 | ||
8059 | $rootScope.StoreTitleName = function (titleName) { | 8064 | $rootScope.StoreTitleName = function (titleName) { |
8060 | 8065 |
400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js
@@ -80,7 +80,7 @@ function ($scope, $rootScope, log, $location, pages, $routeParams, $window,$inte | @@ -80,7 +80,7 @@ function ($scope, $rootScope, log, $location, pages, $routeParams, $window,$inte | ||
80 | { | 80 | { |
81 | $("#externalLink").css('pointer-events', 'auto'); | 81 | $("#externalLink").css('pointer-events', 'auto'); |
82 | $scope.stopLinkRefresh(timeintval); | 82 | $scope.stopLinkRefresh(timeintval); |
83 | - timeintval = $interval(PointerEventEnableDisable, 5000); | 83 | + timeintval = $interval(PointerEventEnableDisable, 10000); |
84 | } | 84 | } |
85 | else | 85 | else |
86 | { | 86 | { |
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
@@ -47,6 +47,9 @@ | @@ -47,6 +47,9 @@ | ||
47 | </li> | 47 | </li> |
48 | <!--redirecting to Admin--> | 48 | <!--redirecting to Admin--> |
49 | <li class="navbarItem" style="float:left"><a ng-click="reDirectURLToAdmin()" ng-show="haveRoleAdmin" style="cursor: pointer;">Admin</a></li> | 49 | <li class="navbarItem" style="float:left"><a ng-click="reDirectURLToAdmin()" ng-show="haveRoleAdmin" style="cursor: pointer;">Admin</a></li> |
50 | + <li class="navbarItem" style="float:left" title="Click here to access Legacy Curriculum Builder"> | ||
51 | + <a href="anatomy-test" ng-click="LegacyLoginClick()" title="Click here to access Legacy Curriculum Builder" style="cursor: pointer;">Legacy Curriculum Builder <em style="color:red">(This version will be discontinued 12/31/20)</em></a> | ||
52 | + </li> | ||
50 | </ul> | 53 | </ul> |
51 | <ul class="nav navbar-nav navbar-right" style="float: right;"> | 54 | <ul class="nav navbar-nav navbar-right" style="float: right;"> |
52 | <li id="userNameoption" class="navbarItem" style="pointer-events:none ;"><a href="#">{{userName}}</a></li> | 55 | <li id="userNameoption" class="navbarItem" style="pointer-events:none ;"><a href="#">{{userName}}</a></li> |