Merge branch 'Develop' of http://gitlab.ebix.com/ADAM/AIAHTML5 into QA

Nikita Kulshreshtha
2 parents 318ffb97 5049713a
Showing 2 changed files with 230 additions and 95 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -9000,47 +9000,47 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
         }
         $scope.jumpToTerm = function (event) {
-
-            $rootScope.searchSelectedText = $('#' + event.currentTarget.id).text();
-            $('#termList option[selected="selected"]').prop("selected", false);
-            $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
-            $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
-            $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
+            if ($rootScope.searchSelectedText != $('#' + event.currentTarget.id).text()) {
+                $rootScope.searchSelectedText = $('#' + event.currentTarget.id).text();
+                $('#termList option[selected="selected"]').prop("selected", false);
+                $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
+                $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
+                $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
-            $rootScope.isLoading = true;
+                $rootScope.isLoading = true;
-            $('#spinner').css('visibility', 'visible');
-            //1.
-            $scope.searchFilter = event.currentTarget.innerHTML;
+                $('#spinner').css('visibility', 'visible');
+                //1.
+                $scope.searchFilter = event.currentTarget.innerHTML;
-            //2.
-            $scope.HighlightBodyOnListManagerSelection(event.currentTarget.id);
+                //2.
+                $scope.HighlightBodyOnListManagerSelection(event.currentTarget.id);
-            $scope.IsSearchVisible = false;
-            $rootScope.isNormalMode = false;
+                $scope.IsSearchVisible = false;
+                $rootScope.isNormalMode = false;
-            //Highlight only Highlight button
+                //Highlight only Highlight button
-            $("#btnHighLight").addClass("btn-primary");
-            $("#btnHighLight").removeClass("btn-black");
+                $("#btnHighLight").addClass("btn-primary");
+                $("#btnHighLight").removeClass("btn-black");
-            if (!$("#btnNormalMode").hasClass("btn-black")) {
-                $("#btnNormalMode").addClass("btn-black");
-            }
+                if (!$("#btnNormalMode").hasClass("btn-black")) {
+                    $("#btnNormalMode").addClass("btn-black");
+                }
-            if (!$("#btnExtract").hasClass("btn-black")) {
-                $("#btnExtract").addClass("btn-black");
-            }
+                if (!$("#btnExtract").hasClass("btn-black")) {
+                    $("#btnExtract").addClass("btn-black");
+                }
-            if ($("#btnExtract").hasClass("btn-primary")) {
-                $("#btnExtract").removeClass("btn-primary");
-            }
+                if ($("#btnExtract").hasClass("btn-primary")) {
+                    $("#btnExtract").removeClass("btn-primary");
+                }
-            if ($("#btnNormalMode").hasClass("btn-primary")) {
-                $("#btnNormalMode").removeClass("btn-primary");
+                if ($("#btnNormalMode").hasClass("btn-primary")) {
+                    $("#btnNormalMode").removeClass("btn-primary");
+                }
             }
-
         }
         //Function to set the vertical and horizontal scroll position of CanvasDiv as per the Navigator
@@ -9801,9 +9801,61 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
         $scope.resetSearchListView = function () {
-            $scope.ShowSearch();
+            // $scope.ShowSearch();
+            $scope.showFilteredTerms()
+        }
+        $scope.showFilteredTerms = function () {
+
+            if ($('#searchListDiv').html() != "") {
+                $('#searchListDiv').empty();
+            }
+            $rootScope.a = $scope.primaryLexiconInd;
+            var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu ng-scope" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:block;z-index:60001;"><li class="ng-scope" ng-repeat="item in vocabTermDataArray[a].vocabTermTxt| filter:{ _TermText: searchFilter}| limitTo : 10">' +
+            '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
+            ' </li></ul>').appendTo('#searchListDiv')
+            $compile($e2)($scope);
+            document.getElementById("termlistfilter").style.display = "block";
+            $timeout(function () {
+                $("#backdrop > #searchListDiv > #termlistfilter > li").each(function (key, value) {
+                    if ($(this).find("a").html() == document.getElementById("typedTermName").value) {
+                        $("#termlistfilter li a").css({ "background-color": "#ffffff", "color": "#000000" });
+                        $(this).find("a").css({ "background-color": "#3399FF", "color": "#ffffff" });
+                    }
+                });
+            }, 100);
+        };
+
+        $scope.ApplySearch = function () {
+            $rootScope.isLoading = false;
+            $('#spinner').css('visibility', 'hidden');
+
+            $('#searchedTermListPopUp').css('display', 'block');
+            $("#searchedTermListPopUp").css("visibility", "visible");
+
+            $('#searchedTermListPopUp').draggable();
+
+            $scope.FillSearchList();
         }
