ADAM / AIAHTML5

Commit 2b8460587f543de8c01e2a4615f380c2fe4208ef

Authored by Amrita Vishnoi
2 parents c982ce6d 76ae71d9

Merge branch 'Develop' into QA

Inline Side-by-side
Showing 14 changed files with 317 additions and 128 deletions
150-DOCUMENTATION/001-CONFIGURATION/ADAM Education Servers List-updated.xlsx
View file @2b84605
No preview for this file type
150-DOCUMENTATION/AIA-TimelinesForIPAD-MAC.xlsx 0 → 100644
View file @2b84605
No preview for this file type
150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Product Sprint 40(30-Sep-2017).xlsx 0 → 100644
View file @2b84605
No preview for this file type
150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Sep17.xlsx
View file @2b84605
No preview for this file type
400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs
  View file @2b84605
... ... @@ -184,7 +184,14 @@ using System.Data.SqlClient;namespace AIAHTML5.API.Controllers
184 184 {
185 185 //based on old .net code(AIA flex), we get modules based on licenseId if licenseid>0.
186 186 //we verified in database that only superadmin has no licenseid so getting all modules for supeadmin
187   - if (userInfo.UserType == AIAHTML5.API.Models.User.SUPER_ADMIN)
  187 + int licenseId, editionId;
  188 + AIAHTML5.API.Models.Users.getLicenseIdForThisUser(userInfo.Id, out licenseId, out editionId);
  189 +
  190 + userInfo.LicenseId = licenseId;
  191 + userInfo.EditionId = editionId;
  192 +
  193 + //if (userInfo.UserType == AIAHTML5.API.Models.User.SUPER_ADMIN)
  194 + if(userInfo.LicenseId == 0)
188 195 {
189 196 userInfo.Modules = AIAHTML5.API.Models.Users.getAllModulesList();
190 197  
... ... @@ -204,11 +211,11 @@ using System.Data.SqlClient;namespace AIAHTML5.API.Controllers
204 211 private static void CheckLicenseStatus(User userInfo)
205 212 {
206 213 //05.1 For normal user need to get the license details, get the license id for authenticated user
207   - int licenseId, editionId;
208   - AIAHTML5.API.Models.Users.getLicenseIdForThisUser(userInfo.Id, out licenseId, out editionId);
  214 + //int licenseId, editionId;
  215 + //AIAHTML5.API.Models.Users.getLicenseIdForThisUser(userInfo.Id, out licenseId, out editionId);
209 216  
210   - userInfo.LicenseId = licenseId;
211   - userInfo.EditionId = editionId;
  217 + //userInfo.LicenseId = licenseId;
  218 + //userInfo.EditionId = editionId;
212 219  
213 220 //05.2 get license details
214 221 userInfo.LicenseInfo = AIAHTML5.API.Models.Users.getLicenseDetails(userInfo.LicenseId);
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
  View file @2b84605
1 1 AIA.controller("3dAController", ["$scope", "$rootScope", "pages", "$log", '$http', 'DataService', '$filter', '$location', '$document', '$sce', "$compile",
2 2 function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location, $document, $sce, $compile) {
3 3  
4   - $rootScope.currentActiveModuleTitle = pages[5].name;
  4 +
5 5 $scope.showTabButton = false;
6 6 $scope.threeDAnatomyData;
7 7 $scope.Id;
8 8 $scope.$on('$viewContentLoaded', function (event) {
9   -
  9 + var currentURL = $location.path();
  10 + var selectedModuleName = '';
  11 + //set module title
  12 + angular.forEach($rootScope.userModules, function (value, key) {
  13 + if (value.slug === currentURL.replace('/', '')) {
  14 + selectedModuleName = value.name;
  15 + }
  16 + $rootScope.currentActiveModuleTitle = selectedModuleName;
  17 + })
10 18 if ($rootScope.refreshcheck == null) {
11 19 $location.path('/');
12 20 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @2b84605
... ... @@ -605,9 +605,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
605 605  
606 606 if (clickedCIImage.length > 0 && clickedCISummary.length > 0) {
607 607  
608   - $rootScope.isLoading = false;
609   - $('#spinner').css('visibility', 'hidden');
610   -
611 608 $.jsPanel({
612 609 id: 'ciImagePanel',
613 610 selector: '.ciView',
... ... @@ -633,6 +630,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
633 630  
634 631 });
635 632  
  633 +
  634 + $('#canvasDiv img').load(function () {
  635 +
  636 + $rootScope.isLoading = false;
  637 + $('#spinner').css('visibility', 'hidden');
  638 + });
  639 +
636 640 $rootScope.currentSlug = 'clinical-illustrations-detail';
637 641  
638 642 $rootScope.openViews.push(
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @2b84605
... ... @@ -11,7 +11,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
11 11 $scope.imagePath = "";
12 12 $rootScope.BodyRegionData;
13 13 $rootScope.BodyRegionCordinatesData;
14   - $scope.isTransparencyActivated = false;
  14 + $rootScope.isTransparencyActivated = false;
  15 + $scope.isTransparencyBtnClicked = false;
15 16 $rootScope.BodyLayerData;
16 17 $rootScope.VocabTermData;
17 18  
... ... @@ -273,12 +274,34 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
273 274  
274 275 };
275 276  
  277 + $scope.DisableUI = function () {
  278 + var daImagePanelConetent = document.getElementsByClassName("jsPanel-content");
  279 + for (var i = 0; i < daImagePanelConetent.length; i++) {
  280 + daImagePanelConetent[i].style.pointerEvents = "none";
  281 + daImagePanelConetent[i].style.opacity = "0.5";
  282 +
  283 + }
  284 + //to disbale layer change slider
  285 + $('.ui-slider').slider('disable');
  286 + }
276 287  
  288 + $scope.EnableUI = function () {
  289 +
  290 + var daImagePanelConetent = document.getElementsByClassName("jsPanel-content");
  291 + for (var i = 0; i < daImagePanelConetent.length; i++) {
  292 + daImagePanelConetent[i].style.pointerEvents = "auto";
  293 + daImagePanelConetent[i].style.opacity = "1";
  294 + }
  295 + //to enable layer change slider
  296 + $('.ui-slider').slider('enable');
  297 +
  298 + }
277 299  
278 300 $scope.openView = function ($event) {
  301 + $scope.DisableUI();
  302 +
279 303 $rootScope.disableAnnotationTB = false;
280 304 $rootScope.MenuModuleName = "DA";
281   - //alert($rootScope.MenuModuleName);
282 305 $rootScope.isLoading = true;
283 306 $('#spinner').css('visibility', 'visible');
284 307  
... ... @@ -594,6 +617,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
594 617 }
595 618  
596 619 angular.element(document).ready(function (e) {
  620 +
597 621 $(document).on("click", "#daImagePanel .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
598 622 $rootScope.selectedBodySystemName = 'All';
599 623 $rootScope.selectedBodySystemId = 0;
... ... @@ -979,10 +1003,17 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
979 1003 var canDiv = document.getElementById('canvasDiv');
980 1004 var canDivChildCount = canDiv.childElementCount;
981 1005 if (canDivChildCount > 0) {
982   - canDiv.innerHTML = '';
983 1006  
984   - //remove transparency scale
985   - $('#transparencyScale').css('visibility', 'hidden');
  1007 + if ($rootScope.isTransparencyActivated) {
  1008 + $scope.flushCanvas();
  1009 + $('#transparencyScale').css('visibility', 'visible');
  1010 + }
  1011 + else {
  1012 + canDiv.innerHTML = '';
  1013 + //remove transparency scale
  1014 + $('#transparencyScale').css('visibility', 'hidden');
  1015 + }
  1016 +
986 1017 }
987 1018  
988 1019 if ($scope.ColoredImageSRC != null && $scope.ColoredImageSRC.length > 0) {
... ... @@ -1728,6 +1759,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1728 1759 }
1729 1760 );
1730 1761 }
  1762 + //else if ($scope.ColoredImageSRC.length == totalCanvas)
  1763 + //{
  1764 + // // dispatch event for enabling rest UI
  1765 + // alert('all canvas drawn');
  1766 + // $scope.EnableUI();
  1767 + //}
  1768 +
1731 1769 //-NIKI-for solving extarct issue 8286
1732 1770  
1733 1771 var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId + '_MR');
... ... @@ -1777,6 +1815,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1777 1815 if ($scope.isExtract == true) {
1778 1816 $rootScope.isLoading = true;
1779 1817 $('#spinner').css('visibility', 'visible');
  1818 + $scope.DisableUI();
1780 1819 $scope.highLightBody();
1781 1820 }
1782 1821 else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true))
... ... @@ -1787,12 +1826,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1787 1826 $rootScope.isLoading = true;
1788 1827 $('#spinner').css('visibility', 'visible');
1789 1828 $rootScope.isHighLight = true;
  1829 + $scope.DisableUI();
1790 1830 $scope.highLightBody();
1791 1831 }
1792 1832 }
1793 1833 else {
1794 1834 $rootScope.isLoading = false;
1795 1835 $('#spinner').css('visibility', 'hidden');
  1836 + $scope.EnableUI();
1796 1837 }
1797 1838 }
1798 1839  
... ... @@ -2197,6 +2238,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2197 2238 if ($scope.isExtract == true) {
2198 2239 $rootScope.isLoading = true;
2199 2240 $('#spinner').css('visibility', 'visible');
  2241 + $scope.DisableUI();
2200 2242 $scope.highLightBody();
2201 2243 }
2202 2244 else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true))
... ... @@ -2211,7 +2253,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2211 2253 $rootScope.isHighLight = true;
2212 2254  
2213 2255 console.log('just before highLightBody call');
2214   -
  2256 + $scope.DisableUI();
2215 2257 $scope.highLightBody();
2216 2258  
2217 2259 console.log('just after highLightBody call');
... ... @@ -2220,11 +2262,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2220 2262 else {
2221 2263 $rootScope.isLoading = false;
2222 2264 $('#spinner').css('visibility', 'hidden');
  2265 + $scope.EnableUI();
2223 2266 }
2224 2267 }
2225 2268 else {
2226 2269 $rootScope.isLoading = false;
2227 2270 $('#spinner').css('visibility', 'hidden');
  2271 + $scope.EnableUI();
2228 2272 }
2229 2273 }
2230 2274  
... ... @@ -2514,7 +2558,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2514 2558 //}
2515 2559  
2516 2560 if ($scope.doAligneCanvasWithTerm == true) {
2517   - $scope.aligneCanvasWithTerm()
  2561 + $scope.aligneCanvasWithTerm();
  2562 +
  2563 + $scope.EnableUI();
2518 2564 }
2519 2565  
2520 2566 // $timeout(function () { $scope.DisableProgressBar() }, 1000);
... ... @@ -2535,8 +2581,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2535 2581  
2536 2582 $scope.HighlightBodyByTermList = function (TermList) {
2537 2583  
2538   - $("#btnTranparency").attr('disabled', 'disabled');
2539   - $scope.currentLayerNumber = $scope.layerNumber;
  2584 + // $("#btnTranparency").attr('disabled', 'disabled');
  2585 + $rootScope.currentLayerNumber = $scope.layerNumber;
2540 2586  
2541 2587 $scope.layerNumber = $('#txtlayerNumber').val();
2542 2588  
... ... @@ -2802,7 +2848,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2802 2848  
2803 2849 $('#spinner').css('visibility', 'hidden');
2804 2850  
2805   -
  2851 + $scope.EnableUI();
2806 2852  
2807 2853 }
2808 2854 }
... ... @@ -2828,7 +2874,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2828 2874 document.getElementById("daView").style.pointerEvents="none";
2829 2875 $('.ui-slider').slider('disable');
2830 2876 $("#btnTranparency").attr('disabled', 'disabled');
2831   - $scope.currentLayerNumber = $scope.layerNumber;
  2877 + $rootScope.currentLayerNumber = $scope.layerNumber;
