diff --git a/150-DOCUMENTATION/AIA-Aug-Report.pptx b/150-DOCUMENTATION/AIA-Aug-Report.pptx new file mode 100644 index 0000000..cf3eb0a --- /dev/null +++ b/150-DOCUMENTATION/AIA-Aug-Report.pptx diff --git a/150-DOCUMENTATION/AIA-July-Report.pptx b/150-DOCUMENTATION/AIA-July-Report.pptx index c05d403..69fdfb5 100644 --- a/150-DOCUMENTATION/AIA-July-Report.pptx +++ b/150-DOCUMENTATION/AIA-July-Report.pptx diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 1c5dabe..54ef3cc 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -2166,13 +2166,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo if ($scope.doAligneCanvasWithTerm == true) { //debugger; - if ($scope.isHighlightBodysystem == true || $rootScope.isListManagerSelected == true) + if ($scope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true) $rootScope.isLoading = false; $('#spinner').css('visibility', 'hidden'); - $scope.isHighlightBodysystem = false; + $scope.isHighlightBodyByBodySystem = false; if ($rootScope.isListManagerSelected == true) $scope.aligneCanvasWithTerm(); @@ -2439,7 +2439,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition) $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition) - $timeout(function () { $scope.DisableProgressBar() }, 1000); + if ($scope.isHighlightBodyByBodySystem) { + $timeout(function () { $scope.DisableProgressBar() }, 20000); + } + else + { + $timeout(function () { $scope.DisableProgressBar() }, 2000); + } } $('#layerChangeSlider').slider("option", "value", parseInt($scope.totalLayers) - parseInt($scope.layerNumber)); @@ -4928,7 +4934,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $('#spinner').css('visibility', 'hidden'); //} - if (($scope.isHighlightBodysystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) { + if (($scope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) { $scope.isLoading = true; @@ -6418,10 +6424,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo }); - - //----End----- - - //body highlight options functinality $scope.LoadBodySystemData = function () { @@ -6452,10 +6454,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } - $scope.HighlightBodysystem = function (event) { + $scope.HighlightBodyByBodySystem = function (event) { //NIKITA - $scope.isHighlightBodysystem = true; + $scope.isHighlightBodyByBodySystem = true; $scope.systemMatchedTermList = new jinqJs() .from($rootScope.BodySystemData.BodySystem.BodySystemTerm) .where('_SystemNumber == ' + event.currentTarget.id) @@ -6464,7 +6466,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo if ($rootScope.isHighLight == false) { //color the body gray $rootScope.isHighLight = true - console.log('highLightBody from HighlightBodysystem') + console.log('highLightBody from HighlightBodyByBodySystem') $scope.highLightBody(); } //now highlight the selected body system in whole body @@ -6474,7 +6476,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $('#spinner').css('visibility', 'visible'); //NIKITA - // $scope.isHighlightBodysystem = true; + // $scope.isHighlightBodyByBodySystem = true; //if (systemMatchedTermList != null || systemMatchedTermList != undefined) { @@ -6722,7 +6724,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $("#canvasDiv").scrollTop(scrolly); $("#canvasDiv").scrollLeft(scrollx); - if (($scope.isHighlightBodysystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) { + if (($scope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) { $timeout(function () { $scope.HighlightBodyByTermList(systemMatchedTermList) }, 100); } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html index 5a31d94..61fc6f1 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html @@ -159,18 +159,18 @@