hiding wait cursor.

added length check.

hiding wait cursor.
added length check.
Nikita Kulshreshtha
1 parent 83721824
Showing 1 changed file with 31 additions and 27 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -2648,26 +2648,32 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         var multiTermList = [];
-        angular.forEach($rootScope.previousHighlightList, function (value, key) {
-            var ActualTermNo = $scope.getActualTermNumber(value);
-            if (ActualTermNo != null) {
-                var TermList = $scope.getTermNumberList(ActualTermNo);
-                if (TermList != null) {
-                    for (var i = 0; i < TermList.length; i++) {
-
-                        multiTermList.push(TermList[i]);
+      
+            angular.forEach($rootScope.previousHighlightList, function (value, key) {
+                var ActualTermNo = $scope.getActualTermNumber(value);
+                if (ActualTermNo != null && ActualTermNo != undefined) {
+                    var TermList = $scope.getTermNumberList(ActualTermNo);
+                    if (TermList != null) {
+                        for (var i = 0; i < TermList.length; i++) {
+
+                            multiTermList.push(TermList[i]);
+                        }
                     }
                 }
-            }
-
-        });
+            });
+     
         console.log('createTermListByPreviousTermsAndHighlight is called');
-        if ((multiTermList != undefined || multiTermList != null) && multiTermList.length > 0) {
+        if ((multiTermList != undefined && multiTermList != null) && multiTermList.length > 0) {
             $timeout(function () { $scope.HighlightBodyByTermList(multiTermList); }, 50);
         }
+        else {
+            $rootScope.isLoading = false;
+
+            $('#spinner').css('visibility', 'hidden');
+        }
     }
@@ -6785,7 +6791,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                   .from($rootScope.TermNumberData.TermData.Term)
                   .where('_TermNumber == ' + iColor)
                   .select('_ActualTermNumber');
-        if ($scope.actualTermNo != null || actualTermNo != undefined) {
+        if ($scope.actualTermNo != null && $scope.actualTermNo != undefined && $scope.actualTermNo.length>0) {
             return $scope.actualTermNo[0]._ActualTermNumber;
         }
@@ -8436,7 +8442,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
     $scope.resetSearchListView = function () {
-        
+
         $("#termlistfilter").css("display", "block");
         //Remove the list and then Repopulate it on change of $scope.searchFilter
         $('#searchListDiv').empty();
@@ -8444,13 +8450,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         // added the timeout to delay the compile of ul li
         $scope.IsSearchVisible = true;
         var isValueMatchedWithTerm = false;
-        for (var i = 0; i <= $rootScope.searchListArray.length - 1; i++)
-        {
+        for (var i = 0; i <= $rootScope.searchListArray.length - 1; i++) {
             var searchFieldVal = $("#typedTermName").val();
             if (searchFieldVal.length > 0) {
-                
+
                 for (var j = 0; j <= searchFieldVal.length - 1; j++) {
-                 
+
                     if (searchFieldVal[j].toUpperCase() != $rootScope.searchListArray[i].name[j].toUpperCase()) {
                         isValueMatchedWithTerm = false;
                         break;
@@ -8460,35 +8465,34 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     }
                 }
                 if (isValueMatchedWithTerm == true) {
-                    $rootScope.ModifiedsearchListArray.push({ "name": $rootScope.searchListArray[i].name, "id": $rootScope.searchListArray[i].id});
+                    $rootScope.ModifiedsearchListArray.push({ "name": $rootScope.searchListArray[i].name, "id": $rootScope.searchListArray[i].id });
                     console.log($rootScope.ModifiedsearchListArray);
                 }
-               
+
             }
         }
-        
+
         var termListFilterHtml = '';
         termListFilterHtml += '<ul id="termlistfilter"  class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;z-index:60001;">';
         if ($("#typedTermName").val().length > 0) {
             for (var i = 0; i <= $rootScope.ModifiedsearchListArray.length - 1; i++) {
-               
+
                 termListFilterHtml += '<li><a id=' + $rootScope.ModifiedsearchListArray[i].id + ' href="javascript:void(0);" onclick="selectTerm(event)">' + $rootScope.ModifiedsearchListArray[i].name + '</a></li>';
             }
             termListFilterHtml += '</ul>';
             $('#searchListDiv').append(termListFilterHtml);
-         
+
         }
-        else
-        {
+        else {
             console.log($rootScope.searchListArray.length);
             for (var i = 0; i <= $rootScope.searchListArray.length - 1; i++) {
-              
+
                 termListFilterHtml += '<li><a id=' + $rootScope.searchListArray[i].id + ' href="javascript:void(0);" onclick="selectTerm(event)">' + $rootScope.searchListArray[i].name + '</a></li>';
             }
             termListFilterHtml += '</ul>';
             $('#searchListDiv').append(termListFilterHtml);
-         
+
         }
     }