diff --git a/150-DOCUMENTATION/001-CONFIGURATION/ADAM Education Servers List-updated.xlsx b/150-DOCUMENTATION/001-CONFIGURATION/ADAM Education Servers List-updated.xlsx index d329e56..497910b 100644 --- a/150-DOCUMENTATION/001-CONFIGURATION/ADAM Education Servers List-updated.xlsx +++ b/150-DOCUMENTATION/001-CONFIGURATION/ADAM Education Servers List-updated.xlsx diff --git a/150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Product Sprint 40(30-Sep-2017).xlsx b/150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Product Sprint 40(30-Sep-2017).xlsx new file mode 100644 index 0000000..db8369c --- /dev/null +++ b/150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Product Sprint 40(30-Sep-2017).xlsx diff --git a/150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Sep17.xlsx b/150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Sep17.xlsx index c13e3e2..7fcbda7 100644 --- a/150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Sep17.xlsx +++ b/150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Sep17.xlsx diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 052ddf8..25ce3fd 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -11,7 +11,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.imagePath = ""; $rootScope.BodyRegionData; $rootScope.BodyRegionCordinatesData; - $scope.isTransparencyActivated = false; + $rootScope.isTransparencyActivated = false; $scope.isTransparencyBtnClicked = false; $rootScope.BodyLayerData; $rootScope.VocabTermData; @@ -274,12 +274,34 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l }; + $scope.DisableUI = function () { + var daImagePanelConetent = document.getElementsByClassName("jsPanel-content"); + for (var i = 0; i < daImagePanelConetent.length; i++) { + daImagePanelConetent[i].style.pointerEvents = "none"; + daImagePanelConetent[i].style.opacity = "0.5"; + + } + //to disbale layer change slider + $('.ui-slider').slider('disable'); + } + + $scope.EnableUI = function () { + var daImagePanelConetent = document.getElementsByClassName("jsPanel-content"); + for (var i = 0; i < daImagePanelConetent.length; i++) { + daImagePanelConetent[i].style.pointerEvents = "auto"; + daImagePanelConetent[i].style.opacity = "1"; + } + //to enable layer change slider + $('.ui-slider').slider('enable'); + + } $scope.openView = function ($event) { + $scope.DisableUI(); + $rootScope.disableAnnotationTB = false; $rootScope.MenuModuleName = "DA"; - //alert($rootScope.MenuModuleName); $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); @@ -595,6 +617,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } angular.element(document).ready(function (e) { + $(document).on("click", "#daImagePanel .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () { $rootScope.selectedBodySystemName = 'All'; $rootScope.selectedBodySystemId = 0; @@ -980,10 +1003,17 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l var canDiv = document.getElementById('canvasDiv'); var canDivChildCount = canDiv.childElementCount; if (canDivChildCount > 0) { - canDiv.innerHTML = ''; - //remove transparency scale - $('#transparencyScale').css('visibility', 'hidden'); + if ($rootScope.isTransparencyActivated) { + $scope.flushCanvas(); + $('#transparencyScale').css('visibility', 'visible'); + } + else { + canDiv.innerHTML = ''; + //remove transparency scale + $('#transparencyScale').css('visibility', 'hidden'); + } + } if ($scope.ColoredImageSRC != null && $scope.ColoredImageSRC.length > 0) { @@ -1729,6 +1759,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } ); } + //else if ($scope.ColoredImageSRC.length == totalCanvas) + //{ + // // dispatch event for enabling rest UI + // alert('all canvas drawn'); + // $scope.EnableUI(); + //} + //-NIKI-for solving extarct issue 8286 var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId + '_MR'); @@ -1778,6 +1815,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l if ($scope.isExtract == true) { $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); + $scope.DisableUI(); $scope.highLightBody(); } else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) @@ -1788,12 +1826,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); $rootScope.isHighLight = true; + $scope.DisableUI(); $scope.highLightBody(); } } else { $rootScope.isLoading = false; $('#spinner').css('visibility', 'hidden'); + $scope.EnableUI(); } } @@ -2198,6 +2238,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l if ($scope.isExtract == true) { $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); + $scope.DisableUI(); $scope.highLightBody(); } else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) @@ -2212,7 +2253,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $rootScope.isHighLight = true; console.log('just before highLightBody call'); - + $scope.DisableUI(); $scope.highLightBody(); console.log('just after highLightBody call'); @@ -2221,11 +2262,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l else { $rootScope.isLoading = false; $('#spinner').css('visibility', 'hidden'); + $scope.EnableUI(); } } else { $rootScope.isLoading = false; $('#spinner').css('visibility', 'hidden'); + $scope.EnableUI(); } } @@ -2515,7 +2558,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l //} if ($scope.doAligneCanvasWithTerm == true) { - $scope.aligneCanvasWithTerm() + $scope.aligneCanvasWithTerm(); + + $scope.EnableUI(); } // $timeout(function () { $scope.DisableProgressBar() }, 1000); @@ -2536,8 +2581,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.HighlightBodyByTermList = function (TermList) { - $("#btnTranparency").attr('disabled', 'disabled'); - $scope.currentLayerNumber = $scope.layerNumber; + // $("#btnTranparency").attr('disabled', 'disabled'); + $rootScope.currentLayerNumber = $scope.layerNumber; $scope.layerNumber = $('#txtlayerNumber').val(); @@ -2803,7 +2848,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $('#spinner').css('visibility', 'hidden'); - + $scope.EnableUI(); } } @@ -2829,7 +2874,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l document.getElementById("daView").style.pointerEvents="none"; $('.ui-slider').slider('disable'); $("#btnTranparency").attr('disabled', 'disabled'); - $scope.currentLayerNumber = $scope.layerNumber; + $rootScope.currentLayerNumber = $scope.layerNumber; $scope.layerNumber = $('#txtlayerNumber').val(); @@ -2838,7 +2883,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l if ($rootScope.isHighLight == true) { - false; + $rootScope.isHighLight = false; + $scope.CloseTransparencyBox(); } console.log('HighlightBodyByTermListForBodySystem is called'); @@ -3076,9 +3122,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $('#spinner').css('visibility', 'hidden') $rootScope.isLoading = false; - document.getElementById("daView").style.pointerEvents = "auto"; - $('.ui-slider').slider('enable'); - + //document.getElementById("daView").style.pointerEvents = "auto"; + //$('.ui-slider').slider('enable'); + $scope.EnableUI(); prevBRID = TermExistInBodyRegionId; $scope.scrollToHighlightedBodyRegion(TermExistInBodyRegionId); @@ -3292,6 +3338,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l //layer change function $scope.LayerChange = function () { + $scope.DisableUI(); //if listanager is visisble then close it // $rootScope.isListManagerSelected = false; @@ -3311,7 +3358,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l // $('#daLoaderLabel').css('visibility', 'visible'); - if ($scope.isTransparencyActivated) { + if ($rootScope.isTransparencyActivated) { //crete temp canavs to store the original data which will be used to chnange the transparency if (document.getElementById('tempCanvas') != null) { @@ -3462,11 +3509,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l var dataLength = $rootScope.BodyLayerData.Layers.DataLayer.length; if (parseInt($('#txtlayerNumber').val()) > (dataLength - 1)) { $('#txtlayerNumber').val(dataLength - 1); - $scope.currentLayerNumber = parseInt(dataLength - 1); + $rootScope.currentLayerNumber = parseInt(dataLength - 1); $scope.layerNumber = parseInt(dataLength - 1); } else - $scope.currentLayerNumber = parseInt($('#txtlayerNumber').val()); + $rootScope.currentLayerNumber = parseInt($('#txtlayerNumber').val()); //$scope.isMousUp(); @@ -4318,9 +4365,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l document.getElementById('canvasDiv').removeEventListener("mousedown", mouseDownListener); //Dated:19-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected. - if ($("#txtlayerNumber").val() != 0 && $scope.currentLayerNumber != undefined) { - $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.currentLayerNumber)); - $("#txtlayerNumber").val(parseInt($scope.currentLayerNumber)); + if ($("#txtlayerNumber").val() != 0 && $rootScope.currentLayerNumber != undefined) { + $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber)); + $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber)); } } @@ -4354,6 +4401,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l function mouseUpListener(e) { + $scope.DisableUI(); + $scope.isTBDrawnOnBodyRegion = false; $(".com").remove(); @@ -4365,7 +4414,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l var previewRectangleHeight = $('.rectangle').height() - $scope.currentLayerNumber = parseInt($('#txtlayerNumber').val()); + $rootScope.currentLayerNumber = parseInt($('#txtlayerNumber').val()); $('.rectangle').remove(); var currentMousePosition = $scope.getMousePos(e); @@ -4413,7 +4462,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } - $scope.isTransparencyActivated = true; + $rootScope.isTransparencyActivated = true; $scope.isTransparencyBtnClicked = false; var BodyRegionDictionary = $rootScope.BodyRegionCordinatesData; @@ -4592,7 +4641,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $('#btnTranparency').addClass('tButtonActive'); - // $('#txtlayerNumber').val((parseInt($scope.currentLayerNumber)) + 1); + // $('#txtlayerNumber').val((parseInt($rootScope.currentLayerNumber)) + 1); //Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected. $('#btnTranparency').removeClass('tButtonActive'); $('#btnTranparency').addClass('btn-black'); @@ -5317,6 +5366,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } + + $scope.EnableUI(); } @@ -6322,7 +6373,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l // $rootScope.switchCanvas(); //To enable extract button - $scope.isTransparencyActivated = false; + $rootScope.isTransparencyActivated = false; $("#btnExtract").removeClass("disabled"); @@ -6368,12 +6419,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l - $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.currentLayerNumber)); + $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber)); //if ($scope.isGenderChnage || $rootScope.isViewChange) { // $("#txtlayerNumber").val(parseInt(0)); //} //else - $("#txtlayerNumber").val(parseInt($scope.currentLayerNumber)); + $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber)); if (document.getElementById('tempCanvas') != null) { @@ -6385,7 +6436,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l //var scope = angular.element(document.getElementById("DAView")).scope(); //scope.$apply(function () { // $scope.layerNumber = 0; - // $scope.isTransparencyActivated = false; + // $rootScope.isTransparencyActivated = false; //}) @@ -6398,7 +6449,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l //$("canvas[name*='transparencyTempCanvas']").nextUntil($("canvas[name*='transparencyTempCanvas']")) //.remove(); - $scope.layerNumber = $scope.currentLayerNumber; + $scope.layerNumber = $rootScope.currentLayerNumber; $scope.transNumber = 100; $(".slider").slider({ value: 100 }) } @@ -6414,7 +6465,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $('#transparencyScale').css('visibility', 'hidden'); - //$scope.isTransparencyActivated = false; + //$rootScope.isTransparencyActivated = false; // document.getElementById('btnTranparency').className = 't-transparency' $('#btnTranparency').removeClass('tButtonActive'); $('#btnTranparency').addClass('btn-black'); @@ -6569,7 +6620,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.terminateCurrentlyRunningWPs(); - if ($scope.isTransparencyActivated) { + if ($rootScope.isTransparencyActivated) { $scope.CloseTransparencyBox(); @@ -6712,16 +6763,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.enableHighlight = function () { - - // $("#btnExtract").removeClass("disabled"); - // $("#btnTranparency").removeClass("disabled"); + $scope.DisableUI(); + $("#btnTranparency").removeAttr('disabled', 'disabled'); - // $rootScope.isTransparencyBoxActivated = false; - // $rootScope.isNormalMode = false; //if listanager is visisble then close it - - // $rootScope.isListManagerSelected = false; $rootScope.CloseListManager(); @@ -6730,7 +6776,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l //to make the system highlight if the body systme highlighted than Normal and again highlight $scope.isbodySystemHighlight = true; } - // $rootScope.isHighlightBodyByBodySystem = false; if ($rootScope.isHighLight == true) { @@ -6794,8 +6839,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.enableNormalMode = function () { $("#btnTranparency").removeClass("disabled"); - if ($scope.isTransparencyActivated) { - $scope.layerNumber = $scope.currentLayerNumber; + if ($rootScope.isTransparencyActivated) { + $scope.layerNumber = $rootScope.currentLayerNumber; } else { $scope.layerNumber = $('#txtlayerNumber').val(); @@ -6896,6 +6941,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.enableExtract = function (isCalledFromButton) { + $scope.DisableUI(); + console.log('isCalledFromButton= ' + isCalledFromButton); //$rootScope.isHighlightBodyByBodySystem = false; @@ -6906,7 +6953,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $rootScope.CanvasDivLeftPosition = $("#canvasDiv").scrollLeft(); - if ($scope.isTransparencyActivated == true) { + if ($rootScope.isTransparencyActivated == true) { $("#btnExtract").addClass("disabled"); @@ -7034,7 +7081,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.highLightBody = function () { - $scope.CloseTransparencyBox(); + if ($rootScope.isTransparencyActivated && $rootScope.isGlobalSettingChanged) { + //do not close Tbox + $rootScope.isGlobalSettingChanged = false; + } + else + $scope.CloseTransparencyBox(); if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) { $("#btnExtract").addClass("disabled"); $('#btnTranparency').addClass('tButtonActive'); @@ -7249,6 +7301,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l else { $scope.isLoading = false; $('#spinner').css('visibility', 'hidden'); + + //for highlight when highlight button is clicked the ui got disabled, + //now highlight is completed so enalbe UI + $scope.EnableUI(); } } @@ -7278,7 +7334,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l else { $scope.isLoading = false; $('#spinner').css('visibility', 'hidden'); - + $scope.EnableUI(); } } } @@ -7417,6 +7473,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l else { $scope.isLoading = false; $('#spinner').css('visibility', 'hidden'); + $scope.EnableUI(); } } @@ -7529,6 +7586,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.OnGenderChange = function (event) { + $scope.DisableUI(); var canvasDiv = document.getElementById('canvasDiv'); $scope.imageVerticalScrollPosition = canvasDiv.scrollTop; @@ -7773,9 +7831,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } $scope.OnViewChange = function (event) { - // alert(event.target.title); - // alert($("[title*='" + event.target.title + "']").parent().hasClass("active")); - if ($("[title='" + event.target.title + "']").parent().hasClass("active") == true) { + + $scope.DisableUI(); + @@ -8001,13 +8059,19 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l //Reload DA controller Body View after setting Change $scope.$on('reloadDABodyViewEvent', function (event, data) { //console.log('reloadDABodyViewEvent'); + $rootScope.isGlobalSettingChanged = true; if ($rootScope.isSettingEventAlredayDispachted == true) { + $scope.DisableUI(); $rootScope.isSettingEventAlredayDispachted = false; $scope.layerNumber = parseInt($('#txtlayerNumber').val()); //alert('mouseUp'); + if ($rootScope.isTransparencyActivated && $rootScope.currentLayerNumber == 0) { + $scope.layerNumber = $rootScope.currentLayerNumber; + $scope.loadSelectedBodyView(data.reloadDABodyViewId); - if ($scope.layerNumber == 0) { + } + else if ($scope.layerNumber == 0) { $scope.loadSelectedBodyView(data.reloadDABodyViewId); } // $scope.loadSelectedBodyView(data.reloadDABodyViewId); @@ -8138,6 +8202,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.HighlightBodyByBodySystem = function (event) { + $scope.DisableUI(); + //if listanager is visisble then close it $rootScope.isListManagerSelected = false; @@ -8710,7 +8776,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.HighlightBodyOnListManagerSelection = function (actualTermNumber, isTermListOptionClicked) { - //$rootScope.SelectedTermList = $("#termList").find("option[id=" + actualTermNumber + "]").val(); + + $scope.DisableUI(); + $rootScope.searchSelectedText = $("#" + actualTermNumber).text(); $rootScope.slectedActualTermNumber = actualTermNumber; @@ -9442,6 +9510,10 @@ function OnIdentityClick() { } function OnZoom() { + alert('on zoom called'); + var scope = angular.element(document.getElementById("daView")).scope(); + scope.DisableUI(); + if ($(".btn-annotation").hasClass("activebtncolor")) //Bug #14928 $(".btn-annotation").removeClass("activebtncolor"); //Dissectible Anatomy > Extract and Annotations displays apart on the page after click on Zoom-in. @@ -9452,6 +9524,8 @@ function OnZoom() { scope.$apply(function () { scope.enableZoom(); }); + + } function onListManagerTermSelection(id, isTermListOptionClicked) { diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index ca030cc..db65b9f 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -317,7 +317,7 @@ > - +