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

Nikita Kulshreshtha
2 parents fad2f955 49fef882
Showing 1 changed file with 23 additions and 6 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -1492,7 +1492,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 //   console.log('$rootScope.isListManagerSelected= ' + $rootScope.isListManagerSelected + ' length= ' + $scope.ColoredImageSRC.length)
-
                     if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
                     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
                         $rootScope.coloredImageCanvasList[parseInt(bodyRegionId - 1)] = coloredImageDataVar;
                     }
                     //
+                    
                     if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
@@ -2507,6 +2507,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                         //send actual term no to get the term text.
                         actualTermNo = $scope.matchedTermNoData[0]._ActualTermNumber;
                         annotationText = $scope.GetAnnotationBasedOnActualTermNo(actualTermNo);
+                        $rootScope.actualTermNumber = actualTermNo;
                         break;
                     };
@@ -5914,6 +5915,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         var viewname = localStorage.getItem("currentViewTitle")
         var currentBodyViewId = $scope.correspondingBodyViewIds[$rootScope.voId];
+        
         if ((event.currentTarget.attributes[1].value == 'Male') && (localStorage.getItem("genderId") == 'Female')) {
             //1.
@@ -5925,8 +5927,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $rootScope.isLoading = true;
             $('#spinner').css('visibility', 'visible');
             //3.
-            $scope.layerNumber = 0;
-            $scope.loadSelectedBodyView(currentBodyViewId);
+            if ($rootScope.isHighLight == true && $rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0) {
+                $scope.setLayerNumberAndHighlightByTermList();
+            }
+            else {
+                $scope.layerNumber = 0;
+                $scope.loadSelectedBodyView(currentBodyViewId);
+            }
             //4.
             $scope.loadSelectedBodyViewNavigator(currentBodyViewId);
@@ -5955,8 +5962,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $rootScope.isLoading = true;
             $('#spinner').css('visibility', 'visible');
             //3.
-            $scope.layerNumber = 0;
-            $scope.loadSelectedBodyView(currentBodyViewId);
+            if ($rootScope.isHighLight == true && $rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0) {
+                $scope.setLayerNumberAndHighlightByTermList();
+            }
+            else {
+                $scope.layerNumber = 0;
+                $scope.loadSelectedBodyView(currentBodyViewId);
+            }
             //4.
             $scope.loadSelectedBodyViewNavigator(currentBodyViewId);
@@ -7114,7 +7126,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         //9.
         $timeout(function () {
-            $rootScope.isHighLight = false;
+            if(($rootScope.isGenderChnage == true && $rootScope.isHighLight==true) || ($rootScope.isViewChange == true && $rootScope.isHighLight==true)){
+
+            }
+            else{
+                $rootScope.isHighLight = false;
+            }
             $('#sppeachBubble').css('display', 'none');
             $("#dot").css("display", "none");
             //DA > Annotation's Line should not displayed.