ADAM / AIAHTML5

Commit 1781f8ea9cf2201ee9410145d236e2e9e6a4a382

Authored by Nikita Kulshreshtha
1 parent 983f50b9

Highlight is maintained on layer change in below cases. 

1. search & list manager
2. Highlight Options
3. Highlight on click.
Inline Side-by-side
Showing 1 changed file with 10 additions and 10 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @1781f8e
@@ -2258,13 +2258,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2258,13 +2258,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2258 2258
2259 if ($scope.doAligneCanvasWithTerm == true) { 2259 if ($scope.doAligneCanvasWithTerm == true) {
2260 //debugger; 2260 //debugger;
2261 - if ($scope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true) 2261 + if ( $rootScope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true)
2262 2262
2263 $rootScope.isLoading = false; 2263 $rootScope.isLoading = false;
2264 2264
2265 - $('#spinner').css('visibility', 'hidden'); 2265 + $('#spinner').css('visibility', 'hidden');
2266 2266
2267 - $scope.isHighlightBodyByBodySystem = false; 2267 + //$rootScope.isHighlightBodyByBodySystem = false;
2268 2268
2269 if ($rootScope.isListManagerSelected == true) 2269 if ($rootScope.isListManagerSelected == true)
2270 $scope.aligneCanvasWithTerm(); 2270 $scope.aligneCanvasWithTerm();
@@ -2418,7 +2418,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2418,7 +2418,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2418 2418
2419 2419
2420 //if listanager is visisble then close it 2420 //if listanager is visisble then close it
2421 - $rootScope.isListManagerSelected = false; 2421 + // $rootScope.isListManagerSelected = false;
2422 2422
2423 $rootScope.CloseListManager(); 2423 $rootScope.CloseListManager();
2424 2424
@@ -2542,7 +2542,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2542,7 +2542,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2542 $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition) 2542 $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition)
2543 $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition) 2543 $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition)
2544 2544
2545 - if ($scope.isHighlightBodyByBodySystem) { 2545 + if ( $rootScope.isHighlightBodyByBodySystem) {
2546 $timeout(function () { $scope.DisableProgressBar() }, 20000); 2546 $timeout(function () { $scope.DisableProgressBar() }, 20000);
2547 } 2547 }
2548 else 2548 else
@@ -5254,7 +5254,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5254,7 +5254,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5254 //} 5254 //}
5255 5255
5256 5256
5257 - if (($scope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) { 5257 + if (( $rootScope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) {
5258 5258
5259 5259
5260 $scope.isLoading = true; 5260 $scope.isLoading = true;
@@ -6973,7 +6973,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -6973,7 +6973,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6973 6973
6974 6974
6975 //NIKITA 6975 //NIKITA
6976 - $scope.isHighlightBodyByBodySystem = true; 6976 + $rootScope.isHighlightBodyByBodySystem = true;
6977 $scope.systemMatchedTermList = new jinqJs() 6977 $scope.systemMatchedTermList = new jinqJs()
6978 .from($rootScope.BodySystemData.BodySystem.BodySystemTerm) 6978 .from($rootScope.BodySystemData.BodySystem.BodySystemTerm)
6979 .where('_SystemNumber == ' + event.currentTarget.id) 6979 .where('_SystemNumber == ' + event.currentTarget.id)
@@ -6985,14 +6985,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -6985,14 +6985,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6985 console.log('highLightBody from HighlightBodyByBodySystem') 6985 console.log('highLightBody from HighlightBodyByBodySystem')
6986 $scope.highLightBody(); 6986 $scope.highLightBody();
6987 } 6987 }
6988 - //now highlight the selected body system in whole body 6988 +
6989 6989
6990 6990
6991 //$rootScope.isLoading = true; 6991 //$rootScope.isLoading = true;
6992 $('#spinner').css('visibility', 'visible'); 6992 $('#spinner').css('visibility', 'visible');
6993 6993
6994 //NIKITA 6994 //NIKITA
6995 - // $scope.isHighlightBodyByBodySystem = true; 6995 + // $rootScope.isHighlightBodyByBodySystem = true;
6996 6996
6997 //if (systemMatchedTermList != null || systemMatchedTermList != undefined) { 6997 //if (systemMatchedTermList != null || systemMatchedTermList != undefined) {
6998 6998
@@ -7289,7 +7289,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -7289,7 +7289,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7289 $("#canvasDiv").scrollTop(scrolly); 7289 $("#canvasDiv").scrollTop(scrolly);
7290 $("#canvasDiv").scrollLeft(scrollx); 7290 $("#canvasDiv").scrollLeft(scrollx);
7291 7291
7292 - if (($scope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) { 7292 + if (( $rootScope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) {
7293 $timeout(function () { $scope.HighlightBodyByTermList(systemMatchedTermList) }, 100); 7293 $timeout(function () { $scope.HighlightBodyByTermList(systemMatchedTermList) }, 100);
7294 } 7294 }
7295 7295