ADAM / AIAHTML5

Commit 3d7c24ebc875f18d8ff7c54ffa3b8377621c432e

Authored by unknown
2 parents 1962d8f8 40ea1f38

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Bugs_v4

Inline Side-by-side
Showing 3 changed files with 43 additions and 10 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @3d7c24e
... ... @@ -1492,7 +1492,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1492 1492  
1493 1493 // console.log('$rootScope.isListManagerSelected= ' + $rootScope.isListManagerSelected + ' length= ' + $scope.ColoredImageSRC.length)
1494 1494  
1495   -
1496 1495 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
1497 1496  
1498 1497 if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.ColoredImageSRC.length == 9)) {
... ... @@ -1848,6 +1847,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1848 1847 $rootScope.coloredImageCanvasList[parseInt(bodyRegionId - 1)] = coloredImageDataVar;
1849 1848 }
1850 1849 //
  1850 +
1851 1851  
1852 1852 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
1853 1853  
... ... @@ -2507,6 +2507,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2507 2507 //send actual term no to get the term text.
2508 2508 actualTermNo = $scope.matchedTermNoData[0]._ActualTermNumber;
2509 2509 annotationText = $scope.GetAnnotationBasedOnActualTermNo(actualTermNo);
  2510 + $rootScope.actualTermNumber = actualTermNo;
2510 2511 break;
2511 2512 };
2512 2513  
... ... @@ -5631,7 +5632,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5631 5632 $('#spinner').css('visibility', 'visible');
5632 5633 $timeout(function () { $scope.HighlightBodyByTermList($scope.systemMatchedTermList) }, 100);
5633 5634 }
5634   - else if ($rootScope.isListManagerSelected == true) {
  5635 + else if (($rootScope.isListManagerSelected == true) || ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0) && ($rootScope.isGenderChnage==true || $rootScope.isViewChange==true)) {
5635 5636  
5636 5637 // console.log('$scope.grayedBR.length is ' + $scope.grayedBR.length);
5637 5638 $timeout(function () {
... ... @@ -5914,6 +5915,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5914 5915 var viewname = localStorage.getItem("currentViewTitle")
5915 5916 var currentBodyViewId = $scope.correspondingBodyViewIds[$rootScope.voId];
5916 5917  
  5918 +
5917 5919 if ((event.currentTarget.attributes[1].value == 'Male') && (localStorage.getItem("genderId") == 'Female')) {
5918 5920  
5919 5921 //1.
... ... @@ -5925,8 +5927,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5925 5927 $rootScope.isLoading = true;
5926 5928 $('#spinner').css('visibility', 'visible');
5927 5929 //3.
5928   - $scope.layerNumber = 0;
5929   - $scope.loadSelectedBodyView(currentBodyViewId);
  5930 +
  5931 + $scope.layerNumber = 0;
  5932 + $scope.loadSelectedBodyView(currentBodyViewId);
  5933 +
5930 5934  
5931 5935 //4.
5932 5936 $scope.loadSelectedBodyViewNavigator(currentBodyViewId);
... ... @@ -5955,8 +5959,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5955 5959 $rootScope.isLoading = true;
5956 5960 $('#spinner').css('visibility', 'visible');
5957 5961 //3.
5958   - $scope.layerNumber = 0;
5959   - $scope.loadSelectedBodyView(currentBodyViewId);
  5962 +
  5963 + $scope.layerNumber = 0;
  5964 + $scope.loadSelectedBodyView(currentBodyViewId);
  5965 +
5960 5966  
5961 5967 //4.
5962 5968 $scope.loadSelectedBodyViewNavigator(currentBodyViewId);
... ... @@ -6065,7 +6071,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6065 6071 }
6066 6072 //if user seelcted any term and serached before gender cnage then itshould be highlighted in chnaged gender
6067 6073  
6068   - if (($rootScope.isListManagerSelected == true) && (($rootScope.isGenderChnage == true) || $rootScope.isViewChange == true)) {
  6074 + if ((($rootScope.isListManagerSelected == true) || ($rootScope.isHighLight == true && $rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0)) && (($rootScope.isGenderChnage == true) || $rootScope.isViewChange == true)) {
6069 6075  
6070 6076 $scope.setLayerNumberAndHighlightByTermList();
6071 6077  
... ... @@ -7114,7 +7120,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7114 7120  
7115 7121 //9.
7116 7122 $timeout(function () {
7117   - $rootScope.isHighLight = false;
  7123 + if(($rootScope.isGenderChnage == true && $rootScope.isHighLight==true) || ($rootScope.isViewChange == true && $rootScope.isHighLight==true)){
  7124 +
  7125 + }
  7126 + else{
  7127 + $rootScope.isHighLight = false;
  7128 + }
7118 7129 $('#sppeachBubble').css('display', 'none');
7119 7130 $("#dot").css("display", "none");
7120 7131 //DA > Annotation's Line should not displayed.
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
  View file @3d7c24e
... ... @@ -35,7 +35,18 @@
35 35 <div class="col-md-2 col-sm-4 pad-lftrgt3">
36 36 <div class="form-group">
37 37 <h6 class="text-center text-primary txt-white f11">Search</h6>
38   - <button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button>&nbsp;<button class="btn btn-primary btn-sm col-md-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>
  38 +
  39 +
  40 + <div class="btn-group col-xs-12" style="padding:0;">
  41 + <button type="button" class="btn btn-primary btn-sm col-xs-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>
  42 + <button type="button" class="btn btn-primary btn-sm col-xs-3" ng-click="ApplySearch(query)">
  43 + <i class="fa fa-search"></i>
  44 + </button>
  45 +
  46 + </div>
  47 +
  48 +
  49 + <!--<button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button>&nbsp;<button class="btn btn-primary btn-sm col-md-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>-->
39 50 </div>
40 51 </div>
41 52 </div>
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
  View file @3d7c24e
... ... @@ -49,7 +49,18 @@
49 49 <div class="col-md-2 col-sm-4 pad-lftrgt3">
50 50 <div class="form-group">
51 51 <h6 class="text-center text-primary txt-white f11">Search</h6>
52   - <button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button>&nbsp;<button class="btn btn-primary btn-sm col-md-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>
  52 +
  53 + <div class="btn-group col-xs-12" style="padding:0;">
  54 + <button type="button" class="btn btn-primary btn-sm col-xs-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>
  55 + <button type="button" class="btn btn-primary btn-sm col-xs-3" ng-click="ApplySearch(query)">
  56 + <i class="fa fa-search"></i>
  57 + </button>
  58 +
  59 + </div>
  60 +
  61 +
  62 +
  63 + <!--<button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button>&nbsp;<button class="btn btn-primary btn-sm col-md-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>-->
53 64 </div>
54 65 </div>
55 66 </div>
... ...