Merge branch 'Develop' into 'QA'

Develop See merge request !965

Merge branch 'Develop' into 'QA'
Develop See merge request !965
Pankaj Tiwary
2 parents 1b2bf24e d3001506
Showing 2 changed files with 59 additions and 29 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/filters/AIAFilter.js
@@ -4617,11 +4617,21 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
             $scope.TransparencyBoxEndY = TransparencyBoxEndY;
             if ($scope.TransparencyBoxStartX == $scope.TransparencyEndX && $scope.TransparencyBoxStartY == $scope.TransparencyBoxEndY) {
-                // $('#transparencyScale').css('visibility', 'hidden');
+
+                //#Bug 26464
+                $timeout(function () {
+                    angular.element(document.activeElement).blur();
+                });
+
             } else {
                 if (previewRectangleWidth == 0 && previewRectangleHeight == 0) {
+                    //#Bug 26464
+                    $timeout(function () {
+                        angular.element(document.activeElement).blur();
+                    });
+
                 }
                 else {
@@ -6696,14 +6706,15 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
                 var sliderVal = parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber);
                 console.log('inside  mouseDownListener. document.getElementById layerChangeSlider value : ' + document.getElementById('layerChangeSlider') + '$rootScope.totalLayers: ' + $rootScope.totalLayers + ' - $rootScope.currentLayerNumber: ' + $rootScope.currentLayerNumber + ' = set value for layerChangeSlider: ' + sliderVal);
-
-                $('#layerChangeSlider').slider("option", "value", sliderVal);
-                //if ($scope.isGenderChnage || $rootScope.isViewChange) {
-                //    $("#txtlayerNumber").val(parseInt(0));
-                //}
-                //else
-                $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber));
-
+                
+                //START BUG#32146
+                if (($rootScope.isHighlightBodyByBodySystem == true || $scope.isbodySystemHighlight == true) && $rootScope.systemNumber > 0) {
+                }
+                else {
+                    $('#layerChangeSlider').slider("option", "value", sliderVal);
+                    $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber));
+                }
+                //END BUG#32146
                 if (document.getElementById('tempCanvas') != null) {
                     $('#tempCanvas').remove();
@@ -8521,7 +8532,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
             $('#structureDropdown').html("");
             var currentBodyViewId = $rootScope.voId;
-            var systemListHtml = '<li><a href="#" title="Current Structure">Current Structure</a></li>  <li role="separator" class="divider"></li>'
+            var systemListHtml = '<li><a href="#" title="Current Structure" onclick="OnBodySystemSelection(event)">Current Structure</a></li>  <li role="separator" class="divider"></li>'
             var systemList = $rootScope.CommonData.DACommonData.BodySystems.Item;
             angular.forEach(systemList, function (value, key) {
@@ -8687,6 +8698,24 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
                     grayCanvasContext.putImageData($rootScope.grayImageDataList[parseInt(i)], 0, 0);
                 }
             }
+
+            //Start BUG#38018 
+            for (var i = 4; i <= $rootScope.grayImageMRDataList.length; i++) {
+                var grayCanvasMRID = 'imageCanvas' + i + '_MR';
+                var grayCanvasMR = document.getElementById(grayCanvasMRID);
+
+                if (grayCanvasMR != null) {
+                    var grayCanvasContextMR = grayCanvasMR.getContext("2d");
+
+                    var canvasHeight = grayCanvasMR.height;
+                    var canvasWidth = grayCanvasMR.width;
+                    grayCanvasContextMR.clearRect(0, 0, canvasHeight, canvasWidth);
+                    grayCanvasContextMR.putImageData($rootScope.grayImageMRDataList[parseInt(i)], 0, 0);
+                }
+            }
+            //END BUG#38018 
+
+
         }
         $scope.removeBodySyetemSelectionClass = function (title_highlightbody) {
@@ -8924,7 +8953,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
                         if ($('#searchListDiv').html() != "")
                             $('#searchListDiv').empty();
                         //Delay compile of ul li so that the remove of li is completed.
-                        $timeout(function () {
                             $scope.isSearchDataLoaded = true;
@@ -8948,13 +8976,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
                                 }
                             }
-                        }, 500);
+ 
                         $scope.IsSearchVisible = true;
                         console.log("primary language: " + $rootScope.vocabTermDataArray[primaryLexiconIndx].language);
                         $rootScope.a = primaryLexiconIndx;
-                        var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu" style="height:130px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:60001;"><li ng-repeat="item in vocabTermDataArray[a].vocabTermTxt| filter:{ _TermText: searchFilter}">' +
+                        var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu" style="height:130px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:60001;"><li 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);
@@ -8962,27 +8990,22 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
                         console.log('termlistfilter is created and complied');
                         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);
-                        $timeout(function () {
                             $rootScope.searchListArray = [];
                             $("#backdrop > #searchListDiv > #termlistfilter > li").each(function (key, value) {
                                 $rootScope.searchListArray.push({ "name": $(this).find("a").html(), "id": $(this).find("a").attr("id") });
                             });
-                        }, 100);
+
                     }
                     else {
                         $rootScope.loadSearchData();
-                        //if ($rootScope.vocabTermDataArray[primaryLexiconIndx].vocabTermTxt.length > 0) {
-                        //    $scope.ShowSearch();
-                        //}
                     }
                 }, 500);
@@ -9813,13 +9836,15 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
             if ($('#searchListDiv').html() != "") {
                 $('#searchListDiv').empty();
             }
+            //Bug 39757
+            $timeout(function () {
             $rootScope.a = $scope.primaryLexiconInd;
             var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu ng-scope" style="height:132px;width:100%;overflow-y:scroll;position:absolute;display:block;z-index:60001;"><li class="ng-scope" ng-repeat="item in vocabTermDataArray[a].vocabTermTxt| startsWithLetter:{ _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" });
@@ -9913,7 +9938,8 @@ function enableShowHideStructureBox() {
 function OnSearch() {
     console.log('Show Search is called outside ');
     var scope = angular.element(document.getElementById("daView")).scope();
-    scope.$apply(function () {
+    //Bug 39757
+    scope.$evalAsync(function () {
         scope.ShowSearch();
     });
 }
@@ -2,15 +2,19 @@
     return function (items, letter) {
         var filtered = [];
-        var letterMatch = new RegExp("^" + letter._TermText, 'i');
-        for (var i = 0; i < items.length; i++) {
-            var item = items[i];
-            //if (letterMatch.test(item._TermText.substring(0, 1))) {
-            if (letterMatch.test(item._TermText)) {
+            var letterMatch = new RegExp("^" + letter._TermText, 'i');
+            for (var i = 0; i < items.length; i++) {
+                var item = items[i];
+                //Bug 39757
+                if (letterMatch.test(item._TermText)) {
-                filtered.push(item);
+                    filtered.push(item);
+                }
+                //Bug 39757
+                if (filtered.length > 10) {
+                    break;
+                }
             }
-        }
         return filtered;
     };
 });
 \ No newline at end of file