Commit ea07fa2546675353fed8f1379d8520a62062bbc8
Against Merge Request #808
Showing
2 changed files
with
21 additions
and
4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| @@ -113,7 +113,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -113,7 +113,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
| 113 | $scope.IsSearchVisible = false; | 113 | $scope.IsSearchVisible = false; |
| 114 | $scope.shapesize = 1; | 114 | $scope.shapesize = 1; |
| 115 | 115 | ||
| 116 | - | 116 | + $scope.CurrentStructure = "active"; |
| 117 | //array for bodyviewid correspoing to male female(used for gender change) | 117 | //array for bodyviewid correspoing to male female(used for gender change) |
| 118 | $scope.correspondingBodyViewIds = { | 118 | $scope.correspondingBodyViewIds = { |
| 119 | '1': '5', | 119 | '1': '5', |
| @@ -8583,8 +8583,22 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | @@ -8583,8 +8583,22 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l | ||
| 8583 | } | 8583 | } |
| 8584 | 8584 | ||
| 8585 | $scope.removeBodySyetemSelectionClass = function (title_highlightbody) { | 8585 | $scope.removeBodySyetemSelectionClass = function (title_highlightbody) { |
| 8586 | - | ||
| 8587 | - if (title_highlightbody == "Cardiovascular") { | 8586 | + if (title_highlightbody == "CurrentStructure") { |
| 8587 | + $scope.CurrentStructure = "active"; | ||
| 8588 | + $scope.Cardiovascular = ""; | ||
| 8589 | + $scope.Digestive = ""; | ||
| 8590 | + $scope.Endocrine = ""; | ||
| 8591 | + $scope.Immune = ""; | ||
| 8592 | + $scope.Integumentary = ""; | ||
| 8593 | + $scope.Lymphatic = ""; | ||
| 8594 | + $scope.Muscular = ""; | ||
| 8595 | + $scope.Nervous = ""; | ||
| 8596 | + $scope.Reproductive = ""; | ||
| 8597 | + $scope.Respiratory = ""; | ||
| 8598 | + $scope.Skeletal = ""; | ||
| 8599 | + $scope.Urinary = ""; | ||
| 8600 | + } | ||
| 8601 | + else if (title_highlightbody == "Cardiovascular") { | ||
| 8588 | $scope.CurrentStructure = ""; | 8602 | $scope.CurrentStructure = ""; |
| 8589 | $scope.Cardiovascular = "active"; | 8603 | $scope.Cardiovascular = "active"; |
| 8590 | $scope.Digestive = ""; | 8604 | $scope.Digestive = ""; |
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
| @@ -168,7 +168,10 @@ | @@ -168,7 +168,10 @@ | ||
| 168 | <div class="custom-tooltip">Highlight Options</div> | 168 | <div class="custom-tooltip">Highlight Options</div> |
| 169 | <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" ng-click="LoadBodySystemData()"><img src="content/images/icon-highlight.png" alt="" title=""></button> | 169 | <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" ng-click="LoadBodySystemData()"><img src="content/images/icon-highlight.png" alt="" title=""></button> |
| 170 | <ul class="dropdown-menu" aria-labelledby="dropdownMenu2"> | 170 | <ul class="dropdown-menu" aria-labelledby="dropdownMenu2"> |
| 171 | - <li ng-class="CurrentStructure"><a href="#" title="Current Structure" id="0" onclick="OnBodySystemSelection(event)">Current Structure</a></li> | 171 | + <li ng-class="CurrentStructure" ><a href="#" title="Current Structure" |
| 172 | + ng-click="removeBodySyetemSelectionClass('CurrentStructure')">Current Structure</a></li> | ||
| 173 | + | ||
| 174 | + | ||
| 172 | <li role="separator" class="divider"></li> | 175 | <li role="separator" class="divider"></li> |
| 173 | <!--<li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" ng-click="HighlightBodyByBodySystem($event)">Cardiovascular</a></li> | 176 | <!--<li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" ng-click="HighlightBodyByBodySystem($event)">Cardiovascular</a></li> |
| 174 | <li ng-class="Digestive"><a href="#" title="Digestive" id="2" ng-click="HighlightBodyByBodySystem($event)">Digestive</a></li> | 177 | <li ng-class="Digestive"><a href="#" title="Digestive" id="2" ng-click="HighlightBodyByBodySystem($event)">Digestive</a></li> |