diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 4039a80..5a592c7 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -45,7 +45,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.doHighlightOrExtract = false; $scope.isEligibleForHighlightBodyByTermList = false; - $scope.AnteriorView = "active"; + // $scope.AnteriorView = "active"; $scope.zoomInOut = 75; $scope.speechBubbleCounter = 0; @@ -273,6 +273,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.ViewTitle = $event.currentTarget.textContent; localStorage.setItem("currentViewTitleFromJson", $event.currentTarget.textContent); + localStorage.setItem("currentViewTitle", $event.currentTarget.textContent); localStorage.setItem("currentBodyViewId", $event.currentTarget.id); var u = $location.url(); @@ -280,7 +281,65 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo var view_list = angular.element($event.currentTarget); var view_list_male_female = view_list.attr('title'); - + + if (($event.currentTarget.textContent == "Female Anterior" || $event.currentTarget.textContent == "Male Anterior")) { + $rootScope.AnteriorView = "active"; + $rootScope.LateralView = ""; + $rootScope.MedialView = ""; + $rootScope.PosteriorView = ""; + $rootScope.LateralArmView = ""; + $rootScope.MedialArmView = ""; + } + if (($event.currentTarget.textContent == "Female Lateral" || $event.currentTarget.textContent == "Male Lateral")) { + $rootScope.AnteriorView = ""; + $rootScope.LateralView = "active"; + $rootScope.MedialView = ""; + $rootScope.PosteriorView = ""; + $rootScope.LateralArmView = ""; + $rootScope.MedialArmView = ""; + + + } + if (($event.currentTarget.textContent == "Female Medial" || $event.currentTarget.textContent == "Male Medial")) { + $rootScope.AnteriorView = ""; + $rootScope.LateralView = ""; + $rootScope.MedialView = "active"; + $rootScope.PosteriorView = ""; + $rootScope.LateralArmView = ""; + $rootScope.MedialArmView = ""; + + + } + if (($event.currentTarget.textContent == "Female Posterior" || $event.currentTarget.textContent == "Male Posterior")) { + $rootScope.AnteriorView = ""; + $rootScope.LateralView = ""; + $rootScope.MedialView = ""; + $rootScope.PosteriorView = "active"; + $rootScope.LateralArmView = ""; + $rootScope.MedialArmView = ""; + + } + if (($event.currentTarget.textContent == "Female Lateral Arm" || $event.currentTarget.textContent == "Male Lateral Arm")) { + $rootScope.AnteriorView = ""; + $rootScope.LateralView = ""; + $rootScope.MedialView = ""; + $rootScope.PosteriorView = ""; + $rootScope.LateralArmView = "active"; + $rootScope.MedialArmView = ""; + + + } + if (($event.currentTarget.textContent == "Female Medial Arm" || $event.currentTarget.textContent == "Male Medial Arm")) { + $rootScope.AnteriorView = ""; + $rootScope.LateralView = ""; + $rootScope.MedialView = ""; + $rootScope.PosteriorView = ""; + $rootScope.LateralArmView = ""; + $rootScope.MedialArmView = "active"; + + + } + //$rootScope.Normal = "LeftButtonsDefaultState"; if (view_list_male_female == "Male") { 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 9319b08..5141c95 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html @@ -54,6 +54,15 @@ .tooltip-custom + .tooltip > .tooltip-arrow { display: none; } + .customTooltip { + background-color: #fff !important; + color: #000 !important; + opacity: 0.9 !important; + + } + + + .custom-tooltip { background-color: #fff; @@ -61,7 +70,7 @@ color: #000; left: -52px; opacity: 0.9; - padding: 3px 0; + padding: 7px; position: absolute; text-align: center; top: 45px; @@ -79,7 +88,7 @@ color: #000; left: 52px; opacity: 0.9; - padding: 3px 0; + padding: 7px; position: absolute; text-align: center; top: 45px; @@ -97,7 +106,7 @@ color: #000; right: 10px; opacity: 0.9; - padding: 3px 0; + padding: 7px; position: absolute; text-align: center; top: 45px; @@ -148,14 +157,14 @@