ADAM / AIAHTML5

Commit 8e20363f1bdd1b644a108d6c4245db1b420224f0

Authored by Amrita Vishnoi
2 parents 25b9cb00 786293c2

Merge branch 'HighLightOptions' into Develop

Inline Side-by-side
Showing 4 changed files with 27 additions and 25 deletions
150-DOCUMENTATION/AIA-Aug-Report.pptx 0 → 100644
View file @8e20363
No preview for this file type
150-DOCUMENTATION/AIA-July-Report.pptx
View file @8e20363
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @8e20363
... ... @@ -2166,13 +2166,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2166 2166  
2167 2167 if ($scope.doAligneCanvasWithTerm == true) {
2168 2168 //debugger;
2169   - if ($scope.isHighlightBodysystem == true || $rootScope.isListManagerSelected == true)
  2169 + if ($scope.isHighlightBodyByBodySystem == true || $rootScope.isListManagerSelected == true)
2170 2170  
2171 2171 $rootScope.isLoading = false;
2172 2172  
2173 2173 $('#spinner').css('visibility', 'hidden');
2174 2174  
2175   - $scope.isHighlightBodysystem = false;
  2175 + $scope.isHighlightBodyByBodySystem = false;
2176 2176  
2177 2177 if ($rootScope.isListManagerSelected == true)
2178 2178 $scope.aligneCanvasWithTerm();
... ... @@ -2439,7 +2439,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2439 2439 $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition)
2440 2440 $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition)
2441 2441  
2442   - $timeout(function () { $scope.DisableProgressBar() }, 1000);
  2442 + if ($scope.isHighlightBodyByBodySystem) {
  2443 + $timeout(function () { $scope.DisableProgressBar() }, 20000);
  2444 + }
  2445 + else
  2446 + {
  2447 + $timeout(function () { $scope.DisableProgressBar() }, 2000);
  2448 + }
2443 2449 }
2444 2450  
2445 2451 $('#layerChangeSlider').slider("option", "value", parseInt($scope.totalLayers) - parseInt($scope.layerNumber));
... ... @@ -4928,7 +4934,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4928 4934 $('#spinner').css('visibility', 'hidden');
4929 4935 //}
4930 4936  
4931   - if (($scope.isHighlightBodysystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) {
  4937 + if (($scope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) {
4932 4938  
4933 4939 $scope.isLoading = true;
4934 4940  
... ... @@ -6418,10 +6424,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6418 6424  
6419 6425 });
6420 6426  
6421   -
6422   - //----End-----
6423   -
6424   -
6425 6427 //body highlight options functinality
6426 6428 $scope.LoadBodySystemData = function () {
6427 6429  
... ... @@ -6452,10 +6454,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6452 6454  
6453 6455 }
6454 6456  
6455   - $scope.HighlightBodysystem = function (event) {
  6457 + $scope.HighlightBodyByBodySystem = function (event) {
6456 6458  
6457 6459 //NIKITA
6458   - $scope.isHighlightBodysystem = true;
  6460 + $scope.isHighlightBodyByBodySystem = true;
6459 6461 $scope.systemMatchedTermList = new jinqJs()
6460 6462 .from($rootScope.BodySystemData.BodySystem.BodySystemTerm)
6461 6463 .where('_SystemNumber == ' + event.currentTarget.id)
... ... @@ -6464,7 +6466,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6464 6466 if ($rootScope.isHighLight == false) {
6465 6467 //color the body gray
6466 6468 $rootScope.isHighLight = true
6467   - console.log('highLightBody from HighlightBodysystem')
  6469 + console.log('highLightBody from HighlightBodyByBodySystem')
6468 6470 $scope.highLightBody();
6469 6471 }
6470 6472 //now highlight the selected body system in whole body
... ... @@ -6474,7 +6476,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6474 6476 $('#spinner').css('visibility', 'visible');
6475 6477  
6476 6478 //NIKITA
6477   - // $scope.isHighlightBodysystem = true;
  6479 + // $scope.isHighlightBodyByBodySystem = true;
6478 6480  
6479 6481 //if (systemMatchedTermList != null || systemMatchedTermList != undefined) {
6480 6482  
... ... @@ -6722,7 +6724,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6722 6724 $("#canvasDiv").scrollTop(scrolly);
6723 6725 $("#canvasDiv").scrollLeft(scrollx);
6724 6726  
6725   - if (($scope.isHighlightBodysystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) {
  6727 + if (($scope.isHighlightBodyByBodySystem == true) && ($scope.systemMatchedTermList != null || $scope.systemMatchedTermList != undefined)) {
6726 6728 $timeout(function () { $scope.HighlightBodyByTermList(systemMatchedTermList) }, 100);
6727 6729 }
6728 6730  
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @8e20363
... ... @@ -159,18 +159,18 @@
159 159 <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
160 160 <li ng-class="CurrentStructure"><a href="#" title="Current Structure">Current Structure</a></li>
161 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 174 </ul>
175 175 </div>
176 176 <div class="col-sm-6 hover-gender-tool" ng-init="switchGender()">
... ...