Pin Issue on zoom in and zoom out

unknown
1 parent 88b77456
Showing 1 changed file with 36 additions and 24 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -405,15 +405,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             }
  
             if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) {
-               
                 $("#modItemImage").css("width", relativeWidth + "px");
                 $("#modItemImage").css("height", relativeHeight + "px");
                 $("#aaDetailViewCanvas").css("width", relativeWidth + "px");
                 $("#modItemImage").css("height", relativeHeight + "px");
-
                 $("#modItemImage").attr('src', '');
-
-
                 $("#aaDetailViewCanvas").remove();
                 //0.5 create canvas on the top of image so that I can draw a line over the canvas.
                 var canvas = document.createElement('canvas');
@@ -424,7 +420,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                 canvas.style.left = '0px';
                 canvas.style.top = '0px';
                 canvas.style.position = "absolute";
-
                 $("#canvasDiv").append(canvas);
                 scope.context = canvas.getContext("2d")
                 $("#modItemImage").attr('src', scope.OpenItemImagePath);
@@ -439,14 +434,16 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                 });
                 scope.isSelectedPinBtnClickedAftrSliderCange = true;
                 switch (btnID) {
-
                     case "hidePinBtn":
                         break;
                     case "allPinBtn":
-                     
+                        if ($("#bodySystemList li.activeAASystemSelect a").attr("id") != undefined) {
+                            scope.showSelectedSystemPins($("#bodySystemList li.activeAASystemSelect a").attr("id"))
+                        }
+                        else
+                        {
                             scope.showAllPins();
-                      
-                       
+                        }
                         break;
                     case "selectedPin":
                             scope.showAllPins();
@@ -454,12 +451,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                                 console.log(scope.allPinDataArray);
                                 scope.activePinOnSliderChange();
                             }, 1000);
-                      
-                      
                         break;
                 }
             }
-
         });
     }
     $scope.highlightBodySystemList = function () {
@@ -471,7 +465,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             for (var j = 0; j < $rootScope.bodySystemNames.length; j++) {
                 if ((bodySystemListObj[i].innerHTML) == ($rootScope.bodySystemNames[j])) {
                     $("#" + i).parent().removeClass("disabledSelectedSystem");
-
                 }
             }
  
@@ -518,7 +511,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     $rootScope.aaPinDataArray = [];
     $rootScope.isShowSelectedSystemPinsClicked = false;
     $scope.showAllPins = function () {
-       
         $scope.allPinDataArray = [];
         var promise = ModuleService.getPinDataForImage($rootScope.imageName)
  
@@ -780,7 +772,16 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     }
     $scope.isSelectedSystemSelected = false;
     $scope.showSelectedSystemPins = function (event) {
-      
+        if (typeof event == "string") {
+                $scope.SelectedSystemID = event;
+                $scope.SelectedSystemTitle = $("#bodySystemList li.activeAASystemSelect a").attr("title");
+               $scope.typeOfEvent = typeof event;
+            }
+        else {
+            $scope.typeOfEvent = typeof event;
+                $scope.SelectedSystemID = event.currentTarget.id;
+                $scope.SelectedSystemTitle = event.currentTarget.title;
+            }
         $scope.clickedPins = [];
         $scope.isSelectedSystemSelected = true;
         $rootScope.isShowSelectedSystemPinsClicked = true;
@@ -790,18 +791,16 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
  
             $("#" + i).parent().removeClass("activeAASystemSelect");
         }
-        $("#" + event.currentTarget.id).parent().addClass("activeAASystemSelect");
+        $("#" + $scope.SelectedSystemID).parent().addClass("activeAASystemSelect");
  
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
  
         $scope.removeSpeechBubble();
-        if (event.currentTarget.id == "0") {
-
+        if ($scope.SelectedSystemID == "0") {
+        
             $scope.selectedSystemName = null;
             if ($scope.isHidePinBtnClicked) {
-
-                // $scope.showAllPinsAfterHide($scope.aaPinData);
                 $scope.showAllPinsAfterHide();
             }
             else {
@@ -810,11 +809,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         }
         else {
  
-            $scope.selectedSystemName = event.currentTarget.title;
+            $scope.selectedSystemName = $scope.SelectedSystemTitle;
             // get termText info
             var promise = ModuleService.getTermTextDataForPin($scope.moduleName)
            .then(
             function (response) {
+            
                 $scope.TermInfo = response.data.Terms.Term;
  
                 //on gettng all required data, draw pins
@@ -1701,6 +1701,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     }
  
     $scope.showAllPinsAfterHide = function (event) {
+     
         if ($("#dropdownMenu221").hasClass("aaSystemDisable")) {
             $("#dropdownMenu221").removeClass("aaSystemDisable");
         }
@@ -1708,6 +1709,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         $('#spinner').css('visibility', 'visible');
         $scope.isHidePinBtnClicked = false;
         $rootScope.isshowAllPinsBtnAfterHideClicked = true;
+    
+        //if ($scope.typeOfEvent == "string") {
+        //    $scope.selectedSystemName = $scope.SelectedSystemTitle;
+        //    alert($scope.selectedSystemName);
+        //}
+       
         if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
  
             $scope.showSystemPins($scope.selectedSystemPinData, false);
@@ -1721,11 +1728,16 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         $(".tooltip-custom").addClass("btn-black");
         $("#allPinBtn").addClass("btn-primary");
         $("#allPinBtn").removeClass("btn-black");
-        if ($scope.isSliderChange == true) {
-            $scope.isSliderChange = false;
-            $scope.showAllPins();
+        if ($("#bodySystemList li.activeAASystemSelect a").attr("title") == "Current Structure" || $("#bodySystemList li.activeAASystemSelect a").attr("title") == undefined)
+       {
+            if ($scope.isSliderChange == true) {
+                $scope.isSliderChange = false;
+                $scope.showAllPins();
  
+            }
         }
+           
+      
     };