ADAM / AIAHTML5

Commit ec7fba62e50b48f56fa502256757564f2e158266

Authored by Amrita Vishnoi
2 parents cfac7f46 6be46160

Merge branch 'ExtractAfterSearchOrLM' of http://52.6.196.163/ADAM/AIAHTML5 into ExtractFixMerge 

# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
Inline Side-by-side
Showing 1 changed file with 35 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @ec7fba6
... ... @@ -1007,7 +1007,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1007 1007  
1008 1008 $scope.one = 1;
1009 1009  
  1010 + if ($rootScope.isListManagerSelected == true) {
  1011 + $scope.layerNumber = $('#txtlayerNumber').val();
  1012 + }
  1013 +
1010 1014 $scope.userInput = parseInt($scope.layerNumber);
  1015 +
  1016 +
1011 1017 $scope.skinTone = $rootScope.globalSetting.ethnicity;
1012 1018  
1013 1019 var SelectedLayerData = [];
... ... @@ -1768,11 +1774,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1768 1774  
1769 1775 $scope.HighlightBodyOnExtract = function () {
1770 1776  
1771   -
  1777 +
1772 1778 var multiTermList = [];
1773 1779 var CallBackBodyRegion = [];
1774 1780  
1775   - if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) {
  1781 + if ($rootScope.isListManagerSelected) {
  1782 +
  1783 + multiTermList = $scope.AllTerms;
  1784 +
  1785 + }
  1786 + else if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) {
1776 1787 angular.forEach($rootScope.previousHighlightList, function (value, key) {
1777 1788  
1778 1789 var ActualTermNo = $scope.getActualTermNumber(value);
... ... @@ -1956,7 +1967,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1956 1967 }
1957 1968 }
1958 1969 }
1959   - }, 50)
  1970 + }, 500)
1960 1971  
1961 1972 }
1962 1973  
... ... @@ -1971,6 +1982,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1971 1982 // $rootScope.updatedGrayDataList = [];
1972 1983 //}
1973 1984  
  1985 + if ($rootScope.isHighLight == true) {
  1986 + false;
  1987 + }
  1988 +
1974 1989 console.log('HighlightBodyByTermList is called');
1975 1990  
1976 1991 // $scope.highlightedBR = null;
... ... @@ -5061,8 +5076,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5061 5076 $('#spinner').css('visibility', 'hidden');
5062 5077 //}
5063 5078  
  5079 +
5064 5080 if (($scope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) {
5065 5081  
  5082 +
5066 5083 $scope.isLoading = true;
5067 5084  
5068 5085 $('#spinner').css('visibility', 'visible');
... ... @@ -5092,9 +5109,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5092 5109  
5093 5110 if ($rootScope.isExtract == true) {
5094 5111 if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && $rootScope.previousHighlightList.length > 0) {
  5112 + console.log('1. $rootScope.isExtract=true and $rootScope.previousHighlightList != null')
5095 5113  
5096 5114 $timeout(function () { $scope.HighlightBodyOnExtract() }, 50);
5097 5115 }
  5116 + else if ($rootScope.isListManagerSelected == true) {
  5117 + console.log('1. $rootScope.isExtract=true and $rootScope.isListManagerSelected == true')
  5118 +
  5119 + $timeout(function () { $scope.HighlightBodyOnExtract() }, 50);
  5120 +
  5121 + }
5098 5122 }
5099 5123 //else {
5100 5124 // // this code is for the case where user first clcik on normal mode then extract then again highlight then we need to call highlight body in gray mode
... ... @@ -5242,13 +5266,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5242 5266 })
5243 5267  
5244 5268 if ($rootScope.isExtract == true) {
5245   - if ($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined || $rootScope.previousHighlightList.length > 0) {
  5269 + if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && $rootScope.previousHighlightList.length > 0) {
  5270 + console.log('2. $rootScope.isExtract=true and $rootScope.previousHighlightList != null, $rootScope.previousHighlightList.length= ' + $rootScope.previousHighlightList.length)
  5271 +
5246 5272  
5247 5273 $timeout(function () { $scope.HighlightBodyOnExtract() }, 50);
5248 5274  
5249 5275 // to do
5250 5276  
5251 5277 }
  5278 + else if ($rootScope.isListManagerSelected == true) {
  5279 + console.log('2. $rootScope.isExtract=true and $rootScope.isListManagerSelected == true')
  5280 + $timeout(function () { $scope.HighlightBodyOnExtract() }, 50);
  5281 +
  5282 + }
5252 5283 }
5253 5284  
5254 5285 }
... ...