Merge branch 'ExtractAfterSearchOrLM' of http://52.6.196.163/ADAM/AIAHTML5 into ExtractFixMerge

# Conflicts: # 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js

Merge branch 'ExtractAfterSearchOrLM' of http://52.6.196.163/ADAM/AIAHTML5 into ExtractFixMerge
# Conflicts: # 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
Amrita Vishnoi
2 parents cfac7f46 6be46160
Showing 1 changed file with 35 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -1007,7 +1007,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $scope.one = 1;
+        if ($rootScope.isListManagerSelected == true) {
+            $scope.layerNumber = $('#txtlayerNumber').val();
+        }
+
         $scope.userInput = parseInt($scope.layerNumber);
+
+        
         $scope.skinTone = $rootScope.globalSetting.ethnicity;
         var SelectedLayerData = [];
@@ -1768,11 +1774,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.HighlightBodyOnExtract = function () {
-
+       
         var multiTermList = [];
         var CallBackBodyRegion = [];
-        if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) {
+        if ($rootScope.isListManagerSelected) {
+            
+                    multiTermList = $scope.AllTerms;
+            
+       }          
+       else if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) {
             angular.forEach($rootScope.previousHighlightList, function (value, key) {
                 var ActualTermNo = $scope.getActualTermNumber(value);
@@ -1956,7 +1967,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     }
                 }
             }
-        }, 50)
+        }, 500)
     }
@@ -1971,6 +1982,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         //    $rootScope.updatedGrayDataList = [];
         //}
+        if ($rootScope.isHighLight == true) {
+            false;
+        }
+
         console.log('HighlightBodyByTermList is called');
         // $scope.highlightedBR = null;
@@ -5061,8 +5076,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                                     $('#spinner').css('visibility', 'hidden');
                                     //}
+                                   
                                     if (($scope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) {
+
                                         $scope.isLoading = true;
                                         $('#spinner').css('visibility', 'visible');
@@ -5092,9 +5109,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                         if ($rootScope.isExtract == true) {
                             if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && $rootScope.previousHighlightList.length > 0) {
+                                console.log('1. $rootScope.isExtract=true and $rootScope.previousHighlightList != null')
                                 $timeout(function () { $scope.HighlightBodyOnExtract() }, 50);
                             }
+                            else if ($rootScope.isListManagerSelected == true) {
+                                console.log('1. $rootScope.isExtract=true and $rootScope.isListManagerSelected == true')
+
+                               $timeout(function () { $scope.HighlightBodyOnExtract() }, 50);
+                                                                
+                            }
                         }
                         //else {
                         //    // this code is for the case where user first clcik on normal mode then extract then again highlight then we need to call highlight body in gray mode 
@@ -5242,13 +5266,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     })
                     if ($rootScope.isExtract == true) {
-                        if ($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined || $rootScope.previousHighlightList.length > 0) {
+                        if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && $rootScope.previousHighlightList.length > 0) {
+                            console.log('2. $rootScope.isExtract=true and $rootScope.previousHighlightList != null, $rootScope.previousHighlightList.length= ' + $rootScope.previousHighlightList.length)
+
                             $timeout(function () { $scope.HighlightBodyOnExtract() }, 50);
                             // to do
                         }
+                        else if ($rootScope.isListManagerSelected == true) {
+                            console.log('2. $rootScope.isExtract=true and $rootScope.isListManagerSelected == true')
+                            $timeout(function () { $scope.HighlightBodyOnExtract() }, 50);
+                     
+                         }
                     }
                 }