diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js index ece36fa..05f20a4 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js @@ -539,13 +539,6 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location $("#threedImage_" + windowviewid).css('background-color', 'aliceblue'); - //incase onload not fire - // call after 20 second - setTimeout(() => { - - $scope.AnimationOnLoad(windowviewid); - - }, 30000); } $scope.AnimationOnLoad = function (windowviewid) { @@ -579,7 +572,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location { $("#threedImage_" + windowviewid).css('pointer-events', 'auto'); $scope.stop3drefresh(timeintval); - timeintval = $interval(PointerEventEnableDisable, 5000); + timeintval = $interval(PointerEventEnableDisable, 10000); } else { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js index e164f6b..bab32e0 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js @@ -26,9 +26,33 @@ function ($scope, $rootScope, pages, log, $location) { encryptedUserName = CryptoJS.AES.encrypt($rootScope.siteUrlInfo.username, key, { iv: iv }); encryptedPassword = CryptoJS.AES.encrypt($rootScope.siteUrlInfo.password, key, { iv: iv }); - $location.url('/'); - - window.open('http://legacy.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=8'); + if($location.host()=="qa.beta.interactiveanatomy.com") + { + if($rootScope.accessOldCurriculum) + { + window.open('http://qa.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=7'); + } + else + { + window.open('http://qa.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=8'); + } + + } + else + { + if($rootScope.accessOldCurriculum) + { + window.open('http://legacy.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=7'); + } + else + { + window.open('http://legacy.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=8'); + } + + } + $rootScope.accessOldCurriculum=false; + + $location.url('/'); } else { @@ -49,20 +73,69 @@ function ($scope, $rootScope, pages, log, $location) { var encryptedRemoteIPAddress = CryptoJS.AES.encrypt($rootScope.siteUrlInfo.remoteIPAddress, key, { iv: iv }); var encryptedSiteId = $rootscope.siteId;*/ + + if($location.host()=="qa.beta.interactiveanatomy.com") + { + if($rootScope.accessOldCurriculum) + { + window.open('http://qa.interactiveanatomy.com/Default.aspx?si=' + encryptedSiteIP + '&ac=' + encryptedAccountNumber + '&ed=' + encryptedEdition + '&rf=' + encryptedUrlReferer + '&rm=' + encryptedRemoteIPAddress + '&mod=7' + '&s=' + encryptedSiteId); + } + else + { + window.open('http://qa.interactiveanatomy.com/Default.aspx?si=' + encryptedSiteIP + '&ac=' + encryptedAccountNumber + '&ed=' + encryptedEdition + '&rf=' + encryptedUrlReferer + '&rm=' + encryptedRemoteIPAddress + '&mod=8' + '&s=' + encryptedSiteId); + } + + } + else + { + if($rootScope.accessOldCurriculum) + { + window.open('http://legacy.interactiveanatomy.com/Default.aspx?si=' + encryptedSiteIP + '&ac=' + encryptedAccountNumber + '&ed=' + encryptedEdition + '&rf=' + encryptedUrlReferer + '&rm=' + encryptedRemoteIPAddress + '&mod=7' + '&s=' + encryptedSiteId); + } + else + { + window.open('http://legacy.interactiveanatomy.com/Default.aspx?si=' + encryptedSiteIP + '&ac=' + encryptedAccountNumber + '&ed=' + encryptedEdition + '&rf=' + encryptedUrlReferer + '&rm=' + encryptedRemoteIPAddress + '&mod=8' + '&s=' + encryptedSiteId); + } + + } + + $rootScope.accessOldCurriculum=false; $location.url('/'); - window.open('http://legacy.interactiveanatomy.com/Default.aspx?si=' + encryptedSiteIP + '&ac=' + encryptedAccountNumber + '&ed=' + encryptedEdition + '&rf=' + encryptedUrlReferer + '&rm=' + encryptedRemoteIPAddress + '&mod=8' + '&s=' + encryptedSiteId); - - } + } } else { userInfo = ($rootScope.userData); var encryptedUserName = CryptoJS.AES.encrypt(userInfo.LoginId, key, { iv: iv }); var encryptedPassword = CryptoJS.AES.encrypt(userInfo.Password, key, { iv: iv }); - $location.url('/'); + if($location.host()=="qa.beta.interactiveanatomy.com") + { + if($rootScope.accessOldCurriculum) + { + window.open('http://qa.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=7'); + } + else + { + window.open('http://qa.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=8'); + } + + } + else + { + if($rootScope.accessOldCurriculum) + { + window.open('http://legacy.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=7'); + } + else + { + window.open('http://legacy.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=8'); + } + + } - window.open('http://legacy.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=8'); + $rootScope.accessOldCurriculum=false; + $location.url('/'); } } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js index 6a5cf84..aaff8c9 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js @@ -386,7 +386,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout var imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage; - var $el = $('
' + var $el = $('
' + '
').appendTo('#grid-view'); @@ -601,7 +601,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout $scope.imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage; - var $el = $('
' + var $el = $('').appendTo('#grid-view'); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 17c43e6..ec700e1 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -8055,6 +8055,11 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $scope.UpdateUserExportImageData(userid,'ModuleName',moduleName); } + $rootScope.accessOldCurriculum=false; + $rootScope.LegacyLoginClick = function () { + + $rootScope.accessOldCurriculum=true; + } $rootScope.StoreTitleName = function (titleName) { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js index 50544d7..89283fb 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js @@ -80,7 +80,7 @@ function ($scope, $rootScope, log, $location, pages, $routeParams, $window,$inte { $("#externalLink").css('pointer-events', 'auto'); $scope.stopLinkRefresh(timeintval); - timeintval = $interval(PointerEventEnableDisable, 5000); + timeintval = $interval(PointerEventEnableDisable, 10000); } else { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html index 33ed363..e280974 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html @@ -47,6 +47,9 @@ +