diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index d60f945..09b3daf 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -37,7 +37,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.activePinArray = []; $scope.showTabButton = true; $scope.isListViewDataLoaded = true; - $rootScope.isSliderSlide = false; $scope.setActiveTab = function (tabToSet) { $scope.activeTab = tabToSet; @@ -295,7 +294,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou range: "min", orientation: "vertical", slide: function (event, ui) { - $rootScope.isSliderSlide = true; var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope(); scope.$apply(function () { scope.sliderVal = ui.value; @@ -303,6 +301,27 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou var relativeWidth = 0; var relativeHeight = 0; if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) { + $("#listManager").css("display", "none"); + $("#optionsListManagerTab").removeClass("active"); + //make the head green + + setTimeout(function () { + + var radialAfterClick = $('#aaDetailViewCanvas').createGradient({ + x1: 50, y1: 50, + x2: 50, y2: 50, + r1: 10, r2: 30, + c1: 'rgba(100, 50, 0,0)', + c2: 'rgb(126, 187, 83)' + }); + for (var i = 0; i <= scope.listMangerID.length - 1; i++) { + $('#aaDetailViewCanvas').setLayer(scope.listMangerID[i], { + fillStyle: radialAfterClick, + }).drawLayers(); + } + + }, 1000); + if (ui.value == 100) { relativeWidth = scope.ViewImageWidth; relativeHeight = scope.ViewImageHeight @@ -490,15 +509,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou if ($rootScope.isShowSelectedSystemPinsClicked == false) { $rootScope.isShowSelectedSystemPinsClicked = true; //load search/vocab data - if ($rootScope.isSliderSlide == true) { - - $rootScope.isSliderSlide = false; - - } - else { - $rootScope.loadSearchData(); - - } + $rootScope.loadSearchData(); } else { $rootScope.isLoading = false; @@ -806,14 +817,14 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } } - + $scope.listMangerID = []; $scope.showAnnotation = function (selectedPinData, isCtrlPressed, isPinClicked, isItemSearched) { $scope.clickedPins = []; $scope.selectedPin = []; var isSameTermWithMultiPin = false; var firstPinId = selectedPinData[0]._PinId; var pinTermNumber = selectedPinData[0]._TermId; - + //check if other pin have same termNumber if ($scope.aaPinData != null && $scope.aaPinData.length > 0) { @@ -821,7 +832,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou .from($scope.aaPinData) .where("_TermId == " + pinTermNumber) .select(); - + console.log(pinDataWithFirstTermNumber); + $scope.listMangerID = []; + for (var i = 0; i <= pinDataWithFirstTermNumber.length - 1; i++) { + $scope.listMangerID.push('PinArc_' + pinDataWithFirstTermNumber[i]._PinId); + } + console.log($scope.listMangerID); $scope.MultiLanguageAnnationArray = []; $scope.GetAnnotationBasedOnActualTermNo(pinTermNumber); @@ -1225,6 +1241,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou radius: 5 * $scope.sliderPercentValue, click: function (clickedPin) { + if (clickedPin.event.ctrlKey == false) { $scope.clickedPins = []; } @@ -1771,7 +1788,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } $scope.highlightPinBasedOnSerachItem = function (id) { - $scope.searchItemId = id; $scope.searchItemText = $("#" + id).text(); $rootScope.searchSelectedText = $("#" + id).text(); @@ -1800,6 +1816,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $("#canvasDiv").scrollTop(annotationTopPos[0]); $scope.IsSearchVisible = false; + + + + } $rootScope.isShowHideButtonClicked = true;