ADAM / AIAHTML5

Commit 978bb06593801562bc660564d64a83ac7e163b6e

Authored by Nikita Kulshreshtha
1 parent e030dd5f

1. configured flex anatomy test into AIAHTML5. 

2. fixing 36819 in homecontroller
Inline Side-by-side
Showing 5 changed files with 25 additions and 4 deletions
400-SOURCECODE/AIAHTML5.API/Controllers/ConfigurationController.cs
  View file @978bb06
... ... @@ -17,5 +17,11 @@ namespace AIAHTML5.API.Controllers
17 17 HttpResponseMessage response = Request.CreateResponse(HttpStatusCode.OK, current_year);
18 18 return response;
19 19 }
  20 +
  21 + public IEnumerable<string> Get()
  22 + {
  23 + return new string[] { "value1", "value2" };
  24 + }
20 25 }
  26 +
21 27 }
22 28 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js
  View file @978bb06
... ... @@ -11,7 +11,21 @@ function ($scope, $rootScope, pages, log, $location) {
11 11 $("html,body").scrollTop(0);
12 12 //alert("scroll");
13 13 }
  14 + $scope.openAIAFlexAnatomyTest = function () {
  15 + var userInfo = ($rootScope.userData);
14 16  
  17 +
  18 + var key = CryptoJS.enc.Base64.parse("MTIzNDU2NzgxMjM0NTY3OA");
  19 + var iv = CryptoJS.enc.Base64.parse("EBESExQVFhcYGRobHB0eHw");
  20 +
  21 + var encryptedUserName = CryptoJS.AES.encrypt(userInfo.LoginId, key, { iv: iv });
  22 + var encryptedPassword = CryptoJS.AES.encrypt(userInfo.Password, key, { iv: iv });
  23 +
  24 + $location.url('/');
  25 +
  26 + window.open('http://qa.interactiveanatomy.com/Default.aspx?un=' + encryptedUserName + '&up=' + encryptedPassword + '&mod=8');
  27 +
  28 + }
15 29 $scope.$on('$viewContentLoaded', function (event) {
16 30  
17 31 // code that will be executed ...
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @978bb06
... ... @@ -817,7 +817,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
817 817  
818 818 $rootScope.LogoutUser = function () {
819 819 localStorage.removeItem('loggedInUserDetails');
820   - // localStorage.clear();
  820 + localStorage.clear();
821 821 document.location = '/';
822 822 $rootScope.isVisibleLogin = true;
823 823 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/AnatTest/AnatTest-view.html
  View file @978bb06
1   -<div class="bodyWrap row ">
  1 +<!--<div class="bodyWrap row ">
2 2 <div ng-include="'app/widget/MainMenu.html'" />
3 3 <div class="main mCustomScrollbar _mCS_1 mCS-autoHide">
4 4  
... ... @@ -79,5 +79,6 @@
79 79  
80 80  
81 81 </div>
82   -</div>
  82 +</div>-->
83 83  
  84 +<div id="anatTest" ng-init="openAIAFlexAnatomyTest()" />
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
  View file @978bb06
... ... @@ -26,7 +26,7 @@
26 26 <div class="sidebar pull-left mCustomScrollbar _mCS_1 mCS-autoHide ">
27 27 <!--{{name}}-->
28 28 <ul class="nav nav-sidebar" ng-init="hideScrollbar()">
29   - <li ng-repeat="module in userModules" ng-hide="module.id==8 || module.id==13"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible();getModuleScrollPosition()" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')" ng-hide="module.id==8 || module.id==13"><!--{{module.name}}--></a></li>
  29 + <li ng-repeat="module in userModules" ng-hide="module.id==13"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible();getModuleScrollPosition()" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')" ng-hide="module.id==13"><!--{{module.name}}--></a></li>
30 30 </ul>
31 31 </div>
32 32  
... ...