diff --git a/400-SOURCECODE/AIAHTML5.API/Controllers/ConfigurationController.cs b/400-SOURCECODE/AIAHTML5.API/Controllers/ConfigurationController.cs index 7199fc0..86866db 100644 --- a/400-SOURCECODE/AIAHTML5.API/Controllers/ConfigurationController.cs +++ b/400-SOURCECODE/AIAHTML5.API/Controllers/ConfigurationController.cs @@ -17,5 +17,11 @@ namespace AIAHTML5.API.Controllers HttpResponseMessage response = Request.CreateResponse(HttpStatusCode.OK, current_year); return response; } + + public IEnumerable Get() + { + return new string[] { "value1", "value2" }; + } } + } \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js index f6ef555..1d4ec82 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js @@ -11,7 +11,21 @@ function ($scope, $rootScope, pages, log, $location) { $("html,body").scrollTop(0); //alert("scroll"); } + $scope.openAIAFlexAnatomyTest = function () { + var userInfo = ($rootScope.userData); + + var key = CryptoJS.enc.Base64.parse("MTIzNDU2NzgxMjM0NTY3OA"); + var iv = CryptoJS.enc.Base64.parse("EBESExQVFhcYGRobHB0eHw"); + + var encryptedUserName = CryptoJS.AES.encrypt(userInfo.LoginId, key, { iv: iv }); + var encryptedPassword = CryptoJS.AES.encrypt(userInfo.Password, key, { iv: iv }); + + $location.url('/'); + + window.open('http://qa.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=8'); + + } $scope.$on('$viewContentLoaded', function (event) { // code that will be executed ... diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index bd78b97..543ed0e 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -817,7 +817,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A $rootScope.LogoutUser = function () { localStorage.removeItem('loggedInUserDetails'); - // localStorage.clear(); + localStorage.clear(); document.location = '/'; $rootScope.isVisibleLogin = true; } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/AnatTest/AnatTest-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/AnatTest/AnatTest-view.html index 0d3d86a..a719f1d 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/AnatTest/AnatTest-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/AnatTest/AnatTest-view.html @@ -1,4 +1,4 @@ -
+ +
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html index 8dadb58..9471173 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html @@ -26,7 +26,7 @@