Merge branch 'AAShowSelecetdPins1' into Develop

Nikita Kulshreshtha
2 parents 9109ad92 008ca6c7
Showing 2 changed files with 125 additions and 29 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
@@ -25,6 +25,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.AllImageType = [];
     $rootScope.speechBubbleDimaensions = [];
     $scope.runningSearchWorkers = [];
+    $scope.clickedPins = [];
     $scope.query = {
         selectedbodyregion: '',
@@ -436,13 +437,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.showSelectedSystemPins = function (event) {
+        $rootScope.isLoading = true;
+        $('#spinner').css('visibility', 'visible');
+
         $scope.removeSpeechBubble();
         if (event.currentTarget.id == "0") {
             $scope.selectedSystemName = null;
             if ($scope.isHidePinBtnClicked) {
-                $scope.showAllPinsAfterHide($scope.aaPinData);
+               // $scope.showAllPinsAfterHide($scope.aaPinData);
+                $scope.showAllPinsAfterHide();
             }
             else {
                 $scope.showAllPins();
@@ -468,7 +473,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                                      .where("_BodySystemName == " + $scope.selectedSystemName)
                                      .select();
                             if ($scope.isHidePinBtnClicked) {
-                                $scope.showAllPinsAfterHide($scope.selectedSystemPinData);
+                               // $scope.showAllPinsAfterHide($scope.selectedSystemPinData);
+                                $scope.showAllPinsAfterHide();
                             }
                             else
@@ -571,6 +577,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         }
+        $rootScope.isLoading = false;
+        $('#spinner').css('visibility', 'hidden');
         // $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i])
     }
@@ -911,7 +919,31 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 var pinID = (clickedPin.name).substring(7, (clickedPin.name).length);
                 // alert('pinId: ' + pinID);
                 //showAnnotation();
-                var pinID = (clickedPin.name).substring(7, (clickedPin.name).length);
+
+                var pinData = new jinqJs()
+                              .from($scope.aaPinData)
+                              .where("_PinId == " + pinID)
+                              .select();
+                
+               
+                var pinTermNumber = pinData[0]._TermId;
+                
+                var pinWithSameTerm = new jinqJs()
+                
+                                     .from($scope.aaPinData)
+                                     .where("_TermId == " + pinTermNumber)
+                                     .select();
+           
+                
+                  if (pinWithSameTerm != undefined && pinWithSameTerm != null && pinWithSameTerm.length > 0) {
+                    
+                        for (var i = 0; i < pinWithSameTerm.length; i++) {
+                    
+                             $scope.clickedPins.push({ 'id': pinWithSameTerm[i]._PinId })
+                         }
+                    
+                   }
+
                 var selectedPinData = new jinqJs()
                             .from($scope.aaPinData)
                             .where("_PinId == " + pinID)
@@ -1046,6 +1078,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.hidePins = function () {
+        $rootScope.isLoading = true;
+        $('#spinner').css('visibility', 'visible');
+
         $scope.hideSpeechBubble();
         $scope.isHidePinBtnClicked = true;
@@ -1063,50 +1098,102 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             }).drawLayers();
         })
+        $rootScope.isLoading = false;
+        $('#spinner').css('visibility', 'hidden');
     }
-    $scope.showAllPinsAfterHide = function (selectedSystemPinData) {
+    $scope.showAllPinsAfterHide = function (event) {
+
+        $rootScope.isLoading = true;
+        $('#spinner').css('visibility', 'visible');
+
         $scope.isHidePinBtnClicked = false;
+
         if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
-            $scope.showSystemPins($scope.selectedSystemPinData);
+
+            $scope.showSystemPins($scope.selectedSystemPinData, false);
+
         } else {
-            $scope.showSystemPins($scope.aaPinData);
-            //angular.forEach($scope.aaPinData, function (aaPinDataValue, aaPinDataKey) {
+            $scope.showSystemPins($scope.aaPinData, false);
+        }
+        $scope.showSpeechBubble();
+    };
+
+
+    $scope.showSelectedPins = function () {
-            //    var pinName = 'Pin_' + aaPinDataValue._PinId;
-            //    var pinArcName = 'PinArc_' + aaPinDataValue._PinId;
+        $rootScope.isLoading = true;
+        $('#spinner').css('visibility', 'visible');
-            //    $('#aaDetailViewCanvas').setLayer(pinName, {
-            //        visible: true // set to true instead to show the layer again
-            //    }).drawLayers();
+        $scope.isHidePinBtnClicked = false;
+
+        if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
+
+            $scope.showSystemPins($scope.selectedSystemPinData, true);
+
+        }
+        else {
+            $scope.showSystemPins($scope.aaPinData, true);
-            //    $('#aaDetailViewCanvas').setLayer(pinArcName, {
-            //        visible: true // set to true instead to show the layer again
-            //    }).drawLayers();
-            //})
         }
         $scope.showSpeechBubble();
     };
