ADAM / AIAHTML5

Commit d460ebff65a25078ce1fbb7369f2a4be04669762

Authored by Amrita Vishnoi
1 parent 25b9cb00

Renamed function name

Inline Side-by-side
Showing 2 changed files with 20 additions and 24 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @d460ebf
@@ -2166,13 +2166,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -2166,13 +2166,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2166 2166
2167 if ($scope.doAligneCanvasWithTerm == true) { 2167 if ($scope.doAligneCanvasWithTerm == true) {
2168 //debugger; 2168 //debugger;
2169 - if ($scope.isHighlightBodysystem == true || $rootScope.isListManagerSelected == true) 2169 + if ($scope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true)
2170 2170
2171 $rootScope.isLoading = false; 2171 $rootScope.isLoading = false;
2172 2172
2173 $('#spinner').css('visibility', 'hidden'); 2173 $('#spinner').css('visibility', 'hidden');
2174 2174
2175 - $scope.isHighlightBodysystem = false; 2175 + $scope.isHighlightBodyByBodySystem = false;
2176 2176
2177 if ($rootScope.isListManagerSelected == true) 2177 if ($rootScope.isListManagerSelected == true)
2178 $scope.aligneCanvasWithTerm(); 2178 $scope.aligneCanvasWithTerm();
@@ -4928,7 +4928,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -4928,7 +4928,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4928 $('#spinner').css('visibility', 'hidden'); 4928 $('#spinner').css('visibility', 'hidden');
4929 //} 4929 //}
4930 4930
4931 - if (($scope.isHighlightBodysystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) { 4931 + if (($scope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) {
4932 4932
4933 $scope.isLoading = true; 4933 $scope.isLoading = true;
4934 4934
@@ -6418,10 +6418,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -6418,10 +6418,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6418 6418
6419 }); 6419 });
6420 6420
6421 -  
6422 - //----End-----  
6423 -  
6424 -  
6425 //body highlight options functinality 6421 //body highlight options functinality
6426 $scope.LoadBodySystemData = function () { 6422 $scope.LoadBodySystemData = function () {
6427 6423
@@ -6452,10 +6448,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -6452,10 +6448,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6452 6448
6453 } 6449 }
6454 6450
6455 - $scope.HighlightBodysystem = function (event) { 6451 + $scope.HighlightBodyByBodySystem = function (event) {
6456 6452
6457 //NIKITA 6453 //NIKITA
6458 - $scope.isHighlightBodysystem = true; 6454 + $scope.isHighlightBodyByBodySystem = true;
6459 $scope.systemMatchedTermList = new jinqJs() 6455 $scope.systemMatchedTermList = new jinqJs()
6460 .from($rootScope.BodySystemData.BodySystem.BodySystemTerm) 6456 .from($rootScope.BodySystemData.BodySystem.BodySystemTerm)
6461 .where('_SystemNumber == ' + event.currentTarget.id) 6457 .where('_SystemNumber == ' + event.currentTarget.id)
@@ -6464,7 +6460,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -6464,7 +6460,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6464 if ($rootScope.isHighLight == false) { 6460 if ($rootScope.isHighLight == false) {
6465 //color the body gray 6461 //color the body gray
6466 $rootScope.isHighLight = true 6462 $rootScope.isHighLight = true
6467 - console.log('highLightBody from HighlightBodysystem') 6463 + console.log('highLightBody from HighlightBodyByBodySystem')
6468 $scope.highLightBody(); 6464 $scope.highLightBody();
6469 } 6465 }
6470 //now highlight the selected body system in whole body 6466 //now highlight the selected body system in whole body
@@ -6474,7 +6470,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -6474,7 +6470,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6474 $('#spinner').css('visibility', 'visible'); 6470 $('#spinner').css('visibility', 'visible');
6475 6471
6476 //NIKITA 6472 //NIKITA
6477 - // $scope.isHighlightBodysystem = true; 6473 + // $scope.isHighlightBodyByBodySystem = true;
6478 6474
6479 //if (systemMatchedTermList != null || systemMatchedTermList != undefined) { 6475 //if (systemMatchedTermList != null || systemMatchedTermList != undefined) {
6480 6476
@@ -6722,7 +6718,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -6722,7 +6718,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6722 $("#canvasDiv").scrollTop(scrolly); 6718 $("#canvasDiv").scrollTop(scrolly);
6723 $("#canvasDiv").scrollLeft(scrollx); 6719 $("#canvasDiv").scrollLeft(scrollx);
6724 6720
6725 - if (($scope.isHighlightBodysystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) { 6721 + if (($scope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) {
6726 $timeout(function () { $scope.HighlightBodyByTermList(systemMatchedTermList) }, 100); 6722 $timeout(function () { $scope.HighlightBodyByTermList(systemMatchedTermList) }, 100);
6727 } 6723 }
6728 6724
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @d460ebf
@@ -159,18 +159,18 @@ @@ -159,18 +159,18 @@
159 <ul class="dropdown-menu" aria-labelledby="dropdownMenu2"> 159 <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
160 <li ng-class="CurrentStructure"><a href="#" title="Current Structure">Current Structure</a></li> 160 <li ng-class="CurrentStructure"><a href="#" title="Current Structure">Current Structure</a></li>
161 <li role="separator" class="divider"></li> 161 <li role="separator" class="divider"></li>
162 - <li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" ng-click="HighlightBodysystem($event)">Cardiovascular</a></li>  
163 - <li ng-class="Digestive"><a href="#" title="Digestive" id="2" ng-click="HighlightBodysystem($event)">Digestive</a></li>  
164 - <li ng-class="Endocrine"><a href="#" title="Endocrine" id="3" ng-click="HighlightBodysystem($event)">Endocrine</a></li>  
165 - <li ng-class="Immune"><a href="#" title="Immune" id="4" ng-click="HighlightBodysystem($event)">Immune</a></li>  
166 - <li ng-class="Integumentary"><a href="#" title="Integumentary" id="5" ng-click="HighlightBodysystem($event)">Integumentary</a></li>  
167 - <li ng-class="Lymphatic"><a href="#" title="Lymphatic" id="6" ng-click="HighlightBodysystem($event)">Lymphatic</a></li>  
168 - <li ng-class="Muscular"><a href="#" title="Muscular" id="7" ng-click="HighlightBodysystem($event)">Muscular</a></li>  
169 - <li ng-class="Nervous"><a href="#" title="Nervous" id="8" ng-click="HighlightBodysystem($event)">Nervous</a></li>  
170 - <li ng-class="Reproductive"><a href="#" title="Reproductive" id="9" ng-click="HighlightBodysystem($event)">Reproductive</a></li>  
171 - <li ng-class="Respiratory"><a href="#" title="Respiratory" id="10" ng-click="HighlightBodysystem($event)">Respiratory</a></li>  
172 - <li ng-class="Skeletal"><a href="#" title="Skeletal" id="11" ng-click="HighlightBodysystem($event)">Skeletal</a></li>  
173 - <li ng-class="Urinary"><a href="#" title="Urinary" id="12" ng-click="HighlightBodysystem($event)">Urinary</a></li> 162 + <li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" ng-click="HighlightBodyByBodySystem($event)">Cardiovascular</a></li>
  163 + <li ng-class="Digestive"><a href="#" title="Digestive" id="2" ng-click="HighlightBodyByBodySystem($event)">Digestive</a></li>
  164 + <li ng-class="Endocrine"><a href="#" title="Endocrine" id="3" ng-click="HighlightBodyByBodySystem($event)">Endocrine</a></li>
  165 + <li ng-class="Immune"><a href="#" title="Immune" id="4" ng-click="HighlightBodyByBodySystem($event)">Immune</a></li>
  166 + <li ng-class="Integumentary"><a href="#" title="Integumentary" id="5" ng-click="HighlightBodyByBodySystem($event)">Integumentary</a></li>
  167 + <li ng-class="Lymphatic"><a href="#" title="Lymphatic" id="6" ng-click="HighlightBodyByBodySystem($event)">Lymphatic</a></li>
  168 + <li ng-class="Muscular"><a href="#" title="Muscular" id="7" ng-click="HighlightBodyByBodySystem($event)">Muscular</a></li>
  169 + <li ng-class="Nervous"><a href="#" title="Nervous" id="8" ng-click="HighlightBodyByBodySystem($event)">Nervous</a></li>
  170 + <li ng-class="Reproductive"><a href="#" title="Reproductive" id="9" ng-click="HighlightBodyByBodySystem($event)">Reproductive</a></li>
  171 + <li ng-class="Respiratory"><a href="#" title="Respiratory" id="10" ng-click="HighlightBodyByBodySystem($event)">Respiratory</a></li>
  172 + <li ng-class="Skeletal"><a href="#" title="Skeletal" id="11" ng-click="HighlightBodyByBodySystem($event)">Skeletal</a></li>
  173 + <li ng-class="Urinary"><a href="#" title="Urinary" id="12" ng-click="HighlightBodyByBodySystem($event)">Urinary</a></li>
174 </ul> 174 </ul>
175 </div> 175 </div>
176 <div class="col-sm-6 hover-gender-tool" ng-init="switchGender()"> 176 <div class="col-sm-6 hover-gender-tool" ng-init="switchGender()">