ADAM / AIAHTML5

Commit da83ae87a67eb9d57bbe0b9ee2467cbd85ab8467

Authored by Amrita Vishnoi
2 parents 4c585150 559ab2d9

Merge branch 'Bug#8736_1' into Develop

Inline Side-by-side
Showing 1 changed file with 10 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @da83ae8
@@ -1516,7 +1516,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1516,7 +1516,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1516 $('#spinner').css('visibility', 'visible'); 1516 $('#spinner').css('visibility', 'visible');
1517 $scope.highLightBody(); 1517 $scope.highLightBody();
1518 } 1518 }
1519 - else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $rootScope.isHighlightBodyByBodySystem == true) { 1519 + else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true))
  1520 + || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $rootScope.isHighlightBodyByBodySystem == true) {
1520 1521
1521 console.log('1. $rootScope.isHighLight= ' + $rootScope.isHighLight) 1522 console.log('1. $rootScope.isHighLight= ' + $rootScope.isHighLight)
1522 1523
@@ -1875,7 +1876,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1875,7 +1876,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1875 $('#spinner').css('visibility', 'visible'); 1876 $('#spinner').css('visibility', 'visible');
1876 $scope.highLightBody(); 1877 $scope.highLightBody();
1877 } 1878 }
1878 - else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $scope.isExtract == true || $rootScope.isHighlightBodyByBodySystem == true) { 1879 + else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true))
  1880 + || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $scope.isExtract == true || $rootScope.isHighlightBodyByBodySystem == true) {
1879 1881
1880 console.log('2. $rootScope.isHighLight= ' + $rootScope.isHighLight) 1882 console.log('2. $rootScope.isHighLight= ' + $rootScope.isHighLight)
1881 1883
@@ -5257,7 +5259,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5257,7 +5259,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5257 $rootScope.isZoomed = false; 5259 $rootScope.isZoomed = false;
5258 5260
5259 //6. 5261 //6.
5260 - $rootScope.isListManagerSelected = false; 5262 + // $rootScope.isListManagerSelected = false;
  5263 + if ($rootScope.actualTermNumber != null && $rootScope.actualTermNumber!=undefined && $rootScope.isListManagerSelected == true) {
  5264 + $rootScope.isListManagerSelected = false;
  5265 + $rootScope.isListManagerAlreadySelected = true;
  5266 + }
5261 5267
5262 //7. 5268 //7.
5263 5269
@@ -5632,7 +5638,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -5632,7 +5638,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5632 $('#spinner').css('visibility', 'visible'); 5638 $('#spinner').css('visibility', 'visible');
5633 $timeout(function () { $scope.HighlightBodyByTermList($scope.systemMatchedTermList) }, 100); 5639 $timeout(function () { $scope.HighlightBodyByTermList($scope.systemMatchedTermList) }, 100);
5634 } 5640 }
5635 - else if (($rootScope.isListManagerSelected == true) || ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0) && ($rootScope.isGenderChnage==true || $rootScope.isViewChange==true)) { 5641 + else if (($rootScope.isListManagerSelected == true) || ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0) && ($rootScope.isGenderChnage==true || $rootScope.isViewChange==true) || $rootScope.isListManagerAlreadySelected==true) {
5636 5642
5637 // console.log('$scope.grayedBR.length is ' + $scope.grayedBR.length); 5643 // console.log('$scope.grayedBR.length is ' + $scope.grayedBR.length);
5638 $timeout(function () { 5644 $timeout(function () {