diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 927247b..08496e9 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -4388,20 +4388,50 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo var isMirror; var width; var BodyRegionDictionary = $rootScope.BodyRegionCordinatesData; - $.each(BodyRegionDictionary, function (index, value) { - - var bodyRegionRight = parseInt(value.X) + parseInt(value.Width); - var bodyRegionBottom = parseInt(value.Y) + parseInt(value.Height); - if (actulalX <= bodyRegionRight && value.X <= actulalX && actualY <= bodyRegionBottom && value.Y <= actualY) { - - clickedBodyRegion = value.bodyRegionId; - x = value.X; - y = value.Y; - width = value.Width; - isMirror = value.IsMirror; - return false; + if ($rootScope.viewOrientationId == 5) { + + var clickedBodyRegionData = new jinqJs() + .from(BodyRegionDictionary) + .where('bodyRegionId == 6') + .select(); + + + // clickedBodyRegion = clickedBodyRegionData[0].bodyRegionId; + x = clickedBodyRegionData[0].X; + y = clickedBodyRegionData[0].Y; + width = clickedBodyRegionData[0].Width; + var height = clickedBodyRegionData[0].Height; + isMirror = clickedBodyRegionData[0].IsMirror; + var bodyRegionRight = parseInt(x) + parseInt(width); + var bodyRegionBottom = parseInt(y) + parseInt(height); + if (actulalX <= bodyRegionRight && x <= actulalX && actualY <= bodyRegionBottom && y <= actualY) { + + clickedBodyRegion = clickedBodyRegionData[0].bodyRegionId; + x = clickedBodyRegionData[0].X; + y = clickedBodyRegionData[0].Y; + width = clickedBodyRegionData[0].Width; + var height = clickedBodyRegionData[0].Height; + isMirror = clickedBodyRegionData[0].IsMirror; + } + + } + else { + $.each(BodyRegionDictionary, function (index, value) { + + var bodyRegionRight = parseInt(value.X) + parseInt(value.Width); + var bodyRegionBottom = parseInt(value.Y) + parseInt(value.Height); + if (actulalX <= bodyRegionRight && value.X <= actulalX && actualY <= bodyRegionBottom && value.Y <= actualY) { + + clickedBodyRegion = value.bodyRegionId; + x = value.X; + y = value.Y; + width = value.Width; + isMirror = value.IsMirror; + return false; + } + }) } - }) + if (isMirror == "Yes") { @@ -4868,6 +4898,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $("#btnTranparency").removeClass("disabled"); $rootScope.isTransparencyBoxActivated = false; $rootScope.isNormalMode = false; + + //if listanager is visisble then close it $rootScope.CloseListManager(); @@ -8020,38 +8052,53 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.HighlightBodyOnListManagerSelection = function (event) { + // Terms search in the Search list should be disable in the List Manager and Vice-Versa. + if ($rootScope.prevId == event.currentTarget.id) { - $scope.terminateCurrentlyRunningWPs(); - //debugger - $rootScope.isListManagerSelected = true; - //--- - if ($rootScope.isListManagerSelected == true) { - $("#btnHighLight").addClass("btn-primary"); - $("#btnHighLight").removeClass("btn-black"); - if (!$("#btnNormalMode").hasClass("btn-black")) { - $("#btnNormalMode").addClass("btn-black"); - } + $rootScope.isLoading = false; + $('#spinner').css('visibility', 'hidden'); + } + else { + $rootScope.prevId = event.currentTarget.id; + $("#termList").find("option").attr('selected', false); + $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); + $("#termList").find("option[id=" + event.currentTarget.id + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); + $("div#backdrop #termlistfilter li").find("a").css({ "background-color": "#ffffff", "color": "#000000" }); + $("div#backdrop #termlistfilter li").find("a[id=" + event.currentTarget.id + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); + $scope.terminateCurrentlyRunningWPs(); + //debugger + $rootScope.isListManagerSelected = true; + //--- + if ($rootScope.isListManagerSelected == true) { + $("#btnHighLight").addClass("btn-primary"); + $("#btnHighLight").removeClass("btn-black"); + if (!$("#btnNormalMode").hasClass("btn-black")) { + $("#btnNormalMode").addClass("btn-black"); + } - if ($("#btnNormalMode").hasClass("btn-primary")) { - $("#btnNormalMode").removeClass("btn-primary"); + if ($("#btnNormalMode").hasClass("btn-primary")) { + $("#btnNormalMode").removeClass("btn-primary"); + } } - } - //--- - $rootScope.isLoading = true; + //--- + $rootScope.isLoading = true; - $('#spinner').css('visibility', 'visible'); + $('#spinner').css('visibility', 'visible'); - $rootScope.isHighlightBodyByBodySystem = false; + $rootScope.isHighlightBodyByBodySystem = false; - //1. - $rootScope.actualTermNumber = event.currentTarget.id;//attributes[0].value; - console.log(' $scope.actualTermNumber insde HighlightBodyOnListManagerSelection= ' + $rootScope.actualTermNumber) + //1. + $rootScope.actualTermNumber = event.currentTarget.id;//attributes[0].value; + console.log(' $scope.actualTermNumber insde HighlightBodyOnListManagerSelection= ' + $rootScope.actualTermNumber) - //2. + //2. - $scope.setLayerNumberAndHighlightByTermList(); + $scope.setLayerNumberAndHighlightByTermList(); + } + + } $scope.setLayerNumberAndHighlightByTermList = function () { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index e80f453..9857508 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -43,9 +43,43 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", $rootScope.isModestyOn; $rootScope.isModestyOff; $rootScope.SetSettingActiveTab; + $rootScope.disableMenuannotation = "disableMenuannotation"; + $rootScope.disableMenuoption = "disableMenuoption"; + $rootScope.menuLabExer; + $rootScope.menuLabExer = 0; + + $rootScope.$on("$locationChangeSuccess", function () { + + if (($location.url() == "/da-body-view") || ($location.url() == "/clinical-illustrations-detail") || ($location.url() == "/clinical-animations-detail")) { + $rootScope.disableMenuannotation = " "; + $rootScope.disableMenuoption = " "; + + + } + else { + + $rootScope.disableMenuannotation = "disableMenuannotation"; + $rootScope.disableMenuoption = "disableMenuoption"; + $rootScope.CloseAnnotationTool(); + $rootScope.CloseListManager(); + angular.element('#modal-settings').modal('hide'); + if ($location.url() == "/lab-exercises") { + + $rootScope.menuLabExer = 0; + } + if($rootScope.menuLabExer==1) + { + $rootScope.disableMenuoption = " "; + } + + } + + }); //jspanel functionality.. + + $rootScope.openParent = function (slug) { // debugger; var openViews = $rootScope.openViews; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js index 717b52b..80bc3bd 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js @@ -35,6 +35,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location $scope.IsVisible = function () { // $scope.scroll(); + } $scope.scroll = function () { @@ -63,7 +64,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location } $scope.getLabExerciseTitle = function (title) { - + $rootScope.menuLabExer = 1; if (title != null) { $scope.LabExerciseQuiz = title; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html index 5619133..5debb16 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html @@ -74,42 +74,46 @@ $('[data-toggle="tooltip"]').tooltip(); }) - var appPath = window.location.pathname.split("/")[1]; - if (window.location.pathname == "/" + appPath + "/da-view-list") { + var appPath = window.location.pathname; + + var appPathvalue = appPath.substring(appPath.lastIndexOf('/') + 1); + + + if (appPathvalue == "da-view-list") { $(".nav-sidebar li a").removeClass('active'); $(".nav-sidebar li:first-child a").addClass('active'); } - else if (window.location.pathname == "/" + appPath + "/3dAnatomy") { + else if (appPathvalue == "3dAnatomy") { $(".nav-sidebar li a").removeClass('active'); $(".nav-sidebar li:nth-child(2) a").addClass('active'); } - else if (window.location.pathname == "/" + appPath + "/clinical-illustrations") { + else if (appPathvalue == "clinical-illustrations") { $(".nav-sidebar li a").removeClass('active'); $(".nav-sidebar li:nth-child(3) a").addClass('active'); } - else if (window.location.pathname == "/" + appPath + "/clinical-animations") { + else if (appPathvalue == "clinical-animations") { $(".nav-sidebar li a").removeClass('active'); $(".nav-sidebar li:nth-child(4) a").addClass('active'); } - else if (window.location.pathname == "/" + appPath + "/Link/encyclopedia") { + else if (appPathvalue == "encyclopedia") { $(".nav-sidebar li a").removeClass('active'); $(".nav-sidebar li:nth-child(5) a").addClass('active'); } - else if (window.location.pathname == "/" + appPath + "/curriculum-builder") { + else if (appPathvalue == "curriculum-builder") { $(".nav-sidebar li a").removeClass('active'); $(".nav-sidebar li:nth-child(6) a").addClass('active'); @@ -117,7 +121,7 @@ } - else if (window.location.pathname == "/" + appPath + "/anatomy-test") { + else if (appPathvalue == "anatomy-test") { $(".nav-sidebar li a").removeClass('active'); $(".nav-sidebar li:nth-child(7) a").addClass('active'); @@ -125,63 +129,62 @@ } - else if (window.location.pathname == "/" + appPath + "/Link/IP-10") { + else if (appPathvalue == "IP-10") { $(".nav-sidebar li a").removeClass('active'); $(".nav-sidebar li:nth-child(8) a").addClass('active'); } - else if (window.location.pathname == "/" + appPath + "/lab-exercises") { + else if (appPathvalue == "lab-exercises") { $(".nav-sidebar li a").removeClass('active'); $(".nav-sidebar li:nth-child(9) a").addClass('active'); } - else if (window.location.pathname == "/" + appPath + "/Link/indepth-reports") { + else if (appPathvalue == "indepth-reports") { $(".nav-sidebar li a").removeClass('active'); $(".nav-sidebar li:nth-child(10) a").addClass('active'); } - else if (window.location.pathname == "/" + appPath + "/Link/complementary-and-alternate-medicine") { + else if (appPathvalue == "complementary-and-alternate-medicine") { $(".nav-sidebar li a").removeClass('active'); $(".nav-sidebar li:nth-child(11) a").addClass('active'); } - else if (window.location.pathname == "/" + appPath + "/ADAM-Images") { + else if (appPathvalue == "ADAM-Images") { $(".nav-sidebar li a").removeClass('active'); $(".nav-sidebar li:nth-child(12) a").addClass('active'); } - else if (window.location.pathname == "/" + appPath + "/Link/bodyguide") { + else if (appPathvalue == "bodyguide") { $(".nav-sidebar li a").removeClass('active'); $(".nav-sidebar li:nth-child(13) a").addClass('active'); } - else if (window.location.pathname == "/" + appPath + "/Link/symptom-navigator") { + else if (appPathvalue == "symptom-navigator") { $(".nav-sidebar li a").removeClass('active'); $(".nav-sidebar li:nth-child(14) a").addClass('active'); } - else if (window.location.pathname == "/" + appPath + "/Link/wellness-tools") { + else if (appPathvalue == "wellness-tools") { $(".nav-sidebar li a").removeClass('active'); $(".nav-sidebar li:nth-child(15) a").addClass('active'); } - else if (window.location.pathname == "/"+ appPath + "/ADAM-on-demand") { + else if (appPathvalue == "ADAM-on-demand") { $(".nav-sidebar li a").removeClass('active'); $(".nav-sidebar li:nth-child(16) a").addClass('active'); } - });