ADAM / AIAHTML5

Commit 15856b94da19e64ace87dbe0573eca0b42c280d8

Authored by Nikita Kulshreshtha
2 parents 3b1ab77b 41397339

Merge branch 'Show/HideFunctionality' into Develop

Inline Side-by-side
Showing 2 changed files with 43 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @15856b9
... ... @@ -797,7 +797,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
797 797 var clickedPinId = clickedSpeechBubbleId.substring(12, clickedSpeechBubbleId.length);
798 798  
799 799 $("#speechBubbleLine" + clickedPinId).css("visibility", "hidden");
800   -
  800 + $("#speechBubbleLine" + clickedPinId).css("display", "none");
801 801  
802 802 for (var i = 0; i <= $rootScope.speechBubbleDimaensions.length - 1; i++) {
803 803 if ($rootScope.speechBubbleDimaensions[i].id == clickedPinId) {
... ... @@ -1273,8 +1273,39 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1273 1273  
1274 1274 $scope.IsSearchVisible = false;
1275 1275 }
1276   -
1277   -
  1276 + $rootScope.isShowHideButtonClicked = true;
  1277 + $scope.ShowHideAnnotation = function () {
  1278 + if ($rootScope.isShowHideButtonClicked == true) {
  1279 + $rootScope.annotationArray = [];
  1280 + $("#canvasDiv").find(".common-drag").each(function () {
  1281 + var speechBubbleID = $(this).attr("id");
  1282 + var sppechBubbleId = $(this).attr("id").substring(12);
  1283 + var b = $("#speechBubbleDraggedLine" + sppechBubbleId).css("display");
  1284 + var speechBubbleLineDispProp = $("#speechBubbleLine" + sppechBubbleId).css("display");
  1285 + var speechBubbleLineID = "speechBubbleLine" + sppechBubbleId;
  1286 + var speechBubbleDraggedLineID = "speechBubbleDraggedLine" + sppechBubbleId;
  1287 + if (speechBubbleLineDispProp == "block") {
  1288 + $rootScope.annotationArray.push({ "speechBuubleId": speechBubbleID, "speechBubbleLineId": speechBubbleLineID });
  1289 + }
  1290 + else {
  1291 + $rootScope.annotationArray.push({ "speechBuubleId": speechBubbleID, "speechBubbleLineId": speechBubbleDraggedLineID });
  1292 + }
  1293 + });
  1294 + $rootScope.isShowHideButtonClicked = false;
  1295 + for (var i = 0; i <= $rootScope.annotationArray.length - 1; i++) {
  1296 + $("#" + $rootScope.annotationArray[i].speechBuubleId).css("display", "none");
  1297 + $("#" + $rootScope.annotationArray[i].speechBubbleLineId).css("display", "none");
  1298 + }
  1299 + }
  1300 + else
  1301 + {
  1302 + $rootScope.isShowHideButtonClicked = true;
  1303 + for (var i = 0; i <= $rootScope.annotationArray.length - 1; i++) {
  1304 + $("#" + $rootScope.annotationArray[i].speechBuubleId).css("display", "block");
  1305 + $("#" + $rootScope.annotationArray[i].speechBubbleLineId).css("display", "block");
  1306 + }
  1307 + }
  1308 + }
1278 1309 }]);
1279 1310  
1280 1311 function showSelectedSystemPins(event) {
... ... @@ -1325,6 +1356,14 @@ function onSearchItemSelection(event) {
1325 1356 });
1326 1357 }
1327 1358  
  1359 +function showHideAnnotation(event) {
  1360 +
  1361 + var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
  1362 + scope.$apply(function () {
  1363 + scope.ShowHideAnnotation(event);
  1364 + });
  1365 +}
  1366 +
1328 1367 function showSelectedPins(event) {
1329 1368  
1330 1369 console.log('showSelectedPins is called')
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
  View file @15856b9
... ... @@ -53,7 +53,7 @@
53 53 </ul>
54 54  
55 55 </div>
56   - <div class="col-sm-12" data-toggle="tooltip" data-placement="top" title="Show/Hide Structure Name Boxes"><button class="btn btn-black btn-sm marginTop5 btn-block"> <img src="../../../content/images/aa/LeftMenu/comment-box.png" alt="" title=""></button> </div>
  56 + <div class="col-sm-12" data-toggle="tooltip" data-placement="top" title="Show/Hide Structure Name Boxes"><button onclick="showHideAnnotation(event)" class="btn btn-black btn-sm marginTop5 btn-block"> <img src="../../../content/images/aa/LeftMenu/comment-box.png" alt="" title=""></button> </div>
57 57 </div>
58 58 <div class="pips-slider" style="margin-top:125px">
59 59 <h3>Zoom <i class="fa fa-search-plus"></i></h3>
... ...