From 0f6ed55c2ad1bd9a107605a5756874224107918e Mon Sep 17 00:00:00 2001 From: nikita Date: Thu, 8 Sep 2016 14:06:28 +0530 Subject: [PATCH] Refs: #7098 --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 6312a3e..6a3baff 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1004,7 +1004,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.one = 1; + if ($rootScope.isListManagerSelected == true) { + $scope.layerNumber = $('#txtlayerNumber').val(); + } + $scope.userInput = parseInt($scope.layerNumber); + + $scope.skinTone = $rootScope.globalSetting.ethnicity; var SelectedLayerData = []; @@ -1765,11 +1771,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.HighlightBodyOnExtract = function () { - + var multiTermList = []; var CallBackBodyRegion = []; - if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) { + if ($rootScope.isListManagerSelected) { + + multiTermList = $scope.AllTerms; + + } + else if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) { angular.forEach($rootScope.previousHighlightList, function (value, key) { var ActualTermNo = $scope.getActualTermNumber(value); @@ -1953,7 +1964,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } } } - }, 50) + }, 500) } @@ -1968,6 +1979,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo // $rootScope.updatedGrayDataList = []; //} + if ($rootScope.isHighLight == true) { + false; + } + console.log('HighlightBodyByTermList is called'); // $scope.highlightedBR = null; @@ -4972,6 +4987,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $('#spinner').css('visibility', 'hidden'); //} + + if (($scope.isHighlightBodysystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) { $scope.isLoading = true; @@ -5003,9 +5020,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo if ($rootScope.isExtract == true) { if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && $rootScope.previousHighlightList.length > 0) { + console.log('1. $rootScope.isExtract=true and $rootScope.previousHighlightList != null') $timeout(function () { $scope.HighlightBodyOnExtract() }, 50); } + else if ($rootScope.isListManagerSelected == true) { + console.log('1. $rootScope.isExtract=true and $rootScope.isListManagerSelected == true') + + $timeout(function () { $scope.HighlightBodyOnExtract() }, 50); + + } } //else { // // 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 }) if ($rootScope.isExtract == true) { - if ($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined || $rootScope.previousHighlightList.length > 0) { + if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && $rootScope.previousHighlightList.length > 0) { + console.log('2. $rootScope.isExtract=true and $rootScope.previousHighlightList != null, $rootScope.previousHighlightList.length= ' + $rootScope.previousHighlightList.length) + $timeout(function () { $scope.HighlightBodyOnExtract() }, 50); // to do } + else if ($rootScope.isListManagerSelected == true) { + console.log('2. $rootScope.isExtract=true and $rootScope.isListManagerSelected == true') + $timeout(function () { $scope.HighlightBodyOnExtract() }, 50); + + } } } -- libgit2 0.21.4