Commit 008ca6c7bf6b32f5e5bad3738412c0a714dc2672
1 parent
fe44a0b6
added loader in all features
Showing
1 changed file
with
24 additions
and
18 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
... | ... | @@ -437,6 +437,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
437 | 437 | |
438 | 438 | $scope.showSelectedSystemPins = function (event) { |
439 | 439 | |
440 | + $rootScope.isLoading = true; | |
441 | + $('#spinner').css('visibility', 'visible'); | |
442 | + | |
440 | 443 | $scope.removeSpeechBubble(); |
441 | 444 | if (event.currentTarget.id == "0") { |
442 | 445 | |
... | ... | @@ -574,6 +577,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
574 | 577 | |
575 | 578 | } |
576 | 579 | |
580 | + $rootScope.isLoading = false; | |
581 | + $('#spinner').css('visibility', 'hidden'); | |
577 | 582 | // $scope.MultiLanguageAnnationArray.push($rootScope.annotationText[i]) |
578 | 583 | } |
579 | 584 | |
... | ... | @@ -1073,6 +1078,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
1073 | 1078 | |
1074 | 1079 | $scope.hidePins = function () { |
1075 | 1080 | |
1081 | + $rootScope.isLoading = true; | |
1082 | + $('#spinner').css('visibility', 'visible'); | |
1083 | + | |
1076 | 1084 | $scope.hideSpeechBubble(); |
1077 | 1085 | |
1078 | 1086 | $scope.isHidePinBtnClicked = true; |
... | ... | @@ -1090,10 +1098,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
1090 | 1098 | }).drawLayers(); |
1091 | 1099 | }) |
1092 | 1100 | |
1101 | + $rootScope.isLoading = false; | |
1102 | + $('#spinner').css('visibility', 'hidden'); | |
1093 | 1103 | } |
1094 | 1104 | |
1095 | 1105 | $scope.showAllPinsAfterHide = function (event) { |
1096 | 1106 | |
1107 | + $rootScope.isLoading = true; | |
1108 | + $('#spinner').css('visibility', 'visible'); | |
1109 | + | |
1110 | + | |
1097 | 1111 | $scope.isHidePinBtnClicked = false; |
1098 | 1112 | |
1099 | 1113 | if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) { |
... | ... | @@ -1110,6 +1124,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
1110 | 1124 | |
1111 | 1125 | $scope.showSelectedPins = function () { |
1112 | 1126 | |
1127 | + $rootScope.isLoading = true; | |
1128 | + $('#spinner').css('visibility', 'visible'); | |
1129 | + | |
1113 | 1130 | $scope.isHidePinBtnClicked = false; |
1114 | 1131 | |
1115 | 1132 | if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) { |
... | ... | @@ -1124,23 +1141,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
1124 | 1141 | $scope.showSpeechBubble(); |
1125 | 1142 | }; |
1126 | 1143 | |
1127 | - | |
1128 | - //$scope.showSystemPins = function (seletedSystemPinData, isShowSelectedPins) { | |
1129 | - | |
1130 | - // angular.forEach(seletedSystemPinData, function (aaPinDataValue, aaPinDataKey) { | |
1131 | - | |
1132 | - // var pinName = 'Pin_' + aaPinDataValue._PinId; | |
1133 | - // var pinArcName = 'PinArc_' + aaPinDataValue._PinId; | |
1134 | - | |
1135 | - // $('#aaDetailViewCanvas').setLayer(pinName, { | |
1136 | - // visible: true // set to true instead to show the layer again | |
1137 | - // }).drawLayers(); | |
1138 | - | |
1139 | - // $('#aaDetailViewCanvas').setLayer(pinArcName, { | |
1140 | - // visible: true // set to true instead to show the layer again | |
1141 | - // }).drawLayers(); | |
1142 | - // }) | |
1143 | - //} | |
1144 | + | |
1144 | 1145 | $scope.showSystemPins = function (seletedSystemPinData, isShowSelectedPins) { |
1145 | 1146 | |
1146 | 1147 | if (isShowSelectedPins) { |
... | ... | @@ -1187,6 +1188,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
1187 | 1188 | }).drawLayers(); |
1188 | 1189 | }) |
1189 | 1190 | } |
1191 | + | |
1192 | + $rootScope.isLoading = false; | |
1193 | + $('#spinner').css('visibility', 'hidden'); | |
1194 | + | |
1195 | + | |
1190 | 1196 | } |
1191 | 1197 | |
1192 | 1198 | $scope.showItemsForSearch = function () { |
... | ... | @@ -1308,7 +1314,7 @@ function onSearchItemSelection(event) { |
1308 | 1314 | } |
1309 | 1315 | |
1310 | 1316 | function showSelectedPins(event) { |
1311 | - alert('showSelectedPins') | |
1317 | + | |
1312 | 1318 | console.log('showSelectedPins is called') |
1313 | 1319 | var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope(); |
1314 | 1320 | scope.$apply(function () { | ... | ... |