ADAM / AIAHTML5

Commit 77cf2deee69a826a69d5b3465056fb5da031d6ce

Authored by unknown
1 parent 700f8c11

Commit changes for Issue ref: 

#9037:Clinical Animation > Annotation's Tools, Modes, Edit shape Style should be disable on CA's detail page.
#9016: Annotation > When text box is opened, view page should get disabled.
Inline Side-by-side
Showing 4 changed files with 21 additions and 14 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @77cf2de
@@ -406,7 +406,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -406,7 +406,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
406 406
407 if ($rootScope.disableAnnotationTB == true) 407 if ($rootScope.disableAnnotationTB == true)
408 { 408 {
409 - $('#AnnotaionPopupDiv').find('input, textarea, button, select').attr('disabled', 'disabled'); 409 + $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
410 $('#slider-range-min-2').slider('disable'); 410 $('#slider-range-min-2').slider('disable');
411 } 411 }
412 $rootScope.isLoading = true; 412 $rootScope.isLoading = true;
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @77cf2de
@@ -431,7 +431,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -431,7 +431,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
431 431
432 432
433 $scope.openView = function ($event) { 433 $scope.openView = function ($event) {
434 - 434 + $rootScope.disableAnnotationTB = false;
435 $rootScope.CIAnotationIdentifyModeOff = true; 435 $rootScope.CIAnotationIdentifyModeOff = true;
436 $rootScope.currentBodyViewId = $event.currentTarget.id; 436 $rootScope.currentBodyViewId = $event.currentTarget.id;
437 if ($event.currentTarget.textContent !== null && typeof ($event.currentTarget.textContent) !== "undefined") { 437 if ($event.currentTarget.textContent !== null && typeof ($event.currentTarget.textContent) !== "undefined") {
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @77cf2de
@@ -265,7 +265,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -265,7 +265,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
265 265
266 266
267 $scope.openView = function ($event) { 267 $scope.openView = function ($event) {
268 - 268 + $rootScope.disableAnnotationTB = false;
269 $rootScope.isLoading = true; 269 $rootScope.isLoading = true;
270 $('#spinner').css('visibility', 'visible'); 270 $('#spinner').css('visibility', 'visible');
271 271
@@ -6836,7 +6836,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -6836,7 +6836,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6836 6836
6837 if ($rootScope.disableAnnotationtoolOnListManager == true) 6837 if ($rootScope.disableAnnotationtoolOnListManager == true)
6838 { 6838 {
6839 - $('#AnnotaionPopupDiv').find('input, textarea, button, select').attr('disabled', 'disabled'); 6839 + $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
6840 $('#slider-range-min-2').slider('disable'); 6840 $('#slider-range-min-2').slider('disable');
6841 if ($rootScope.setListManagerZindex == true) 6841 if ($rootScope.setListManagerZindex == true)
6842 { 6842 {
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @77cf2de
@@ -473,16 +473,22 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -473,16 +473,22 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
473 } 473 }
474 474
475 $rootScope.enableAnnotationToolBar = function () { 475 $rootScope.enableAnnotationToolBar = function () {
476 -  
477 - document.getElementById('modelbackground').style.display = "block";  
478 - //$("#editshapestyle").modal('show');  
479 - document.getElementById('modeleditstyle').style.display = "block";  
480 - if ($('#modeleditstyle').css("display") == "block") { //Check if the modal is already showing  
481 - var previewOpacity = $('#imgOpacity').css("opacity");  
482 - $('#slider-range-min-4 div.ui-slider-range-min').css("width", (previewOpacity*100) + "%");  
483 - $('#slider-range-min-4 span.ui-slider-handle').css("left", (previewOpacity * 100) + "%");  
484 -  
485 - }; 476 + if ($rootScope.disableAnnotationTB == true) {
  477 + document.getElementById('modelbackground').style.display = "none";
  478 + //$("#editshapestyle").modal('show');
  479 + document.getElementById('modeleditstyle').style.display = "none";
  480 + }
  481 + else {
  482 + document.getElementById('modelbackground').style.display = "block";
  483 + //$("#editshapestyle").modal('show');
  484 + document.getElementById('modeleditstyle').style.display = "block";
  485 + if ($('#modeleditstyle').css("display") == "block") { //Check if the modal is already showing
  486 + var previewOpacity = $('#imgOpacity').css("opacity");
  487 + $('#slider-range-min-4 div.ui-slider-range-min').css("width", (previewOpacity * 100) + "%");
  488 + $('#slider-range-min-4 span.ui-slider-handle').css("left", (previewOpacity * 100) + "%");
  489 +
  490 + };
  491 + }
486 } 492 }
487 493
488 494
@@ -1818,6 +1824,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -1818,6 +1824,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1818 $rootScope.disableAnnotationtoolOnListManager = false; 1824 $rootScope.disableAnnotationtoolOnListManager = false;
1819 $rootScope.ShowListManager = function () { 1825 $rootScope.ShowListManager = function () {
1820 console.log('ShowListManager') 1826 console.log('ShowListManager')
  1827 +
1821 $rootScope.disableAnnotationtoolOnListManager = true; 1828 $rootScope.disableAnnotationtoolOnListManager = true;
1822 1829
1823 $rootScope.isLoading = true; 1830 $rootScope.isLoading = true;