Commit 71f83bc0a9b6cbacdf0824d7a81fc9284f2ec2cd
Merge branch 'AAPiinIssue_1' into Develop
Showing
1 changed file
with
9 additions
and
3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -516,6 +516,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -516,6 +516,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
516 | $rootScope.aaPinDataArray = []; | 516 | $rootScope.aaPinDataArray = []; |
517 | $rootScope.isShowSelectedSystemPinsClicked = false; | 517 | $rootScope.isShowSelectedSystemPinsClicked = false; |
518 | $scope.showAllPins = function () { | 518 | $scope.showAllPins = function () { |
519 | + | ||
519 | $scope.allPinDataArray = []; | 520 | $scope.allPinDataArray = []; |
520 | var promise = ModuleService.getPinDataForImage($rootScope.imageName) | 521 | var promise = ModuleService.getPinDataForImage($rootScope.imageName) |
521 | .then( | 522 | .then( |
@@ -530,7 +531,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -530,7 +531,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
530 | document.getElementById('navigatorDiv').style.visibility = 'hidden'; | 531 | document.getElementById('navigatorDiv').style.visibility = 'hidden'; |
531 | 532 | ||
532 | } | 533 | } |
534 | + | ||
533 | //draw pins | 535 | //draw pins |
536 | + | ||
537 | + | ||
534 | $scope.aaPinData = result.data.Root.Item; | 538 | $scope.aaPinData = result.data.Root.Item; |
535 | if ($scope.aaPinData != null && $scope.aaPinData.length > 0) { | 539 | if ($scope.aaPinData != null && $scope.aaPinData.length > 0) { |
536 | $rootScope.aaPinDataArray = $scope.aaPinData | 540 | $rootScope.aaPinDataArray = $scope.aaPinData |
@@ -771,7 +775,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -771,7 +775,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
771 | $scope.isBodySystemSelected = false; | 775 | $scope.isBodySystemSelected = false; |
772 | $scope.SelectedSystemTitle = "Current Structure"; | 776 | $scope.SelectedSystemTitle = "Current Structure"; |
773 | $scope.showSelectedSystemPins = function (event) { | 777 | $scope.showSelectedSystemPins = function (event) { |
774 | - | 778 | + |
775 | if (typeof event == "object") { | 779 | if (typeof event == "object") { |
776 | if (event.currentTarget.title == $("#bodySystemList li.activeAASystemSelect a").attr("title")) { | 780 | if (event.currentTarget.title == $("#bodySystemList li.activeAASystemSelect a").attr("title")) { |
777 | 781 | ||
@@ -809,6 +813,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -809,6 +813,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
809 | $scope.showAllPinsAfterHide(); | 813 | $scope.showAllPinsAfterHide(); |
810 | } | 814 | } |
811 | else { | 815 | else { |
816 | + //#30499 : Atlas Anatomy > All Pins are not appeared on the body system even after selecting the Body System: All | ||
817 | + $('#aaDetailViewCanvas').removeLayers(); | ||
812 | $scope.showAllPins(); | 818 | $scope.showAllPins(); |
813 | } | 819 | } |
814 | } | 820 | } |
@@ -839,7 +845,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -839,7 +845,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
839 | if ($scope.selectedSystemPinData != null && $scope.selectedSystemPinData.length > 0) { | 845 | if ($scope.selectedSystemPinData != null && $scope.selectedSystemPinData.length > 0) { |
840 | 846 | ||
841 | angular.forEach($scope.aaPinData, function (aaPinDataValue, aaPinDataKey) { | 847 | angular.forEach($scope.aaPinData, function (aaPinDataValue, aaPinDataKey) { |
842 | - | 848 | + |
843 | if (aaPinDataValue._BodySystemName != $scope.selectedSystemName) | 849 | if (aaPinDataValue._BodySystemName != $scope.selectedSystemName) |
844 | { | 850 | { |
845 | $scope.removePin('aaDetailViewCanvas', aaPinDataValue._PinId); | 851 | $scope.removePin('aaDetailViewCanvas', aaPinDataValue._PinId); |
@@ -1384,7 +1390,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -1384,7 +1390,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
1384 | 1390 | ||
1385 | 1391 | ||
1386 | $scope.drawStaticPinsOnImage = function (canvasId, PinId, offsetX1, offsetY1, x, y) { | 1392 | $scope.drawStaticPinsOnImage = function (canvasId, PinId, offsetX1, offsetY1, x, y) { |
1387 | - | 1393 | + |
1388 | //if ($scope.isSearchOptionClicked == true) { | 1394 | //if ($scope.isSearchOptionClicked == true) { |
1389 | // $scope.clickedPins = []; | 1395 | // $scope.clickedPins = []; |
1390 | // $scope.isSearchOptionClicked = false; | 1396 | // $scope.isSearchOptionClicked = false; |