diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index b921075..205b537 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1184,7 +1184,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l var bodySystemListObj = document.getElementById("structureDropdownDA_" + windowviewid); var len = bodySystemListObj!=null?(bodySystemListObj.id).split("_").length:0; if (len>1) { - $scope.stopIntervalLoader(timeintval); + $scope.stopIntervalLoader(timeintval); + // set search for language input + $scope.langSearchLoad(windowviewid); //wait until DOM element load of DA $scope.daViewLoader(windowviewid); } @@ -1377,8 +1379,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } }); - // set search for language input - $scope.langSearchLoad(windowviewid); } @@ -1388,18 +1388,18 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $('#searchlangaugeDiv_'+windowviewid).css("display","none"); var languageArray = $rootScope.lexiconLanguageArray; - $("#btnDATermSearch_"+windowviewid).parent().css("margin-right", "10px"); + // $("#btnDATermSearch_"+windowviewid).parent().css("margin-right", "10px"); if(languageArray.length>1) { - $("#btnDATermSearch_"+windowviewid).parent().css("margin-right", "-10px"); + // $("#btnDATermSearch_"+windowviewid).parent().css("margin-right", "-10px"); $('#searchlangaugeDiv_'+windowviewid).css("display","block"); var option=''; for (var i = 0; i <= languageArray.length - 1; i++) { option=option+''; } var $all = $('#searchlangaugeDiv_'+windowviewid).append( - '
'+ + '
'+ ''+ @@ -9622,14 +9622,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l //set true to false or vice versa var iskeyctrlActive= $scope.GetwindowStoreData(windowviewid, 'keyctrl'); - + $("#multiannotation_" + windowviewid).toggleClass("disableMultiAnnotationText"); + if(iskeyctrlActive) { - $("#multiannotation_"+windowviewid).addClass("disableMultiAnnotationText"); + $("#multiannotation_"+windowviewid ).attr('title', 'Active Multiple Structure'); } else { - $("#multiannotation_"+windowviewid).removeClass("disableMultiAnnotationText"); + $("#multiannotation_"+windowviewid ).attr('title', 'Disable Multiple Structure'); } $scope.SetwindowStoreData(windowviewid, 'keyctrl', !iskeyctrlActive); @@ -9642,19 +9643,23 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l var windowviewid = (event.currentTarget.id).split("_")[len-1]; $scope.SetwindowStoreData(windowviewid,'isListManagerSelected',false); + $("#btnStrutureBox_" + windowviewid).toggleClass("disableHideShowStructure"); $rootScope.CloseListManager(); var btnStrutureBoxname = document.getElementById("btnStrutureBox_" + windowviewid).name; if (btnStrutureBoxname == "showAnnotationStructure") { - $("#btnStrutureBox_" + windowviewid).addClass("disableHideShowStructure"); + $("#btnStrutureBox_"+windowviewid ).attr('title', 'Show Structure Name Boxes'); + $("#btnStrutureBox_"+windowviewid +" i").removeClass("far fa-comment-alt-times").addClass("far fa-comment-alt"); + $("#btnStrutureBox_"+windowviewid ).attr('name', 'hideAnnotationStructure'); + $scope.hideAnnotation(windowviewid); - document.getElementById("btnStrutureBox_" + windowviewid).name = "hideAnnotationStructure"; $scope.SetwindowStoreData(windowviewid, 'showHideAnnotations', 'hideAnnotationStructure'); } else { - $("#btnStrutureBox_" + windowviewid).removeClass("disableHideShowStructure"); + $("#btnStrutureBox_"+windowviewid ).attr('title', 'Hide Structure Name Boxes'); + $("#btnStrutureBox_"+windowviewid +" i").removeClass("far fa-comment-alt").addClass("far fa-comment-alt-times"); + $("#btnStrutureBox_"+windowviewid ).attr('name', 'showAnnotationStructure'); $scope.showAnnotation(windowviewid); - document.getElementById("btnStrutureBox_" + windowviewid).name = "showAnnotationStructure"; $scope.SetwindowStoreData(windowviewid, 'showHideAnnotations', 'showAnnotationStructure'); } } @@ -11940,7 +11945,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l var oldtimestamp = $scope.GetwindowStoreData(windowviewid, 'SearchTimeStampValue'); - if ((newtimestamp - oldtimestamp) > 500) { + if ((newtimestamp - oldtimestamp) > 100) { $scope.SetwindowStoreData(windowviewid, 'SearchTimeStampValue', newtimestamp); $scope.showFilteredTerms(windowviewid); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 1df8726..037f268 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -787,10 +787,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.SetAAwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight); $timeout(function () { + $scope.setControlsIDs(windowviewid); if (document.getElementById('aaBodyView') != null) { $compile(aaViewElement.contents())($scope); - $scope.setControlsIDs(windowviewid); - + var timeintval = null; timeintval = $interval(function () { var bodySystemListObj = document.getElementById("bodySystemList_" + windowviewid); @@ -798,6 +798,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou if (len>1) { $scope.stopIntervalLoader(); //wait until DOM element load of AA + // set search for language input + $scope.langSearchLoad(windowviewid); $scope.loadAAModule(windowviewid); } else @@ -805,7 +807,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.setControlsIDs(windowviewid); console.log("waiting for loading module"); } - }, 200); + },100); $scope.stopIntervalLoader = function () { if (angular.isDefined(timeintval)) { $interval.cancel(timeintval); @@ -815,7 +817,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } - }, 500); + }, 1000); } @@ -1119,9 +1121,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } } }); - - // set search for language input - $scope.langSearchLoad(windowviewid); } @@ -1142,7 +1141,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou option=option+''; } var $all = $('#searchlangaugeDiv_'+windowviewid).append( - '
'+ + '
'+ ''+ @@ -3603,7 +3602,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou var oldtimestamp = $scope.GetAAwindowStoreData(windowviewid, 'SearchTimeStampValue'); - if ((newtimestamp - oldtimestamp) > 500) { + if ((newtimestamp - oldtimestamp) > 100) { $scope.SetAAwindowStoreData(windowviewid, 'SearchTimeStampValue', newtimestamp); $scope.showFilteredTerms(windowviewid); @@ -3829,15 +3828,17 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou //set true to false or vice versa var iskeyctrlActive= $scope.GetAAwindowStoreData(windowviewid, 'keyctrl'); - - if(iskeyctrlActive) - { - $("#multiannotation_"+windowviewid).addClass("disableMultiAnnotationText"); - } - else - { - $("#multiannotation_"+windowviewid).removeClass("disableMultiAnnotationText"); - } + + $("#multiannotation_" + windowviewid).toggleClass("disableAAMultiAnnotationText"); + + if(iskeyctrlActive) + { + $("#multiannotation_"+windowviewid ).attr('title', 'Active Multiple Structure'); + } + else + { + $("#multiannotation_"+windowviewid ).attr('title', 'Disable Multiple Structure'); + } $scope.SetAAwindowStoreData(windowviewid, 'keyctrl', !iskeyctrlActive); } @@ -3848,17 +3849,21 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $rootScope.UnsaveCurriculum = true; var btnStrutureBoxname = document.getElementById("comment-box_"+windowviewid).name; + $("#comment-box_" + windowviewid).toggleClass("disableAAAnnotationText"); if (btnStrutureBoxname == "showAnnotationText") { - $("#comment-box_"+windowviewid).addClass("disableAnnotationText"); - document.getElementById("comment-box_"+windowviewid).name = "hideAnnotationText"; - $scope.SetAAwindowStoreData(windowviewid, 'showHideAnnotations', 'hideAnnotationText'); + $("#comment-box_"+windowviewid ).attr('title', 'Show Structure Name Boxes'); + $("#comment-box_"+windowviewid +" i").removeClass("far fa-comment-alt-times").addClass("far fa-comment-alt"); + $("#comment-box_"+windowviewid ).attr('name', 'hideAnnotationText'); + $scope.SetAAwindowStoreData(windowviewid, 'showHideAnnotations', 'hideAnnotationText'); } else { - $("#comment-box_"+windowviewid).removeClass("disableAnnotationText"); - document.getElementById("comment-box_"+windowviewid).name = "showAnnotationText"; + $("#comment-box_"+windowviewid ).attr('title', 'Hide Structure Name Boxes'); + $("#comment-box_"+windowviewid +" i").removeClass("far fa-comment-alt").addClass("far fa-comment-alt-times"); + $("#comment-box_"+windowviewid ).attr('name', 'showAnnotationText'); $scope.SetAAwindowStoreData(windowviewid, 'showHideAnnotations', 'showAnnotationText'); + } $scope.ShowHideAnnotationText(windowviewid); @@ -3876,7 +3881,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } } else { - $("#comment-box_"+windowviewid).addClass("disableAnnotationText"); + $("#comment-box_"+windowviewid).addClass("disableAAAnnotationText"); for (var i = 0; i <= speechBubbleDimaensions.length - 1; i++) { $("#" + speechBubbleDimaensions[i].speechBuubleId).css("display", "none"); @@ -4097,6 +4102,14 @@ function hideSearchList(event) { }); } +function resetSearchListView(event) { + console.log('AA keyup search is called') + var scope = angular.element(document.getElementById("aaBodyView")).scope(); + scope.$apply(function () { + scope.resetSearchListView(event); + }); +} + function onSearchItemSelection(termid, isTermListOptionClicked) { console.log('AA hide search is called'); 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 1d1a676..79aa73c 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 @@ -58,15 +58,7 @@ .pad0 { padding: 0; } - .disableAnnotationText { - background: #4b4b4b; - border-color: #3f3f3f !important; - } - .disableMultiAnnotationText { - background: #4b4b4b; - border-color: #3f3f3f !important; - } - +
@@ -96,13 +88,18 @@
  • Urinary
    • -
    - -
    -
    - -
    + +
    +
    + +
    +
    +

    Zoom

    @@ -114,8 +111,9 @@
    +
    - +
    @@ -131,9 +129,7 @@
    -
    - -
    +
    +
    -
    - +
    +
    @@ -243,6 +243,7 @@
    +
    @@ -253,17 +254,14 @@
    -
    +
    -
    -
    - -
    -
    +
    +