Merge branch '14986_Merge' into Develop

Nikita Kulshreshtha
2 parents 7d6f8fb7 4de65404
Showing 2 changed files with 100 additions and 49 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -563,7 +563,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             value: 0,
             slide: function (event, ui) {
                 // $("#txtlayerNumber").val(100 - ui.value); // basic math operation..
-
+                
                 // $("#txtlayerNumber").val($("#layerChangeSlider").slider("value"));
             },
             stop: function (event, ui) {
@@ -614,11 +614,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                         }
                     }
                 }
-            });
+           });
+
+
        })
     $scope.loadSearchDataForBodyView = function () {
-       
+      
         console.log('loadSearchDataForBodyView');
         var currentBodyViewId = localStorage.getItem("currentBodyViewId");
@@ -684,11 +686,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                                                            '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
                                                       ' </li></ul>').appendTo('#searchListDiv')
                 $compile($e2)($scope);
-
+             
             }, 500);
-
+          
         }, true);
+    
+
     }
     $scope.loadBodyViewData = function (currentVoid) {
@@ -2763,9 +2767,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         // $rootScope.isListManagerSelected = false;
         $rootScope.CloseListManager();
-
-
-
+       
         $scope.isLayerChange = true;
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
@@ -6923,6 +6925,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $scope.female = "active";
         }
         $rootScope.CloseAnnotationTool();
+        $scope.searchFilter = '';
     }
     //clsoe worker process
@@ -7045,7 +7048,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         //Remove the search list and then Repopulate it on change of View
         $('#searchListDiv').empty()
-
         if ($rootScope.openViews.length > 0) {
             $rootScope.openViews.splice($rootScope.openViews.length - 1);
         }
@@ -7131,6 +7133,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 //2.
                 $scope.loadNavigatorForSelectedBodyView($rootScope.voId);
+                //3. load corresponding navigator man
+                $scope.loadNavigatorForSelectedBodyView($rootScope.voId);
+
+                //4. change the search terms as per the selected bodyview
+                $scope.loadSearchDataForBodyView();
+
+                //5.Change the popup title next to search
+                $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
             };
@@ -7208,7 +7218,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         }
         //13573 : DA > Annotations should not be display if we change the body view.
         $rootScope.CloseAnnotationTool();
-      
+        $scope.searchFilter = '';
     }
     //Reload DA controller event listener after setting change
@@ -7625,22 +7635,22 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         if ($("#btnExtract").hasClass("btn-primary")) {
             $("#btnExtract").removeClass("btn-primary");
         }
-
+        
         if ($("#btnNormalMode").hasClass("btn-primary")) {
             $("#btnNormalMode").removeClass("btn-primary");
         }
     }
-
+    $rootScope.isSearchInputClicked = true;
     $scope.ShowSearch = function () {
-
         console.log('ShowSearch is called');
         //this check is for log only because we are writing length so need to check if its not null or undefined
         if ($scope.VocabTermTxt != null || $scope.VocabTermTxt != undefined) 
-          console.log('$scope.VocabTermTxt.length= ' + $scope.VocabTermTxt.length)
+            console.log('$scope.VocabTermTxt.length= ' + $scope.VocabTermTxt.length)
         $timeout(function () {
-            if (($scope.VocabTermTxt!=null|| $scope.VocabTermTxt!=undefined) && ($scope.VocabTermTxt.length > 0)) {
+            if (($scope.VocabTermTxt != null || $scope.VocabTermTxt != undefined) && ($scope.VocabTermTxt.length > 0)) {
+             
                 $scope.IsSearchVisible = true;
                 document.getElementById("termlistfilter").style.display = "block";
             }
@@ -7650,35 +7660,34 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     $scope.ShowSearch();
                 }
             }
-        }, 500);
+         
+            if ($rootScope.isSearchInputClicked == true) {
+                $rootScope.isSearchInputClicked = false;
+                $rootScope.searchListArray = [];
+                $("#backdrop > #searchListDiv > #termlistfilter > li").each(function (key, value) {
+                    $rootScope.searchListArray.push({ "name": $(this).find("a").html(), "id": $(this).find("a").attr("id") });
+                });
-        //$scope.IsSearchVisible = true;
+            }
+          
+        }, 500);
-        //document.getElementById("termlistfilter").style.display = "block";
     }
+
     $scope.HideSearch = function () {
-        if ($("#backdrop").is(":hover") || $("#termlistfilter").is(":hover") || $("#typedtermname").is(":focus")) {
-            $scope.IsSearchVisible = true;
-            document.getElementById("termlistfilter").style.display = "block";
-        }
-        else {
-            //1. persist term in DAsearch but hide ul/li
-            if ($("#btnDATermSearch").is(":hover")) {
-                $scope.IsSearchVisible = false;
-            }
-            else {
-                //2.hide ul/li and clear DA search
-                $scope.IsSearchVisible = false;
-                document.getElementById("termlistfilter").style.display = "none";
-                $scope.searchFilter = "";
-            }
-        }
+       
+        $timeout(function () {
+
+            $("#termlistfilter").css("display", "none");
+
+
+        }, 1000);
     }
     $scope.jumpToTerm = function (event) {
-       // alert(event.currentTarget.value);
+     
        $rootScope.searchSelectedText = $('#'+ event.currentTarget.id).text();
        $('#termList option[selected="selected"]').prop("selected", false);
        $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
@@ -8401,7 +8410,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     $("#btnNormalMode").removeClass("btn-primary");
                 }
-                $('#typedtermname').val($scope.searchFilter);
+                $('#typedTermName').val($scope.searchFilter);
             }
             else {
@@ -8416,21 +8425,62 @@ 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()
+        $('#searchListDiv').empty();
+        $rootScope.ModifiedsearchListArray = [];
         // added the timeout to delay the compile of ul li
-        $timeout(function () {
-            var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:60001;"><li ng-repeat="item in VocabTermTxt| filter:{ _TermText: searchFilter}">' +
-                                                   '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
-                                              ' </li></ul>').appendTo('#searchListDiv')
-        $compile($e2)($scope);
-        }, 500);
-
+        $scope.IsSearchVisible = true;
+        var isValueMatchedWithTerm = false;
+        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;
+                    }
+                    else {
+                        isValueMatchedWithTerm = true
+                    }
+                }
+                if (isValueMatchedWithTerm == true) {
+                    $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
+        {
+            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);
+         
+        }
     }
-
-
+    
 }]
 );
@@ -130,6 +130,7 @@
         left: 0;
         right: 0;
     }
+   
 </style>
 <div class=" " id="daView" ng-controller="DAController">
     <div class="pos-relative leftToolBar tools pull-left">
@@ -268,14 +269,14 @@
                 <div class="">
                     <div class="input-group col-sm-8 col-xs-7 col-md-10 pull-left">
-                        <input type="text" class="form-control input-sm pull-left" id="typedtermname" ng-blur="HideSearch()" onclick="OnSearch()" ondblclick="OnSearch()" ng-model="searchFilter" ng-change="resetSearchListView()"  placeholder=" search...">
+                        <input type="text" class="form-control input-sm pull-left" id="typedTermName" onclick="OnSearch()" ondblclick="OnSearch()" ng-model="searchFilter" ng-change="resetSearchListView()" ng-blur="HideSearch()" placeholder=" search...">
                         <div id="backdrop" ng-show="IsSearchVisible">
                             <div id="searchListDiv" class="col-sm-12 col-xs-12 col-md-12 col-lg-12 pull-left">
                             </div>
                         </div>
-
+                     
                     </div>
                     <div class="btn-group">