Refs: #7375

Nikita Kulshreshtha
1 parent 2988be2f
Showing 1 changed file with 27 additions and 10 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -5090,6 +5090,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                                         $timeout(function () { $scope.HighlightBodyByTermList($scope.systemMatchedTermList) }, 100);
                                     }
                                     else if ($rootScope.isListManagerSelected == true) {
+                                        console.log('$rootScope.isListManagerSelected == true')
                                         $scope.isLoading = true;
                                         $('#spinner').css('visibility', 'visible');
@@ -5367,7 +5368,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         //if listanager is visisble then close it
-            $rootScope.isListManagerSelected = false;
+            //$rootScope.isListManagerSelected = false;
             $rootScope.CloseListManager();
         $rootScope.isLoading = true;
@@ -5508,7 +5509,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                  if (canDivChildCount > 0) {
                      canDiv.innerHTML = '';
                  }
-                 $scope.CalculateImageCordinates($rootScope.viewOrientationId);
+
+
+                 //if user seelcted any term and serached before gender cnage then itshould be highlighted in chnaged gender
+                 if (($rootScope.isListManagerSelected == true) && ($rootScope.isGenderChnage == true)) {
+                     $scope.setLayerNumberAndHighlightByTermList();
+                 }
+                 else {
+                     $scope.CalculateImageCordinates($rootScope.viewOrientationId);
+                 }
                  $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
              },
               function (error) {
@@ -7066,10 +7075,21 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $('#spinner').css('visibility', 'visible');
         //1.
-        var actualTermNumber = event.currentTarget.id;//attributes[0].value;
-        $scope.TermList = $scope.getTermNumberList(actualTermNumber);
+       $rootScope.actualTermNumber = event.currentTarget.id;//attributes[0].value;
+       console.log(' $scope.actualTermNumber insde HighlightBodyOnListManagerSelection= ' + $rootScope.actualTermNumber)
         //2.
+
+        $scope.setLayerNumberAndHighlightByTermList();
+
+
+    }
+
+    $scope.setLayerNumberAndHighlightByTermList = function () {
+        console.log(' $scope.actualTermNumber insde setLayerNumberAndHighlightByTermList= ' + $rootScope.actualTermNumber)
+
+        $scope.TermList = $scope.getTermNumberList($rootScope.actualTermNumber);
+
         var internalLayerNumberList = [];
         for (var i = 0; i < $scope.TermList.length; i++) {
             var layerNumber = $scope.TermList[i]._InternalLayerNumber
@@ -7109,9 +7129,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $scope.layerNumber = layerNumber;
         //4.get scroll position
-        if (actualTermNumber != DA[0].SKIN_TERM_ID) {
+        if ($rootScope.actualTermNumber != DA[0].SKIN_TERM_ID) {
-            $scope.termCoordinate = $scope.getTermCoordinate(actualTermNumber);
+            $scope.termCoordinate = $scope.getTermCoordinate($rootScope.actualTermNumber);
         }
@@ -7126,7 +7146,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             //6.
             var matchedDataonActualTerm = new jinqJs()
                                      .from($scope.matchdedDataOnLayer)
-                                     .where('_ActualTermNumber == ' + actualTermNumber)
+                                     .where('_ActualTermNumber == ' + $scope.actualTermNumber)
                                      .select('_TermNumber');
             if (matchedDataonActualTerm != null || matchedDataonActualTerm != undefined) {
@@ -7164,9 +7184,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             //redraw body of respective layer
             $scope.CalculateImageCordinates($rootScope.viewOrientationId)
         }, 500);
-
-
-
     }
     $scope.getChildTermList = function (termNo) {