From 88824d7ccb369cca5aa5639025a6f0900ced2b13 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 10 Apr 2018 18:10:29 +0530 Subject: [PATCH] Commit Changes --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 47a635e..f75f31a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -433,12 +433,17 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } }); scope.isSelectedPinBtnClickedAftrSliderCange = true; + switch (btnID) { case "hidePinBtn": break; case "allPinBtn": + if ($("#bodySystemList li.activeAASystemSelect a").attr("id") != undefined) { scope.showSelectedSystemPins($("#bodySystemList li.activeAASystemSelect a").attr("id")) + setTimeout(function () { + scope.removeSpeechBubble(); + }, 1000); } else { @@ -511,6 +516,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $rootScope.aaPinDataArray = []; $rootScope.isShowSelectedSystemPinsClicked = false; $scope.showAllPins = function () { + $scope.allPinDataArray = []; var promise = ModuleService.getPinDataForImage($rootScope.imageName) @@ -713,7 +719,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou //"$$hashKey": value._Summary }); - console.log($scope.searchAAListViewData); + if ($('#searchItem').length > 0) $('#searchItem').remove(); } @@ -727,8 +733,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $('#ListViewDiv').append('No illustration found for the selected search criteria!'); } - //console.log(JSON.stringify(result, null, 4)); - console.log('SearchAAListViewData--' + $scope.searchAAListViewData); + }, function (error) { // handle errors here @@ -772,6 +777,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } $scope.isSelectedSystemSelected = false; $scope.showSelectedSystemPins = function (event) { + if (typeof event == "string") { $scope.SelectedSystemID = event; $scope.SelectedSystemTitle = $("#bodySystemList li.activeAASystemSelect a").attr("title"); @@ -781,8 +787,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.typeOfEvent = typeof event; $scope.SelectedSystemID = event.currentTarget.id; $scope.SelectedSystemTitle = event.currentTarget.title; + $scope.clickedPins = []; } - $scope.clickedPins = []; + $scope.isSelectedSystemSelected = true; $rootScope.isShowSelectedSystemPinsClicked = true; var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a"); @@ -808,13 +815,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } } else { - + $scope.selectedSystemName = $scope.SelectedSystemTitle; // get termText info var promise = ModuleService.getTermTextDataForPin($scope.moduleName) .then( function (response) { - + $scope.TermInfo = response.data.Terms.Term; //on gettng all required data, draw pins @@ -840,10 +847,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou }) angular.forEach($scope.selectedSystemPinData, function (value, key) { - - $scope.drawStaticPinsOnImage('aaDetailViewCanvas', value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY) - }); //make all pin heads grey @@ -873,6 +877,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou ) } + } $scope.listMangerID = []; $scope.activePinArray = []; @@ -905,7 +910,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.listMangerID.push('PinArc_' + pinDataWithFirstTermNumber[i]._PinId); $scope.activePinArray.push('PinArc_' + pinDataWithFirstTermNumber[i]._PinId); } - console.log($scope.listMangerID); + $scope.MultiLanguageAnnationArray = []; $scope.GetAnnotationBasedOnActualTermNo(pinTermNumber); @@ -957,15 +962,14 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou }) } - + $rootScope.isLoading = false; $('#spinner').css('visibility', 'hidden'); } $scope.removeSpeechBubble = function () { - - + //clear speech bubbles var speechBubbles = $("div[id*='speechBubble']"); if (speechBubbles != null || speechBubbles != undefined && speechBubbles.length > 0) { @@ -1710,11 +1714,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.isHidePinBtnClicked = false; $rootScope.isshowAllPinsBtnAfterHideClicked = true; - //if ($scope.typeOfEvent == "string") { - // $scope.selectedSystemName = $scope.SelectedSystemTitle; - // alert($scope.selectedSystemName); - //} - + if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) { $scope.showSystemPins($scope.selectedSystemPinData, false); @@ -1742,7 +1742,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.showSelectedPins = function () { - + $("#listManager").css("display", "none"); $("#optionsListManagerTab").removeClass("active"); $("#dropdownMenu221").addClass("aaSystemDisable"); @@ -1787,6 +1787,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.showSystemPins = function (seletedSystemPinData, isShowSelectedPins) { + console.log("$scope.activePinArray"+ $scope.activePinArray); if (isShowSelectedPins) { angular.forEach($scope.clickedPins, function (value, key) { @@ -1991,7 +1992,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } } $scope.activePinOnLayerChange = function () { - + if ($scope.isSelectedSystemSelectedAftrChange == true) { //make all pin heads grey var radial = $('#aaDetailViewCanvas').createGradient({ @@ -2006,7 +2007,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou }).drawLayers(); } - + + if ($("#bodySystemList li.activeAASystemSelect a").attr("id") == "0") { + $scope.activePinArray = []; + } console.log($scope.activePinArray); for (var i = 0; i <= $scope.activePinArray.length - 1; i++) { var radialAfterClick = $('#aaDetailViewCanvas').createGradient({ -- libgit2 0.21.4