ADAM / AIAHTML5

Commit 6a9236825daa79f86af381c1aa0b990391db8be6

Authored by Nikita Kulshreshtha
2 parents 1b575eae 107a6ba2

Merge branch 'DisableUI-OnZoom' of http://52.6.196.163/ADAM/AIAHTML5 into DisableUI

Inline Side-by-side
Showing 7 changed files with 76 additions and 19 deletions
150-DOCUMENTATION/001-CONFIGURATION/ADAM Education Servers List-updated.xlsx
View file @6a92368
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 @6a92368
No preview for this file type
150-DOCUMENTATION/Audit/Sprints/JulyAugSep/Ebix-Estimation Model_Health_Dev_Sep17.xlsx
View file @6a92368
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @6a92368
... ... @@ -273,7 +273,24 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
273 273  
274 274 };
275 275  
  276 + $scope.DisableUI = function () {
  277 + alert('disable ui');
  278 + var daImagePanelConetent = document.getElementsByClassName("jsPanel-content");
  279 + for (var i = 0; i < daImagePanelConetent.length; i++) {
  280 + daImagePanelConetent[i].style.pointerEvents = "none";
  281 + }
  282 +
  283 + }
276 284  
  285 + $scope.EnableUI = function () {
  286 + alert('enable ui');
  287 + var daImagePanelConetent = document.getElementsByClassName("jsPanel-content");
  288 + for (var i = 0; i < daImagePanelConetent.length; i++) {
  289 + daImagePanelConetent[i].style.pointerEvents = "auto";
  290 + }
  291 +
  292 + alert('enable ui');
  293 + }
277 294  
278 295 $scope.openView = function ($event) {
279 296 $rootScope.disableAnnotationTB = false;
... ... @@ -1735,6 +1752,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1735 1752 }
1736 1753 );
1737 1754 }
  1755 + else if ($scope.ColoredImageSRC.length == totalCanvas)
  1756 + {
  1757 + // dispatch event for enabling rest UI
  1758 + alert('all canvas drawn');
  1759 + $scope.EnableUI();
  1760 + }
  1761 +
1738 1762 //-NIKI-for solving extarct issue 8286
1739 1763  
1740 1764 var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId + '_MR');
... ... @@ -3918,6 +3942,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3918 3942 document.getElementById('dot').style.display = 'block';
3919 3943 document.getElementById('dot').style.left = ((Globe[0].currentX) - 10) + 'px';
3920 3944 document.getElementById('dot').style.top = ((Globe[0].currentY) + 10) + 'px';
  3945 + document.getElementById('bord').style.display = 'block';
  3946 + document.getElementById('bord').style.left = ((Globe[0].currentX) - 2) + 'px';
  3947 + document.getElementById('bord').style.top = ((Globe[0].currentY) + 1) + 'px';
3921 3948 document.getElementById('sppeachBubble').style.display = 'block';
3922 3949 document.getElementById('sppeachBubble').style.left = (Globe[0].currentX) + 'px';
3923 3950 document.getElementById('sppeachBubble').style.top = (Globe[0].currentY) + 'px';
... ... @@ -4116,6 +4143,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4116 4143 document.getElementById('dot_annotation').style.display = 'block';
4117 4144 document.getElementById('dot_annotation').style.left = ((Globe[0].currentX) - 10) + 'px';
4118 4145 document.getElementById('dot_annotation').style.top = ((Globe[0].currentY) + 10) + 'px';
  4146 + document.getElementById('bord_annotation').style.display = 'block';
  4147 + document.getElementById('bord_annotation').style.left = ((Globe[0].currentX) - 2) + 'px';
  4148 + document.getElementById('bord_annotation').style.top = ((Globe[0].currentY) + 1) + 'px';
