Commit 87e7d11095c1a4de25a9693b5799411c84262dca
1 parent
837606de
Commit changes for Issue Ref #10122:Clinical Animation > Annotation Toolbar gets…
… enable when List Manager is opened and closed in CA detail page.
Showing
3 changed files
with
35 additions
and
14 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
@@ -372,7 +372,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -372,7 +372,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
372 | 372 | ||
373 | $scope.openView = function ($event) { | 373 | $scope.openView = function ($event) { |
374 | $rootScope.disableAnnotationTBFn(); | 374 | $rootScope.disableAnnotationTBFn(); |
375 | - | 375 | + $rootScope.MenuModuleName = "CA"; |
376 | + //alert($rootScope.MenuModuleName); | ||
376 | $rootScope.currentBodyViewId = $event.currentTarget.id; | 377 | $rootScope.currentBodyViewId = $event.currentTarget.id; |
377 | if ($event.currentTarget.textContent !== null && typeof ($event.currentTarget.textContent) !== "undefined") { | 378 | if ($event.currentTarget.textContent !== null && typeof ($event.currentTarget.textContent) !== "undefined") { |
378 | var CITitle = []; | 379 | var CITitle = []; |
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -266,6 +266,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -266,6 +266,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
266 | 266 | ||
267 | $scope.openView = function ($event) { | 267 | $scope.openView = function ($event) { |
268 | $rootScope.disableAnnotationTB = false; | 268 | $rootScope.disableAnnotationTB = false; |
269 | + $rootScope.MenuModuleName = "DA"; | ||
270 | + //alert($rootScope.MenuModuleName); | ||
269 | $rootScope.isLoading = true; | 271 | $rootScope.isLoading = true; |
270 | $('#spinner').css('visibility', 'visible'); | 272 | $('#spinner').css('visibility', 'visible'); |
271 | 273 | ||
@@ -6839,11 +6841,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -6839,11 +6841,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
6839 | 6841 | ||
6840 | //list manager | 6842 | //list manager |
6841 | $scope.$on('listManagerEvent', function (event, data) { | 6843 | $scope.$on('listManagerEvent', function (event, data) { |
6842 | - | ||
6843 | - if ($rootScope.disableAnnotationtoolOnListManager == true) | ||
6844 | - { | ||
6845 | - $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled'); | ||
6846 | - $('#slider-range-min-2').slider('disable'); | 6844 | + |
6845 | + //if ($rootScope.MenuModuleName == "DA") { | ||
6846 | + // if ($rootScope.disableAnnotationtoolOnListManager == true) { | ||
6847 | + // $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled'); | ||
6848 | + // $('#slider-range-min-2').slider('disable'); | ||
6849 | + // } | ||
6850 | + //} | ||
6847 | if ($rootScope.setListManagerZindex == true) | 6851 | if ($rootScope.setListManagerZindex == true) |
6848 | { | 6852 | { |
6849 | var canvasPaintZindex = $('#canvasPaint').css("z-index"); //x | 6853 | var canvasPaintZindex = $('#canvasPaint').css("z-index"); //x |
@@ -6865,7 +6869,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -6865,7 +6869,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
6865 | } | 6869 | } |
6866 | 6870 | ||
6867 | } | 6871 | } |
6868 | - } | 6872 | + |
6869 | 6873 | ||
6870 | 6874 | ||
6871 | 6875 |
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -169,7 +169,21 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", | @@ -169,7 +169,21 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", | ||
169 | //annotation tool custom events | 169 | //annotation tool custom events |
170 | $rootScope.ShowAnnotationWindow = function () { | 170 | $rootScope.ShowAnnotationWindow = function () { |
171 | //7904 | 171 | //7904 |
172 | - | 172 | + if ($rootScope.MenuModuleName == "DA") { |
173 | + if ($rootScope.disableAnnotationtoolOnListManager == true) { | ||
174 | + $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled'); | ||
175 | + $('#slider-range-min-2').slider('disable'); | ||
176 | + | ||
177 | + // $rootScope.disableAnnotationTB = false; | ||
178 | + }else | ||
179 | + { | ||
180 | + $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').removeAttr('disabled', 'disabled'); | ||
181 | + $('#slider-range-min-2').slider('enable'); | ||
182 | + } | ||
183 | + // document.getElementById('modelbackground').style.display = "block"; | ||
184 | + // document.getElementById('modeleditstyle').style.display = "block"; | ||
185 | + | ||
186 | + } | ||
173 | $("#OnIdentify").addClass("annotationtoolbartab"); | 187 | $("#OnIdentify").addClass("annotationtoolbartab"); |
174 | $("#annotationToolBarOptions").addClass("active"); | 188 | $("#annotationToolBarOptions").addClass("active"); |
175 | $("#annotationButton").addClass("active"); | 189 | $("#annotationButton").addClass("active"); |
@@ -1824,7 +1838,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", | @@ -1824,7 +1838,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", | ||
1824 | console.log('ShowListManager') | 1838 | console.log('ShowListManager') |
1825 | 1839 | ||
1826 | $rootScope.disableAnnotationtoolOnListManager = true; | 1840 | $rootScope.disableAnnotationtoolOnListManager = true; |
1827 | - | 1841 | + $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled'); |
1842 | + $('#slider-range-min-2').slider('disable'); | ||
1828 | $rootScope.isLoading = true; | 1843 | $rootScope.isLoading = true; |
1829 | $('#spinner').css('visibility', 'visible'); | 1844 | $('#spinner').css('visibility', 'visible'); |
1830 | 1845 | ||
@@ -1840,13 +1855,14 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", | @@ -1840,13 +1855,14 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", | ||
1840 | 1855 | ||
1841 | $rootScope.CloseListManager = function () { | 1856 | $rootScope.CloseListManager = function () { |
1842 | console.log('close') | 1857 | console.log('close') |
1843 | - | ||
1844 | $rootScope.disableAnnotationtoolOnListManager = false; | 1858 | $rootScope.disableAnnotationtoolOnListManager = false; |
1845 | - if ($rootScope.disableAnnotationtoolOnListManager == false) { | ||
1846 | - $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').removeAttr('disabled', 'disabled'); | ||
1847 | - $('#slider-range-min-2').slider('enable'); | 1859 | + if ($rootScope.MenuModuleName == "DA") { |
1860 | + | ||
1861 | + if ($rootScope.disableAnnotationtoolOnListManager == false) { | ||
1862 | + $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').removeAttr('disabled', 'disabled'); | ||
1863 | + $('#slider-range-min-2').slider('enable'); | ||
1864 | + } | ||
1848 | } | 1865 | } |
1849 | - //$rootScope.isListManagerSelected = false; | ||
1850 | $('#listManager').css('display', 'none'); | 1866 | $('#listManager').css('display', 'none'); |
1851 | $("#listManager").css("visibility", "hidden"); | 1867 | $("#listManager").css("visibility", "hidden"); |
1852 | 1868 |