ADAM / AIAHTML5

Commit b17f8fce976e2d7567957472a6d167e0cc8b01db

Authored by Mukul Rajput
1 parent 9c3f0aab

this is solution for the bug 20259 AA highlight issue in body system

Inline Side-by-side
Showing 3 changed files with 50 additions and 17 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @b17f8fc
... ... @@ -312,12 +312,14 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
312 312 var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a");
313 313 var bodySystemListlength = bodySystemListObj.length;
314 314 for (var i = 0; i < bodySystemListlength; i++) {
  315 +
315 316 //var boldTag = lis[i];
316 317 for (var j = 0; j < $rootScope.bodySystemNames.length; j++) {
317 318 if ((bodySystemListObj[i].innerHTML) == ($rootScope.bodySystemNames[j])) {
318   - $("#" + i).parent().removeClass("disabled");
319   -
  319 + $("#" + i).parent().removeClass("disabledSelectedSystem");
  320 +
320 321 }
  322 +
321 323 }
322 324  
323 325 }
... ... @@ -592,12 +594,22 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
592 594  
593 595 $scope.showSelectedSystemPins = function (event) {
594 596  
  597 +
  598 + var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a");
  599 + var bodySystemListlength = bodySystemListObj.length;
  600 + for (var i = 0; i < bodySystemListlength; i++)
  601 + {
  602 +
  603 + $("#" + i).parent().removeClass("activeAASystemSelect");
  604 + }
  605 + $("#" + event.currentTarget.id).parent().addClass("activeAASystemSelect");
  606 +
595 607 $rootScope.isLoading = true;
596 608 $('#spinner').css('visibility', 'visible');
597 609  
598 610 $scope.removeSpeechBubble();
599 611 if (event.currentTarget.id == "0") {
600   -
  612 +
601 613 $scope.selectedSystemName = null;
602 614 if ($scope.isHidePinBtnClicked) {
603 615  
... ... @@ -609,7 +621,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
609 621 }
610 622 }
611 623 else {
612   -
  624 +
613 625 $scope.selectedSystemName = event.currentTarget.title;
614 626 // get termText info
615 627 var promise = ModuleService.getTermTextDataForPin($scope.moduleName)
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
  View file @b17f8fc
... ... @@ -80,18 +80,18 @@
80 80 <ul class="dropdown-menu" aria-labelledby="dropdownMenu221" id="bodySystemList">
81 81 <li><a id="0" href="#" title="Current Structure" onclick="showSelectedSystemPins(event)">All</a></li>
82 82 <li role="separator" class="divider"></li>
83   - <li class="disabled"><a id="1" href="#" title="Cardiovascular" onclick="showSelectedSystemPins(event)">Cardiovascular</a></li>
84   - <li class="disabled"><a id="2" href="#" title="Digestive" onclick="showSelectedSystemPins(event)">Digestive</a></li>
85   - <li class="disabled"><a id="3" href="#" title="Endocrine" onclick="showSelectedSystemPins(event)">Endocrine</a></li>
86   - <li class="disabled"><a id="4" href="#" title="Immune" onclick="showSelectedSystemPins(event)">Immune</a></li>
87   - <li class="disabled"><a id="5" href="#" title="Integumentary" onclick="showSelectedSystemPins(event)">Integumentary</a></li>
88   - <li class="disabled"><a id="6" href="#" title="Lymphatic" onclick="showSelectedSystemPins(event)">Lymphatic</a></li>
89   - <li class="disabled"><a id="7" href="#" title="Muscular" onclick="showSelectedSystemPins(event)">Muscular</a></li>
90   - <li class="disabled"><a id="8" href="#" title="Nervous" onclick="showSelectedSystemPins(event)">Nervous</a></li>
91   - <li class="disabled"><a id="9" href="#" title="Reproductive" onclick="showSelectedSystemPins(event)">Reproductive</a></li>
92   - <li class="disabled"><a id="10" href="#" title="Respiratory" onclick="showSelectedSystemPins(event)">Respiratory</a></li>
93   - <li class="disabled"><a id="11" href="#" title="Skeletal" onclick="showSelectedSystemPins(event)">Skeletal</a></li>
94   - <li class="disabled"><a id="12" href="#" title="Urinary" onclick="showSelectedSystemPins(event)">Urinary</a></li>
  83 + <li class="disabledSelectedSystem"><a id="1" href="#" title="Cardiovascular" onclick="showSelectedSystemPins(event)">Cardiovascular</a></li>
  84 + <li class="disabledSelectedSystem"><a id="2" href="#" title="Digestive" onclick="showSelectedSystemPins(event)">Digestive</a></li>
  85 + <li class="disabledSelectedSystem"><a id="3" href="#" title="Endocrine" onclick="showSelectedSystemPins(event)">Endocrine</a></li>
  86 + <li class="disabledSelectedSystem"><a id="4" href="#" title="Immune" onclick="showSelectedSystemPins(event)">Immune</a></li>
  87 + <li class="disabledSelectedSystem"><a id="5" href="#" title="Integumentary" onclick="showSelectedSystemPins(event)">Integumentary</a></li>
  88 + <li class="disabledSelectedSystem"><a id="6" href="#" title="Lymphatic" onclick="showSelectedSystemPins(event)">Lymphatic</a></li>
  89 + <li class="disabledSelectedSystem"><a id="7" href="#" title="Muscular" onclick="showSelectedSystemPins(event)">Muscular</a></li>
  90 + <li class="disabledSelectedSystem"><a id="8" href="#" title="Nervous" onclick="showSelectedSystemPins(event)">Nervous</a></li>
  91 + <li class="disabledSelectedSystem"><a id="9" href="#" title="Reproductive" onclick="showSelectedSystemPins(event)">Reproductive</a></li>
  92 + <li class="disabledSelectedSystem"><a id="10" href="#" title="Respiratory" onclick="showSelectedSystemPins(event)">Respiratory</a></li>
  93 + <li class="disabledSelectedSystem"><a id="11" href="#" title="Skeletal" onclick="showSelectedSystemPins(event)">Skeletal</a></li>
  94 + <li class="disabledSelectedSystem"><a id="12" href="#" title="Urinary" onclick="showSelectedSystemPins(event)">Urinary</a></li>
95 95 </ul>
96 96  
97 97 </div>
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @b17f8fc
... ... @@ -1047,4 +1047,25 @@ background-size:cover;
1047 1047 {
1048 1048 background: #8C8C8C!important;
1049 1049 border: 1px solid #a2a2a2;
1050   - }
1051 1050 \ No newline at end of file
  1051 + }
  1052 +
  1053 +.activeAASystemSelect{
  1054 + background-color:#0095DA;
  1055 + color:#ffffff;
  1056 +}
  1057 +
  1058 +.activeAASystemSelect a
  1059 +{
  1060 +color:#ffffff !important;
  1061 +}
  1062 +
  1063 +.disabledSelectedSystem a, .disabledSelectedSystem > a:hover, .dropdown-menu > .disabledSelectedSystem > a:focus
  1064 + {
  1065 +
  1066 + text-decoration: none;
  1067 + background-color: transparent !important;
  1068 + background-image: none;
  1069 + cursor: not-allowed;
  1070 + color: #878787 !important;
  1071 + pointer-events:none;
  1072 +}
1052 1073 \ No newline at end of file
... ...