2832 2878  
2833 2879 $scope.layerNumber = $('#txtlayerNumber').val();
2834 2880  
... ... @@ -2837,7 +2883,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2837 2883  
2838 2884  
2839 2885 if ($rootScope.isHighLight == true) {
2840   - false;
  2886 + $rootScope.isHighLight = false;
  2887 + $scope.CloseTransparencyBox();
2841 2888 }
2842 2889  
2843 2890 console.log('HighlightBodyByTermListForBodySystem is called');
... ... @@ -3075,9 +3122,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3075 3122 $('#spinner').css('visibility', 'hidden')
3076 3123 $rootScope.isLoading = false;
3077 3124  
3078   - document.getElementById("daView").style.pointerEvents = "auto";
3079   - $('.ui-slider').slider('enable');
3080   -
  3125 + //document.getElementById("daView").style.pointerEvents = "auto";
  3126 + //$('.ui-slider').slider('enable');
  3127 + $scope.EnableUI();
3081 3128 prevBRID = TermExistInBodyRegionId;
3082 3129  
3083 3130 $scope.scrollToHighlightedBodyRegion(TermExistInBodyRegionId);
... ... @@ -3291,6 +3338,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3291 3338 //layer change function
3292 3339 $scope.LayerChange = function () {
3293 3340  
  3341 + $scope.DisableUI();
3294 3342  
3295 3343 //if listanager is visisble then close it
3296 3344 // $rootScope.isListManagerSelected = false;
... ... @@ -3310,7 +3358,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3310 3358 // $('#daLoaderLabel').css('visibility', 'visible');
3311 3359  
3312 3360  
3313   - if ($scope.isTransparencyActivated) {
  3361 + if ($rootScope.isTransparencyActivated) {
3314 3362  
3315 3363 //crete temp canavs to store the original data which will be used to chnange the transparency
3316 3364 if (document.getElementById('tempCanvas') != null) {
... ... @@ -3461,11 +3509,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3461 3509 var dataLength = $rootScope.BodyLayerData.Layers.DataLayer.length;
3462 3510 if (parseInt($('#txtlayerNumber').val()) > (dataLength - 1)) {
3463 3511 $('#txtlayerNumber').val(dataLength - 1);
3464   - $scope.currentLayerNumber = parseInt(dataLength - 1);
  3512 + $rootScope.currentLayerNumber = parseInt(dataLength - 1);
3465 3513 $scope.layerNumber = parseInt(dataLength - 1);
3466 3514 }
3467 3515 else
3468   - $scope.currentLayerNumber = parseInt($('#txtlayerNumber').val());
  3516 + $rootScope.currentLayerNumber = parseInt($('#txtlayerNumber').val());
3469 3517  
3470 3518 //$scope.isMousUp();
3471 3519  
... ... @@ -3910,6 +3958,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3910 3958 document.getElementById('dot').style.display = 'block';
3911 3959 document.getElementById('dot').style.left = ((Globe[0].currentX) - 10) + 'px';
3912 3960 document.getElementById('dot').style.top = ((Globe[0].currentY) + 10) + 'px';
  3961 + document.getElementById('bord').style.display = 'block';
  3962 + document.getElementById('bord').style.left = ((Globe[0].currentX) - 2) + 'px';
  3963 + document.getElementById('bord').style.top = ((Globe[0].currentY) + 1) + 'px';
3913 3964 document.getElementById('sppeachBubble').style.display = 'block';
3914 3965 document.getElementById('sppeachBubble').style.left = (Globe[0].currentX) + 'px';
3915 3966 document.getElementById('sppeachBubble').style.top = (Globe[0].currentY) + 'px';
... ... @@ -4108,6 +4159,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4108 4159 document.getElementById('dot_annotation').style.display = 'block';
4109 4160 document.getElementById('dot_annotation').style.left = ((Globe[0].currentX) - 10) + 'px';
4110 4161 document.getElementById('dot_annotation').style.top = ((Globe[0].currentY) + 10) + 'px';
  4162 + document.getElementById('bord_annotation').style.display = 'block';
  4163 + document.getElementById('bord_annotation').style.left = ((Globe[0].currentX) - 2) + 'px';
  4164 + document.getElementById('bord_annotation').style.top = ((Globe[0].currentY) + 1) + 'px';
4111 4165 document.getElementById('sppeachBubble_annotation').style.display = 'block';
4112 4166 document.getElementById('sppeachBubble_annotation').style.left = (Globe[0].currentX) + 'px';
4113 4167 document.getElementById('sppeachBubble_annotation').style.top = (Globe[0].currentY) + 'px';
... ... @@ -4311,9 +4365,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4311 4365  
4312 4366 document.getElementById('canvasDiv').removeEventListener("mousedown", mouseDownListener);
4313 4367 //Dated:19-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
4314   - if ($("#txtlayerNumber").val() != 0 && $scope.currentLayerNumber != undefined) {
4315   - $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.currentLayerNumber));
4316   - $("#txtlayerNumber").val(parseInt($scope.currentLayerNumber));
  4368 + if ($("#txtlayerNumber").val() != 0 && $rootScope.currentLayerNumber != undefined) {
  4369 + $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber));
  4370 + $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber));
