ADAM / AIAHTML5

Commit 25dcbbd49a659f2fb57bb0e989f008e6ae2b3ab1

Authored by Nikita Kulshreshtha
1 parent 2988be2f

Refs: #7375

Inline Side-by-side
Showing 1 changed file with 27 additions and 10 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @25dcbbd
... ... @@ -5090,6 +5090,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5090 5090 $timeout(function () { $scope.HighlightBodyByTermList($scope.systemMatchedTermList) }, 100);
5091 5091 }
5092 5092 else if ($rootScope.isListManagerSelected == true) {
  5093 + console.log('$rootScope.isListManagerSelected == true')
5093 5094 $scope.isLoading = true;
5094 5095  
5095 5096 $('#spinner').css('visibility', 'visible');
... ... @@ -5367,7 +5368,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5367 5368  
5368 5369 //if listanager is visisble then close it
5369 5370  
5370   - $rootScope.isListManagerSelected = false;
  5371 + //$rootScope.isListManagerSelected = false;
5371 5372 $rootScope.CloseListManager();
5372 5373  
5373 5374 $rootScope.isLoading = true;
... ... @@ -5508,7 +5509,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5508 5509 if (canDivChildCount > 0) {
5509 5510 canDiv.innerHTML = '';
5510 5511 }
5511   - $scope.CalculateImageCordinates($rootScope.viewOrientationId);
  5512 +
  5513 +
  5514 + //if user seelcted any term and serached before gender cnage then itshould be highlighted in chnaged gender
  5515 + if (($rootScope.isListManagerSelected == true) && ($rootScope.isGenderChnage == true)) {
  5516 + $scope.setLayerNumberAndHighlightByTermList();
  5517 + }
  5518 + else {
  5519 + $scope.CalculateImageCordinates($rootScope.viewOrientationId);
  5520 + }
5512 5521 $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle");
5513 5522 },
5514 5523 function (error) {
... ... @@ -7066,10 +7075,21 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7066 7075  
7067 7076 $('#spinner').css('visibility', 'visible');
7068 7077 //1.
7069   - var actualTermNumber = event.currentTarget.id;//attributes[0].value;
7070   - $scope.TermList = $scope.getTermNumberList(actualTermNumber);
  7078 + $rootScope.actualTermNumber = event.currentTarget.id;//attributes[0].value;
  7079 + console.log(' $scope.actualTermNumber insde HighlightBodyOnListManagerSelection= ' + $rootScope.actualTermNumber)
7071 7080  
7072 7081 //2.
  7082 +
  7083 + $scope.setLayerNumberAndHighlightByTermList();
  7084 +
  7085 +
  7086 + }
  7087 +
  7088 + $scope.setLayerNumberAndHighlightByTermList = function () {
  7089 + console.log(' $scope.actualTermNumber insde setLayerNumberAndHighlightByTermList= ' + $rootScope.actualTermNumber)
  7090 +
  7091 + $scope.TermList = $scope.getTermNumberList($rootScope.actualTermNumber);
  7092 +
7073 7093 var internalLayerNumberList = [];
7074 7094 for (var i = 0; i < $scope.TermList.length; i++) {
7075 7095 var layerNumber = $scope.TermList[i]._InternalLayerNumber
... ... @@ -7109,9 +7129,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7109 7129 $scope.layerNumber = layerNumber;
7110 7130  
7111 7131 //4.get scroll position
7112   - if (actualTermNumber != DA[0].SKIN_TERM_ID) {
  7132 + if ($rootScope.actualTermNumber != DA[0].SKIN_TERM_ID) {
7113 7133  
7114   - $scope.termCoordinate = $scope.getTermCoordinate(actualTermNumber);
  7134 + $scope.termCoordinate = $scope.getTermCoordinate($rootScope.actualTermNumber);
7115 7135  
7116 7136 }
7117 7137  
... ... @@ -7126,7 +7146,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7126 7146 //6.
7127 7147 var matchedDataonActualTerm = new jinqJs()
7128 7148 .from($scope.matchdedDataOnLayer)
7129   - .where('_ActualTermNumber == ' + actualTermNumber)
  7149 + .where('_ActualTermNumber == ' + $scope.actualTermNumber)
7130 7150 .select('_TermNumber');
7131 7151  
7132 7152 if (matchedDataonActualTerm != null || matchedDataonActualTerm != undefined) {
... ... @@ -7164,9 +7184,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7164 7184 //redraw body of respective layer
7165 7185 $scope.CalculateImageCordinates($rootScope.viewOrientationId)
7166 7186 }, 500);
7167   -
7168   -
7169   -
7170 7187 }
7171 7188  
7172 7189 $scope.getChildTermList = function (termNo) {
... ...