+        $scope.FillSearchList = function () {
+            if ($('#searchTermListUl').html() != "") {
+                $('#searchTermListUl').empty();
+            }
+            $rootScope.a = $scope.primaryLexiconInd;
+            $scope.sFilter = $("#typedTermName").val();
+            var $e2 = $('<li class="ng-scope" ng-repeat="item in vocabTermDataArray[a].vocabTermTxt| filter:{ _TermText: sFilter}">' +
+            '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
+            ' </li>').appendTo('#searchTermListUl')
+            $compile($e2)($scope);
+
+            $rootScope.isLoading = false;
+            $('#spinner').css('visibility', 'hidden');
+        }
+        $scope.closeSerachTermListPopUp = function () {
+            $('#searchedTermListPopUp').css('display', 'none');
+            $("#searchedTermListPopUp").css("visibility", "hidden");
+
+        }
     }])
 function OnGenderChange(event) {
@@ -36,7 +36,7 @@
         border: solid;
         position: absolute;
         /*Bug #24255: Mac > DA > Body Navigator is not appear properly.*/
-         height:14px !important;
+        height: 14px !important;
     }
     #wrapper {
@@ -46,7 +46,7 @@
         margin: 20px auto;
     }
-    .tooltip-custom + .tooltip > .tooltip-inner {   
+    .tooltip-custom + .tooltip > .tooltip-inner {
         background-color: #fff;
         border: 1px solid #000;
         color: #000;
@@ -111,7 +111,10 @@
         color: #000;
         border-radius: 0;
     }
-    .pad0{padding:0;}
+
+    .pad0 {
+        padding: 0;
+    }
 </style>
 <!--Annotation Toolbar: Jcanvas-->
 <style>
@@ -132,7 +135,6 @@
         left: 0;
         right: 0;
     }
-   
 </style>
 <div class=" " id="daView" ng-controller="DAController">
     <div class="pos-relative leftToolBar tools pull-left">
@@ -168,9 +170,11 @@
                     <div class="custom-tooltip">Highlight Options</div>
                     <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu2" ng-click="LoadBodySystemData($event)"><img src="content/images/icon-highlight.png" alt="" title=""></button>
                     <ul class="dropdown-menu" id="structureDropdown">
-                        <li ng-class="CurrentStructure" ><a href="#" title="Current Structure"
-   onclick="OnBodySystemSelection(event)">Current Structure</a></li>
-                     
+                        <li ng-class="CurrentStructure">
+                            <a href="#" title="Current Structure"
+                               onclick="OnBodySystemSelection(event)">Current Structure</a>
+                        </li>
+
                         <li role="separator" class="divider"></li>
                         <!--<li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" ng-click="HighlightBodyByBodySystem($event)">Cardiovascular</a></li>
@@ -274,11 +278,10 @@
                 <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" onclick="OnSearch()" ondblclick="OnSearch()" ng-model="searchFilter" ng-change="resetSearchListView()" ng-blur="HideSearch()" placeholder=" search...">
