Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Develop

Nikita Kulshreshtha
2 parents 56375750 b32144cb
Showing 1 changed file with 25 additions and 6 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -1943,6 +1943,22 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.HighlightBodyOnExtract = function () {
         console.log(' insode HighlightBodyOnExtract. $rootScope.MaskCanvasData length= ' + $rootScope.MaskCanvasData.length + ', $rootScope.previousHighlightList.length= ' + $rootScope.previousHighlightList.length)
+
+        $("#btnExtract").removeClass("btn-black");
+        $("#btnExtract").addClass("btn-primary");
+
+       
+        if ($("#btnNormalMode").hasClass("btn-primary")) {
+            $("#btnNormalMode").removeClass("btn-primary");
+            $("#btnNormalMode").addClass("btn-black");
+        }
+
+        if ($("#btnHighLight").hasClass("btn-primary")) {
+            $("#btnHighLight").removeClass("btn-primary");
+            $("#btnHighLight").addClass("btn-black");
+        }
+
+
         //terminate previous running workers to create space for new workers
         $scope.layerNumber = $('#txtlayerNumber').val();
         $scope.terminateCurrentlyRunningWPs();
@@ -7981,14 +7997,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             }
         }
-        $('#spinner').css('visibility', 'visible');
-        console.log('listManagerEvent');
+      
         if ($rootScope.islistManagerEventAlredayDispachted == true) {
-
+            $('#spinner').css('visibility', 'visible');
+            console.log('listManagerEvent');
             var systemList = $rootScope.CommonData.DACommonData.BodySystems.Item;
             $('#bodySystems').empty();
@@ -8076,13 +8092,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 var $el = $('<option ng-click=HighlightBodyOnListManagerSelection($event) id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList')
                 $compile($el)($scope);
-                $rootScope.isLoading = false;
-                $('#spinner').css('visibility', 'hidden');
             }
+
+            $rootScope.isLoading = false;
+            $('#spinner').css('visibility', 'hidden');
+
             var termsTotal = '<span class="pull-left marginTop5">' + $scope.VocabTermTxt.length + ' Structures</span>';
             $("#totalTerms").empty();
             $('#totalTerms').append(termsTotal);
-      
+
+          
         }
     }