Pin Clicked Issue

unknown
1 parent e25b7583
Showing 1 changed file with 50 additions and 67 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -796,39 +796,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $rootScope.speechBubbleDimaensions.push({ "currentX": x, "currentY": y, "id": PinId });
         speechBubbleDims.push({ currentX: x, currentY: y });
         document.getElementById('speechBubbleLine' + PinId + '').style.display = 'block';
-        if ($scope.sliderVal == 100) {
-          
-            document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 46)) + 'px';
-            document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY - 28)) + 'px';
-        }
-        else if ($scope.sliderVal == 85) {
-          
-            document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 44)) + 'px';
-            document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY - 26)) + 'px';
-        } else if ($scope.sliderVal == 70) {
-
-            document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 42)) + 'px';
-            document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY - 24)) + 'px';
-        }
-        else if ($scope.sliderVal == 55) {
-
-            document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 40)) + 'px';
-            document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY - 22)) + 'px';
-        }
-        else if ($scope.sliderVal == 40) {
-
-            document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 38)) + 'px';
-            document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY - 20)) + 'px';
+        document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 12)) + 'px';
+        if ($scope.sliderVal == 25) {
+            document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY + 5)) + 'px';
         }
-        else if ($scope.sliderVal == 25) {
-
-            document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 36)) + 'px';
-            document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY - 18)) + 'px';
+        else
+        {
+            document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY)) + 'px';
         }
         document.getElementById('speechBubble' + PinId + '').style.display = 'block';
-        document.getElementById('speechBubble' + PinId + '').style.left = (speechBubbleDims[0].currentX - 70) + 'px';
-        document.getElementById('speechBubble' + PinId + '').style.top = (speechBubbleDims[0].currentY - 58) + 'px';
-
+        document.getElementById('speechBubble' + PinId + '').style.left = (speechBubbleDims[0].currentX - 4) + 'px';
+        document.getElementById('speechBubble' + PinId + '').style.top = (speechBubbleDims[0].currentY) + 'px';
         $('.common-drag').draggable(
         {
@@ -958,6 +936,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 visible: true,
                 x1: offsetX1 * $scope.sliderPercentValue, y1: offsetY1 * $scope.sliderPercentValue,
                 x2: x * $scope.sliderPercentValue, y2: y * $scope.sliderPercentValue,
+              
             }).drawArc({
                 name: "PinArc_" + PinId,
@@ -1272,6 +1251,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.showAllPinsAfterHide = function (event) {
+
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
@@ -1289,24 +1269,25 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $scope.showSpeechBubble();
     };
-
+ 
     $scope.showSelectedPins = function () {
+      
+            $rootScope.isLoading = true;
+            $('#spinner').css('visibility', 'visible');
-        $rootScope.isLoading = true;
-        $('#spinner').css('visibility', 'visible');
+            $scope.isHidePinBtnClicked = false;
-        $scope.isHidePinBtnClicked = false;
+            if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
-        if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
+                $scope.showSystemPins($scope.selectedSystemPinData, true);
-            $scope.showSystemPins($scope.selectedSystemPinData, true);
+            }
+            else {
+                $scope.showSystemPins($scope.aaPinData, true);
-        }
-        else {
-            $scope.showSystemPins($scope.aaPinData, true);
+            }
+            $scope.showSpeechBubble();
-        }
-        $scope.showSpeechBubble();
     };
@@ -1338,6 +1319,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             })
             // })
+            alert($scope.clickedPins.length);
             $scope.clickedPins = [];
         }
@@ -1569,39 +1551,40 @@ $(document).ready(function () {
                 scope.removeSpeechBubble();
                 var relativeWidth = 0;
                 var relativeHeight = 0;
+                if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) {
+                if (ui.value == 100) {
+                    relativeWidth = scope.ViewImageWidth;
+                    relativeHeight = scope.ViewImageHeight
+                    scope.sliderPercentValue = 1.0;
+                }
+                else if (ui.value == 85) {
+                    relativeWidth = scope.ViewImageWidth * 0.85;
+                    relativeHeight = scope.ViewImageHeight * 0.85;
+                    scope.sliderPercentValue = 0.85;
-           if (ui.value == 100) {
-                relativeWidth = scope.ViewImageWidth;
-                relativeHeight = scope.ViewImageHeight
-                scope.sliderPercentValue = 1.0;
-            }
-            else if (ui.value == 85) {
-                relativeWidth = scope.ViewImageWidth * 0.85;
-                relativeHeight = scope.ViewImageHeight * 0.85;
-                scope.sliderPercentValue = 0.85;
-
-            } else if (ui.value == 70) {
-                relativeWidth = scope.ViewImageWidth * 0.70;
-                relativeHeight = scope.ViewImageHeight * 0.70;
-                scope.sliderPercentValue = 0.70;
-            } else if (ui.value == 55) {
+                } else if (ui.value == 70) {
+                    relativeWidth = scope.ViewImageWidth * 0.70;
+                    relativeHeight = scope.ViewImageHeight * 0.70;
+                    scope.sliderPercentValue = 0.70;
+                } else if (ui.value == 55) {
-                relativeWidth = scope.ViewImageWidth * 0.55;
-                relativeHeight = scope.ViewImageHeight * 0.55;
-                scope.sliderPercentValue = 0.55;
+                    relativeWidth = scope.ViewImageWidth * 0.55;
+                    relativeHeight = scope.ViewImageHeight * 0.55;
+                    scope.sliderPercentValue = 0.55;
-            } else if (ui.value == 40) {
+                } else if (ui.value == 40) {
-                relativeWidth = scope.ViewImageWidth * 0.40;
-                relativeHeight = scope.ViewImageHeight * 0.40;
-                scope.sliderPercentValue = 0.40;
+                    relativeWidth = scope.ViewImageWidth * 0.40;
+                    relativeHeight = scope.ViewImageHeight * 0.40;
+                    scope.sliderPercentValue = 0.40;
-            } else if (ui.value == 25) {
+                } else if (ui.value == 25) {
-                relativeWidth = scope.ViewImageWidth * 0.25;
-                relativeHeight = scope.ViewImageHeight * 0.25;
-                scope.sliderPercentValue = 0.25;
+                    relativeWidth = scope.ViewImageWidth * 0.25;
+                    relativeHeight = scope.ViewImageHeight * 0.25;
+                    scope.sliderPercentValue = 0.25;
+                }
             }
                 console.log('ui.value= '+ui.value+' ,relativeWidth= ' + relativeWidth + ',relativeHeight= ' + relativeHeight)