ADAM / AIAHTML5

Commit a2b89c82fb276d27057d49c1a9a79e8f05687265

Authored by unknown
1 parent e25b7583

Pin Clicked Issue

Inline Side-by-side
Showing 1 changed file with 50 additions and 67 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @a2b89c8
... ... @@ -796,39 +796,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
796 796 $rootScope.speechBubbleDimaensions.push({ "currentX": x, "currentY": y, "id": PinId });
797 797 speechBubbleDims.push({ currentX: x, currentY: y });
798 798 document.getElementById('speechBubbleLine' + PinId + '').style.display = 'block';
799   - if ($scope.sliderVal == 100) {
800   -
801   - document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 46)) + 'px';
802   - document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY - 28)) + 'px';
803   - }
804   - else if ($scope.sliderVal == 85) {
805   -
806   - document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 44)) + 'px';
807   - document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY - 26)) + 'px';
808   - } else if ($scope.sliderVal == 70) {
809   -
810   - document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 42)) + 'px';
811   - document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY - 24)) + 'px';
812   - }
813   - else if ($scope.sliderVal == 55) {
814   -
815   - document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 40)) + 'px';
816   - document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY - 22)) + 'px';
817   - }
818   - else if ($scope.sliderVal == 40) {
819   -
820   - document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 38)) + 'px';
821   - document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY - 20)) + 'px';
  799 + document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 12)) + 'px';
  800 + if ($scope.sliderVal == 25) {
  801 + document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY + 5)) + 'px';
822 802 }
823   - else if ($scope.sliderVal == 25) {
824   -
825   - document.getElementById('speechBubbleLine' + PinId + '').style.left = ((speechBubbleDims[0].currentX - 36)) + 'px';
826   - document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY - 18)) + 'px';
  803 + else
  804 + {
  805 + document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY)) + 'px';
827 806 }
828 807 document.getElementById('speechBubble' + PinId + '').style.display = 'block';
829   - document.getElementById('speechBubble' + PinId + '').style.left = (speechBubbleDims[0].currentX - 70) + 'px';
830   - document.getElementById('speechBubble' + PinId + '').style.top = (speechBubbleDims[0].currentY - 58) + 'px';
831   -
  808 + document.getElementById('speechBubble' + PinId + '').style.left = (speechBubbleDims[0].currentX - 4) + 'px';
  809 + document.getElementById('speechBubble' + PinId + '').style.top = (speechBubbleDims[0].currentY) + 'px';
832 810 $('.common-drag').draggable(
833 811 {
834 812  
... ... @@ -958,6 +936,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
958 936 visible: true,
959 937 x1: offsetX1 * $scope.sliderPercentValue, y1: offsetY1 * $scope.sliderPercentValue,
960 938 x2: x * $scope.sliderPercentValue, y2: y * $scope.sliderPercentValue,
  939 +
961 940  
962 941 }).drawArc({
963 942 name: "PinArc_" + PinId,
... ... @@ -1272,6 +1251,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1272 1251  
1273 1252 $scope.showAllPinsAfterHide = function (event) {
1274 1253  
  1254 +
1275 1255 $rootScope.isLoading = true;
1276 1256 $('#spinner').css('visibility', 'visible');
1277 1257  
... ... @@ -1289,24 +1269,25 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1289 1269 $scope.showSpeechBubble();
1290 1270 };
1291 1271  
1292   -
  1272 +
1293 1273 $scope.showSelectedPins = function () {
  1274 +
  1275 + $rootScope.isLoading = true;
  1276 + $('#spinner').css('visibility', 'visible');
1294 1277  
1295   - $rootScope.isLoading = true;
1296   - $('#spinner').css('visibility', 'visible');
  1278 + $scope.isHidePinBtnClicked = false;
1297 1279  
1298   - $scope.isHidePinBtnClicked = false;
  1280 + if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
1299 1281  
1300   - if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
  1282 + $scope.showSystemPins($scope.selectedSystemPinData, true);
1301 1283  
1302   - $scope.showSystemPins($scope.selectedSystemPinData, true);
  1284 + }
  1285 + else {
  1286 + $scope.showSystemPins($scope.aaPinData, true);
1303 1287  
1304   - }
1305   - else {
1306   - $scope.showSystemPins($scope.aaPinData, true);
  1288 + }
  1289 + $scope.showSpeechBubble();
1307 1290  
1308   - }
1309   - $scope.showSpeechBubble();
1310 1291 };
1311 1292  
1312 1293  
... ... @@ -1338,6 +1319,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1338 1319 })
1339 1320  
1340 1321 // })
  1322 + alert($scope.clickedPins.length);