-
+                        <!--<input type="text" class="form-control input-sm pull-left" id="typedTermName" onclick="OnSearch()" ng-model="searchFilter" ng-blur="HideSearch()" ng-change="resetSearchListView()" placeholder=" search..." >-->
+                        <input type="text" class="form-control input-sm pull-left" id="typedTermName" onclick="OnSearch()" ng-model="searchFilter" ng-change="showFilteredTerms()" ng-blur="HideSearch()" placeholder=" search..." ng-model-options="{debounce: 500}">
                         <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>
@@ -290,6 +293,12 @@
                             <i class="fa fa-caret-down" style="font-size:20px;"></i>
                         </button>
                     </div>
+                    <div class="btn-group" style="vertical-align:top;">
+                        <!--   <h6 class="text-center text-primary txt-white f11 col-xs-12">Search</h6>-->
+                        <button type="button" class="btn btn-primary btn-sm col-xs-12" ng-click="ApplySearch()" style="margin-right:2px;">
+                            <i class="fa fa-search"></i>
+                        </button>
+                    </div>
                     <div class="btn-group open" id="da-body-nav">
                         <button type="button" style="padding:0px 0px 10px 1px !important;background-color:rgba(255,255,255,0.0); border:none;" class="btn btn-primary dropdown-toggle btn-sm" id="navigatorBtn">
                             <img src="~/../content/images/DA/navigator-view.png" style="height:30px; width:50px" />
@@ -383,36 +392,36 @@
         </div>
     </div>
     <div class="modal fade" id="daMessageModal" role="dialog" style="top:20%;">
-        
-                <div class="modal-dialog modal-sm">
-            
-            
-            
-                        <div class="modal-content">
-                
-               
+
+        <div class="modal-dialog modal-sm">
+
+
+
+            <div class="modal-content">
+
+
                 <div class="modal-header">
-                   
+
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                   
-                              </div>
-                   
-                               <div class="modal-title"></div>
-                
-                                <!--<div class="modal-body">"No body system"</div>-->
-                
-                                <div class="modal-header"><p data-ng-bind ="message" style="font-size:15px;"></p></div>
-               
-
-                
+
+                </div>
+
+                <div class="modal-title"></div>
+
+                <!--<div class="modal-body">"No body system"</div>-->
+
+                <div class="modal-header"><p data-ng-bind="message" style="font-size:15px;"></p></div>
+
+
+
                 <div class="modal-footer"> <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal">OK</button></div>
-                
-                
+
+
             </div>
-            
-            
+
+
         </div>
-      
+
     </div>
@@ -431,6 +440,83 @@
             </div>
         </div>
     </div>
+    <style>
+        #searchedTermListPopUp {
+            background: #fff;
+            border-radius: 3px;
+            border: 1px solid #ededed;
+            -webkit-box-shadow: 0px 0px 2px 1px rgba(173,173,173,1);
+            -moz-box-shadow: 0px 0px 2px 1px rgba(173,173,173,1);
+            box-shadow: 0px 0px 2px 1px rgba(173,173,173,1);
+            width: 350px;
+            position: absolute;
+            top: 170px;
+            left: 140px;
+            display: none;
+            z-index: 780000;
+            height: auto !important;
+        }
+
+            #searchedTermListPopUp .annotation-modal-header {
+                background: #818f44;
+                padding: 2px 10px;
+            }
+
+                #searchedTermListPopUp .annotation-modal-header h4 {
+                    color: #fff;
+                    font-size: 15px;
+                    line-height: 20px;
+                }
+
+            #searchedTermListPopUp .modal-header .close {
+                color: #fff;
+                margin: 0;
+                opacity: 10;
+                text-shadow: none;
+            }
+
+            #searchedTermListPopUp .modal-footer {
+                padding: 5px 10px;
+            }
+    </style>
+
+
+
+    <div id="searchedTermListPopUp" style="">
+        <div class="modal-header annotation-modal-header">
+            <button type="button" class="close" aria-label="Close" ng-click="closeSerachTermListPopUp()"><span aria-hidden="true">&times;</span></button>
+            <h4 class="modal-title" id="myModalLabel">Search List</h4>
+        </div>
+        <div class="modal-body">
+            <div class="row paddingTopBtm10">
+                <div class="col-sm-12">
+
+
+                    <div style="">
+
+
+                        <!--DA > List Manager > Multiple structure selection should not be available.-->
+                        <div class="form-group">
+                            <!--<select id="searchTermList" class="form-control" size="10" onclick="if (typeof (this.selectedIndex) != 'undefined') onListManagerTermSelection(this.options[this.selectedIndex].id, true)"></select>-->
+                            <ul id="searchTermListUl" class="form-control dropdown-menu" style="height:200px;width:100%;overflow-y:scroll;position:absolute;display:block;z-index:60001;"></ul>
+
+                        </div>
+
+                    </div>
+                    <div style="clear:both;"></div>
+
+
+
+
+                </div>
+            </div>
+
+        </div>
+        <div class="modal-footer" id="totalTerms">
+            <!--<span class="pull-left marginTop5">424 Structures</span>-->
+            <!--<button data-dismiss="modal" class="btn btn-primary" type="button"><i class="fa fa-arrow-circle-right"></i></button>-->
+        </div>
+    </div>
 </div>
 <!--<script src="../../../libs/jquery/1.11.4/jquery-ui.js"></script>-->
 <script src="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script>
