diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 1fce044..5ee8feb 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -5489,7 +5489,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //if listanager is visisble then close it - $rootScope.isListManagerSelected = false; + // $rootScope.isListManagerSelected = false; $rootScope.CloseListManager(); $rootScope.isLoading = true; @@ -5630,7 +5630,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo if (canDivChildCount > 0) { canDiv.innerHTML = ''; } - $scope.CalculateImageCordinates($rootScope.viewOrientationId); + //if user seelcted any term and serached before gender cnage then itshould be highlighted in chnaged gender + + if (($rootScope.isListManagerSelected == true) && ($rootScope.isGenderChnage == true)) { + + $scope.setLayerNumberAndHighlightByTermList(); + + } + + else { + + $scope.CalculateImageCordinates($rootScope.viewOrientationId); + + } + $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle"); }, function (error) { @@ -7338,19 +7351,27 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.HighlightBodyOnListManagerSelection = function (event) { $scope.terminateCurrentlyRunningWPs(); - + //debugger $rootScope.isListManagerSelected = true; - - $rootScope.setScrollBasedOnSearch = true; - $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); //1. - var actualTermNumber = event.currentTarget.id;//attributes[0].value; - $scope.TermList = $scope.getTermNumberList(actualTermNumber); + $rootScope.actualTermNumber = event.currentTarget.id;//attributes[0].value; + console.log(' $scope.actualTermNumber insde HighlightBodyOnListManagerSelection= ' + $rootScope.actualTermNumber) //2. + + $scope.setLayerNumberAndHighlightByTermList(); + + + } + + $scope.setLayerNumberAndHighlightByTermList = function () { + console.log(' $scope.actualTermNumber insde setLayerNumberAndHighlightByTermList= ' + $rootScope.actualTermNumber) + + $scope.TermList = $scope.getTermNumberList($rootScope.actualTermNumber); + var internalLayerNumberList = []; for (var i = 0; i < $scope.TermList.length; i++) { var layerNumber = $scope.TermList[i]._InternalLayerNumber @@ -7390,9 +7411,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.layerNumber = layerNumber; //4.get scroll position - if (actualTermNumber != DA[0].SKIN_TERM_ID) { + if ($rootScope.actualTermNumber != DA[0].SKIN_TERM_ID) { - $scope.termCoordinate = $scope.getTermCoordinate(actualTermNumber); + $scope.termCoordinate = $scope.getTermCoordinate($rootScope.actualTermNumber); } @@ -7407,7 +7428,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //6. var matchedDataonActualTerm = new jinqJs() .from($scope.matchdedDataOnLayer) - .where('_ActualTermNumber == ' + actualTermNumber) + .where('_ActualTermNumber == ' + $scope.actualTermNumber) .select('_TermNumber'); if (matchedDataonActualTerm != null || matchedDataonActualTerm != undefined) { @@ -7445,9 +7466,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //redraw body of respective layer $scope.CalculateImageCordinates($rootScope.viewOrientationId) }, 500); - - - } $scope.getChildTermList = function (termNo) {