ADAM / AIAHTML5

Commit e0e09d97be9dc7e9c049818aa274a3e3ab2f8039

Authored by Nikita Kulshreshtha
2 parents fad2f955 49fef882

Merge branch 'Bug#8837_1' of http://52.6.196.163/ADAM/AIAHTML5 into Bug#8837_2

Inline Side-by-side
Showing 1 changed file with 23 additions and 6 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @e0e09d9
... ... @@ -1492,7 +1492,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1492 1492  
1493 1493 // console.log('$rootScope.isListManagerSelected= ' + $rootScope.isListManagerSelected + ' length= ' + $scope.ColoredImageSRC.length)
1494 1494  
1495   -
1496 1495 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
1497 1496  
1498 1497 if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) {
... ... @@ -1848,6 +1847,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1848 1847 $rootScope.coloredImageCanvasList[parseInt(bodyRegionId - 1)] = coloredImageDataVar;
1849 1848 }
1850 1849 //
  1850 +
1851 1851  
1852 1852 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
1853 1853  
... ... @@ -2507,6 +2507,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2507 2507 //send actual term no to get the term text.
2508 2508 actualTermNo = $scope.matchedTermNoData[0]._ActualTermNumber;
2509 2509 annotationText = $scope.GetAnnotationBasedOnActualTermNo(actualTermNo);
  2510 + $rootScope.actualTermNumber = actualTermNo;
2510 2511 break;
2511 2512 };
2512 2513  
... ... @@ -5914,6 +5915,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5914 5915 var viewname = localStorage.getItem("currentViewTitle")
5915 5916 var currentBodyViewId = $scope.correspondingBodyViewIds[$rootScope.voId];
5916 5917  
  5918 +
5917 5919 if ((event.currentTarget.attributes[1].value == 'Male') && (localStorage.getItem("genderId") == 'Female')) {
5918 5920  
5919 5921 //1.
... ... @@ -5925,8 +5927,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5925 5927 $rootScope.isLoading = true;
5926 5928 $('#spinner').css('visibility', 'visible');
5927 5929 //3.
5928   - $scope.layerNumber = 0;
5929   - $scope.loadSelectedBodyView(currentBodyViewId);
  5930 + if ($rootScope.isHighLight == true && $rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0) {
  5931 + $scope.setLayerNumberAndHighlightByTermList();
  5932 + }
  5933 + else {
  5934 + $scope.layerNumber = 0;
  5935 + $scope.loadSelectedBodyView(currentBodyViewId);
  5936 + }
5930 5937  
5931 5938 //4.
5932 5939 $scope.loadSelectedBodyViewNavigator(currentBodyViewId);
... ... @@ -5955,8 +5962,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5955 5962 $rootScope.isLoading = true;
5956 5963 $('#spinner').css('visibility', 'visible');
5957 5964 //3.
5958   - $scope.layerNumber = 0;
5959   - $scope.loadSelectedBodyView(currentBodyViewId);
  5965 + if ($rootScope.isHighLight == true && $rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0) {
  5966 + $scope.setLayerNumberAndHighlightByTermList();
  5967 + }
  5968 + else {
  5969 + $scope.layerNumber = 0;
  5970 + $scope.loadSelectedBodyView(currentBodyViewId);
  5971 + }
5960 5972  
5961 5973 //4.
5962 5974 $scope.loadSelectedBodyViewNavigator(currentBodyViewId);
... ... @@ -7114,7 +7126,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7114 7126  
7115 7127 //9.
7116 7128 $timeout(function () {
7117   - $rootScope.isHighLight = false;
  7129 + if(($rootScope.isGenderChnage == true && $rootScope.isHighLight==true) || ($rootScope.isViewChange == true && $rootScope.isHighLight==true)){
  7130 +
  7131 + }
  7132 + else{
  7133 + $rootScope.isHighLight = false;
  7134 + }
7118 7135 $('#sppeachBubble').css('display', 'none');
7119 7136 $("#dot").css("display", "none");
7120 7137 //DA > Annotation's Line should not displayed.
... ...