@@ -444,7 +530,7 @@
 <script>
     $(window).load(function () {
         $(".stickey-area").sticky();
-     
+
     });</script>
 <script>
@@ -462,14 +548,12 @@
               && (e.which < 37  // arrow keys
                   || e.which > 40)
               && (e.keyCode < 96  // Dissectible Anatomy > Num Lock is not working for enter the layer.
-              || e.keyCode > 105))
-
-            {
+              || e.keyCode > 105)) {
                 e.preventDefault();
                 return false;
             }
         });
-      
+
     });
 </script>
@@ -485,10 +569,10 @@
 <script>
     $(function () {
-     
-      // issue in navigator image in internet explorer
+
+        // issue in navigator image in internet explorer
         if ($.browser.msie == true) {
-            $("#navigatorDiv").css({"min-width":"auto", "min-height":"auto"});
+            $("#navigatorDiv").css({ "min-width": "auto", "min-height": "auto" });
             $("#containment-wrapper").css("min-width", "auto");
         }
         $("#transparencyScale").draggable();
@@ -501,30 +585,29 @@
         if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
         }
-        else
-        {
-        $("#dropdownMenu2").mouseover(function () {
-            $(".custom-tooltip").css("display", "block");
-        });
-        $("#dropdownMenu2").mouseout(function () {
-            $(".custom-tooltip").css("display", "none");
-        });
+        else {
+            $("#dropdownMenu2").mouseover(function () {
+                $(".custom-tooltip").css("display", "block");
+            });
+            $("#dropdownMenu2").mouseout(function () {
+                $(".custom-tooltip").css("display", "none");
+            });
-        $("#dropdownMenu4").mouseover(function () {
-            $(".custom-tooltip1").css("display", "block");
-        });
-        $("#dropdownMenu4").mouseout(function () {
-            $(".custom-tooltip1").css("display", "none");
-        });
+            $("#dropdownMenu4").mouseover(function () {
+                $(".custom-tooltip1").css("display", "block");
+            });
+            $("#dropdownMenu4").mouseout(function () {
+                $(".custom-tooltip1").css("display", "none");
+            });
+
+            $("#dropdownMenu3").mouseover(function () {
+                $(".custom-tooltip2").css("display", "block");
+            });
+            $("#dropdownMenu3").mouseout(function () {
+                $(".custom-tooltip2").css("display", "none");
+            });
+        }
-        $("#dropdownMenu3").mouseover(function () {
-            $(".custom-tooltip2").css("display", "block");
-        });
-        $("#dropdownMenu3").mouseout(function () {
-            $(".custom-tooltip2").css("display", "none");
-        });
-     }
-       
     });
 </script>
 <script>