ADAM / AIAHTML5

Commit 212f1588a2cb2afd015619031c60e3f34f961888

Authored by Amrita Vishnoi
2 parents 3d8d7054 85c71e46

Merge branch 'oldTileViewController-2' into Develop

Inline Side-by-side
Showing 2 changed files with 41 additions and 11 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @212f158
... ... @@ -4255,6 +4255,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4255 4255 };
4256 4256  
4257 4257 $rootScope.ShowPrintPreviewWindow = function (event) { // Print Preview
  4258 + if ($location.url() == "/module-item-view") {
  4259 + if ($("#hidePinBtn").hasClass("btn-primary")) {
  4260 + $rootScope.isHidePinBtnActiveInPrintPreview = true;
  4261 + }
  4262 + if ($("#selectedPin").hasClass("btn-primary")) {
  4263 + $rootScope.isShowSelectedPinActiveInPrintPrevMode = true;
  4264 + }
  4265 + if ($("#allPinBtn").hasClass("btn-primary")) {
  4266 + $rootScope.isShowAllPinBtnActiveInPrintPreviewMode = true;
  4267 + }
  4268 + }
4258 4269 $(".tools").css("z-index", "1029");
4259 4270 $rootScope.CloseListManager();
4260 4271 $rootScope.CloseAnnotationTool();
... ... @@ -4319,6 +4330,13 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4319 4330 }
4320 4331 }
4321 4332 });
  4333 +
  4334 + if ($location.url() == "/module-item-view") {
  4335 + $timeout(function () {
  4336 + $rootScope.hidePins();
  4337 + }, 100);
  4338 + }
  4339 +
4322 4340 };
4323 4341  
4324 4342 function OpenJSPanel() {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @212f158
... ... @@ -303,10 +303,28 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
303 303 $rootScope.searchSelectedText = '';
304 304  
305 305 });
  306 +
  307 + $(document).on("click", "#dvPrintPreview .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
  308 +
  309 + if ($rootScope.isShowAllPinBtnActiveInPrintPreviewMode == true) {
  310 + $("#allPinBtn").trigger("click");
  311 + $rootScope.isShowAllPinBtnActiveInPrintPreviewMode = false;
  312 + }
  313 + if ($rootScope.isHidePinBtnActiveInPrintPreview == true) {
  314 + $("#hidePinBtn").trigger("click");
  315 + $rootScope.isHidePinBtnActiveInPrintPreview = false;
  316 + }
  317 + if($rootScope.isShowSelectedPinActiveInPrintPrevMode == true)
  318 + {
  319 + $("#selectedPin").trigger("click");
  320 + $rootScope.isShowSelectedPinActiveInPrintPrevMode = false;
  321 + }
  322 + });
  323 +
306 324 })
307 325 $rootScope.aaPinDataArray = [];
308 326 $scope.showAllPins = function () {
309   -
  327 +
310 328 $scope.allPinDataArray = [];
311 329 var promise = ModuleService.getPinDataForImage($rootScope.imageName)
312 330  
... ... @@ -1341,11 +1359,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1341 1359 }
1342 1360 }
1343 1361  
1344   - $scope.hidePins = function () {
  1362 + $rootScope.hidePins = function () {
1345 1363  
1346 1364 $rootScope.isLoading = true;
1347 1365 $('#spinner').css('visibility', 'visible');
1348   -
1349 1366 $scope.hideSpeechBubble();
1350 1367  
1351 1368 $scope.isHidePinBtnClicked = true;
... ... @@ -1372,12 +1389,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1372 1389 }
1373 1390  
1374 1391 $scope.showAllPinsAfterHide = function (event) {
1375   -
1376   -
1377 1392 $rootScope.isLoading = true;
1378 1393 $('#spinner').css('visibility', 'visible');
1379   -
1380   -
1381 1394 $scope.isHidePinBtnClicked = false;
1382 1395  
1383 1396 if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
... ... @@ -1402,7 +1415,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1402 1415  
1403 1416  
1404 1417 $scope.showSelectedPins = function () {
1405   -
1406 1418 $rootScope.isLoading = true;
1407 1419 $('#spinner').css('visibility', 'visible');
1408 1420  
... ... @@ -1720,9 +1732,9 @@ function showSelectedSystemPins(event) {
1720 1732  
1721 1733 function hidePins(event) {
1722 1734  
1723   - var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
1724   - scope.$apply(function () {
1725   - scope.hidePins(event);
  1735 + var rootScope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
  1736 + rootScope.$apply(function () {
  1737 + rootScope.hidePins(event);
1726 1738 });
1727 1739 }
1728 1740  
... ...