4317 4371 }
4318 4372  
4319 4373 }
... ... @@ -4347,6 +4401,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4347 4401  
4348 4402 function mouseUpListener(e) {
4349 4403  
  4404 + $scope.DisableUI();
  4405 +
4350 4406 $scope.isTBDrawnOnBodyRegion = false;
4351 4407  
4352 4408 $(".com").remove();
... ... @@ -4358,7 +4414,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4358 4414 var previewRectangleHeight = $('.rectangle').height()
4359 4415  
4360 4416  
4361   - $scope.currentLayerNumber = parseInt($('#txtlayerNumber').val());
  4417 + $rootScope.currentLayerNumber = parseInt($('#txtlayerNumber').val());
4362 4418 $('.rectangle').remove();
4363 4419  
4364 4420 var currentMousePosition = $scope.getMousePos(e);
... ... @@ -4406,7 +4462,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4406 4462 }
4407 4463  
4408 4464  
4409   - $scope.isTransparencyActivated = true;
  4465 + $rootScope.isTransparencyActivated = true;
  4466 + $scope.isTransparencyBtnClicked = false;
4410 4467  
4411 4468 var BodyRegionDictionary = $rootScope.BodyRegionCordinatesData;
4412 4469  
... ... @@ -4537,8 +4594,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4537 4594 })
4538 4595  
4539 4596 //for modesty
4540   - if ($rootScope.isModestyOn == true && $scope.modestyImageInfo.length > 0) {
4541   - $.each($scope.modestyImageInfo, function (index, value) {
  4597 + //if ($rootScope.isModestyOn == true && $scope.modestyImageInfo.length > 0) {
  4598 + if ($scope.modestyImageInfo.length > 0) {
  4599 +
  4600 + $.each($scope.modestyImageInfo, function (index, value) {
4542 4601  
4543 4602 var tBoxDimesions = $scope.getTBoxDimesions($scope.TransparencyBoxStartX, TransparencyEndX, $scope.TransparencyBoxStartY, TransparencyBoxEndY, value.x, value.y, value.Height, value.Width);
4544 4603  
... ... @@ -4582,7 +4641,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4582 4641  
4583 4642 $('#btnTranparency').addClass('tButtonActive');
4584 4643  
4585   - // $('#txtlayerNumber').val((parseInt($scope.currentLayerNumber)) + 1);
  4644 + // $('#txtlayerNumber').val((parseInt($rootScope.currentLayerNumber)) + 1);
4586 4645 //Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
4587 4646 $('#btnTranparency').removeClass('tButtonActive');
4588 4647 $('#btnTranparency').addClass('btn-black');
... ... @@ -4672,7 +4731,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4672 4731  
4673 4732 $scope.loadTransparencyImage = function (bodyRegionId, Height, Width, X, Y, IsMirror, TransparencyBoxStartX, TransparencyEndX, TransparencyBoxStartY, TransparencyBoxEndY, scope, isLayerChanged, isTransparencyChanged, isResized) {
4674 4733  
4675   -
4676 4734 var transparencyCanvas = document.getElementById('transparencyCanvas');
4677 4735  
4678 4736 TransparencyBoxStartX = parseInt((transparencyCanvas.style.left).replace('px', ''));
... ... @@ -4692,6 +4750,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4692 4750 var HeightforTransImage = TBImageDimensions.HeightforTransImageTB;
4693 4751 var YforTransImage = TBImageDimensions.YforTransImageTB;
4694 4752  
  4753 +
4695 4754 //0. get current layer number
4696 4755 if (isResized) {
4697 4756 //do nothing
... ... @@ -4727,7 +4786,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4727 4786 var tranparencyImgSrc;
4728 4787 var tranparencyMaskImgSrc;
4729 4788  
4730   - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
  4789 + if ((bodyRegionId.match('modestyImg'))) {
4731 4790 var modestyBodyRegionData = new jinqJs()
4732 4791 .from($scope.modestyImageInfo)
4733 4792 .where('bodyRegionId == ' + bodyRegionId)
... ... @@ -4777,8 +4836,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4777 4836 transparencyTempcanavsMask.id = 'transparencyTempCanvasMask_MR' + bodyRegionId + '_mci';
4778 4837 }
4779 4838 else {
4780   - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
4781   - transparencyTempCanvas.id = 'transparencyTempCanvas_' + bodyRegionId;
  4839 + if ((bodyRegionId.match('modestyImg'))) {
  4840 +
  4841 + transparencyTempCanvas.id = 'transparencyTempCanvas_' + bodyRegionId;
4782 4842  
4783 4843 }
4784 4844 else {
... ... @@ -4798,7 +4858,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4798 4858 document.getElementById('canvasDiv').appendChild(transparencyTempCanvas);
4799 4859  
4800 4860 //create temp mask canvas
4801   - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) { }
  4861 + if ((bodyRegionId.match('modestyImg'))) { }
  4862 +
4802 4863 else {
4803 4864 transparencyTempcanavsMask.height = Height;
4804 4865 transparencyTempcanavsMask.width = Width;
... ... @@ -4811,10 +4872,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4811 4872 }
4812 4873  
4813 4874 //for modesty canvas
4814   - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
  4875 + if ((bodyRegionId.match('modestyImg'))) {
4815 4876  
4816 4877 var modestyTransTempCanvasId = 'tempCanvasModesty_' + bodyRegionId;
4817 4878 var modestyTransCanvasId = 'modestyTransCanavs_' + bodyRegionId;
  4879 +
4818 4880 if (document.getElementById(modestyTransTempCanvasId) != null) {
4819 4881 document.getElementById(modestyTransTempCanvasId).parentNode.removeChild(document.getElementById(modestyTransTempCanvasId));
4820 4882 }
... ... @@ -4829,7 +4891,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4829 4891 tempCanvasModesty.style.top = 10 + 'px';
4830 4892 tempCanvasModesty.style.backgroundColor = "transparent";
4831 4893 tempCanvasModesty.style.visibility = 'hidden';
4832   - tempCanvasModesty.style.border = "black 1px solid";
  4894 + // tempCanvasModesty.style.border = "black 1px solid";
4833 4895 document.getElementById('canvasDiv').appendChild(tempCanvasModesty);
4834 4896 }
4835 4897 if (document.getElementById(modestyTransCanvasId) != null) {
... ... @@ -4837,16 +4899,21 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4837 4899 }
4838 4900  
4839 4901 if (document.getElementById(modestyTransCanvasId) == null || document.getElementById(modestyTransCanvasId) == undefined) {
4840   - $rootScope.isTBoxModestyVisible = true;
  4902 +
4841 4903 var canvasModesty = document.createElement('canvas');
4842 4904 canvasModesty.id = modestyTransCanvasId;
  4905 + canvasModesty.className = 'transModestyImg'
4843 4906 canvasModesty.height = Height;
4844 4907 canvasModesty.width = Width;
4845 4908 canvasModesty.style.position = "absolute";
4846 4909 canvasModesty.style.left = X + 'px';
4847 4910 canvasModesty.style.top = Y + 'px';
4848   - canvasModesty.style.visibility = 'visible';
4849   - if($rootScope.currentBodyViewId=="11"){
  4911 + if ($rootScope.isModestyOn == true) {
  4912 + canvasModesty.style.visibility = 'visible';
  4913 + $rootScope.isTBoxModestyVisible = true;
  4914 + }
  4915 + else
  4916 + canvasModesty.style.visibility = 'hidden';
4850 4917  
4851 4918 canvasModesty.style.zIndex = 11000;
4852 4919 }
... ... @@ -4867,8 +4934,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4867 4934 tempCanvasID = 'transparencyTempCanvas_MR_' + bodyRegionId;
4868 4935 }
4869 4936 else {
4870   - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
4871   - tempCanvasID = 'transparencyTempCanvas_' + bodyRegionId;//bodyRegionId;
  4937 + if ((bodyRegionId.match('modestyImg'))) {
  4938 +
  4939 + tempCanvasID = 'transparencyTempCanvas_' + bodyRegionId;//bodyRegionId;
4872 4940 }
4873 4941 else
4874 4942 tempCanvasID = 'transparencyTempCanvas_' + bodyRegionId;
... ... @@ -4908,7 +4976,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4908 4976 if ($rootScope.isHighLight != true) {
4909 4977  
4910 4978  
4911   - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
  4979 + if ((bodyRegionId.match('modestyImg'))) {
  4980 +
4912 4981 var modestyTempCanvasId = 'tempCanvasModesty_' + bodyRegionId;
4913 4982 if (document.getElementById(modestyTempCanvasId) != undefined || document.getElementById(modestyTempCanvasId) != null) {
4914 4983 var contxModestyTemp = document.getElementById(modestyTempCanvasId).getContext('2d');
... ... @@ -4963,7 +5032,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4963 5032 }
4964 5033  
4965 5034 //set modesty image visiblility true/false as per layer
4966   - // if(bodyRegionId.match('modestyImg3'))
4967 5035 var BRID = '';
4968 5036 if (bodyRegionId.match('modestyImg') && document.getElementById('modestyTransCanavs_' + bodyRegionId) != null) {
4969 5037 BRID = bodyRegionId[bodyRegionId.length - 1];
... ... @@ -4989,7 +5057,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4989 5057  
4990 5058 var modestyCanavs = document.getElementById(modestyTransCanvases[j].id);
4991 5059  
4992   - if ((parseInt(lowerlayerNumberForModesty) <= parseInt($scope.layerNumber)) && (HigherlayerNumberForModesty) > parseInt($scope.layerNumber)) {
  5060 + if ($rootScope.isModestyOn == true && (parseInt(lowerlayerNumberForModesty) <= parseInt($scope.layerNumber)) && (HigherlayerNumberForModesty) > parseInt($scope.layerNumber)) {
4993 5061  
4994 5062 modestyCanavs.style.visibility = 'visible';
4995 5063 }
... ... @@ -5026,7 +5094,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5026 5094 XforCopyImage = 0;
5027 5095 WidthforCopyImage = Width;
5028 5096 WidthforTransImage = Width;
5029   - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
  5097 +
  5098 + if ((bodyRegionId.match('modestyImg'))) {
5030 5099 XforTransImage = 0;
5031 5100 }
5032 5101 else
... ... @@ -5040,7 +5109,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5040 5109  
5041 5110 WidthforTransImage = parseInt(TransparencyEndX) - parseInt(X);
5042 5111  
5043   - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
  5112 + if ((bodyRegionId.match('modestyImg'))) {
5044 5113 XforTransImage = 0;
5045 5114 }
5046 5115 else
... ... @@ -5053,7 +5122,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5053 5122 WidthforCopyImage = parseInt(X) + parseInt(Width) - parseInt(TransparencyBoxStartX);
5054 5123 WidthforTransImage = parseInt(X) + parseInt(Width) - parseInt(TransparencyBoxStartX);
5055 5124  
5056   - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
  5125 + if ((bodyRegionId.match('modestyImg'))) {
5057 5126  
5058 5127 XforTransImage = parseInt(TransparencyBoxStartX) - parseInt(X);
5059 5128 }
... ... @@ -5064,7 +5133,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5064 5133 XforCopyImage = parseInt(TransparencyBoxStartX) - parseInt(X);//parseInt(X) + parseInt(Width) - parseInt(scope.TransparencyBoxStartX)// scope.TransparencyBoxStartX ;
5065 5134 WidthforCopyImage = parseInt(TransparencyEndX) - parseInt(TransparencyBoxStartX);
5066 5135 WidthforTransImage = parseInt(TransparencyEndX) - parseInt(TransparencyBoxStartX);
5067   - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
  5136 + if ((bodyRegionId.match('modestyImg'))) {
5068 5137  
5069 5138 XforTransImage = parseInt(TransparencyBoxStartX) - parseInt(X);
5070 5139 }
... ... @@ -5081,7 +5150,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5081 5150 HeightforCopyImage = Height;
5082 5151  
5083 5152 HeightforTransImage = Height;
5084   - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
  5153 +
  5154 + if ((bodyRegionId.match('modestyImg'))) {
5085 5155 YforTransImage = 0;
5086 5156 }
5087 5157 else
... ... @@ -5094,7 +5164,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5094 5164  
5095 5165 HeightforTransImage = (parseInt(TransparencyBoxEndY)) - parseInt(Y)// - parseInt(scope.TransparencyBoxStartY));
5096 5166  
5097   - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
  5167 + if ((bodyRegionId.match('modestyImg'))) {
5098 5168 YforTransImage = 0;
5099 5169 }
5100 5170 else
... ... @@ -5106,8 +5176,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5106 5176 YforCopyImage = parseInt(TransparencyBoxStartY) - parseInt(Y);
5107 5177 HeightforCopyImage = parseInt(Y) + parseInt(Height) - parseInt(TransparencyBoxStartY);
5108 5178 HeightforTransImage = parseInt(Y) + parseInt(Height) - parseInt(TransparencyBoxStartY);
5109   - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
5110   - YforTransImage = parseInt(TransparencyBoxStartY) - parseInt(Y);
  5179 +
  5180 + if ((bodyRegionId.match('modestyImg'))) {
  5181 + YforTransImage = parseInt(TransparencyBoxStartY) - parseInt(Y);
5111 5182  
5112 5183 }
5113 5184 else
... ... @@ -5119,7 +5190,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5119 5190 YforCopyImage = parseInt(TransparencyBoxStartY) - parseInt(Y);
5120 5191 HeightforCopyImage = parseInt(TransparencyBoxEndY) - parseInt(TransparencyBoxStartY);
5121 5192 HeightforTransImage = parseInt(TransparencyBoxEndY) - parseInt(TransparencyBoxStartY);
5122   - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
  5193 +
  5194 + if ((bodyRegionId.match('modestyImg'))) {
5123 5195 YforTransImage = parseInt(TransparencyBoxStartY) - parseInt(Y);
5124 5196  
5125 5197 }
... ... @@ -5196,6 +5268,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5196 5268  
5197 5269 $scope.DrawOnTBWithSelectedTransparency = function (tempCanvasID, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage, Height, Width, bodyRegionId, isLayerChanged, isResized) {
5198 5270  
  5271 +
  5272 +
5199 5273 var transNumber = $scope.transNumber;//txtTransparencyChange.value;
5200 5274 //this changes the transparency when transparency is already activated and user resizes or chage the layer
5201 5275  
... ... @@ -5242,7 +5316,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5242 5316  
5243 5317  
5244 5318 var ctx;
5245   - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
  5319 + if ((bodyRegionId.match('modestyImg'))) {
  5320 +
5246 5321 var modestyTransCanvasId = 'modestyTransCanavs_' + bodyRegionId
5247 5322 ctx = document.getElementById(modestyTransCanvasId).getContext('2d');
5248 5323 }
... ... @@ -5253,7 +5328,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5253 5328 ctx.drawImage(tmpCanvasContext, XforCopyImage, YforCopyImage, WidthforCopyImage, HeightforCopyImage, XforTransImage, YforTransImage, WidthforTransImage, HeightforTransImage)
5254 5329  
5255 5330  
5256   - if ($rootScope.isModestyOn == true && (bodyRegionId.match('modestyImg'))) {
  5331 + if ((bodyRegionId.match('modestyImg'))) {
5257 5332  
5258 5333 var imageD1 = ctx.getImageData(0, 0, Width, Height);
5259 5334 var imageData1 = imageD1.data;
... ... @@ -5268,8 +5343,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5268 5343  
5269 5344 }
5270 5345  
5271   -
5272 5346 ctx.putImageData(imageD1, 0, 0);
  5347 + if ($rootScope.isModestyOn)
  5348 + document.getElementById('modestyTransCanavs_' + bodyRegionId).style.visibility = 'visible';
  5349 + else
  5350 + document.getElementById('modestyTransCanavs_' + bodyRegionId).style.visibility = 'hidden';
5273 5351  
5274 5352 }
5275 5353  
... ... @@ -5288,6 +5366,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5288 5366  
5289 5367  
5290 5368 }
  5369 +
  5370 + $scope.EnableUI();
5291 5371 }
5292 5372  
5293 5373  
... ... @@ -6293,7 +6373,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6293 6373  
6294 6374 // $rootScope.switchCanvas();
6295 6375 //To enable extract button
6296   - $scope.isTransparencyActivated = false;
  6376 + $rootScope.isTransparencyActivated = false;
6297 6377 $("#btnExtract").removeClass("disabled");
6298 6378  
6299 6379  
... ... @@ -6339,12 +6419,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6339 6419  
6340 6420  
6341 6421  
6342   - $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.currentLayerNumber));
  6422 + $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($rootScope.currentLayerNumber));
6343 6423 //if ($scope.isGenderChnage || $rootScope.isViewChange) {
6344 6424 // $("#txtlayerNumber").val(parseInt(0));
6345 6425 //}
6346 6426 //else
6347   - $("#txtlayerNumber").val(parseInt($scope.currentLayerNumber));
  6427 + $("#txtlayerNumber").val(parseInt($rootScope.currentLayerNumber));
6348 6428  
6349 6429  
6350 6430 if (document.getElementById('tempCanvas') != null) {
... ... @@ -6356,7 +6436,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6356 6436 //var scope = angular.element(document.getElementById("DAView")).scope();
6357 6437 //scope.$apply(function () {
6358 6438 // $scope.layerNumber = 0;
6359   - // $scope.isTransparencyActivated = false;
  6439 + // $rootScope.isTransparencyActivated = false;
6360 6440 //})
6361 6441  
6362 6442  
... ... @@ -6369,7 +6449,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6369 6449  
6370 6450 //$("canvas[name*='transparencyTempCanvas']").nextUntil($("canvas[name*='transparencyTempCanvas']"))
6371 6451 //.remove();
6372   - $scope.layerNumber = $scope.currentLayerNumber;
  6452 + $scope.layerNumber = $rootScope.currentLayerNumber;
6373 6453 $scope.transNumber = 100;
6374 6454 $(".slider").slider({ value: 100 })
6375 6455 }
... ... @@ -6385,7 +6465,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6385 6465  
6386 6466 $('#transparencyScale').css('visibility', 'hidden');
6387 6467  
6388   - //$scope.isTransparencyActivated = false;
  6468 + //$rootScope.isTransparencyActivated = false;
6389 6469 // document.getElementById('btnTranparency').className = 't-transparency'
6390 6470 $('#btnTranparency').removeClass('tButtonActive');
6391 6471 $('#btnTranparency').addClass('btn-black');
... ... @@ -6513,7 +6593,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6513 6593 $('.btnCursor').removeClass('activebtncolor');
6514 6594 $(".annotationTollbar").css("display", "none");
6515 6595 $("#annotationButton").removeClass("active");
6516   - $("#btnExtract").removeClass("disabled");
  6596 + if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) {
  6597 + $("#btnExtract").addClass("disabled");
  6598 + $('#btnTranparency').addClass('tButtonActive');
  6599 + $('#btnTranparency').removeClass('btn-black');
  6600 + }
  6601 + else
  6602 + $("#btnExtract").removeClass("disabled");
  6603 +
6517 6604 $("#btnTranparency").removeClass("disabled");
6518 6605 $rootScope.isTransparencyBoxActivated = false;
6519 6606 $rootScope.isNormalMode = false;
... ... @@ -6533,7 +6620,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6533 6620  
6534 6621 $scope.terminateCurrentlyRunningWPs();
6535 6622  
6536   - if ($scope.isTransparencyActivated) {
  6623 + if ($rootScope.isTransparencyActivated) {
6537 6624  
6538 6625 $scope.CloseTransparencyBox();
6539 6626  
... ... @@ -6676,16 +6763,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6676 6763  
6677 6764 $scope.enableHighlight = function () {
6678 6765  
6679   -
6680   - // $("#btnExtract").removeClass("disabled");
6681   - // $("#btnTranparency").removeClass("disabled");
  6766 + $scope.DisableUI();
  6767 +
6682 6768 $("#btnTranparency").removeAttr('disabled', 'disabled');
6683   - // $rootScope.isTransparencyBoxActivated = false;
6684   - // $rootScope.isNormalMode = false;
6685 6769  
6686 6770 //if listanager is visisble then close it
6687   -
6688   - // $rootScope.isListManagerSelected = false;
6689 6771 $rootScope.CloseListManager();
6690 6772  
6691 6773  
... ... @@ -6694,7 +6776,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6694 6776 //to make the system highlight if the body systme highlighted than Normal and again highlight
6695 6777 $scope.isbodySystemHighlight = true;
6696 6778 }
6697   - // $rootScope.isHighlightBodyByBodySystem = false;
6698 6779  
6699 6780 if ($rootScope.isHighLight == true) {
6700 6781  
... ... @@ -6758,8 +6839,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6758 6839 $scope.enableNormalMode = function () {
6759 6840 $("#btnTranparency").removeClass("disabled");
6760 6841  
6761   - if ($scope.isTransparencyActivated) {
6762   - $scope.layerNumber = $scope.currentLayerNumber;
  6842 + if ($rootScope.isTransparencyActivated) {
  6843 + $scope.layerNumber = $rootScope.currentLayerNumber;
6763 6844 }
6764 6845 else {
6765 6846 $scope.layerNumber = $('#txtlayerNumber').val();
... ... @@ -6860,6 +6941,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6860 6941  
6861 6942 $scope.enableExtract = function (isCalledFromButton) {
6862 6943  
  6944 + $scope.DisableUI();
  6945 +
6863 6946 console.log('isCalledFromButton= ' + isCalledFromButton);
6864 6947  
6865 6948 //$rootScope.isHighlightBodyByBodySystem = false;
... ... @@ -6870,7 +6953,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6870 6953 $rootScope.CanvasDivLeftPosition = $("#canvasDiv").scrollLeft();
6871 6954  
6872 6955  
6873   - if ($scope.isTransparencyActivated == true) {
  6956 + if ($rootScope.isTransparencyActivated == true) {
6874 6957  
6875 6958 $("#btnExtract").addClass("disabled");
6876 6959  
... ... @@ -6998,7 +7081,17 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6998 7081  
6999 7082 $scope.highLightBody = function () {
7000 7083  
7001   - $scope.CloseTransparencyBox();
  7084 + if ($rootScope.isTransparencyActivated && $rootScope.isGlobalSettingChanged) {
  7085 + //do not close Tbox
  7086 + $rootScope.isGlobalSettingChanged = false;
  7087 + }
  7088 + else
  7089 + $scope.CloseTransparencyBox();
  7090 + if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) {
  7091 + $("#btnExtract").addClass("disabled");
  7092 + $('#btnTranparency').addClass('tButtonActive');
  7093 + $('#btnTranparency').removeClass('btn-black');
  7094 + }
7002 7095 $scope.Normal = "";
7003 7096 $scope.Extract = "";
7004 7097 $scope.Highlight = "LeftButtonsDefaultState";
... ... @@ -7208,6 +7301,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7208 7301 else {
7209 7302 $scope.isLoading = false;
7210 7303 $('#spinner').css('visibility', 'hidden');
  7304 +
  7305 + //for highlight when highlight button is clicked the ui got disabled,
  7306 + //now highlight is completed so enalbe UI
  7307 + $scope.EnableUI();
7211 7308 }
7212 7309  
7213 7310 }
... ... @@ -7237,7 +7334,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7237 7334 else {
7238 7335 $scope.isLoading = false;
7239 7336 $('#spinner').css('visibility', 'hidden');
7240   -
  7337 + $scope.EnableUI();
7241 7338 }
7242 7339 }
7243 7340 }
... ... @@ -7376,6 +7473,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7376 7473 else {
7377 7474 $scope.isLoading = false;
7378 7475 $('#spinner').css('visibility', 'hidden');
  7476 + $scope.EnableUI();
7379 7477  
7380 7478 }
7381 7479 }
... ... @@ -7488,6 +7586,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7488 7586  
7489 7587 $scope.OnGenderChange = function (event) {
7490 7588  
  7589 + $scope.DisableUI();
7491 7590  
7492 7591 var canvasDiv = document.getElementById('canvasDiv');
7493 7592 $scope.imageVerticalScrollPosition = canvasDiv.scrollTop;
... ... @@ -7500,7 +7599,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7500 7599  
7501 7600 //close transparecny box
7502 7601 $scope.CloseTransparencyBox();
7503   -
  7602 + if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) {
  7603 + $("#btnExtract").addClass("disabled");
  7604 + $('#btnTranparency').addClass('tButtonActive');
  7605 + $('#btnTranparency').removeClass('btn-black');
  7606 + }
7504 7607 //if listanager is visisble then close it
7505 7608  
7506 7609 // $rootScope.isListManagerSelected = false;
... ... @@ -7728,9 +7831,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7728 7831 }
7729 7832  
7730 7833 $scope.OnViewChange = function (event) {
7731   - // alert(event.target.title);
7732   - // alert($("[title*='" + event.target.title + "']").parent().hasClass("active"));
7733   - if ($("[title*='" + event.target.title + "']").parent().hasClass("active") == true) {
  7834 +
  7835 + $scope.DisableUI();
  7836 +
7734 7837  
7735 7838  
7736 7839  
... ... @@ -7747,7 +7850,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7747 7850  
7748 7851 //close transparency box
7749 7852 $scope.CloseTransparencyBox();
7750   -
  7853 + if ($scope.isTransparencyBtnClicked == true && !$scope.isTransparencyActivated) {
  7854 + $("#btnExtract").addClass("disabled");
  7855 + $('#btnTranparency').addClass('tButtonActive');
  7856 + $('#btnTranparency').removeClass('btn-black');
  7857 + }
7751 7858 //if listanager is visisble then close it
7752 7859  
7753 7860 //$rootScope.isListManagerSelected = false;
... ... @@ -7952,13 +8059,19 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7952 8059 //Reload DA controller Body View after setting Change
7953 8060 $scope.$on('reloadDABodyViewEvent', function (event, data) {
7954 8061 //console.log('reloadDABodyViewEvent');
  8062 + $rootScope.isGlobalSettingChanged = true;
7955 8063 if ($rootScope.isSettingEventAlredayDispachted == true) {
  8064 + $scope.DisableUI();
7956 8065 $rootScope.isSettingEventAlredayDispachted = false;
7957 8066 $scope.layerNumber = parseInt($('#txtlayerNumber').val());
7958 8067 //alert('mouseUp');
7959 8068  
  8069 + if ($rootScope.isTransparencyActivated && $rootScope.currentLayerNumber == 0) {
  8070 + $scope.layerNumber = $rootScope.currentLayerNumber;
  8071 + $scope.loadSelectedBodyView(data.reloadDABodyViewId);
7960 8072  
7961   - if ($scope.layerNumber == 0) {
  8073 + }
  8074 + else if ($scope.layerNumber == 0) {
7962 8075 $scope.loadSelectedBodyView(data.reloadDABodyViewId);
7963 8076 }
7964 8077 // $scope.loadSelectedBodyView(data.reloadDABodyViewId);
... ... @@ -8089,6 +8202,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8089 8202  
8090 8203 $scope.HighlightBodyByBodySystem = function (event) {
8091 8204  
  8205 + $scope.DisableUI();
  8206 +
8092 8207 //if listanager is visisble then close it
8093 8208  
8094 8209 $rootScope.isListManagerSelected = false;
... ... @@ -8661,7 +8776,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8661 8776  
8662 8777  
8663 8778 $scope.HighlightBodyOnListManagerSelection = function (actualTermNumber, isTermListOptionClicked) {
8664   - //$rootScope.SelectedTermList = $("#termList").find("option[id=" + actualTermNumber + "]").val();
  8779 +
  8780 + $scope.DisableUI();
  8781 +
8665 8782 $rootScope.searchSelectedText = $("#" + actualTermNumber).text();
8666 8783 $rootScope.slectedActualTermNumber = actualTermNumber;
8667 8784  
... ... @@ -9393,6 +9510,10 @@ function OnIdentityClick() {
9393 9510 }
9394 9511  
9395 9512 function OnZoom() {
  9513 + alert('on zoom called');
  9514 + var scope = angular.element(document.getElementById("daView")).scope();
  9515 + scope.DisableUI();
  9516 +
9396 9517 if ($(".btn-annotation").hasClass("activebtncolor")) //Bug #14928
9397 9518 $(".btn-annotation").removeClass("activebtncolor");
9398 9519 //Dissectible Anatomy > Extract and Annotations displays apart on the page after click on Zoom-in.
... ... @@ -9403,6 +9524,8 @@ function OnZoom() {
9403 9524 scope.$apply(function () {
9404 9525 scope.enableZoom();
9405 9526 });
  9527 +
  9528 +
9406 9529 }
9407 9530  
9408 9531 function onListManagerTermSelection(id, isTermListOptionClicked) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @2b84605
... ... @@ -220,7 +220,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
220 220 }
221 221 else {
222 222  
223   - if (result.UserType == UserTypeConstants.SUPER_ADMIN && result.IsActive) { //(!result.IsSubscriptionExpired) &&
  223 + //if (result.UserType == UserTypeConstants.SUPER_ADMIN && result.IsActive) { //(!result.IsSubscriptionExpired) &&
  224 + if (result.LicenseId == 0 && result.IsActive) {
224 225 $rootScope.userData = result;
225 226 $rootScope.userModules = result.Modules;
226 227 $rootScope.isVisibleLogin = false;
... ... @@ -377,7 +378,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
377 378 $rootScope.userModules = userInfo.Modules;
378 379  
379 380 $rootScope.isVisibleLogin = false;
380   -
  381 + $rootScope.haveRoleAdmin = true;
381 382  
382 383 if ($rootScope.refreshcheck == null) {
383 384  
... ... @@ -388,6 +389,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
388 389  
389 390 else
390 391 {
  392 + $rootScope.haveRoleAdmin = false;
  393 +
391 394 if (userInfo.LicenseInfo.IsTermAccepted) {
392 395 $rootScope.userData = userInfo;
393 396 $rootScope.userModules = userInfo.Modules;
... ... @@ -995,8 +998,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
995 998 // alert($rootScope.AnnotationFontFamily.FontStyle.length);
996 999  
997 1000 for (var i = 0; i <= $rootScope.AnnotationFontFamily.FontFamily.length - 1; i++) {
998   -
999   - $("#selected-font-family").append("<option value=" + $rootScope.AnnotationFontFamily.FontFamily[i].FontName + ">" + $rootScope.AnnotationFontFamily.FontFamily[i].FontName + "</option>");
  1001 + var fontName = $rootScope.AnnotationFontFamily.FontFamily[i].FontName;
  1002 + if (/\s/g.test(fontName)) { //Check if white-space exists in between strings
  1003 + fontName = fontName.replace(" ", "_"); // replace white-space with an underscore
  1004 + }
  1005 + //$rootScope.AnnotationFontFamily.FontFamily[i].FontName
  1006 + $("#selected-font-family").append("<option value=" + fontName + ">" + $rootScope.AnnotationFontFamily.FontFamily[i].FontName + "</option>");
1000 1007  
1001 1008 }
1002 1009 $rootScope.isFontFamilyLoaded = true;
... ... @@ -3039,7 +3046,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3039 3046 $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": $rootScope.TextPropertyArray[i].FontColor });
3040 3047  
3041 3048 var CurrentFontFamily = $rootScope.TextPropertyArray[i].FontFamily;
3042   - // alert(CurrentFontFamily);
  3049 + // alert(CurrentFontFamily);
3043 3050 // CurrentFontFamily = CurrentFontFamily.replace(/'/g, "");
3044 3051 var CurrentFontSize = parseInt($rootScope.TextPropertyArray[i].FontSize);
3045 3052 $("#selected-font-family option[value=" + CurrentFontFamily + "]").prop('selected', true);
... ... @@ -3666,6 +3673,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3666 3673 $rootScope.closeModal = function () {
3667 3674  
3668 3675 document.getElementById('modelbackground').style.display = "none";
  3676 + $("#drawTextBGColorpicker span.minicolors-swatch-color").css('background-color', $rootScope.selectedBGColorForTextArea);
3669 3677  
3670 3678 }
3671 3679 //-- End ----------------------------
... ... @@ -4172,6 +4180,16 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4172 4180 $('.modestyImg').css('visibility', 'hidden');
4173 4181 }
4174 4182 }
  4183 +
  4184 + if ($('.transModestyImg') != null) {
  4185 + if (($rootScope.globalSetting.modesty == 'Y')) {
  4186 + $('.transModestyImg').css('visibility', 'visible');
  4187 + }
  4188 +
  4189 + else {
  4190 + $('.transModestyImg').css('visibility', 'hidden');
  4191 + }
  4192 + }
4175 4193 $rootScope.changeNavigatorModesty();
4176 4194 }
4177 4195  
... ... @@ -4310,6 +4328,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4310 4328 }
4311 4329 if ($location.url() == "/module-item-view") {
4312 4330 $("#aaDetailViewCanvas").css("display", "none");
  4331 + $("#canvasPaint").css("display", "none");
  4332 + $("#canvas").css("display", "none");
  4333 +
4313 4334 }
4314 4335 }, 520);
4315 4336 }
... ... @@ -4327,6 +4348,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4327 4348 }
4328 4349 if ($location.url() == "/module-item-view") {
4329 4350 $("#aaDetailViewCanvas").css("display", "none");
  4351 + $("#canvasPaint").css("display", "none");
  4352 + $("#canvas").css("display", "none");
4330 4353 }
4331 4354 }, 320);
4332 4355 }
... ... @@ -4353,6 +4376,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4353 4376 function OpenJSPanel() {
4354 4377 $("#daImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
4355 4378 $("#ciImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
  4379 + $("#ImagePanel").css({ "pointer-events": "none", "opacity": ".5" });
4356 4380 $.jsPanel({
4357 4381 id: 'jsPanel-1',
4358 4382 selector: '#dvPrintPreview',
... ... @@ -4403,34 +4427,34 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4403 4427 $(document).on('change', '#printPSOptions', function () {
4404 4428 var option = $('#printPSOptions').find(":selected").text();
4405 4429 switch (option) {
4406   - case (option = "10%"):
  4430 + case ("10%"):
4407 4431 ResizeImage(0.1);
4408 4432 break;
4409   - case (option = "25%"):
  4433 + case ("25%"):
4410 4434 ResizeImage(0.25);
4411 4435 break;
4412   - case (option = "50%"):
  4436 + case ("50%"):
4413 4437 ResizeImage(0.5);
4414 4438 break;
4415   - case (option = "75%"):
  4439 + case ("75%"):
4416 4440 ResizeImage(.75);
4417 4441 break;
4418   - case (option = "65%"):
  4442 + case ("65%"):
4419 4443 ResizeImage(0.65);
4420 4444 break;
4421   - case (option = "100%"):
  4445 + case ("100%"):
4422 4446 ResizeImage(1);
4423 4447 break;
4424   - case (option = "150%"):
  4448 + case ("150%"):
4425 4449 ResizeImage(1.5);
4426 4450 break;
4427   - case (option = "200%"):
  4451 + case ("200%"):
4428 4452 ResizeImage(2);
4429 4453 break;
4430   - case (option = "500%"):
  4454 + case ("500%"):
4431 4455 ResizeImage(5);
4432 4456 break;
4433   - case (option = "Auto"):
  4457 + case ("Auto"):
4434 4458 ResizeImage(0);
4435 4459 break;
4436 4460 default:
... ... @@ -4480,11 +4504,16 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4480 4504 $(document).on('click', '#jsPanel-1 .jsglyph-remove', function () {
4481 4505 $("#daImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
4482 4506 $("#ciImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
  4507 + $("#ImagePanel").css({ "pointer-events": "auto", "opacity": "1" });
4483 4508 $("#annotationButton").parent().removeClass("disableMenuannotation");
4484 4509 $("#annotationToolBarOptions").removeClass("disableMenuoption");
4485 4510 $("#optionsListManagerTab").removeClass("disableMenuoption");
4486 4511 $('#fileMenuAnchor').parent().removeClass('disableFileMenu');
4487   - $("#aaDetailViewCanvas").css("display", "block");
  4512 + if ($location.url() == "/module-item-view") {
  4513 + $("#aaDetailViewCanvas").css("display", "block");
  4514 + $("#canvasPaint").css("display", "block");
  4515 + $("#canvas").css("display", "block");
  4516 + }
4488 4517 if ($('#jsPanel-1').length > 0)
4489 4518 $('#jsPanel-1').remove();
4490 4519 console.log('close');
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @2b84605
... ... @@ -324,7 +324,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
324 324 })
325 325 $rootScope.aaPinDataArray = [];
326 326 $scope.showAllPins = function () {
327   -
  327 +
328 328 $scope.allPinDataArray = [];
329 329 var promise = ModuleService.getPinDataForImage($rootScope.imageName)
330 330  
... ... @@ -576,7 +576,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
576 576 }
577 577  
578 578 $scope.showSelectedSystemPins = function (event) {
579   -
580 579 var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a");
581 580 var bodySystemListlength = bodySystemListObj.length;
582 581 for (var i = 0; i < bodySystemListlength; i++) {
... ... @@ -655,7 +654,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
655 654 }
656 655  
657 656 $scope.showAnnotation = function (selectedPinData, isCtrlPressed, isPinClicked, isItemSearched) {
658   -
  657 + $scope.clickedPins = [];
659 658 $scope.selectedPin = [];
660 659 var isSameTermWithMultiPin = false;
661 660 var firstPinId = selectedPinData[0]._PinId;
... ... @@ -713,13 +712,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
713 712  
714 713 angular.forEach(pinDataWithFirstTermNumber, function (value, key) {
715 714 $scope.selectedPin.push(value._PinId);
  715 + $scope.clickedPins.push({ 'id': value._PinId });
716 716 var headX = (parseInt(value._HeadX));
717 717 var headY = (parseInt(value._HeadY));
718 718 $scope.createSpeechBubble(parseInt(headX) + 10, parseInt(headY) + 10, value._PinId, isCtrlPressed, isPinClicked, isSameTermWithMultiPin);
719 719 })
720   -
721   -
722   -
  720 +
723 721 }
724 722  
725 723 $rootScope.isLoading = false;
... ... @@ -1360,7 +1358,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1360 1358 }
1361 1359  
1362 1360 $rootScope.hidePins = function () {
1363   -
  1361 + $("#dropdownMenu221").addClass("aaSystemDisable");
1364 1362 $rootScope.isLoading = true;
1365 1363 $('#spinner').css('visibility', 'visible');
1366 1364 $scope.hideSpeechBubble();
... ... @@ -1389,10 +1387,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1389 1387 }
1390 1388  
1391 1389 $scope.showAllPinsAfterHide = function (event) {
  1390 + if ($("#dropdownMenu221").hasClass("aaSystemDisable")) {
  1391 + $("#dropdownMenu221").removeClass("aaSystemDisable");
  1392 + }
1392 1393 $rootScope.isLoading = true;
1393 1394 $('#spinner').css('visibility', 'visible');
1394 1395 $scope.isHidePinBtnClicked = false;
1395   -
  1396 + $rootScope.isshowAllPinsBtnAfterHideClicked = true;
1396 1397 if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
1397 1398  
1398 1399 $scope.showSystemPins($scope.selectedSystemPinData, false);
... ... @@ -1415,6 +1416,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1415 1416  
1416 1417  
1417 1418 $scope.showSelectedPins = function () {
  1419 + if ($("#dropdownMenu221").hasClass("aaSystemDisable")) {
  1420 + $("#dropdownMenu221").removeClass("aaSystemDisable");
  1421 + }
1418 1422 $rootScope.isLoading = true;
1419 1423 $('#spinner').css('visibility', 'visible');
1420 1424  
... ... @@ -1518,8 +1522,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1518 1522  
1519 1523  
1520 1524 }
1521   -
  1525 + $rootScope.isshowAllPinsBtnAfterHideClicked = true;
1522 1526 $scope.showItemsForSearch = function () {
  1527 + if($rootScope.isshowAllPinsBtnAfterHideClicked == true){
1523 1528 console.log('showItemsForSearch is called');
1524 1529 //this check is for log only because we are writing length so need to check if its not null or undefined
1525 1530  
... ... @@ -1547,7 +1552,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1547 1552 }
1548 1553  
1549 1554 }, 500);
1550   -
  1555 + }
1551 1556 }
1552 1557  
1553 1558  
... ... @@ -1574,8 +1579,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1574 1579 $("#termlistfilter li a").css({ "background-color": "#ffffff", "color": "#000000" });
1575 1580 $("#termlistfilter li #" + $scope.searchItemId).css({ "background-color": "#3399FF", "color": "#ffffff" });
1576 1581 $scope.searchFilter = $("#" + id).text();
1577   - selectedTermName.placeholder = $("#" + id).text();
1578   -
  1582 + //selectedTermName.placeholder = $("#" + id).text();
  1583 + selectedTermName.value = $("#" + id).text();
  1584 + selectedTermName.placeholder = "search... ";
1579 1585  
1580 1586 //get data from pindata for this trem
1581 1587  
... ...
400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
  View file @2b84605
... ... @@ -498,7 +498,7 @@ AIA.constant(&quot;UserModules&quot;, [
498 498 ]);
499 499 AIA.constant("AIAConstants", {
500 500  
501   - "NO_BODY_SYSTEM_AVAILABLE": "No body system available in this layer.",
  501 + "NO_BODY_SYSTEM_AVAILABLE": "Selected body system is not available on this layer.",
502 502 })
503 503 AIA.config(function ($routeProvider, pages, $locationProvider) {
504 504  
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
  View file @2b84605
... ... @@ -26,7 +26,7 @@
26 26 <div class="sidebar pull-left mCustomScrollbar _mCS_1 mCS-autoHide ">
27 27 <!--{{name}}-->
28 28 <ul class="nav nav-sidebar" ng-init="hideScrollbar()">
29   - <li ng-repeat="module in userModules" ng-disabled="module.id==7|| module.id==8 || module.id==10"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible();getModuleScrollPosition()" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')" ng-disabled="module.id==7|| module.id==8 || module.id==10"><!--{{module.name}}--></a></li>
  29 + <li ng-repeat="module in userModules" ng-disabled="module.id==7|| module.id==8 || module.id==10 || module.id==13"><a id="{{module.slug}}" href="{{module.slug}}" ng-click="IsVisible();getModuleScrollPosition()" data-ng-bind="module.name" ng-class="HightLightModuleSelection('{{module.slug}}')" ng-disabled="module.id==7|| module.id==8 || module.id==10 || module.id==13"><!--{{module.name}}--></a></li>
30 30 </ul>
31 31 </div>
32 32  
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @2b84605
... ... @@ -317,7 +317,7 @@
317 317 </div>>
318 318  
319 319  
320   - <!--list manager Modal-->
  320 +
321 321 <div class="modal fade" id="ShowListManager" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" ng-init="tab = 1" style="width:27%;left:50%;overflow:hidden;height:500px;top:100px">
322 322 <div class="modal-dialog" role="document" style="width:400px;">
323 323 <div class="modal-content" style="width:100%;max-width:400px;">
... ... @@ -1272,9 +1272,7 @@
1272 1272 <div class="form-group" id="moduleDiv12">
1273 1273 <div class="col-sm-8">• Complementary and Alternative Medicine</div>
1274 1274 </div>
1275   - <div class="form-group" id="moduleDiv13">
1276   - <div class="col-sm-8">• A.D.A.M Images</div>
1277   - </div>
  1275 +
1278 1276 <div class="form-group" id="moduleDiv14">
1279 1277 <div class="col-sm-8">• Body Guide</div>
1280 1278 </div>
... ... @@ -1301,6 +1299,9 @@
1301 1299 <div class="form-group" id="moduleDiv10">
1302 1300 <div class="col-sm-8"><i>• Lab Exercises</i></div> <!--(To be available by 08/16/2017)-->
1303 1301 </div>
  1302 + <div class="form-group" id="moduleDiv13">
  1303 + <div class="col-sm-8">• A.D.A.M Images</div>
  1304 + </div>
1304 1305 </div>
1305 1306 <div class="form-group">
1306 1307 <div style="text-align: center">
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @2b84605
... ... @@ -986,7 +986,10 @@ background-size:cover;
986 986 {
987 987 color: #fff;
988 988 }
989   -
  989 + #messageModal
  990 + {
  991 + z-index: 214748;
  992 + }
990 993 #messageModal .modal-dialog
991 994 {
992 995 width:300px
... ... @@ -999,7 +1002,8 @@ background-size:cover;
999 1002 }
1000 1003 #messageModal .modal-body
1001 1004 {
1002   - text-align:center;
  1005 + text-align: justify;
  1006 + text-align-last: center;
1003 1007 }
1004 1008 #messageModal .modal-header
1005 1009 {
... ... @@ -1100,4 +1104,11 @@ li[disabled], a[disabled] {
1100 1104 }
1101 1105 a[disabled] {
1102 1106 color: #aaa !important;
1103   -}
1104 1107 \ No newline at end of file
  1108 +}
  1109 +
  1110 +
  1111 +.aaSystemDisable
  1112 + {
  1113 + pointer-events : none;
  1114 + opacity : 0.5;
  1115 +}
... ...