diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index bdc2b79..a6f0cf2 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1,8 +1,8 @@  'use strict'; -AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "DataService", "TermService", "AIAConstants", - function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, DataService, TermService,AIAConstants) { +AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "DataService","TermService","AIAConstants", + function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, DataService, TermService, AIAConstants) { $scope.genderId = ""; @@ -2645,11 +2645,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } - if ($scope.layerNumber == 224) - { - } - else { - + var worker = new Worker('term-number-wp.js'); //push workers in array to further used the refernece to delete the workers @@ -2799,7 +2795,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l worker.onerror = function (e) { alert('Error: Line ' + e.lineno + ' in ' + e.filename + ': ' + e.message); }; - } + } } }, 100) @@ -2809,6 +2805,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.HighlightBodyByTermListForBodySystem = function (TermList) { + //disable the background till the system gets highlighted. + document.getElementById("daView").style.pointerEvents="none"; + $("#btnTranparency").attr('disabled', 'disabled'); $scope.currentLayerNumber = $scope.layerNumber; @@ -2859,6 +2858,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE; $("#daMessageModal").modal('show'); + + $scope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE; + $("#daMessageModal").modal('show'); + document.getElementById("daView").style.pointerEvents = "auto"; + } else { console.log('1. HighlightBodyByTermListForBodySystem is called'); @@ -3033,6 +3037,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $('#spinner').css('visibility', 'hidden') $rootScope.isLoading = false; + + document.getElementById("daView").style.pointerEvents = "auto"; + prevBRID = TermExistInBodyRegionId; }) @@ -3042,6 +3049,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l else { $('#spinner').css('visibility', 'hidden') $rootScope.isLoading = false; + document.getElementById("daView").style.pointerEvents = "auto"; + } }) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js index c8d9517..380d783 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js @@ -335,7 +335,8 @@ AIA.constant("AdminConstants", { "ERROR_IN_SENDING_MAIL": "Some internal error occured.", "MAIL_SENT": "Mail sent.", "MAIL_NOT_SENT": "Mail not sent.", - "MAIL_SENT_SUCCESS_MESSAGE": "We have received your request. We will get back to you soon." + "MAIL_SENT_SUCCESS_MESSAGE": "We have received your request. We will get back to you soon.", + }) AIA.constant("UserTypeConstants", { "SUPER_ADMIN": "Super Admin", @@ -425,7 +426,10 @@ AIA.constant("UserModules", [ "slug": "Link/aod" } ]); +AIA.constant("AIAConstants", { + "NO_BODY_SYSTEM_AVAILABLE" : "No body system available in this layer.", +}) AIA.config(function ($routeProvider, pages, $locationProvider) { $locationProvider.html5Mode(true); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html index 24cacbe..d65f4f7 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html @@ -169,17 +169,17 @@