ADAM / AIAHTML5

Commit 4893f494f091142099a49ce375c2ff4d5b1dd7ad

Authored by unknown
1 parent 0ae372ae

Commit Changes

Inline Side-by-side
Showing 1 changed file with 8 additions and 11 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @4893f49
@@ -360,6 +360,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou @@ -360,6 +360,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
360 c1: 'rgba(100, 50, 0,0)', 360 c1: 'rgba(100, 50, 0,0)',
361 c2: 'rgb(126, 187, 83)' 361 c2: 'rgb(126, 187, 83)'
362 }); 362 });
  363 + console.log(scope.listMangerID);
363 for (var i = 0; i <= scope.listMangerID.length - 1; i++) { 364 for (var i = 0; i <= scope.listMangerID.length - 1; i++) {
364 $('#aaDetailViewCanvas').setLayer(scope.listMangerID[i], { 365 $('#aaDetailViewCanvas').setLayer(scope.listMangerID[i], {
365 fillStyle: radialAfterClick, 366 fillStyle: radialAfterClick,
@@ -866,18 +867,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou @@ -866,18 +867,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
866 .where("_TermId == " + pinTermNumber) 867 .where("_TermId == " + pinTermNumber)
867 .select(); 868 .select();
868 869
869 - $scope.listMangerID = [];  
870 - $scope.activePinArray = []; 870 + // $scope.listMangerID = [];
  871 + $scope.activePinArray = [];
871 for (var i = 0; i <= pinDataWithFirstTermNumber.length - 1; i++) { 872 for (var i = 0; i <= pinDataWithFirstTermNumber.length - 1; i++) {
872 $scope.listMangerID.push('PinArc_' + pinDataWithFirstTermNumber[i]._PinId); 873 $scope.listMangerID.push('PinArc_' + pinDataWithFirstTermNumber[i]._PinId);
873 $scope.activePinArray.push('PinArc_' + pinDataWithFirstTermNumber[i]._PinId); 874 $scope.activePinArray.push('PinArc_' + pinDataWithFirstTermNumber[i]._PinId);
874 } 875 }
875 -  
876 -  
877 -  
878 -  
879 -  
880 -  
881 console.log($scope.listMangerID); 876 console.log($scope.listMangerID);
882 $scope.MultiLanguageAnnationArray = []; 877 $scope.MultiLanguageAnnationArray = [];
883 878
@@ -1304,8 +1299,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou @@ -1304,8 +1299,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1304 1299
1305 click: function (clickedPin) { 1300 click: function (clickedPin) {
1306 1301
1307 - if (clickedPin.event.ctrlKey == false) { 1302 + if (clickedPin.event.ctrlKey == false) {
1308 $scope.clickedPins = []; 1303 $scope.clickedPins = [];
  1304 + $scope.listMangerID = [];
1309 } 1305 }
1310 var pinID = (clickedPin.name).substring(7, (clickedPin.name).length); 1306 var pinID = (clickedPin.name).substring(7, (clickedPin.name).length);
1311 var pinData = new jinqJs() 1307 var pinData = new jinqJs()
@@ -1705,7 +1701,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou @@ -1705,7 +1701,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1705 $("#dropdownMenu221").addClass("aaSystemDisable"); 1701 $("#dropdownMenu221").addClass("aaSystemDisable");
1706 $rootScope.isLoading = true; 1702 $rootScope.isLoading = true;
1707 $('#spinner').css('visibility', 'visible'); 1703 $('#spinner').css('visibility', 'visible');
1708 - 1704 +
1709 $scope.isHidePinBtnClicked = false; 1705 $scope.isHidePinBtnClicked = false;
1710 1706
1711 if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) { 1707 if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
@@ -1752,7 +1748,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou @@ -1752,7 +1748,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1752 .from(seletedSystemPinData) 1748 .from(seletedSystemPinData)
1753 .where('_PinId != ' + value.id) 1749 .where('_PinId != ' + value.id)
1754 .select(); 1750 .select();
1755 - }) 1751 + });
  1752 + console.log($scope.clickedPins);
1756 angular.forEach($scope.clickedPins, function (value1, key1) { 1753 angular.forEach($scope.clickedPins, function (value1, key1) {
1757 1754
1758 // if (aaPinDataValue._PinId != value.id) { 1755 // if (aaPinDataValue._PinId != value.id) {