Commit 7e662ac4a2774ad2eafc5b329347873245fc987d
Merge branch 'AtlasHightlightBodySystem' into Develop
Showing
2 changed files
with
33 additions
and
13 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -67,6 +67,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -67,6 +67,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
67 | 67 | ||
68 | //2. Pick the image name to create a source to open | 68 | //2. Pick the image name to create a source to open |
69 | $rootScope.imageName = $rootScope.OpenedTileData[3]; | 69 | $rootScope.imageName = $rootScope.OpenedTileData[3]; |
70 | + $rootScope.bodySystemName = $rootScope.OpenedTileData[2]; | ||
70 | $rootScope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3]; | 71 | $rootScope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3]; |
71 | 72 | ||
72 | //3. set opened module item title | 73 | //3. set opened module item title |
@@ -153,10 +154,28 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -153,10 +154,28 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
153 | 154 | ||
154 | //6. Show all pins on AA opened item | 155 | //6. Show all pins on AA opened item |
155 | $scope.showAllPins(); | 156 | $scope.showAllPins(); |
157 | + //7. Highlight all system body list in left side | ||
158 | + $scope.highlightBodySystemList(); | ||
156 | } | 159 | } |
157 | }, 1050); | 160 | }, 1050); |
158 | } | 161 | } |
159 | 162 | ||
163 | + | ||
164 | + $scope.highlightBodySystemList = function () { | ||
165 | + $rootScope.bodySystemNames = $rootScope.bodySystemName.trim().split(/\s*,\s*/); | ||
166 | + var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a"); | ||
167 | + var bodySystemListlength = bodySystemListObj.length; | ||
168 | + for (var i = 0; i < bodySystemListlength; i++) { | ||
169 | + //var boldTag = lis[i]; | ||
170 | + for (var j = 0; j < $rootScope.bodySystemNames.length; j++) { | ||
171 | + if ((bodySystemListObj[i].innerHTML) == ($rootScope.bodySystemNames[j])) { | ||
172 | + $("#" + i).removeClass("disabled"); | ||
173 | + | ||
174 | + } | ||
175 | + } | ||
176 | + | ||
177 | + } | ||
178 | + } | ||
160 | function loadFailure() { | 179 | function loadFailure() { |
161 | console.log('unable to load opened module ietem'); | 180 | console.log('unable to load opened module ietem'); |
162 | return true; | 181 | return true; |
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
@@ -16,21 +16,22 @@ | @@ -16,21 +16,22 @@ | ||
16 | <div class="col-sm-6" title="Show All Pins in System(s)"><button class="btn btn-primary btn-sm marginTop5"><img src="../../../content/images/aa/LeftMenu/all-pin.png" alt="" title=""></button></div> | 16 | <div class="col-sm-6" title="Show All Pins in System(s)"><button class="btn btn-primary btn-sm marginTop5"><img src="../../../content/images/aa/LeftMenu/all-pin.png" alt="" title=""></button></div> |
17 | <div class="col-sm-6" title="Select System"> | 17 | <div class="col-sm-6" title="Select System"> |
18 | <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu221" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><img src="../../../content/images/aa/LeftMenu/icon-highlight.png" alt="" title=""></button> | 18 | <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu221" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><img src="../../../content/images/aa/LeftMenu/icon-highlight.png" alt="" title=""></button> |
19 | - <ul class="dropdown-menu" aria-labelledby="dropdownMenu221"> | 19 | + |
20 | + <ul class="dropdown-menu" aria-labelledby="dropdownMenu221" id="bodySystemList"> | ||
20 | <li><a href="#" title="Current Structure">All</a></li> | 21 | <li><a href="#" title="Current Structure">All</a></li> |
21 | <li role="separator" class="divider"></li> | 22 | <li role="separator" class="divider"></li> |
22 | - <li><a href="#" title="Cardiovascular">Cardiovascular</a></li> | ||
23 | - <li><a href="#" title="Digestive">Digestive</a></li> | ||
24 | - <li class="disabled"><a href="#" title="Endocrine">Endocrine</a></li> | ||
25 | - <li class="disabled"><a href="#" title="Immune">Immune</a></li> | ||
26 | - <li class="disabled"><a href="#" title="Integumentary">Integumentary</a></li> | ||
27 | - <li class="disabled"><a href="#" title="Lymphatic">Lymphatic</a></li> | ||
28 | - <li><a href="#" title="Muscular">Muscular</a></li> | ||
29 | - <li class="disabled"><a href="#" title="Nervous">Nervous</a></li> | ||
30 | - <li class="disabled"><a href="#" title="Reproductive">Reproductive</a></li> | ||
31 | - <li class="disabled"><a href="#" title="Respiratory">Respiratory</a></li> | ||
32 | - <li><a href="#" title="Skeletal">Skeletal</a></li> | ||
33 | - <li class="disabled"><a href="#" title="Urinary">Urinary</a></li> | 23 | + <li id="1" class="disabled"><a href="#" title="Cardiovascular">Cardiovascular</a></li> |
24 | + <li id="2" class="disabled"><a href="#" title="Digestive">Digestive</a></li> | ||
25 | + <li id="3" class="disabled"><a href="#" title="Endocrine">Endocrine</a></li> | ||
26 | + <li id="4" class="disabled"><a href="#" title="Immune">Immune</a></li> | ||
27 | + <li id="5" class="disabled"><a href="#" title="Integumentary">Integumentary</a></li> | ||
28 | + <li id="6" class="disabled"><a href="#" title="Lymphatic">Lymphatic</a></li> | ||
29 | + <li id="7" class="disabled"><a href="#" title="Muscular">Muscular</a></li> | ||
30 | + <li id="8" class="disabled"><a href="#" title="Nervous">Nervous</a></li> | ||
31 | + <li id="9" class="disabled"><a href="#" title="Reproductive">Reproductive</a></li> | ||
32 | + <li id="10" class="disabled"><a href="#" title="Respiratory">Respiratory</a></li> | ||
33 | + <li id="11" class="disabled"><a href="#" title="Skeletal">Skeletal</a></li> | ||
34 | + <li id="12" class="disabled"><a href="#" title="Urinary">Urinary</a></li> | ||
34 | </ul> | 35 | </ul> |
35 | 36 | ||
36 | </div> | 37 | </div> |