ADAM / AIAHTML5

Commit 4ce5e8721c7e0de8608674918bb599febd3b66d9

Authored by Amrita Vishnoi
2 parents 68dcf74f 5c63e1db

Merge branch 'AAPinIssue_2' into Develop

Inline Side-by-side
Showing 1 changed file with 24 additions and 7 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @4ce5e87
... ... @@ -516,7 +516,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
516 516 $rootScope.aaPinDataArray = [];
517 517 $rootScope.isShowSelectedSystemPinsClicked = false;
518 518 $scope.showAllPins = function () {
519   -
  519 +
520 520 $scope.allPinDataArray = [];
521 521 var promise = ModuleService.getPinDataForImage($rootScope.imageName)
522 522 .then(
... ... @@ -534,7 +534,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
534 534  
535 535 //draw pins
536 536  
537   -
538 537 $scope.aaPinData = result.data.Root.Item;
539 538 if ($scope.aaPinData != null && $scope.aaPinData.length > 0) {
540 539 $rootScope.aaPinDataArray = $scope.aaPinData
... ... @@ -559,12 +558,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
559 558 console.log(' error in showAllPins: ' + error.statusText);
560 559 }
561 560 )
562   - if ($scope.isSliderChange == true) {
  561 + //if ($scope.isSliderChange == true) {
563 562 $timeout(function () {
564   - $scope.activePinOnLayerChange();
  563 + $scope.activePinOnLayerChange();
565 564 }, 1000);
566 565  
567   - }
  566 + //}
568 567  
569 568 }
570 569  
... ... @@ -775,7 +774,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
775 774 $scope.isBodySystemSelected = false;
776 775 $scope.SelectedSystemTitle = "Current Structure";
777 776 $scope.showSelectedSystemPins = function (event) {
778   -
  777 +
779 778 if (typeof event == "object") {
780 779 if (event.currentTarget.title == $("#bodySystemList li.activeAASystemSelect a").attr("title")) {
781 780  
... ... @@ -2014,7 +2013,25 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2014 2013 $scope.isSearchOptionClicked = true;
2015 2014 $scope.listMangerID = [];
2016 2015 $scope.searchItemId = id;
2017   -
  2016 +
  2017 + // 30507 Atlas Anatomy > The pin selection should change in the below scenario.
  2018 + $("div.tools div:eq(1) div").each(function () {
  2019 + if ($(this).find("button").hasClass("btn-primary")) {
  2020 + var btnID = $(this).find("button").attr("id")
  2021 + if (btnID == "allPinBtn") {
  2022 + }
  2023 + else
  2024 + {
  2025 + $("div.tools div:eq(1) div").find("button").removeClass("btn-primary");
  2026 + $('#' + btnID).addClass("btn-black");
  2027 + $("#allPinBtn").removeClass("btn-black");
  2028 + $("#allPinBtn").addClass("btn-primary");
  2029 + $scope.showAllPinsAfterHide();
  2030 + }
  2031 + }
  2032 + });
  2033 +
  2034 +
2018 2035 $scope.searchItemText = $("#" + id).val();
2019 2036 $rootScope.searchSelectedText = $("#" + id).val();
2020 2037 $('#termList option[selected="selected"]').prop("selected", false);
... ...