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/AIA-TimelinesForIPAD-MAC.xlsx b/150-DOCUMENTATION/AIA-TimelinesForIPAD-MAC.xlsx new file mode 100644 index 0000000..20b6778 --- /dev/null +++ b/150-DOCUMENTATION/AIA-TimelinesForIPAD-MAC.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.API/Controllers/AuthenticateController.cs b/400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs index 86f130b..2d7d218 100644 --- a/400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs +++ b/400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs @@ -184,7 +184,14 @@ using System.Data.SqlClient;namespace AIAHTML5.API.Controllers { //based on old .net code(AIA flex), we get modules based on licenseId if licenseid>0. //we verified in database that only superadmin has no licenseid so getting all modules for supeadmin - if (userInfo.UserType == AIAHTML5.API.Models.User.SUPER_ADMIN) + int licenseId, editionId; + AIAHTML5.API.Models.Users.getLicenseIdForThisUser(userInfo.Id, out licenseId, out editionId); + + userInfo.LicenseId = licenseId; + userInfo.EditionId = editionId; + + //if (userInfo.UserType == AIAHTML5.API.Models.User.SUPER_ADMIN) + if(userInfo.LicenseId == 0) { userInfo.Modules = AIAHTML5.API.Models.Users.getAllModulesList(); @@ -204,11 +211,11 @@ using System.Data.SqlClient;namespace AIAHTML5.API.Controllers private static void CheckLicenseStatus(User userInfo) { //05.1 For normal user need to get the license details, get the license id for authenticated user - int licenseId, editionId; - AIAHTML5.API.Models.Users.getLicenseIdForThisUser(userInfo.Id, out licenseId, out editionId); + //int licenseId, editionId; + //AIAHTML5.API.Models.Users.getLicenseIdForThisUser(userInfo.Id, out licenseId, out editionId); - userInfo.LicenseId = licenseId; - userInfo.EditionId = editionId; + //userInfo.LicenseId = licenseId; + //userInfo.EditionId = editionId; //05.2 get license details userInfo.LicenseInfo = AIAHTML5.API.Models.Users.getLicenseDetails(userInfo.LicenseId); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js index 5cec29a..33f02ff 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js @@ -1,12 +1,20 @@ AIA.controller("3dAController", ["$scope", "$rootScope", "pages", "$log", '$http', 'DataService', '$filter', '$location', '$document', '$sce', "$compile", function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location, $document, $sce, $compile) { - $rootScope.currentActiveModuleTitle = pages[5].name; + $scope.showTabButton = false; $scope.threeDAnatomyData; $scope.Id; $scope.$on('$viewContentLoaded', function (event) { - + var currentURL = $location.path(); + var selectedModuleName = ''; + //set module title + angular.forEach($rootScope.userModules, function (value, key) { + if (value.slug === currentURL.replace('/', '')) { + selectedModuleName = value.name; + } + $rootScope.currentActiveModuleTitle = selectedModuleName; + }) if ($rootScope.refreshcheck == null) { $location.path('/'); } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js index 7effc15..4b6cc38 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js @@ -605,9 +605,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout if (clickedCIImage.length > 0 && clickedCISummary.length > 0) { - $rootScope.isLoading = false; - $('#spinner').css('visibility', 'hidden'); - $.jsPanel({ id: 'ciImagePanel', selector: '.ciView', @@ -633,6 +630,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout }); + + $('#canvasDiv img').load(function () { + + $rootScope.isLoading = false; + $('#spinner').css('visibility', 'hidden'); + }); + $rootScope.currentSlug = 'clinical-illustrations-detail'; $rootScope.openViews.push( diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 09e8887..25ce3fd 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -11,7 +11,8 @@ 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; @@ -273,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'); @@ -594,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; @@ -979,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) { @@ -1728,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'); @@ -1777,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)) @@ -1787,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(); } } @@ -2197,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)) @@ -2211,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'); @@ -2220,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(); } } @@ -2514,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); @@ -2535,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(); @@ -2802,7 +2848,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $('#spinner').css('visibility', 'hidden'); - + $scope.EnableUI(); } } @@ -2828,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(); @@ -2837,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'); @@ -3075,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); @@ -3291,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; @@ -3310,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) { @@ -3461,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(); @@ -3910,6 +3958,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l document.getElementById('dot').style.display = 'block'; document.getElementById('dot').style.left = ((Globe[0].currentX) - 10) + 'px'; document.getElementById('dot').style.top = ((Globe[0].currentY) + 10) + 'px'; + document.getElementById('bord').style.display = 'block'; + document.getElementById('bord').style.left = ((Globe[0].currentX) - 2) + 'px'; + document.getElementById('bord').style.top = ((Globe[0].currentY) + 1) + 'px'; document.getElementById('sppeachBubble').style.display = 'block'; document.getElementById('sppeachBubble').style.left = (Globe[0].currentX) + 'px'; document.getElementById('sppeachBubble').style.top = (Globe[0].currentY) + 'px'; @@ -4108,6 +4159,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l document.getElementById('dot_annotation').style.display = 'block'; document.getElementById('dot_annotation').style.left = ((Globe[0].currentX) - 10) + 'px'; document.getElementById('dot_annotation').style.top = ((Globe[0].currentY) + 10) + 'px'; + document.getElementById('bord_annotation').style.display = 'block'; + document.getElementById('bord_annotation').style.left = ((Globe[0].currentX) - 2) + 'px'; + document.getElementById('bord_annotation').style.top = ((Globe[0].currentY) + 1) + 'px'; document.getElementById('sppeachBubble_annotation').style.display = 'block'; document.getElementById('sppeachBubble_annotation').style.left = (Globe[0].currentX) + 'px'; document.getElementById('sppeachBubble_annotation').style.top = (Globe[0].currentY) + 'px'; @@ -4311,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)); } } @@ -4347,6 +4401,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l function mouseUpListener(e) { + $scope.DisableUI(); + $scope.isTBDrawnOnBodyRegion = false; $(".com").remove(); @@ -4358,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); @@ -4406,7 +4462,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } - $scope.isTransparencyActivated = true; + $rootScope.isTransparencyActivated = true; + $scope.isTransparencyBtnClicked = false; var BodyRegionDictionary = $rootScope.BodyRegionCordinatesData; @@ -4537,8 +4594,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l }) //for modesty - if ($rootScope.isModestyOn == true && $scope.modestyImageInfo.length > 0) { - $.each($scope.modestyImageInfo, function (index, value) { + //if ($rootScope.isModestyOn == true && $scope.modestyImageInfo.length > 0) { + if ($scope.modestyImageInfo.length > 0) { + + $.each($scope.modestyImageInfo, function (index, value) { var tBoxDimesions = $scope.getTBoxDimesions($scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, value.x, value.y, value.Height, value.Width); @@ -4582,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'); @@ -4672,7 +4731,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.loadTransparencyImage = function (bodyRegionId, Height, Width, X, Y, IsMirror, TransparencyBoxStartX, TransparencyEndX, TransparencyBoxStartY, TransparencyBoxEndY, scope, isLayerChanged, isTransparencyChanged, isResized) { - var transparencyCanvas = document.getElementById('transparencyCanvas'); TransparencyBoxStartX = parseInt((transparencyCanvas.style.left).replace('px', '')); @@ -4692,6 +4750,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l var HeightforTransImage = TBImageDimensions.HeightforTransImageTB; var YforTransImage = TBImageDimensions.YforTransImageTB; + //0. get current layer number if (isResized) { //do nothing @@ -4727,7 +4786,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l var tranparencyImgSrc; var tranparencyMaskImgSrc; - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) { + if ((bodyRegionId.match('modestyImg'))) { var modestyBodyRegionData = new jinqJs() .from($scope.modestyImageInfo) .where('bodyRegionId == ' + bodyRegionId) @@ -4777,8 +4836,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l transparencyTempcanavsMask.id = 'transparencyTempCanvasMask_MR' + bodyRegionId + '_mci'; } else { - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) { - transparencyTempCanvas.id = 'transparencyTempCanvas_' + bodyRegionId; + if ((bodyRegionId.match('modestyImg'))) { + + transparencyTempCanvas.id = 'transparencyTempCanvas_' + bodyRegionId; } else { @@ -4798,7 +4858,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l document.getElementById('canvasDiv').appendChild(transparencyTempCanvas); //create temp mask canvas - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) { } + if ((bodyRegionId.match('modestyImg'))) { } + else { transparencyTempcanavsMask.height = Height; transparencyTempcanavsMask.width = Width; @@ -4811,10 +4872,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } //for modesty canvas - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) { + if ((bodyRegionId.match('modestyImg'))) { var modestyTransTempCanvasId = 'tempCanvasModesty_' + bodyRegionId; var modestyTransCanvasId = 'modestyTransCanavs_' + bodyRegionId; + if (document.getElementById(modestyTransTempCanvasId) != null) { document.getElementById(modestyTransTempCanvasId).parentNode.removeChild(document.getElementById(modestyTransTempCanvasId)); } @@ -4829,7 +4891,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l tempCanvasModesty.style.top = 10 + 'px'; tempCanvasModesty.style.backgroundColor = "transparent"; tempCanvasModesty.style.visibility = 'hidden'; - tempCanvasModesty.style.border = "black 1px solid"; + // tempCanvasModesty.style.border = "black 1px solid"; document.getElementById('canvasDiv').appendChild(tempCanvasModesty); } if (document.getElementById(modestyTransCanvasId) != null) { @@ -4837,16 +4899,21 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } if (document.getElementById(modestyTransCanvasId) == null || document.getElementById(modestyTransCanvasId) == undefined) { - $rootScope.isTBoxModestyVisible = true; + var canvasModesty = document.createElement('canvas'); canvasModesty.id = modestyTransCanvasId; + canvasModesty.className = 'transModestyImg' canvasModesty.height = Height; canvasModesty.width = Width; canvasModesty.style.position = "absolute"; canvasModesty.style.left = X + 'px'; canvasModesty.style.top = Y + 'px'; - canvasModesty.style.visibility = 'visible'; - if($rootScope.currentBodyViewId=="11"){ + if ($rootScope.isModestyOn == true) { + canvasModesty.style.visibility = 'visible'; + $rootScope.isTBoxModestyVisible = true; + } + else + canvasModesty.style.visibility = 'hidden'; canvasModesty.style.zIndex = 11000; } @@ -4867,8 +4934,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l tempCanvasID = 'transparencyTempCanvas_MR_' + bodyRegionId; } else { - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) { - tempCanvasID = 'transparencyTempCanvas_' + bodyRegionId;//bodyRegionId; + if ((bodyRegionId.match('modestyImg'))) { + + tempCanvasID = 'transparencyTempCanvas_' + bodyRegionId;//bodyRegionId; } else tempCanvasID = 'transparencyTempCanvas_' + bodyRegionId; @@ -4908,7 +4976,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l if ($rootScope.isHighLight != true) { - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) { + if ((bodyRegionId.match('modestyImg'))) { + var modestyTempCanvasId = 'tempCanvasModesty_' + bodyRegionId; if (document.getElementById(modestyTempCanvasId) != undefined || document.getElementById(modestyTempCanvasId) != null) { var contxModestyTemp = document.getElementById(modestyTempCanvasId).getContext('2d'); @@ -4963,7 +5032,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } //set modesty image visiblility true/false as per layer - // if(bodyRegionId.match('modestyImg3')) var BRID = ''; if (bodyRegionId.match('modestyImg') && document.getElementById('modestyTransCanavs_' + bodyRegionId) != null) { BRID = bodyRegionId[bodyRegionId.length - 1]; @@ -4989,7 +5057,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l var modestyCanavs = document.getElementById(modestyTransCanvases[j].id); - if ((parseInt(lowerlayerNumberForModesty) <= parseInt($scope.layerNumber)) && (HigherlayerNumberForModesty) > parseInt($scope.layerNumber)) { + if ($rootScope.isModestyOn == true && (parseInt(lowerlayerNumberForModesty) <= parseInt($scope.layerNumber)) && (HigherlayerNumberForModesty) > parseInt($scope.layerNumber)) { modestyCanavs.style.visibility = 'visible'; } @@ -5026,7 +5094,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l XforCopyImage = 0; WidthforCopyImage = Width; WidthforTransImage = Width; - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) { + + if ((bodyRegionId.match('modestyImg'))) { XforTransImage = 0; } else @@ -5040,7 +5109,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l WidthforTransImage = parseInt(TransparencyEndX) - parseInt(X); - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) { + if ((bodyRegionId.match('modestyImg'))) { XforTransImage = 0; } else @@ -5053,7 +5122,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l WidthforCopyImage = parseInt(X) + parseInt(Width) - parseInt(TransparencyBoxStartX); WidthforTransImage = parseInt(X) + parseInt(Width) - parseInt(TransparencyBoxStartX); - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) { + if ((bodyRegionId.match('modestyImg'))) { XforTransImage = parseInt(TransparencyBoxStartX) - parseInt(X); } @@ -5064,7 +5133,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l XforCopyImage = parseInt(TransparencyBoxStartX) - parseInt(X);//parseInt(X) + parseInt(Width) - parseInt(scope.TransparencyBoxStartX)// scope.TransparencyBoxStartX ; WidthforCopyImage = parseInt(TransparencyEndX) - parseInt(TransparencyBoxStartX); WidthforTransImage = parseInt(TransparencyEndX) - parseInt(TransparencyBoxStartX); - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) { + if ((bodyRegionId.match('modestyImg'))) { XforTransImage = parseInt(TransparencyBoxStartX) - parseInt(X); } @@ -5081,7 +5150,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l HeightforCopyImage = Height; HeightforTransImage = Height; - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) { + + if ((bodyRegionId.match('modestyImg'))) { YforTransImage = 0; } else @@ -5094,7 +5164,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l HeightforTransImage = (parseInt(TransparencyBoxEndY)) - parseInt(Y)// - parseInt(scope.TransparencyBoxStartY)); - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) { + if ((bodyRegionId.match('modestyImg'))) { YforTransImage = 0; } else @@ -5106,8 +5176,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l YforCopyImage = parseInt(TransparencyBoxStartY) - parseInt(Y); HeightforCopyImage = parseInt(Y) + parseInt(Height) - parseInt(TransparencyBoxStartY); HeightforTransImage = parseInt(Y) + parseInt(Height) - parseInt(TransparencyBoxStartY); - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) { - YforTransImage = parseInt(TransparencyBoxStartY) - parseInt(Y); + + if ((bodyRegionId.match('modestyImg'))) { + YforTransImage = parseInt(TransparencyBoxStartY) - parseInt(Y); } else @@ -5119,7 +5190,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l YforCopyImage = parseInt(TransparencyBoxStartY) - parseInt(Y); HeightforCopyImage = parseInt(TransparencyBoxEndY) - parseInt(TransparencyBoxStartY); HeightforTransImage = parseInt(TransparencyBoxEndY) - parseInt(TransparencyBoxStartY); - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) { + + if ((bodyRegionId.match('modestyImg'))) { YforTransImage = parseInt(TransparencyBoxStartY) - parseInt(Y); } @@ -5196,6 +5268,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.DrawOnTBWithSelectedTransparency = function (tempCanvasID, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage, Height, Width, bodyRegionId, isLayerChanged, isResized) { + + var transNumber = $scope.transNumber;//txtTransparencyChange.value; //this changes the transparency when transparency is already activated and user resizes or chage the layer @@ -5242,7 +5316,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l var ctx; - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) { + if ((bodyRegionId.match('modestyImg'))) { + var modestyTransCanvasId = 'modestyTransCanavs_' + bodyRegionId ctx = document.getElementById(modestyTransCanvasId).getContext('2d'); } @@ -5253,7 +5328,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l ctx.drawImage(tmpCanvasContext, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage) - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) { + if ((bodyRegionId.match('modestyImg'))) { var imageD1 = ctx.getImageData(0, 0, Width, Height); var imageData1 = imageD1.data; @@ -5268,8 +5343,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } - ctx.putImageData(imageD1, 0, 0); + if ($rootScope.isModestyOn) + document.getElementById('modestyTransCanavs_' + bodyRegionId).style.visibility = 'visible'; + else + document.getElementById('modestyTransCanavs_' + bodyRegionId).style.visibility = 'hidden'; } @@ -5288,6 +5366,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } + + $scope.EnableUI(); } @@ -6293,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"); @@ -6339,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) { @@ -6356,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; //}) @@ -6369,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 }) } @@ -6385,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'); @@ -6513,7 +6593,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $('.btnCursor').removeClass('activebtncolor'); $(".annotationTollbar").css("display", "none"); $("#annotationButton").removeClass("active"); - $("#btnExtract").removeClass("disabled"); + if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) { + $("#btnExtract").addClass("disabled"); + $('#btnTranparency').addClass('tButtonActive'); + $('#btnTranparency').removeClass('btn-black'); + } + else + $("#btnExtract").removeClass("disabled"); + $("#btnTranparency").removeClass("disabled"); $rootScope.isTransparencyBoxActivated = false; $rootScope.isNormalMode = false; @@ -6533,7 +6620,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.terminateCurrentlyRunningWPs(); - if ($scope.isTransparencyActivated) { + if ($rootScope.isTransparencyActivated) { $scope.CloseTransparencyBox(); @@ -6676,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(); @@ -6694,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) { @@ -6758,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(); @@ -6860,6 +6941,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.enableExtract = function (isCalledFromButton) { + $scope.DisableUI(); + console.log('isCalledFromButton= ' + isCalledFromButton); //$rootScope.isHighlightBodyByBodySystem = false; @@ -6870,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"); @@ -6998,7 +7081,17 @@ 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'); + $('#btnTranparency').removeClass('btn-black'); + } $scope.Normal = ""; $scope.Extract = ""; $scope.Highlight = "LeftButtonsDefaultState"; @@ -7208,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(); } } @@ -7237,7 +7334,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l else { $scope.isLoading = false; $('#spinner').css('visibility', 'hidden'); - + $scope.EnableUI(); } } } @@ -7376,6 +7473,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l else { $scope.isLoading = false; $('#spinner').css('visibility', 'hidden'); + $scope.EnableUI(); } } @@ -7488,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; @@ -7500,7 +7599,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l //close transparecny box $scope.CloseTransparencyBox(); - + if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) { + $("#btnExtract").addClass("disabled"); + $('#btnTranparency').addClass('tButtonActive'); + $('#btnTranparency').removeClass('btn-black'); + } //if listanager is visisble then close it // $rootScope.isListManagerSelected = false; @@ -7728,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(); + @@ -7747,7 +7850,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l //close transparency box $scope.CloseTransparencyBox(); - + if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) { + $("#btnExtract").addClass("disabled"); + $('#btnTranparency').addClass('tButtonActive'); + $('#btnTranparency').removeClass('btn-black'); + } //if listanager is visisble then close it //$rootScope.isListManagerSelected = false; @@ -7952,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); @@ -8089,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; @@ -8661,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; @@ -9393,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. @@ -9403,6 +9524,8 @@ function OnZoom() { scope.$apply(function () { scope.enableZoom(); }); + + } function onListManagerTermSelection(id, isTermListOptionClicked) { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 0d1a77c..84a75c1 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -220,7 +220,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic } else { - if (result.UserType == UserTypeConstants.SUPER_ADMIN && result.IsActive) { //(!result.IsSubscriptionExpired) && + //if (result.UserType == UserTypeConstants.SUPER_ADMIN && result.IsActive) { //(!result.IsSubscriptionExpired) && + if (result.LicenseId == 0 && result.IsActive) { $rootScope.userData = result; $rootScope.userModules = result.Modules; $rootScope.isVisibleLogin = false; @@ -377,7 +378,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.userModules = userInfo.Modules; $rootScope.isVisibleLogin = false; - + $rootScope.haveRoleAdmin = true; if ($rootScope.refreshcheck == null) { @@ -388,6 +389,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic else { + $rootScope.haveRoleAdmin = false; + if (userInfo.LicenseInfo.IsTermAccepted) { $rootScope.userData = userInfo; $rootScope.userModules = userInfo.Modules; @@ -995,8 +998,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic // alert($rootScope.AnnotationFontFamily.FontStyle.length); for (var i = 0; i <= $rootScope.AnnotationFontFamily.FontFamily.length - 1; i++) { - - $("#selected-font-family").append(""); + var fontName = $rootScope.AnnotationFontFamily.FontFamily[i].FontName; + if (/\s/g.test(fontName)) { //Check if white-space exists in between strings + fontName = fontName.replace(" ", "_"); // replace white-space with an underscore + } + //$rootScope.AnnotationFontFamily.FontFamily[i].FontName + $("#selected-font-family").append(""); } $rootScope.isFontFamilyLoaded = true; @@ -3039,7 +3046,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": $rootScope.TextPropertyArray[i].FontColor }); var CurrentFontFamily = $rootScope.TextPropertyArray[i].FontFamily; - // alert(CurrentFontFamily); + // alert(CurrentFontFamily); // CurrentFontFamily = CurrentFontFamily.replace(/'/g, ""); var CurrentFontSize = parseInt($rootScope.TextPropertyArray[i].FontSize); $("#selected-font-family option[value=" + CurrentFontFamily + "]").prop('selected', true); @@ -3666,6 +3673,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $rootScope.closeModal = function () { document.getElementById('modelbackground').style.display = "none"; + $("#drawTextBGColorpicker span.minicolors-swatch-color").css('background-color', $rootScope.selectedBGColorForTextArea); } //-- End ---------------------------- @@ -4172,6 +4180,16 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $('.modestyImg').css('visibility', 'hidden'); } } + + if ($('.transModestyImg') != null) { + if (($rootScope.globalSetting.modesty == 'Y')) { + $('.transModestyImg').css('visibility', 'visible'); + } + + else { + $('.transModestyImg').css('visibility', 'hidden'); + } + } $rootScope.changeNavigatorModesty(); } @@ -4310,6 +4328,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic } if ($location.url() == "/module-item-view") { $("#aaDetailViewCanvas").css("display", "none"); + $("#canvasPaint").css("display", "none"); + $("#canvas").css("display", "none"); + } }, 520); } @@ -4327,6 +4348,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic } if ($location.url() == "/module-item-view") { $("#aaDetailViewCanvas").css("display", "none"); + $("#canvasPaint").css("display", "none"); + $("#canvas").css("display", "none"); } }, 320); } @@ -4353,6 +4376,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic function OpenJSPanel() { $("#daImagePanel").css({ "pointer-events": "none", "opacity": ".5" }); $("#ciImagePanel").css({ "pointer-events": "none", "opacity": ".5" }); + $("#ImagePanel").css({ "pointer-events": "none", "opacity": ".5" }); $.jsPanel({ id: 'jsPanel-1', selector: '#dvPrintPreview', @@ -4403,34 +4427,34 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $(document).on('change', '#printPSOptions', function () { var option = $('#printPSOptions').find(":selected").text(); switch (option) { - case (option = "10%"): + case ("10%"): ResizeImage(0.1); break; - case (option = "25%"): + case ("25%"): ResizeImage(0.25); break; - case (option = "50%"): + case ("50%"): ResizeImage(0.5); break; - case (option = "75%"): + case ("75%"): ResizeImage(.75); break; - case (option = "65%"): + case ("65%"): ResizeImage(0.65); break; - case (option = "100%"): + case ("100%"): ResizeImage(1); break; - case (option = "150%"): + case ("150%"): ResizeImage(1.5); break; - case (option = "200%"): + case ("200%"): ResizeImage(2); break; - case (option = "500%"): + case ("500%"): ResizeImage(5); break; - case (option = "Auto"): + case ("Auto"): ResizeImage(0); break; default: @@ -4480,11 +4504,16 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $(document).on('click', '#jsPanel-1 .jsglyph-remove', function () { $("#daImagePanel").css({ "pointer-events": "auto", "opacity": "1" }); $("#ciImagePanel").css({ "pointer-events": "auto", "opacity": "1" }); + $("#ImagePanel").css({ "pointer-events": "auto", "opacity": "1" }); $("#annotationButton").parent().removeClass("disableMenuannotation"); $("#annotationToolBarOptions").removeClass("disableMenuoption"); $("#optionsListManagerTab").removeClass("disableMenuoption"); $('#fileMenuAnchor').parent().removeClass('disableFileMenu'); - $("#aaDetailViewCanvas").css("display", "block"); + if ($location.url() == "/module-item-view") { + $("#aaDetailViewCanvas").css("display", "block"); + $("#canvasPaint").css("display", "block"); + $("#canvas").css("display", "block"); + } if ($('#jsPanel-1').length > 0) $('#jsPanel-1').remove(); console.log('close'); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 2f533c3..5339c85 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -324,7 +324,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou }) $rootScope.aaPinDataArray = []; $scope.showAllPins = function () { - + $scope.allPinDataArray = []; var promise = ModuleService.getPinDataForImage($rootScope.imageName) @@ -576,7 +576,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } $scope.showSelectedSystemPins = function (event) { - var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a"); var bodySystemListlength = bodySystemListObj.length; for (var i = 0; i < bodySystemListlength; i++) { @@ -655,7 +654,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } $scope.showAnnotation = function (selectedPinData, isCtrlPressed, isPinClicked, isItemSearched) { - + $scope.clickedPins = []; $scope.selectedPin = []; var isSameTermWithMultiPin = false; var firstPinId = selectedPinData[0]._PinId; @@ -713,13 +712,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou angular.forEach(pinDataWithFirstTermNumber, function (value, key) { $scope.selectedPin.push(value._PinId); + $scope.clickedPins.push({ 'id': value._PinId }); var headX = (parseInt(value._HeadX)); var headY = (parseInt(value._HeadY)); $scope.createSpeechBubble(parseInt(headX) + 10, parseInt(headY) + 10, value._PinId, isCtrlPressed, isPinClicked, isSameTermWithMultiPin); }) - - - + } $rootScope.isLoading = false; @@ -1360,7 +1358,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } $rootScope.hidePins = function () { - + $("#dropdownMenu221").addClass("aaSystemDisable"); $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); $scope.hideSpeechBubble(); @@ -1389,10 +1387,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } $scope.showAllPinsAfterHide = function (event) { + if ($("#dropdownMenu221").hasClass("aaSystemDisable")) { + $("#dropdownMenu221").removeClass("aaSystemDisable"); + } $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); $scope.isHidePinBtnClicked = false; - + $rootScope.isshowAllPinsBtnAfterHideClicked = true; if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) { $scope.showSystemPins($scope.selectedSystemPinData, false); @@ -1415,6 +1416,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.showSelectedPins = function () { + if ($("#dropdownMenu221").hasClass("aaSystemDisable")) { + $("#dropdownMenu221").removeClass("aaSystemDisable"); + } $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); @@ -1518,8 +1522,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } - + $rootScope.isshowAllPinsBtnAfterHideClicked = true; $scope.showItemsForSearch = function () { + if($rootScope.isshowAllPinsBtnAfterHideClicked == true){ console.log('showItemsForSearch is called'); //this check is for log only because we are writing length so need to check if its not null or undefined @@ -1547,7 +1552,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } }, 500); - + } } @@ -1574,8 +1579,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $("#termlistfilter li a").css({ "background-color": "#ffffff", "color": "#000000" }); $("#termlistfilter li #" + $scope.searchItemId).css({ "background-color": "#3399FF", "color": "#ffffff" }); $scope.searchFilter = $("#" + id).text(); - selectedTermName.placeholder = $("#" + id).text(); - + //selectedTermName.placeholder = $("#" + id).text(); + selectedTermName.value = $("#" + id).text(); + selectedTermName.placeholder = "search... "; //get data from pindata for this trem diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js index a82768c..0a27b5c 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js @@ -498,7 +498,7 @@ AIA.constant("UserModules", [ ]); AIA.constant("AIAConstants", { - "NO_BODY_SYSTEM_AVAILABLE": "No body system available in this layer.", + "NO_BODY_SYSTEM_AVAILABLE": "Selected body system is not available on this layer.", }) AIA.config(function ($routeProvider, pages, $locationProvider) { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html index 69c183b..a226654 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html @@ -26,7 +26,7 @@
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index c23caff..db65b9f 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -317,7 +317,7 @@ > - +