4119 4149 document.getElementById('sppeachBubble_annotation').style.display = 'block';
4120 4150 document.getElementById('sppeachBubble_annotation').style.left = (Globe[0].currentX) + 'px';
4121 4151 document.getElementById('sppeachBubble_annotation').style.top = (Globe[0].currentY) + 'px';
... ... @@ -9411,6 +9441,10 @@ function OnIdentityClick() {
9411 9441 }
9412 9442  
9413 9443 function OnZoom() {
  9444 + alert('on zoom called');
  9445 + var scope = angular.element(document.getElementById("daView")).scope();
  9446 + scope.DisableUI();
  9447 +
9414 9448 if ($(".btn-annotation").hasClass("activebtncolor")) //Bug #14928
9415 9449 $(".btn-annotation").removeClass("activebtncolor");
9416 9450 //Dissectible Anatomy > Extract and Annotations displays apart on the page after click on Zoom-in.
... ... @@ -9421,6 +9455,8 @@ function OnZoom() {
9421 9455 scope.$apply(function () {
9422 9456 scope.enableZoom();
9423 9457 });
  9458 +
  9459 +
9424 9460 }
9425 9461  
9426 9462 function onListManagerTermSelection(id, isTermListOptionClicked) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @6a92368
... ... @@ -377,7 +377,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
377 377 $rootScope.userModules = userInfo.Modules;
378 378  
379 379 $rootScope.isVisibleLogin = false;
380   -
  380 + $rootScope.haveRoleAdmin = true;
381 381  
382 382 if ($rootScope.refreshcheck == null) {
383 383  
... ... @@ -388,6 +388,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
388 388  
389 389 else
390 390 {
  391 + $rootScope.haveRoleAdmin = false;
  392 +
391 393 if (userInfo.LicenseInfo.IsTermAccepted) {
392 394 $rootScope.userData = userInfo;
393 395 $rootScope.userModules = userInfo.Modules;
... ... @@ -995,8 +997,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
995 997 // alert($rootScope.AnnotationFontFamily.FontStyle.length);
996 998  
997 999 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>");
  1000 + var fontName = $rootScope.AnnotationFontFamily.FontFamily[i].FontName;
  1001 + if (/\s/g.test(fontName)) { //Check if white-space exists in between strings
  1002 + fontName = fontName.replace(" ", "_"); // replace white-space with an underscore
  1003 + }
  1004 + //$rootScope.AnnotationFontFamily.FontFamily[i].FontName
  1005 + $("#selected-font-family").append("<option value=" + fontName + ">" + $rootScope.AnnotationFontFamily.FontFamily[i].FontName + "</option>");
1000 1006  
1001 1007 }
1002 1008 $rootScope.isFontFamilyLoaded = true;
... ... @@ -3039,7 +3045,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3039 3045 $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": $rootScope.TextPropertyArray[i].FontColor });
3040 3046  
3041 3047 var CurrentFontFamily = $rootScope.TextPropertyArray[i].FontFamily;
3042   - // alert(CurrentFontFamily);
  3048 + // alert(CurrentFontFamily);
3043 3049 // CurrentFontFamily = CurrentFontFamily.replace(/'/g, "");
3044 3050 var CurrentFontSize = parseInt($rootScope.TextPropertyArray[i].FontSize);
3045 3051 $("#selected-font-family option[value=" + CurrentFontFamily + "]").prop('selected', true);
... ... @@ -3666,6 +3672,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3666 3672 $rootScope.closeModal = function () {
3667 3673  
3668 3674 document.getElementById('modelbackground').style.display = "none";
  3675 + $("#drawTextBGColorpicker span.minicolors-swatch-color").css('background-color', $rootScope.selectedBGColorForTextArea);
3669 3676  
3670 3677 }
3671 3678 //-- End ----------------------------
... ... @@ -4310,6 +4317,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4310 4317 }
4311 4318 if ($location.url() == "/module-item-view") {
4312 4319 $("#aaDetailViewCanvas").css("display", "none");
  4320 + $("#canvasPaint").css("display", "none");
  4321 + $("#canvas").css("display", "none");
  4322 +
4313 4323 }
4314 4324 }, 520);
4315 4325 }
... ... @@ -4327,6 +4337,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4327 4337 }
4328 4338 if ($location.url() == "/module-item-view") {
4329 4339 $("#aaDetailViewCanvas").css("display", "none");
  4340 + $("#canvasPaint").css("display", "none");
  4341 + $("#canvas").css("display", "none");
4330 4342 }
4331 4343 }, 320);
4332 4344 }
... ... @@ -4484,7 +4496,11 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
4484 4496 $("#annotationToolBarOptions").removeClass("disableMenuoption");
4485 4497 $("#optionsListManagerTab").removeClass("disableMenuoption");
4486 4498 $('#fileMenuAnchor').parent().removeClass('disableFileMenu');
4487   - $("#aaDetailViewCanvas").css("display", "block");
  4499 + if ($location.url() == "/module-item-view") {
  4500 + $("#aaDetailViewCanvas").css("display", "block");
  4501 + $("#canvasPaint").css("display", "block");
  4502 + $("#canvas").css("display", "block");
  4503 + }
4488 4504 if ($('#jsPanel-1').length > 0)
4489 4505 $('#jsPanel-1').remove();
4490 4506 console.log('close');
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @6a92368
... ... @@ -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 + $rootScope.isshowAllPinsBtnAfterHideClicked = false;
1364 1362 $rootScope.isLoading = true;
1365 1363 $('#spinner').css('visibility', 'visible');
1366 1364 $scope.hideSpeechBubble();
... ... @@ -1392,7 +1390,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1392 1390 $rootScope.isLoading = true;
1393 1391 $('#spinner').css('visibility', 'visible');
1394 1392 $scope.isHidePinBtnClicked = false;
1395   -
  1393 + $rootScope.isshowAllPinsBtnAfterHideClicked = true;
1396 1394 if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
1397 1395  
1398 1396 $scope.showSystemPins($scope.selectedSystemPinData, false);
... ... @@ -1415,6 +1413,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1415 1413  
1416 1414  
1417 1415 $scope.showSelectedPins = function () {
  1416 + $rootScope.isshowAllPinsBtnAfterHideClicked = false;
1418 1417 $rootScope.isLoading = true;
1419 1418 $('#spinner').css('visibility', 'visible');
1420 1419  
... ... @@ -1518,8 +1517,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1518 1517  
1519 1518  
1520 1519 }
1521   -
  1520 + $rootScope.isshowAllPinsBtnAfterHideClicked = true;
1522 1521 $scope.showItemsForSearch = function () {
  1522 + if($rootScope.isshowAllPinsBtnAfterHideClicked == true){
1523 1523 console.log('showItemsForSearch is called');
1524 1524 //this check is for log only because we are writing length so need to check if its not null or undefined
1525 1525  
... ... @@ -1547,7 +1547,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1547 1547 }
1548 1548  
1549 1549 }, 500);
1550   -
  1550 + }
1551 1551 }
1552 1552  
1553 1553  
... ... @@ -1574,8 +1574,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1574 1574 $("#termlistfilter li a").css({ "background-color": "#ffffff", "color": "#000000" });
1575 1575 $("#termlistfilter li #" + $scope.searchItemId).css({ "background-color": "#3399FF", "color": "#ffffff" });
1576 1576 $scope.searchFilter = $("#" + id).text();
1577   - selectedTermName.placeholder = $("#" + id).text();
1578   -
  1577 + //selectedTermName.placeholder = $("#" + id).text();
  1578 + selectedTermName.value = $("#" + id).text();
  1579 + selectedTermName.placeholder = "search... ";
1579 1580  
1580 1581 //get data from pindata for this trem
1581 1582  
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @6a92368
... ... @@ -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 {
... ...