ADAM / AIAHTML5

Commit 88824d7ccb369cca5aa5639025a6f0900ced2b13

Authored by unknown
1 parent 5b3772c3

Commit Changes

Inline Side-by-side
Showing 1 changed file with 25 additions and 21 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @88824d7
... ... @@ -433,12 +433,17 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
433 433 }
434 434 });
435 435 scope.isSelectedPinBtnClickedAftrSliderCange = true;
  436 +
436 437 switch (btnID) {
437 438 case "hidePinBtn":
438 439 break;
439 440 case "allPinBtn":
  441 +
440 442 if ($("#bodySystemList li.activeAASystemSelect a").attr("id") != undefined) {
441 443 scope.showSelectedSystemPins($("#bodySystemList li.activeAASystemSelect a").attr("id"))
  444 + setTimeout(function () {
  445 + scope.removeSpeechBubble();
  446 + }, 1000);
442 447 }
443 448 else
444 449 {
... ... @@ -511,6 +516,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
511 516 $rootScope.aaPinDataArray = [];
512 517 $rootScope.isShowSelectedSystemPinsClicked = false;
513 518 $scope.showAllPins = function () {
  519 +
514 520 $scope.allPinDataArray = [];
515 521 var promise = ModuleService.getPinDataForImage($rootScope.imageName)
516 522  
... ... @@ -713,7 +719,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
713 719 //"$$hashKey": value._Summary
714 720  
715 721 });
716   - console.log($scope.searchAAListViewData);
  722 +
717 723 if ($('#searchItem').length > 0)
718 724 $('#searchItem').remove();
719 725 }
... ... @@ -727,8 +733,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
727 733  
728 734 $('#ListViewDiv').append('<tr id="searchItem"><td colspan="6"><strong style="color:black;">No illustration found for the selected search criteria!</strong></td></tr>');
729 735 }
730   - //console.log(JSON.stringify(result, null, 4));
731   - console.log('SearchAAListViewData--' + $scope.searchAAListViewData);
  736 +
732 737 },
733 738 function (error) {
734 739 // handle errors here
... ... @@ -772,6 +777,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
772 777 }
773 778 $scope.isSelectedSystemSelected = false;
774 779 $scope.showSelectedSystemPins = function (event) {
  780 +
775 781 if (typeof event == "string") {
776 782 $scope.SelectedSystemID = event;
777 783 $scope.SelectedSystemTitle = $("#bodySystemList li.activeAASystemSelect a").attr("title");
... ... @@ -781,8 +787,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
781 787 $scope.typeOfEvent = typeof event;
782 788 $scope.SelectedSystemID = event.currentTarget.id;
783 789 $scope.SelectedSystemTitle = event.currentTarget.title;
  790 + $scope.clickedPins = [];
784 791 }
785   - $scope.clickedPins = [];
  792 +
786 793 $scope.isSelectedSystemSelected = true;
787 794 $rootScope.isShowSelectedSystemPinsClicked = true;
788 795 var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a");
... ... @@ -808,13 +815,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
808 815 }
809 816 }
810 817 else {
811   -
  818 +
812 819 $scope.selectedSystemName = $scope.SelectedSystemTitle;
813 820 // get termText info
814 821 var promise = ModuleService.getTermTextDataForPin($scope.moduleName)
815 822 .then(
816 823 function (response) {
817   -
  824 +
818 825 $scope.TermInfo = response.data.Terms.Term;
819 826  
820 827 //on gettng all required data, draw pins
... ... @@ -840,10 +847,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
840 847 })
841 848  
842 849 angular.forEach($scope.selectedSystemPinData, function (value, key) {
843   -
844   -
845 850 $scope.drawStaticPinsOnImage('aaDetailViewCanvas', value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY)
846   -
847 851 });
848 852  
849 853 //make all pin heads grey
... ... @@ -873,6 +877,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
873 877 )
874 878  
875 879 }
  880 +
876 881 }
877 882 $scope.listMangerID = [];
878 883 $scope.activePinArray = [];
... ... @@ -905,7 +910,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
905 910 $scope.listMangerID.push('PinArc_' + pinDataWithFirstTermNumber[i]._PinId);
906 911 $scope.activePinArray.push('PinArc_' + pinDataWithFirstTermNumber[i]._PinId);
907 912 }
908   - console.log($scope.listMangerID);
  913 +
909 914 $scope.MultiLanguageAnnationArray = [];
910 915  
911 916 $scope.GetAnnotationBasedOnActualTermNo(pinTermNumber);
... ... @@ -957,15 +962,14 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
957 962 })
958 963  
959 964 }
960   -
  965 +
961 966 $rootScope.isLoading = false;
962 967 $('#spinner').css('visibility', 'hidden');
963 968  
964 969 }
965 970  
966 971 $scope.removeSpeechBubble = function () {
967   -
968   -
  972 +
969 973 //clear speech bubbles
970 974 var speechBubbles = $("div[id*='speechBubble']");
971 975 if (speechBubbles != null || speechBubbles != undefined && speechBubbles.length > 0) {
... ... @@ -1710,11 +1714,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1710 1714 $scope.isHidePinBtnClicked = false;
1711 1715 $rootScope.isshowAllPinsBtnAfterHideClicked = true;
1712 1716  
1713   - //if ($scope.typeOfEvent == "string") {
1714   - // $scope.selectedSystemName = $scope.SelectedSystemTitle;
1715   - // alert($scope.selectedSystemName);
1716   - //}
1717   -
  1717 +
1718 1718 if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
1719 1719  
1720 1720 $scope.showSystemPins($scope.selectedSystemPinData, false);
... ... @@ -1742,7 +1742,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1742 1742  
1743 1743  
1744 1744 $scope.showSelectedPins = function () {
1745   -
  1745 +
1746 1746 $("#listManager").css("display", "none");
1747 1747 $("#optionsListManagerTab").removeClass("active");
1748 1748 $("#dropdownMenu221").addClass("aaSystemDisable");
... ... @@ -1787,6 +1787,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1787 1787  
1788 1788 $scope.showSystemPins = function (seletedSystemPinData, isShowSelectedPins) {
1789 1789  
  1790 + console.log("$scope.activePinArray"+ $scope.activePinArray);
1790 1791 if (isShowSelectedPins) {
1791 1792  
1792 1793 angular.forEach($scope.clickedPins, function (value, key) {
... ... @@ -1991,7 +1992,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1991 1992 }
1992 1993 }
1993 1994 $scope.activePinOnLayerChange = function () {
1994   -
  1995 +
1995 1996 if ($scope.isSelectedSystemSelectedAftrChange == true) {
1996 1997 //make all pin heads grey
1997 1998 var radial = $('#aaDetailViewCanvas').createGradient({
... ... @@ -2006,7 +2007,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2006 2007 }).drawLayers();
2007 2008  
2008 2009 }
2009   -
  2010 +
  2011 + if ($("#bodySystemList li.activeAASystemSelect a").attr("id") == "0") {
  2012 + $scope.activePinArray = [];
  2013 + }
2010 2014 console.log($scope.activePinArray);
2011 2015 for (var i = 0; i <= $scope.activePinArray.length - 1; i++) {
2012 2016 var radialAfterClick = $('#aaDetailViewCanvas').createGradient({
... ...