ADAM / AIAHTML5

Commit 344849548d3dfd5a400d1b03638ddde14bf5bd1e

Authored by Amrita Vishnoi
1 parent 0094b394

Refs: #5287 

Able to maintain selected Gender from the left tool bar button list.
Also have fix of tool tip relocation on gender click.
Inline Side-by-side
Showing 2 changed files with 48 additions and 50 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @3448495
... ... @@ -115,6 +115,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
115 115 }
116 116  
117 117  
  118 + $scope.switchGender = function () {
  119 +
  120 + var retrievedObject = localStorage.getItem('currentViewTitle');
  121 +
  122 + if (retrievedObject == "Male Anterior") {
  123 + $scope.male = "active";
  124 + $scope.female = "";
  125 + }
  126 + else if (retrievedObject == "Female Anterior") {
  127 + $scope.male = "";
  128 + $scope.female = "active";
  129 + }
  130 + }
  131 +
118 132 //get the DA body view list based on selected gender
119 133 //get the DA body view list based on selected gender
120 134 $scope.getDAViewList = function ($event) {
... ... @@ -208,6 +222,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
208 222 var u = $location.url();
209 223 $location.url('/da-body-view');
210 224  
  225 + var view_list = angular.element($event.currentTarget);
  226 + var view_list_male_female = view_list.attr('title');
  227 +
  228 +
  229 + if (view_list_male_female == "Male") {
  230 +
  231 + $rootScope.male = "active";
  232 + $rootScope.female = "";
  233 + }
  234 + else {
  235 +
  236 + $rootScope.male = "";
  237 + $rootScope.female = "active";
  238 + }
211 239  
212 240 }
213 241  
... ... @@ -3142,10 +3170,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
3142 3170  
3143 3171 $scope.createTransparencyBox = function () {
3144 3172  
3145   - // debugger
3146   - // alert('transparency clcked')
3147   -
3148   -
3149 3173  
3150 3174 $scope.isTransparencyActivated = true;
3151 3175 // alert('transparencyClicked' + $scope.isTransparencyActivated)
... ... @@ -4819,6 +4843,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4819 4843 $rootScope.isLoading = true;
4820 4844  
4821 4845 }
  4846 + var target = angular.element(event.currentTarget);
  4847 + var title_male_female = target.attr('title');
  4848 +
  4849 + if (title_male_female == "Male") {
  4850 +
  4851 + $scope.male = "active";
  4852 + $scope.female = "";
  4853 + }
  4854 + else {
  4855 + $scope.male = "";
  4856 + $scope.female = "active";
  4857 + }
4822 4858  
4823 4859 }
4824 4860  
... ... @@ -5083,8 +5119,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5083 5119  
5084 5120  
5085 5121 $timeout(function () { $scope.HighlightBodyByTermList(systemMatchedTermList) }, 100);
5086   -
5087   - }
  5122 + $(".custom-tooltip").css("diisplay", "none");
  5123 + }
5088 5124  
5089 5125 $scope.ShowSearch = function () {
5090 5126 $scope.IsSearchVisible = true;
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @3448495
... ... @@ -54,7 +54,7 @@
54 54 background-color: #fff;
55 55 border: 0 none;
56 56 color: #000;
57   - left: 2px;
  57 + left:52px;
58 58 opacity: 0.9;
59 59 padding: 3px 0;
60 60 position: absolute;
... ... @@ -129,15 +129,15 @@
129 129 <li><a href="#" title="Urinary" id="12" ng-click="HighlightBodysystem($event)">Urinary</a></li>
130 130 </ul>
131 131 </div>
132   - <div class="col-sm-6 hover-gender-tool" title="Gender">
133   - <div class="custom-tooltip1">Gender</div>
  132 + <div class="col-sm-6 hover-gender-tool" ng-init="switchGender()">
  133 + <div class=" custom-tooltip1">Gender</div>
134 134 <button class="btn btn-black btn-sm marginTop5 dropdown-toggle" type="button" id="dropdownMenu4" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> <i class=" fa fa-intersex font16"></i></button>
135 135 <ul class="dropdown-menu" aria-labelledby="dropdownMenu3">
136   - <li><a href="#" title="Male" ng-click="OnGenderChange($event)">Male</a></li>
137   - <li><a href="#" title="Female" ng-click="OnGenderChange($event)">Female</a></li>
  136 + <li ng-class="male"><a href="#" title="Male" ng-click="OnGenderChange($event)">Male</a></li>
  137 + <li ng-class="female"><a href="#" title="Female" ng-click="OnGenderChange($event)">Female</a></li>
138 138 </ul>
139 139 </div>
140   - <div class="col-sm-6 tooltip-View-custom" title="View">
  140 + <div class="col-sm-6 tooltip-View-custom" >
141 141 <div class="custom-tooltip2">View</div>
142 142 <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu3" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"><img src="content/images/view.png" alt="" title=""></button>
143 143 <ul class="dropdown-menu" aria-labelledby="dropdownMenu3">
... ... @@ -353,44 +353,6 @@ $(window).load(function () {
353 353 $(".custom-tooltip2").css("display", "none");
354 354 });
355 355  
356   - $(".hover-tool").on('click', function () {
357   -
358   -
359   - if ($(".hover-tool").hasClass("open")) {
360   - $(".custom-tooltip").css("display", "block");
361   - }
362   - else {
363   -
364   - $(".custom-tooltip").css("display", "none");
365   -
366   - }
367   - });
368   -
369   - $(".hover-gender-tool").on('click', function () {
370   -
371   -
372   - if ($(".hover-gender-tool").hasClass("open")) {
373   - $(".custom-tooltip1").css("display", "block");
374   - }
375   - else {
376   -
377   - $(".custom-tooltip1").css("display", "none");
378   -
379   - }
380   - });
381   -
382   - $(".hover-view-tool").on('click', function () {
383   -
384   -
385   - if ($(".hover-view-tool").hasClass("open")) {
386   - $(".custom-tooltip1").css("display", "block");
387   - }
388   - else {
389   -
390   - $(".custom-tooltip1").css("display", "none");
391   -
392   - }
393   - });
394 356  
395 357  
396 358 $("#slider-range-min-2").slider({
... ...