ADAM / AIAHTML5

Commit 66fc170f17c73187d5504d77cfe07206f9bfd325

Authored by Nikita Kulshreshtha
1 parent 5778e0a8

on gender change searched highlited portion is hilghlighted.

Inline Side-by-side
Showing 1 changed file with 32 additions and 14 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @66fc170
... ... @@ -5489,7 +5489,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5489 5489  
5490 5490 //if listanager is visisble then close it
5491 5491  
5492   - $rootScope.isListManagerSelected = false;
  5492 + // $rootScope.isListManagerSelected = false;
5493 5493 $rootScope.CloseListManager();
5494 5494  
5495 5495 $rootScope.isLoading = true;
... ... @@ -5630,7 +5630,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5630 5630 if (canDivChildCount > 0) {
5631 5631 canDiv.innerHTML = '';
5632 5632 }
5633   - $scope.CalculateImageCordinates($rootScope.viewOrientationId);
  5633 + //if user seelcted any term and serached before gender cnage then itshould be highlighted in chnaged gender
  5634 +
  5635 + if (($rootScope.isListManagerSelected == true) && ($rootScope.isGenderChnage == true)) {
  5636 +
  5637 + $scope.setLayerNumberAndHighlightByTermList();
  5638 +
  5639 + }
  5640 +
  5641 + else {
  5642 +
  5643 + $scope.CalculateImageCordinates($rootScope.viewOrientationId);
  5644 +
  5645 + }
  5646 +
5634 5647 $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
5635 5648 },
5636 5649 function (error) {
... ... @@ -7338,19 +7351,27 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7338 7351 $scope.HighlightBodyOnListManagerSelection = function (event) {
7339 7352  
7340 7353 $scope.terminateCurrentlyRunningWPs();
7341   -
  7354 + //debugger
7342 7355 $rootScope.isListManagerSelected = true;
7343   -
7344   - $rootScope.setScrollBasedOnSearch = true;
7345   -
7346 7356 $rootScope.isLoading = true;
7347 7357  
7348 7358 $('#spinner').css('visibility', 'visible');
7349 7359 //1.
7350   - var actualTermNumber = event.currentTarget.id;//attributes[0].value;
7351   - $scope.TermList = $scope.getTermNumberList(actualTermNumber);
  7360 + $rootScope.actualTermNumber = event.currentTarget.id;//attributes[0].value;
  7361 + console.log(' $scope.actualTermNumber insde HighlightBodyOnListManagerSelection= ' + $rootScope.actualTermNumber)
7352 7362  
7353 7363 //2.
  7364 +
  7365 + $scope.setLayerNumberAndHighlightByTermList();
  7366 +
  7367 +
  7368 + }
  7369 +
  7370 + $scope.setLayerNumberAndHighlightByTermList = function () {
  7371 + console.log(' $scope.actualTermNumber insde setLayerNumberAndHighlightByTermList= ' + $rootScope.actualTermNumber)
  7372 +
  7373 + $scope.TermList = $scope.getTermNumberList($rootScope.actualTermNumber);
  7374 +
7354 7375 var internalLayerNumberList = [];
7355 7376 for (var i = 0; i < $scope.TermList.length; i++) {
7356 7377 var layerNumber = $scope.TermList[i]._InternalLayerNumber
... ... @@ -7390,9 +7411,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7390 7411 $scope.layerNumber = layerNumber;
7391 7412  
7392 7413 //4.get scroll position
7393   - if (actualTermNumber != DA[0].SKIN_TERM_ID) {
  7414 + if ($rootScope.actualTermNumber != DA[0].SKIN_TERM_ID) {
7394 7415  
7395   - $scope.termCoordinate = $scope.getTermCoordinate(actualTermNumber);
  7416 + $scope.termCoordinate = $scope.getTermCoordinate($rootScope.actualTermNumber);
7396 7417  
7397 7418 }
7398 7419  
... ... @@ -7407,7 +7428,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7407 7428 //6.
7408 7429 var matchedDataonActualTerm = new jinqJs()
7409 7430 .from($scope.matchdedDataOnLayer)
7410   - .where('_ActualTermNumber == ' + actualTermNumber)
  7431 + .where('_ActualTermNumber == ' + $scope.actualTermNumber)
7411 7432 .select('_TermNumber');
7412 7433  
7413 7434 if (matchedDataonActualTerm != null || matchedDataonActualTerm != undefined) {
... ... @@ -7445,9 +7466,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7445 7466 //redraw body of respective layer
7446 7467 $scope.CalculateImageCordinates($rootScope.viewOrientationId)
7447 7468 }, 500);
7448   -
7449   -
7450   -
7451 7469 }
7452 7470  
7453 7471 $scope.getChildTermList = function (termNo) {
... ...