diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 6bfa5c8..dbb35e0 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -777,7 +777,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo var clickedPinId = clickedSpeechBubbleId.substring(12, clickedSpeechBubbleId.length); $("#speechBubbleLine" + clickedPinId).css("visibility", "hidden"); - + $("#speechBubbleLine" + clickedPinId).css("display", "none"); for (var i = 0; i <= $rootScope.speechBubbleDimaensions.length - 1; i++) { if ($rootScope.speechBubbleDimaensions[i].id == clickedPinId) { @@ -1174,8 +1174,39 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.IsSearchVisible = false; } - - + $rootScope.isShowHideButtonClicked = true; + $scope.ShowHideAnnotation = function () { + if ($rootScope.isShowHideButtonClicked == true) { + $rootScope.annotationArray = []; + $("#canvasDiv").find(".common-drag").each(function () { + var speechBubbleID = $(this).attr("id"); + var sppechBubbleId = $(this).attr("id").substring(12); + var b = $("#speechBubbleDraggedLine" + sppechBubbleId).css("display"); + var speechBubbleLineDispProp = $("#speechBubbleLine" + sppechBubbleId).css("display"); + var speechBubbleLineID = "speechBubbleLine" + sppechBubbleId; + var speechBubbleDraggedLineID = "speechBubbleDraggedLine" + sppechBubbleId; + if (speechBubbleLineDispProp == "block") { + $rootScope.annotationArray.push({ "speechBuubleId": speechBubbleID, "speechBubbleLineId": speechBubbleLineID }); + } + else { + $rootScope.annotationArray.push({ "speechBuubleId": speechBubbleID, "speechBubbleLineId": speechBubbleDraggedLineID }); + } + }); + $rootScope.isShowHideButtonClicked = false; + for (var i = 0; i <= $rootScope.annotationArray.length - 1; i++) { + $("#" + $rootScope.annotationArray[i].speechBuubleId).css("display", "none"); + $("#" + $rootScope.annotationArray[i].speechBubbleLineId).css("display", "none"); + } + } + else + { + $rootScope.isShowHideButtonClicked = true; + for (var i = 0; i <= $rootScope.annotationArray.length - 1; i++) { + $("#" + $rootScope.annotationArray[i].speechBuubleId).css("display", "block"); + $("#" + $rootScope.annotationArray[i].speechBubbleLineId).css("display", "block"); + } + } + } }]); function showSelectedSystemPins(event) { @@ -1225,3 +1256,11 @@ function onSearchItemSelection(event) { scope.highlightPinBasedOnSerachItem(event); }); } + +function showHideAnnotation(event) { + + var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope(); + scope.$apply(function () { + scope.ShowHideAnnotation(event); + }); +} diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html b/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html index 7b31e87..1e481fd 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html @@ -53,7 +53,7 @@ -