1341 1323 $scope.clickedPins = [];
1342 1324 }
1343 1325  
... ... @@ -1569,39 +1551,40 @@ $(document).ready(function () {
1569 1551 scope.removeSpeechBubble();
1570 1552 var relativeWidth = 0;
1571 1553 var relativeHeight = 0;
  1554 + if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) {
  1555 + if (ui.value == 100) {
  1556 + relativeWidth = scope.ViewImageWidth;
  1557 + relativeHeight = scope.ViewImageHeight
  1558 + scope.sliderPercentValue = 1.0;
  1559 + }
  1560 + else if (ui.value == 85) {
  1561 + relativeWidth = scope.ViewImageWidth * 0.85;
  1562 + relativeHeight = scope.ViewImageHeight * 0.85;
  1563 + scope.sliderPercentValue = 0.85;
1572 1564  
1573   - if (ui.value == 100) {
1574   - relativeWidth = scope.ViewImageWidth;
1575   - relativeHeight = scope.ViewImageHeight
1576   - scope.sliderPercentValue = 1.0;
1577   - }
1578   - else if (ui.value == 85) {
1579   - relativeWidth = scope.ViewImageWidth * 0.85;
1580   - relativeHeight = scope.ViewImageHeight * 0.85;
1581   - scope.sliderPercentValue = 0.85;
1582   -
1583   - } else if (ui.value == 70) {
1584   - relativeWidth = scope.ViewImageWidth * 0.70;
1585   - relativeHeight = scope.ViewImageHeight * 0.70;
1586   - scope.sliderPercentValue = 0.70;
1587   - } else if (ui.value == 55) {
  1565 + } else if (ui.value == 70) {
  1566 + relativeWidth = scope.ViewImageWidth * 0.70;
  1567 + relativeHeight = scope.ViewImageHeight * 0.70;
  1568 + scope.sliderPercentValue = 0.70;
  1569 + } else if (ui.value == 55) {
1588 1570  
1589   - relativeWidth = scope.ViewImageWidth * 0.55;
1590   - relativeHeight = scope.ViewImageHeight * 0.55;
1591   - scope.sliderPercentValue = 0.55;
  1571 + relativeWidth = scope.ViewImageWidth * 0.55;
  1572 + relativeHeight = scope.ViewImageHeight * 0.55;
  1573 + scope.sliderPercentValue = 0.55;
1592 1574  
1593   - } else if (ui.value == 40) {
  1575 + } else if (ui.value == 40) {
1594 1576  
1595   - relativeWidth = scope.ViewImageWidth * 0.40;
1596   - relativeHeight = scope.ViewImageHeight * 0.40;
1597   - scope.sliderPercentValue = 0.40;
  1577 + relativeWidth = scope.ViewImageWidth * 0.40;
  1578 + relativeHeight = scope.ViewImageHeight * 0.40;
  1579 + scope.sliderPercentValue = 0.40;
1598 1580  
1599   - } else if (ui.value == 25) {
  1581 + } else if (ui.value == 25) {
1600 1582  
1601   - relativeWidth = scope.ViewImageWidth * 0.25;
1602   - relativeHeight = scope.ViewImageHeight * 0.25;
1603   - scope.sliderPercentValue = 0.25;
  1583 + relativeWidth = scope.ViewImageWidth * 0.25;
  1584 + relativeHeight = scope.ViewImageHeight * 0.25;
  1585 + scope.sliderPercentValue = 0.25;
1604 1586  
  1587 + }
1605 1588 }
1606 1589  
1607 1590 console.log('ui.value= '+ui.value+' ,relativeWidth= ' + relativeWidth + ',relativeHeight= ' + relativeHeight)
... ...