diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 0ed967d..f9fb4a0 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -115,6 +115,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } + $scope.switchGender = function () { + + var retrievedObject = localStorage.getItem('currentViewTitle'); + + if (retrievedObject == "Male Anterior") { + $scope.male = "active"; + $scope.female = ""; + } + else if (retrievedObject == "Female Anterior") { + $scope.male = ""; + $scope.female = "active"; + } + } + //get the DA body view list based on selected gender //get the DA body view list based on selected gender $scope.getDAViewList = function ($event) { @@ -208,6 +222,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo var u = $location.url(); $location.url('/da-body-view'); + var view_list = angular.element($event.currentTarget); + var view_list_male_female = view_list.attr('title'); + + + if (view_list_male_female == "Male") { + + $rootScope.male = "active"; + $rootScope.female = ""; + } + else { + + $rootScope.male = ""; + $rootScope.female = "active"; + } } @@ -3142,10 +3170,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.createTransparencyBox = function () { - // debugger - // alert('transparency clcked') - - $scope.isTransparencyActivated = true; // alert('transparencyClicked' + $scope.isTransparencyActivated) @@ -4819,6 +4843,18 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.isLoading = true; } + var target = angular.element(event.currentTarget); + var title_male_female = target.attr('title'); + + if (title_male_female == "Male") { + + $scope.male = "active"; + $scope.female = ""; + } + else { + $scope.male = ""; + $scope.female = "active"; + } } @@ -5083,8 +5119,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $timeout(function () { $scope.HighlightBodyByTermList(systemMatchedTermList) }, 100); - - } + $(".custom-tooltip").css("diisplay", "none"); + } $scope.ShowSearch = function () { $scope.IsSearchVisible = true; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html index 7871454..43bb2c1 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html @@ -54,7 +54,7 @@ background-color: #fff; border: 0 none; color: #000; - left: 2px; + left:52px; opacity: 0.9; padding: 3px 0; position: absolute; @@ -129,15 +129,15 @@