Commit ea07fa2546675353fed8f1379d8520a62062bbc8

Authored by Amrita Vishnoi
2 parents 65f49340 1b7ae462

Against Merge Request #808

400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
... ... @@ -113,7 +113,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
113 113 $scope.IsSearchVisible = false;
114 114 $scope.shapesize = 1;
115 115  
116   -
  116 + $scope.CurrentStructure = "active";
117 117 //array for bodyviewid correspoing to male female(used for gender change)
118 118 $scope.correspondingBodyViewIds = {
119 119 '1': '5',
... ... @@ -8583,8 +8583,22 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
8583 8583 }
8584 8584  
8585 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 8602 $scope.CurrentStructure = "";
8589 8603 $scope.Cardiovascular = "active";
8590 8604 $scope.Digestive = "";
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
... ... @@ -168,7 +168,10 @@
168 168 <div class="custom-tooltip">Highlight Options</div>
169 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 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 175 <li role="separator" class="divider"></li>
173 176 <!--<li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" ng-click="HighlightBodyByBodySystem($event)">Cardiovascular</a></li>
174 177 <li ng-class="Digestive"><a href="#" title="Digestive" id="2" ng-click="HighlightBodyByBodySystem($event)">Digestive</a></li>
... ...