ADAM / AIAHTML5

Commit 7030d986c3209325d0a507fce66b7f7a0627f12a

Authored by Nikita Kulshreshtha
1 parent c982ce6d

Implemented as per live.. 

extarct button gets disabled when transaprnacy box is clicked even you click on nay other button.
It gets enable when transparnecy  box is closed.
Inline Side-by-side
Showing 1 changed file with 25 additions and 3 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @7030d98
@@ -12,6 +12,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -12,6 +12,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
12 $rootScope.BodyRegionData; 12 $rootScope.BodyRegionData;
13 $rootScope.BodyRegionCordinatesData; 13 $rootScope.BodyRegionCordinatesData;
14 $scope.isTransparencyActivated = false; 14 $scope.isTransparencyActivated = false;
  15 + $scope.isTransparencyBtnClicked = false;
15 $rootScope.BodyLayerData; 16 $rootScope.BodyLayerData;
16 $rootScope.VocabTermData; 17 $rootScope.VocabTermData;
17 18
@@ -4407,6 +4408,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -4407,6 +4408,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
4407 4408
4408 4409
4409 $scope.isTransparencyActivated = true; 4410 $scope.isTransparencyActivated = true;
  4411 + $scope.isTransparencyBtnClicked = false;
4410 4412
4411 var BodyRegionDictionary = $rootScope.BodyRegionCordinatesData; 4413 var BodyRegionDictionary = $rootScope.BodyRegionCordinatesData;
4412 4414
@@ -6513,7 +6515,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -6513,7 +6515,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6513 $('.btnCursor').removeClass('activebtncolor'); 6515 $('.btnCursor').removeClass('activebtncolor');
6514 $(".annotationTollbar").css("display", "none"); 6516 $(".annotationTollbar").css("display", "none");
6515 $("#annotationButton").removeClass("active"); 6517 $("#annotationButton").removeClass("active");
6516 - $("#btnExtract").removeClass("disabled"); 6518 + if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) {
  6519 + $("#btnExtract").addClass("disabled");
  6520 + $('#btnTranparency').addClass('tButtonActive');
  6521 + $('#btnTranparency').removeClass('btn-black');
  6522 + }
  6523 + else
  6524 + $("#btnExtract").removeClass("disabled");
  6525 +
6517 $("#btnTranparency").removeClass("disabled"); 6526 $("#btnTranparency").removeClass("disabled");
6518 $rootScope.isTransparencyBoxActivated = false; 6527 $rootScope.isTransparencyBoxActivated = false;
6519 $rootScope.isNormalMode = false; 6528 $rootScope.isNormalMode = false;
@@ -6999,6 +7008,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -6999,6 +7008,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
6999 $scope.highLightBody = function () { 7008 $scope.highLightBody = function () {
7000 7009
7001 $scope.CloseTransparencyBox(); 7010 $scope.CloseTransparencyBox();
  7011 + if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) {
  7012 + $("#btnExtract").addClass("disabled");
  7013 + $('#btnTranparency').addClass('tButtonActive');
  7014 + $('#btnTranparency').removeClass('btn-black');
  7015 + }
7002 $scope.Normal = ""; 7016 $scope.Normal = "";
7003 $scope.Extract = ""; 7017 $scope.Extract = "";
7004 $scope.Highlight = "LeftButtonsDefaultState"; 7018 $scope.Highlight = "LeftButtonsDefaultState";
@@ -7500,7 +7514,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -7500,7 +7514,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7500 7514
7501 //close transparecny box 7515 //close transparecny box
7502 $scope.CloseTransparencyBox(); 7516 $scope.CloseTransparencyBox();
7503 - 7517 + if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) {
  7518 + $("#btnExtract").addClass("disabled");
  7519 + $('#btnTranparency').addClass('tButtonActive');
  7520 + $('#btnTranparency').removeClass('btn-black');
  7521 + }
7504 //if listanager is visisble then close it 7522 //if listanager is visisble then close it
7505 7523
7506 // $rootScope.isListManagerSelected = false; 7524 // $rootScope.isListManagerSelected = false;
@@ -7747,7 +7765,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l @@ -7747,7 +7765,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
7747 7765
7748 //close transparency box 7766 //close transparency box
7749 $scope.CloseTransparencyBox(); 7767 $scope.CloseTransparencyBox();
7750 - 7768 + if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) {
  7769 + $("#btnExtract").addClass("disabled");
  7770 + $('#btnTranparency').addClass('tButtonActive');
  7771 + $('#btnTranparency').removeClass('btn-black');
  7772 + }
7751 //if listanager is visisble then close it 7773 //if listanager is visisble then close it
7752 7774
7753 //$rootScope.isListManagerSelected = false; 7775 //$rootScope.isListManagerSelected = false;