From c104acf430f8da30bc43385ed06ef974e778c0fb Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 2 Nov 2016 17:48:44 +0530 Subject: [PATCH] Commit changes for issue ref : #9037 Clinical Animation > Annotation's Tools, Modes, Edit shape Style should be disable on CA's detail page. --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js | 12 +++++++++--- 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js | 7 +++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js index ad560e5..e3ec785 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js @@ -371,7 +371,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout $scope.openView = function ($event) { - + $rootScope.disableAnnotationTBFn(); + $rootScope.currentBodyViewId = $event.currentTarget.id; if ($event.currentTarget.textContent !== null && typeof ($event.currentTarget.textContent) !== "undefined") { var CITitle = []; @@ -400,9 +401,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout //console.log($location.url('/clinical-animations-detail')); } - + $scope.openBodyView = function () { - + + if ($rootScope.disableAnnotationTB == true) + { + $('#AnnotaionPopupDiv').find('input, textarea, button, select').attr('disabled', 'disabled'); + $('#slider-range-min-2').slider('disable'); + } $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); $scope.voId = localStorage.getItem("currentBodyViewId"); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 6243f52..05a5777 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -1798,8 +1798,11 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", $rootScope.lastX = x; $rootScope.lastY = y; } - - + $rootScope.disableAnnotationTB = false; + $rootScope.disableAnnotationTBFn = function() + { + $rootScope.disableAnnotationTB = true; + } //list manager function -- libgit2 0.21.4