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

unknown
2 parents 1962d8f8 40ea1f38
Showing 3 changed files with 43 additions and 10 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
@@ -1492,7 +1492,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 //   console.log('$rootScope.isListManagerSelected= ' + $rootScope.isListManagerSelected + ' length= ' + $scope.ColoredImageSRC.length)
-
                     if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
                     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
                         $rootScope.coloredImageCanvasList[parseInt(bodyRegionId - 1)] = coloredImageDataVar;
                     }
                     //
+                    
                     if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
@@ -2507,6 +2507,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                         //send actual term no to get the term text.
                         actualTermNo = $scope.matchedTermNoData[0]._ActualTermNumber;
                         annotationText = $scope.GetAnnotationBasedOnActualTermNo(actualTermNo);
+                        $rootScope.actualTermNumber = actualTermNo;
                         break;
                     };
@@ -5631,7 +5632,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                                             $('#spinner').css('visibility', 'visible');
                                             $timeout(function () { $scope.HighlightBodyByTermList($scope.systemMatchedTermList) }, 100);
                                         }
-                                        else if ($rootScope.isListManagerSelected == true) {
+                                        else if (($rootScope.isListManagerSelected == true) || ($rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0) && ($rootScope.isGenderChnage==true || $rootScope.isViewChange==true)) {
                                             // console.log('$scope.grayedBR.length is ' + $scope.grayedBR.length);
                                             $timeout(function () {
@@ -5914,6 +5915,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         var viewname = localStorage.getItem("currentViewTitle")
         var currentBodyViewId = $scope.correspondingBodyViewIds[$rootScope.voId];
+        
         if ((event.currentTarget.attributes[1].value == 'Male') && (localStorage.getItem("genderId") == 'Female')) {
             //1.
@@ -5925,8 +5927,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $rootScope.isLoading = true;
             $('#spinner').css('visibility', 'visible');
             //3.
-            $scope.layerNumber = 0;
-            $scope.loadSelectedBodyView(currentBodyViewId);
+          
+                $scope.layerNumber = 0;
+                $scope.loadSelectedBodyView(currentBodyViewId);
+           
             //4.
             $scope.loadSelectedBodyViewNavigator(currentBodyViewId);
@@ -5955,8 +5959,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $rootScope.isLoading = true;
             $('#spinner').css('visibility', 'visible');
             //3.
-            $scope.layerNumber = 0;
-            $scope.loadSelectedBodyView(currentBodyViewId);
+            
+                $scope.layerNumber = 0;
+                $scope.loadSelectedBodyView(currentBodyViewId);
+            
             //4.
             $scope.loadSelectedBodyViewNavigator(currentBodyViewId);
@@ -6065,7 +6071,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                  }
                  //if user seelcted any term and serached before gender cnage then itshould be highlighted in chnaged gender
-                 if (($rootScope.isListManagerSelected == true) && (($rootScope.isGenderChnage == true) || $rootScope.isViewChange == true)) {
+                 if ((($rootScope.isListManagerSelected == true) || ($rootScope.isHighLight == true && $rootScope.previousHighlightList != null && $rootScope.previousHighlightList.length > 0)) && (($rootScope.isGenderChnage == true) || $rootScope.isViewChange == true)) {
                      $scope.setLayerNumberAndHighlightByTermList();
@@ -7114,7 +7120,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         //9.
         $timeout(function () {
-            $rootScope.isHighLight = false;
+            if(($rootScope.isGenderChnage == true && $rootScope.isHighLight==true) || ($rootScope.isViewChange == true && $rootScope.isHighLight==true)){
+
+            }
+            else{
+                $rootScope.isHighLight = false;
+            }
             $('#sppeachBubble').css('display', 'none');
             $("#dot").css("display", "none");
             //DA > Annotation's Line should not displayed.
@@ -35,7 +35,18 @@
                         <div class="col-md-2 col-sm-4 pad-lftrgt3">
                             <div class="form-group">
                                 <h6 class="text-center text-primary txt-white f11">Search</h6>
-                                <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>
+
+
+                                <div class="btn-group col-xs-12" style="padding:0;">
+                                    <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>
+                                    <button type="button" class="btn btn-primary btn-sm col-xs-3" ng-click="ApplySearch(query)">
+                                        <i class="fa fa-search"></i>
+                                    </button>
+
+                                </div>
+
+
+                                <!--<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>-->
                             </div>
                         </div>
                     </div>
@@ -49,7 +49,18 @@
                     <div class="col-md-2 col-sm-4 pad-lftrgt3">
                         <div class="form-group">
                             <h6 class="text-center text-primary txt-white f11">Search</h6>
-                            <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>
+
+                            <div class="btn-group col-xs-12" style="padding:0;">
+                                <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>
+                                <button type="button" class="btn btn-primary btn-sm col-xs-3" ng-click="ApplySearch(query)">
+                                    <i class="fa fa-search"></i>
+                                </button>
+                               
+                            </div>
+
+
+
+                            <!--<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>-->
                         </div>
                     </div>
                 </div>