-    $scope.showSystemPins = function (seletedSystemPinData) {
+   
+    $scope.showSystemPins = function (seletedSystemPinData, isShowSelectedPins) {
-        angular.forEach(seletedSystemPinData, function (aaPinDataValue, aaPinDataKey) {
+        if (isShowSelectedPins) {
-            var pinName = 'Pin_' + aaPinDataValue._PinId;
-            var pinArcName = 'PinArc_' + aaPinDataValue._PinId;
+            angular.forEach($scope.clickedPins, function (value, key) {
-            $('#aaDetailViewCanvas').setLayer(pinName, {
-                visible: true // set to true instead to show the layer again
-            }).drawLayers();
+                seletedSystemPinData = new jinqJs()
+                                     .from(seletedSystemPinData)
+                                     .where('_PinId != ' + value.id)
+                                     .select();
+            })
+                angular.forEach(seletedSystemPinData, function (aaPinDataValue, aaPinDataKey) {
-            $('#aaDetailViewCanvas').setLayer(pinArcName, {
-                visible: true // set to true instead to show the layer again
-            }).drawLayers();
-        })
-    }
+                   // if (aaPinDataValue._PinId != value.id) {
+                        var pinName = 'Pin_' + aaPinDataValue._PinId;
+                        var pinArcName = 'PinArc_' + aaPinDataValue._PinId;
+
+                        $('#aaDetailViewCanvas').setLayer(pinName, {
+                            visible: false // set to true instead to show the layer again
+                        }).drawLayers();
+                        $('#aaDetailViewCanvas').setLayer(pinArcName, {
+                            visible: false // set to true instead to show the layer again
+                        }).drawLayers();
+                   // }
+                })
+
+           // })
+            $scope.clickedPins = [];
+        }
+
+        else {
+            angular.forEach(seletedSystemPinData, function (aaPinDataValue, aaPinDataKey) {
+
+                var pinName = 'Pin_' + aaPinDataValue._PinId;
+                var pinArcName = 'PinArc_' + aaPinDataValue._PinId;
+
+                $('#aaDetailViewCanvas').setLayer(pinName, {
+                    visible: true // set to true instead to show the layer again
+                }).drawLayers();
+
+                $('#aaDetailViewCanvas').setLayer(pinArcName, {
+                    visible: true // set to true instead to show the layer again
+                }).drawLayers();
+            })
+        }
+
+        $rootScope.isLoading = false;
+        $('#spinner').css('visibility', 'hidden');
+
+
+    }
     $scope.showItemsForSearch = function () {
         console.log('showItemsForSearch is called');
@@ -1225,3 +1312,12 @@ function onSearchItemSelection(event) {
         scope.highlightPinBasedOnSerachItem(event);
     });
 }
+
+function showSelectedPins(event) {
+   
+    console.log('showSelectedPins is called')
+    var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
+    scope.$apply(function () {
+        scope.showSelectedPins(event);
+    });
+}
 \ No newline at end of file
@@ -30,7 +30,7 @@
         <div class="toggle-icon toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"></div>
         <div class="">
             <div class="col-sm-6" title="Hide Pins"><button onclick="hidePins(event)" class="btn btn-black btn-sm" > <img src="../../../content/images/aa/LeftMenu/hide-pin.png" alt="" title=""></button> </div>
-            <div class="col-sm-6" title="Show Selected Pins"><button class="btn btn-black btn-sm pull-right"><img src="../../../content/images/aa/LeftMenu/draw-pin.png" alt="" title=""></button></div>
+            <div class="col-sm-6" title="Show Selected Pins"><button class="btn btn-black btn-sm pull-right" onclick="showSelectedPins(event)"><img src="../../../content/images/aa/LeftMenu/draw-pin.png" alt="" title=""></button></div>
             <div class="col-sm-6" title="Show All Pins in System(s)"><button class="btn btn-primary btn-sm marginTop5" onclick="showAllPins(event)"><img src="../../../content/images/aa/LeftMenu/all-pin.png" alt="" title=""></button></div>
             <div class="col-sm-6" title="Select System">
                 <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu221" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><img src="../../../content/images/aa/LeftMenu/icon-highlight.png" alt="" title=""></button>