Commit 40eacec0e8962e85bdbc59aca1df410595ee19fc
merged 25065
Showing
1 changed file
with
35 additions
and
15 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
... | ... | @@ -37,7 +37,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
37 | 37 | $scope.activePinArray = []; |
38 | 38 | $scope.showTabButton = true; |
39 | 39 | $scope.isListViewDataLoaded = true; |
40 | - $rootScope.isSliderSlide = false; | |
41 | 40 | $scope.setActiveTab = function (tabToSet) { |
42 | 41 | |
43 | 42 | $scope.activeTab = tabToSet; |
... | ... | @@ -295,7 +294,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
295 | 294 | range: "min", |
296 | 295 | orientation: "vertical", |
297 | 296 | slide: function (event, ui) { |
298 | - $rootScope.isSliderSlide = true; | |
299 | 297 | var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope(); |
300 | 298 | scope.$apply(function () { |
301 | 299 | scope.sliderVal = ui.value; |
... | ... | @@ -303,6 +301,27 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
303 | 301 | var relativeWidth = 0; |
304 | 302 | var relativeHeight = 0; |
305 | 303 | if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) { |
304 | + $("#listManager").css("display", "none"); | |
305 | + $("#optionsListManagerTab").removeClass("active"); | |
306 | + //make the head green | |
307 | + | |
308 | + setTimeout(function () { | |
309 | + | |
310 | + var radialAfterClick = $('#aaDetailViewCanvas').createGradient({ | |
311 | + x1: 50, y1: 50, | |
312 | + x2: 50, y2: 50, | |
313 | + r1: 10, r2: 30, | |
314 | + c1: 'rgba(100, 50, 0,0)', | |
315 | + c2: 'rgb(126, 187, 83)' | |
316 | + }); | |
317 | + for (var i = 0; i <= scope.listMangerID.length - 1; i++) { | |
318 | + $('#aaDetailViewCanvas').setLayer(scope.listMangerID[i], { | |
319 | + fillStyle: radialAfterClick, | |
320 | + }).drawLayers(); | |
321 | + } | |
322 | + | |
323 | + }, 1000); | |
324 | + | |
306 | 325 | if (ui.value == 100) { |
307 | 326 | relativeWidth = scope.ViewImageWidth; |
308 | 327 | relativeHeight = scope.ViewImageHeight |
... | ... | @@ -490,15 +509,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
490 | 509 | if ($rootScope.isShowSelectedSystemPinsClicked == false) { |
491 | 510 | $rootScope.isShowSelectedSystemPinsClicked = true; |
492 | 511 | //load search/vocab data |
493 | - if ($rootScope.isSliderSlide == true) { | |
494 | - | |
495 | - $rootScope.isSliderSlide = false; | |
496 | - | |
497 | - } | |
498 | - else { | |
499 | - $rootScope.loadSearchData(); | |
500 | - | |
501 | - } | |
512 | + $rootScope.loadSearchData(); | |
502 | 513 | } |
503 | 514 | else { |
504 | 515 | $rootScope.isLoading = false; |
... | ... | @@ -806,14 +817,14 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
806 | 817 | |
807 | 818 | } |
808 | 819 | } |
809 | - | |
820 | + $scope.listMangerID = []; | |
810 | 821 | $scope.showAnnotation = function (selectedPinData, isCtrlPressed, isPinClicked, isItemSearched) { |
811 | 822 | $scope.clickedPins = []; |
812 | 823 | $scope.selectedPin = []; |
813 | 824 | var isSameTermWithMultiPin = false; |
814 | 825 | var firstPinId = selectedPinData[0]._PinId; |
815 | 826 | var pinTermNumber = selectedPinData[0]._TermId; |
816 | - | |
827 | + | |
817 | 828 | //check if other pin have same termNumber |
818 | 829 | if ($scope.aaPinData != null && $scope.aaPinData.length > 0) { |
819 | 830 | |
... | ... | @@ -821,7 +832,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
821 | 832 | .from($scope.aaPinData) |
822 | 833 | .where("_TermId == " + pinTermNumber) |
823 | 834 | .select(); |
824 | - | |
835 | + console.log(pinDataWithFirstTermNumber); | |
836 | + $scope.listMangerID = []; | |
837 | + for (var i = 0; i <= pinDataWithFirstTermNumber.length - 1; i++) { | |
838 | + $scope.listMangerID.push('PinArc_' + pinDataWithFirstTermNumber[i]._PinId); | |
839 | + } | |
840 | + console.log($scope.listMangerID); | |
825 | 841 | $scope.MultiLanguageAnnationArray = []; |
826 | 842 | |
827 | 843 | $scope.GetAnnotationBasedOnActualTermNo(pinTermNumber); |
... | ... | @@ -1225,6 +1241,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
1225 | 1241 | radius: 5 * $scope.sliderPercentValue, |
1226 | 1242 | |
1227 | 1243 | click: function (clickedPin) { |
1244 | + | |
1228 | 1245 | if (clickedPin.event.ctrlKey == false) { |
1229 | 1246 | $scope.clickedPins = []; |
1230 | 1247 | } |
... | ... | @@ -1771,7 +1788,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
1771 | 1788 | } |
1772 | 1789 | |
1773 | 1790 | $scope.highlightPinBasedOnSerachItem = function (id) { |
1774 | - | |
1775 | 1791 | $scope.searchItemId = id; |
1776 | 1792 | $scope.searchItemText = $("#" + id).text(); |
1777 | 1793 | $rootScope.searchSelectedText = $("#" + id).text(); |
... | ... | @@ -1800,6 +1816,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou |
1800 | 1816 | $("#canvasDiv").scrollTop(annotationTopPos[0]); |
1801 | 1817 | |
1802 | 1818 | $scope.IsSearchVisible = false; |
1819 | + | |
1820 | + | |
1821 | + | |
1822 | + | |
1803 | 1823 | } |
1804 | 1824 | |
1805 | 1825 | $rootScope.isShowHideButtonClicked = true; | ... | ... |