ADAM / AIAHTML5

Commit 0f6ed55c2ad1bd9a107605a5756874224107918e

Authored by Nikita Kulshreshtha
1 parent 5e186125

Refs: #7098

Inline Side-by-side
Showing 1 changed file with 35 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @0f6ed55
... ... @@ -1004,7 +1004,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1004 1004  
1005 1005 $scope.one = 1;
1006 1006  
  1007 + if ($rootScope.isListManagerSelected == true) {
  1008 + $scope.layerNumber = $('#txtlayerNumber').val();
  1009 + }
  1010 +
1007 1011 $scope.userInput = parseInt($scope.layerNumber);
  1012 +
  1013 +
1008 1014 $scope.skinTone = $rootScope.globalSetting.ethnicity;
1009 1015  
1010 1016 var SelectedLayerData = [];
... ... @@ -1765,11 +1771,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1765 1771  
1766 1772 $scope.HighlightBodyOnExtract = function () {
1767 1773  
1768   -
  1774 +
1769 1775 var multiTermList = [];
1770 1776 var CallBackBodyRegion = [];
1771 1777  
1772   - if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) {
  1778 + if ($rootScope.isListManagerSelected) {
  1779 +
  1780 + multiTermList = $scope.AllTerms;
  1781 +
  1782 + }
  1783 + else if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) {
1773 1784 angular.forEach($rootScope.previousHighlightList, function (value, key) {
1774 1785  
1775 1786 var ActualTermNo = $scope.getActualTermNumber(value);
... ... @@ -1953,7 +1964,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1953 1964 }
1954 1965 }
1955 1966 }
1956   - }, 50)
  1967 + }, 500)
1957 1968  
1958 1969 }
1959 1970  
... ... @@ -1968,6 +1979,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1968 1979 // $rootScope.updatedGrayDataList = [];
1969 1980 //}
1970 1981  
  1982 + if ($rootScope.isHighLight == true) {
  1983 + false;
  1984 + }
  1985 +
1971 1986 console.log('HighlightBodyByTermList is called');
1972 1987  
1973 1988 // $scope.highlightedBR = null;
... ... @@ -4972,6 +4987,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4972 4987 $('#spinner').css('visibility', 'hidden');
4973 4988 //}
4974 4989  
  4990 +
  4991 +
4975 4992 if (($scope.isHighlightBodysystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) {
4976 4993  
4977 4994 $scope.isLoading = true;
... ... @@ -5003,9 +5020,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5003 5020  
5004 5021 if ($rootScope.isExtract == true) {
5005 5022 if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && $rootScope.previousHighlightList.length > 0) {
  5023 + console.log('1. $rootScope.isExtract=true and $rootScope.previousHighlightList != null')
5006 5024  
5007 5025 $timeout(function () { $scope.HighlightBodyOnExtract() }, 50);
5008 5026 }
  5027 + else if ($rootScope.isListManagerSelected == true) {
  5028 + console.log('1. $rootScope.isExtract=true and $rootScope.isListManagerSelected == true')
  5029 +
  5030 + $timeout(function () { $scope.HighlightBodyOnExtract() }, 50);
  5031 +
  5032 + }
5009 5033 }
5010 5034 //else {
5011 5035 // // 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
... ... @@ -5153,13 +5177,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5153 5177 })
5154 5178  
5155 5179 if ($rootScope.isExtract == true) {
5156   - if ($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined || $rootScope.previousHighlightList.length > 0) {
  5180 + if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && $rootScope.previousHighlightList.length > 0) {
  5181 + console.log('2. $rootScope.isExtract=true and $rootScope.previousHighlightList != null, $rootScope.previousHighlightList.length= ' + $rootScope.previousHighlightList.length)
  5182 +
5157 5183  
5158 5184 $timeout(function () { $scope.HighlightBodyOnExtract() }, 50);
5159 5185  
5160 5186 // to do
5161 5187  
5162 5188 }
  5189 + else if ($rootScope.isListManagerSelected == true) {
  5190 + console.log('2. $rootScope.isExtract=true and $rootScope.isListManagerSelected == true')
  5191 + $timeout(function () { $scope.HighlightBodyOnExtract() }, 50);
  5192 +
  5193 + }
5163 5194 }
5164 5195  
5165 5196 }
... ...