ADAM / AIAHTML5

Commit c81a594f56123e00bb20e2b2c309f1c79505fe21

Authored by Amrita Vishnoi
2 parents 767ecfca c5b9000f

Merge branch 'Bug#8666' into Develop

Inline Side-by-side
Showing 1 changed file with 7 additions and 5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @c81a594
... ... @@ -5929,7 +5929,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5929 5929 var currentBodyViewId = $scope.correspondingBodyViewIds[$rootScope.voId];
5930 5930  
5931 5931  
5932   - if ((event.currentTarget.attributes[1].value == 'Male') && (localStorage.getItem("genderId") == 'Female')) {
  5932 + if ((event.currentTarget.title == 'Male') && (localStorage.getItem("genderId") == 'Female')) {
5933 5933  
5934 5934 //1.
5935 5935 localStorage.setItem("genderId", 'Male');
... ... @@ -5961,7 +5961,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5961 5961  
5962 5962 }
5963 5963  
5964   - else if ((event.currentTarget.attributes[1].value == 'Female') && (localStorage.getItem("genderId") == 'Male')) {
  5964 + else if ((event.currentTarget.title == 'Female') && (localStorage.getItem("genderId") == 'Male')) {
5965 5965  
5966 5966 //1.
5967 5967 localStorage.setItem("genderId", 'Female');
... ... @@ -6145,7 +6145,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6145 6145  
6146 6146 $scope.layerNumber = 0;
6147 6147 // debugger;
6148   - var selectedViewId = $scope.bodyViews[event.currentTarget.attributes[1].value];
  6148 + //var selectedViewId = $scope.bodyViews[event.currentTarget.attributes[1].value];
  6149 + var selectedViewId = $scope.bodyViews[event.currentTarget.title];
  6150 +
6149 6151 $rootScope.viewOrientationId = selectedViewId;
6150 6152 if (localStorage.getItem("genderId") == 'Male') {
6151 6153 if ($rootScope.voId != selectedViewId) {
... ... @@ -6210,8 +6212,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6210 6212 // $('#daImagePanel')[0].childNodes[0].childNodes[0].innerHTML = localStorage.getItem("genderId") + " " + $scope.bodyViews[event.currentTarget.attributes[1].value;
6211 6213  
6212 6214 }
6213   - $('#daImagePanel')[0].childNodes[0].childNodes[0].innerHTML = localStorage.getItem("genderId") + " " + event.currentTarget.attributes[1].value;
6214   - localStorage.setItem("currentViewTitle", localStorage.getItem("genderId") + " " + event.currentTarget.attributes[1].value);
  6215 + $('#daImagePanel')[0].childNodes[0].childNodes[0].innerHTML = localStorage.getItem("genderId") + " " + event.currentTarget.title;
  6216 + localStorage.setItem("currentViewTitle", localStorage.getItem("genderId") + " " + event.currentTarget.title);
6215 6217  
6216 6218  
6217 6219 $rootScope.openViews.push(
... ...