ADAM / AIAHTML5

Commit f5775bf8c18451f81d1900c60748f83a37c8d7b2

Authored by Amrita Vishnoi
2 parents 832feceb 2ca490b1

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Develop

Inline Side-by-side
Showing 6 changed files with 205 additions and 204 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @f5775bf
@@ -1471,7 +1471,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1471,7 +1471,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1471 1471
1472 FlipedImgCanvas.addEventListener('click', function (evt) { 1472 FlipedImgCanvas.addEventListener('click', function (evt) {
1473 1473
1474 - 1474 + var canvasDiv = document.getElementById('canvasDiv');
  1475 + $scope.imageVerticalScrollPosition = canvasDiv.scrollTop;
1475 //to get correct data on multihighlight highlight 1476 //to get correct data on multihighlight highlight
1476 if ($scope.isLayerChange == true) { 1477 if ($scope.isLayerChange == true) {
1477 $scope.isLayerChange = false; 1478 $scope.isLayerChange = false;
@@ -1872,8 +1873,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -1872,8 +1873,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1872 } 1873 }
1873 1874
1874 imgCanvas.addEventListener('click', function (evt) { 1875 imgCanvas.addEventListener('click', function (evt) {
1875 -  
1876 - 1876 + var canvasDiv = document.getElementById('canvasDiv');
  1877 + $scope.imageVerticalScrollPosition = canvasDiv.scrollTop;
1877 if ($scope.isLayerChange == true) { 1878 if ($scope.isLayerChange == true) {
1878 $scope.isLayerChange = false; 1879 $scope.isLayerChange = false;
1879 } 1880 }
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @f5775bf
@@ -353,99 +353,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -353,99 +353,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
353 $rootScope.lexiconLanguageArray = []; 353 $rootScope.lexiconLanguageArray = [];
354 $rootScope.lexiconLanguageArray.push({ id: "1", language: "English" }); 354 $rootScope.lexiconLanguageArray.push({ id: "1", language: "English" });
355 $(document).ready(function () { 355 $(document).ready(function () {
356 - // getUserDetails();  
357 -  
358 - // var ajaxResult = [];  
359 - // var ajaxResult1 = [];  
360 -  
361 - function onBrushSizeChange() {  
362 - $('.btnCursor').addClass('activebtncolor');  
363 - $(".btn-annotation").removeClass("activebtncolor");  
364 - $(".btn-annotation-erase").removeClass("activebtncolor");  
365 - $(".btn-annotation-erase").removeClass("activebtncolor");  
366 - $(".annotationpaintbrushsize").removeClass("activebtncolor");  
367 - var x = $('#canvasPaint').css("z-index");  
368 -  
369 - var y = $('#canvas').css("z-index");  
370 - if (x > y) {  
371 - y = parseInt(x) + 1;  
372 - } else {  
373 - y = parseInt(y) + 1;  
374 - }  
375 - $('#canvas').css("z-index", y);  
376 - }  
377 -  
378 - $("#slider-range-min-2").slider({  
379 - range: "min",  
380 - min: 1,  
381 - max: 60,  
382 - value: 1,  
383 - slide: function (event, ui) {  
384 -  
385 - onBrushSizeChange();  
386 - console.log("sliding");  
387 - $("#btnBrushSize").val(ui.value);  
388 -  
389 - },  
390 - stop: function (event, ui) {  
391 -  
392 - $("#paintLine").attr("data-size", ui.value);  
393 -  
394 - }  
395 -  
396 - });  
397 -  
398 -  
399 - $("#btnBrushSize").keydown(function () {  
400 - onBrushSizeChange();  
401 - var brushSizevalue = this.value;  
402 - $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));  
403 - });  
404 - $("#btnBrushSize").keyup(function () {  
405 - onBrushSizeChange();  
406 - var brushSizevalue = this.value;  
407 - $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));  
408 - });  
409 - $("#btnBrushSizeIncrement").click(function () {  
410 - onBrushSizeChange();  
411 - var brushIncrementVar = $("#btnBrushSize").val();  
412 - if (brushIncrementVar >= 60) {  
413 - $("#slider-range-min-2").slider("value", 60);  
414 - }  
415 - else if (brushIncrementVar == "") {  
416 - var brushIncrementedValue = 1;  
417 - $("#btnBrushSize").val(brushIncrementedValue);  
418 - $("#slider-range-min-2").slider("value", parseInt(brushIncrementedValue));  
419 - }  
420 - else {  
421 - var brushIncrementedValue = parseInt(brushIncrementVar) + 1;  
422 - $("#btnBrushSize").val(brushIncrementedValue);  
423 - $("#slider-range-min-2").slider("value", parseInt(brushIncrementedValue));  
424 - }  
425 - });  
426 - $("#btnBrushSizeDecrease").click(function () {  
427 - onBrushSizeChange();  
428 - var brushDecreaseVar = $("#btnBrushSize").val();  
429 - if (brushDecreaseVar == "") {  
430 - var brushDecrementedValue = 1;  
431 - $("#btnBrushSize").val(brushDecrementedValue);  
432 - $("#slider-range-min-2").slider("value", parseInt(brushDecrementedValue));  
433 - }  
434 - else if (brushDecreaseVar <= 1) {  
435 - $("#slider-range-min-2").slider("value", 1);  
436 - }  
437 - else {  
438 - var brushDecrementedValue = parseInt(brushDecreaseVar) - 1;  
439 - $("#btnBrushSize").val(brushDecrementedValue);  
440 - $("#slider-range-min-2").slider("value", parseInt(brushDecrementedValue));  
441 - }  
442 - });  
443 -  
444 - $("#btnBrushSize").val($("#slider-range-min-2").slider("value"));  
445 -  
446 -  
447 - // annotation slider ends  
448 -  
449 $rootScope.isLexiconTabClicked = true; 356 $rootScope.isLexiconTabClicked = true;
450 $rootScope.lexiconData = function () { 357 $rootScope.lexiconData = function () {
451 if ($rootScope.isLexiconTabClicked == true) { 358 if ($rootScope.isLexiconTabClicked == true) {
@@ -841,6 +748,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -841,6 +748,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
841 $("#DrawMode").removeClass("annotationtoolbartab"); 748 $("#DrawMode").removeClass("annotationtoolbartab");
842 $('.btnCursor').removeClass('activebtncolor'); 749 $('.btnCursor').removeClass('activebtncolor');
843 $("#annotationButton").removeClass("active"); 750 $("#annotationButton").removeClass("active");
  751 + $("#annotationButton").blur();
844 $("#annotationToolBarOptions").removeClass("active"); 752 $("#annotationToolBarOptions").removeClass("active");
845 753
846 754
@@ -3555,8 +3463,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic @@ -3555,8 +3463,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3555 3463
3556 OpenJSPanel(); // open jsPanel here 3464 OpenJSPanel(); // open jsPanel here
3557 if ($('#jsPanel-1').length > 0) { 3465 if ($('#jsPanel-1').length > 0) {
3558 - $('.jsPanel-btn-min').attr('style', 'display: none');  
3559 - $('.jsPanel-btn-max').attr('style', 'display: none');  
3560 $('.jsPanel-btn-norm').attr('style', 'display: none'); 3466 $('.jsPanel-btn-norm').attr('style', 'display: none');
3561 } 3467 }
3562 3468
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @f5775bf
@@ -927,7 +927,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -927,7 +927,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
927 c2: 'rgb(216, 216, 216)' 927 c2: 'rgb(216, 216, 216)'
928 }); 928 });
929 $('#' + canvasId).drawLine({ 929 $('#' + canvasId).drawLine({
930 -  
931 layer: true, 930 layer: true,
932 name: "Pin_" + PinId, 931 name: "Pin_" + PinId,
933 groups: ["Pin_" + PinId], 932 groups: ["Pin_" + PinId],
@@ -950,17 +949,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -950,17 +949,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
950 radius: 5 * $scope.sliderPercentValue, 949 radius: 5 * $scope.sliderPercentValue,
951 950
952 click: function (clickedPin) { 951 click: function (clickedPin) {
953 - // alert('pin clciked = ' + clickedPin.name)  
954 - //change the head color to green  
955 - var radialAfterClick = $('#aaDetailViewCanvas').createGradient({  
956 - x1: 50, y1: 50,  
957 - x2: 50, y2: 50,  
958 - r1: 10, r2: 30,  
959 - c1: 'rgba(100, 50, 0,0)',  
960 - c2: 'rgb(126, 187, 83)'  
961 - });  
962 -  
963 - clickedPin.fillStyle = radialAfterClick; 952 + // alert('pin clciked = ' + clickedPin.name)
  953 +
  954 + if (clickedPin.event.ctrlKey == false) {
  955 + $scope.clickedPins = [];
  956 + }
964 957
965 var pinID = (clickedPin.name).substring(7, (clickedPin.name).length); 958 var pinID = (clickedPin.name).substring(7, (clickedPin.name).length);
966 // alert('pinId: ' + pinID); 959 // alert('pinId: ' + pinID);
@@ -991,112 +984,56 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo @@ -991,112 +984,56 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
991 } 984 }
992 985
993 var selectedPinData = new jinqJs() 986 var selectedPinData = new jinqJs()
994 - .from($scope.aaPinData) 987 + .from($scope.aaPinData)
995 .where("_PinId == " + pinID) 988 .where("_PinId == " + pinID)
996 .select(); 989 .select();
997 if (clickedPin.event.ctrlKey == true) { 990 if (clickedPin.event.ctrlKey == true) {
  991 +
  992 + var radialAfterClick = $('#aaDetailViewCanvas').createGradient({
  993 + x1: 50, y1: 50,
  994 + x2: 50, y2: 50,
  995 + r1: 10, r2: 30,
  996 + c1: 'rgba(100, 50, 0,0)',
  997 + c2: 'rgb(126, 187, 83)'
  998 + });
  999 +
  1000 + clickedPin.fillStyle = radialAfterClick;
998 $scope.showAnnotation(selectedPinData, true, true, false); 1001 $scope.showAnnotation(selectedPinData, true, true, false);
999 1002
1000 } 1003 }
1001 else { 1004 else {
1002 - $scope.showAnnotation(selectedPinData, false, true, false);  
1003 -  
1004 - }  
1005 -  
1006 -  
1007 - }  
1008 -  
1009 - }).drawLayers();  
1010 - //}  
1011 - // else  
1012 - // {  
1013 - // var radial = $('#' + canvasId).createGradient({  
1014 - // x1: 50, y1: 50,  
1015 - // x2: 50, y2: 50,  
1016 - // r1: 10, r2: 30,  
1017 - // c1: 'rgba(100, 50, 0,0)',  
1018 - // c2: 'rgb(216, 216, 216)'  
1019 - // });  
1020 - // $('#' + canvasId).drawLine({  
1021 -  
1022 - // layer: true,  
1023 - // name: "Pin_" + PinId,  
1024 - // groups: ["Pin_" + PinId],  
1025 - // strokeStyle: 'black',  
1026 - // strokeWidth: 2,  
1027 - // visible: true,  
1028 - // x1: offsetX1, y1: offsetY1,  
1029 - // x2: x, y2: y,  
1030 -  
1031 - // }).drawArc({  
1032 - // name: "PinArc_" + PinId,  
1033 - // layer: true,  
1034 - // groups: ["Pin_" + PinId],  
1035 - // strokeStyle: 'grey',  
1036 - // strokeWidth: 2,  
1037 - // visible: true,  
1038 - // fillStyle: radial,  
1039 - // x: x, y: y,  
1040 - // radius: 5,  
1041 -  
1042 - // click: function (clickedPin) {  
1043 - // alert('pin clciked = ' + clickedPin.name) //change the head color to green  
1044 - // var radialAfterClick = $('#aaDetailViewCanvas').createGradient({  
1045 - // x1: 50, y1: 50,  
1046 - // x2: 50, y2: 50,  
1047 - // r1: 10, r2: 30,  
1048 - // c1: 'rgba(100, 50, 0,0)',  
1049 - // c2: 'rgb(126, 187, 83)'  
1050 - // });  
1051 -  
1052 - // clickedPin.fillStyle = radialAfterClick;  
1053 -  
1054 - // var pinID = (clickedPin.name).substring(7, (clickedPin.name).length);  
1055 - // // alert('pinId: ' + pinID);  
1056 - // //showAnnotation();  
1057 -  
1058 - // var pinData = new jinqJs()  
1059 - // .from($scope.aaPinData)  
1060 - // .where("_PinId == " + pinID)  
1061 - // .select();  
1062 -  
1063 -  
1064 - // var pinTermNumber = pinData[0]._TermId;  
1065 -  
1066 - // var pinWithSameTerm = new jinqJs()  
1067 -  
1068 - // .from($scope.aaPinData)  
1069 - // .where("_TermId == " + pinTermNumber)  
1070 - // .select();  
1071 -  
1072 -  
1073 - // if (pinWithSameTerm != undefined && pinWithSameTerm != null && pinWithSameTerm.length > 0) {  
1074 -  
1075 - // for (var i = 0; i < pinWithSameTerm.length; i++) { 1005 + var radial = $('#aaDetailViewCanvas').createGradient({
  1006 + x1: 50, y1: 50,
  1007 + x2: 50, y2: 50,
  1008 + r1: 10, r2: 30,
  1009 + c1: 'rgba(100, 50, 0,0)',
  1010 + c2: 'rgb(216, 216, 216)'
  1011 + });
1076 1012
1077 - // $scope.clickedPins.push({ 'id': pinWithSameTerm[i]._PinId })  
1078 - // }  
1079 1013
1080 - // } 1014 + $('#aaDetailViewCanvas').setLayers({
  1015 + fillStyle: radial,
  1016 + }).drawLayers();
1081 1017
1082 - // var selectedPinData = new jinqJs()  
1083 - // .from($scope.aaPinData)  
1084 - // .where("_PinId == " + pinID)  
1085 - // .select();  
1086 - // if (clickedPin.event.ctrlKey == true) {  
1087 - // $scope.showAnnotation(selectedPinData, true, true, false); 1018 + //change the head color to green
  1019 + var radialAfterClick = $('#aaDetailViewCanvas').createGradient({
  1020 + x1: 50, y1: 50,
  1021 + x2: 50, y2: 50,
  1022 + r1: 10, r2: 30,
  1023 + c1: 'rgba(100, 50, 0,0)',
  1024 + c2: 'rgb(126, 187, 83)'
  1025 + });
1088 1026
1089 - // }  
1090 - // else {  
1091 - // $scope.showAnnotation(selectedPinData, false, true, false); 1027 + clickedPin.fillStyle = radialAfterClick;
  1028 + $scope.showAnnotation(selectedPinData, false, true, false);
1092 1029
1093 - // } 1030 + }
1094 1031
1095 1032
1096 - // } 1033 + }
1097 1034
1098 - // }).drawLayers();  
1099 - //} 1035 + }).drawLayers();
  1036 +
1100 1037
1101 } 1038 }
1102 1039
@@ -1602,7 +1539,6 @@ $(document).ready(function () { @@ -1602,7 +1539,6 @@ $(document).ready(function () {
1602 } 1539 }
1603 } 1540 }
1604 1541
1605 - console.log('ui.value= '+ui.value+' ,relativeWidth= ' + relativeWidth + ',relativeHeight= ' + relativeHeight)  
1606 if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) { 1542 if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) {
1607 $("#modItemImage").css("width", relativeWidth + "px"); 1543 $("#modItemImage").css("width", relativeWidth + "px");
1608 $("#modItemImage").css("height", relativeHeight + "px"); 1544 $("#modItemImage").css("height", relativeHeight + "px");
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
  View file @f5775bf
@@ -16,6 +16,11 @@ @@ -16,6 +16,11 @@
16 left: 0; 16 left: 0;
17 right: 0; 17 right: 0;
18 } 18 }
  19 + .active
  20 + {
  21 + margin-left:15px!important;
  22 + }
  23 + .tools1{left:-96px;}
19 </style> 24 </style>
20 <div id="aaDetailPageDiv" class="bodyWrap row" ng-controller="TileViewListController"> 25 <div id="aaDetailPageDiv" class="bodyWrap row" ng-controller="TileViewListController">
21 26
@@ -27,7 +32,7 @@ @@ -27,7 +32,7 @@
27 <div class="clearfix"></div>--> 32 <div class="clearfix"></div>-->
28 <!--</div>--> 33 <!--</div>-->
29 <div class="tools pull-left" style="top:44px;"> 34 <div class="tools pull-left" style="top:44px;">
30 - <div class="toggle-icon toggleBar toggleHeadingButton" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"></div> 35 + <div class="toggle-icon toggleBar toggleHeadingButton" id="sideBarToggle" data-toggle="tooltip" data-placement="top" title="Show/Hide Sidebar"></div>
31 <div class=""> 36 <div class="">
32 <div class="col-sm-6" title="Hide Pins"><button onclick="hidePins(event)" class="btn btn-black btn-sm"> <img src="../../../content/images/aa/LeftMenu/hide-pin.png" alt="" title=""></button> </div> 37 <div class="col-sm-6" title="Hide Pins"><button onclick="hidePins(event)" class="btn btn-black btn-sm"> <img src="../../../content/images/aa/LeftMenu/hide-pin.png" alt="" title=""></button> </div>
33 <div class="col-sm-6" title="Show Selected Pins"><button class="btn btn-black btn-sm pull-right" onclick="showSelectedPins(event)"><img src="../../../content/images/aa/LeftMenu/draw-pin.png" alt="" title=""></button></div> 38 <div class="col-sm-6" title="Show Selected Pins"><button class="btn btn-black btn-sm pull-right" onclick="showSelectedPins(event)"><img src="../../../content/images/aa/LeftMenu/draw-pin.png" alt="" title=""></button></div>
@@ -159,8 +164,24 @@ @@ -159,8 +164,24 @@
159 </script> 164 </script>
160 165
161 <script> 166 <script>
  167 + var isSideBarBtnClicked = true;
162 $(document).ready(function () { 168 $(document).ready(function () {
163 $('[data-toggle="tooltip"]').tooltip(); 169 $('[data-toggle="tooltip"]').tooltip();
  170 + $("#sideBarToggle").click(function () {
  171 + if (isSideBarBtnClicked == true) {
  172 + $(".main2").addClass("active");
  173 + $(".tools").addClass("tools1");
  174 + isSideBarBtnClicked = false;
  175 +
  176 + }
  177 + else
  178 + {
  179 + $(".main2").removeClass("active");
  180 + $(".tools").removeClass("tools1");
  181 + isSideBarBtnClicked = true;
  182 + }
  183 +
  184 + });
164 }); 185 });
165 </script> 186 </script>
166 <script src="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script> 187 <script src="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script>
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @f5775bf
@@ -1669,6 +1669,140 @@ @@ -1669,6 +1669,140 @@
1669 1669
1670 }); 1670 });
1671 </script> 1671 </script>
  1672 + <script>
  1673 + $(function () {
  1674 + function onBrushSizeChange() {
  1675 + $('.btnCursor').addClass('activebtncolor');
  1676 + $(".btn-annotation").removeClass("activebtncolor");
  1677 + $(".btn-annotation-erase").removeClass("activebtncolor");
  1678 + $(".btn-annotation-erase").removeClass("activebtncolor");
  1679 + $(".annotationpaintbrushsize").removeClass("activebtncolor");
  1680 + var x = $('#canvasPaint').css("z-index");
  1681 +
  1682 + var y = $('#canvas').css("z-index");
  1683 + if (x > y) {
  1684 + y = parseInt(x) + 1;
  1685 + } else {
  1686 + y = parseInt(y) + 1;
  1687 + }
  1688 + $('#canvas').css("z-index", y);
  1689 + }
  1690 +
  1691 + $("#slider-range-min-2").slider({
  1692 + range: "min",
  1693 + min: 1,
  1694 + max: 60,
  1695 + value: 1,
  1696 + slide: function (event, ui) {
  1697 +
  1698 + onBrushSizeChange();
  1699 +
  1700 +
  1701 +
  1702 + $("#btnBrushSize").val(ui.value);
  1703 +
  1704 + $("#annotationpaintbrushsize").css({ "pointer-events": "auto", "opacity": "1" });
  1705 + $("#annotationpainteraser").css({ "pointer-events": "auto", "opacity": "1" });
  1706 + $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": "1" });
  1707 + $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": "1" });
  1708 +
  1709 + },
  1710 + stop: function (event, ui) {
  1711 +
  1712 + $("#paintLine").attr("data-size", ui.value);
  1713 +
  1714 + }
  1715 +
  1716 + });
  1717 +
  1718 +
  1719 + $("#btnBrushSize").keydown(function () {
  1720 + $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": "1" });
  1721 + $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": "1" });
  1722 + onBrushSizeChange();
  1723 + var brushSizevalue = this.value;
  1724 +
  1725 + $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
  1726 + });
  1727 + $("#btnBrushSize").keyup(function () {
  1728 + onBrushSizeChange();
  1729 + var brushSizevalue = this.value;
  1730 + if (brushSizevalue == "") {
  1731 +
  1732 + $("#slider-range-min-2").slider("value", 0);
  1733 +
  1734 + $("#annotationpaintbrushsize").css({ "pointer-events": "none", "opacity": ".5" });
  1735 + $("#annotationpainteraser").css({ "pointer-events": "none", "opacity": ".5" });
  1736 + }
  1737 + else {
  1738 + $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
  1739 + $("#annotationpaintbrushsize").css({ "pointer-events": "auto", "opacity": "1" });
  1740 + $("#annotationpainteraser").css({ "pointer-events": "auto", "opacity": "1" });
  1741 + }
  1742 + // $("#slider-range-min-2").slider("value", parseInt(brushSizevalue));
  1743 + });
  1744 + $("#btnBrushSizeIncrement").click(function () {
  1745 + if ($("#annotationpaintbrushsize").css('pointer-events') == 'none') {
  1746 + $("#annotationpaintbrushsize").css({ "pointer-events": "auto", "opacity": "1" });
  1747 + $("#annotationpainteraser").css({ "pointer-events": "auto", "opacity": "1" });
  1748 + $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": "1" });
  1749 + $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": "1" });
  1750 + }
  1751 +
  1752 + onBrushSizeChange();
  1753 + var brushIncrementVar = $("#btnBrushSize").val();
  1754 + if (brushIncrementVar >= 60) {
  1755 + $("#slider-range-min-2").slider("value", 60);
  1756 + }
  1757 + else if (brushIncrementVar == "") {
  1758 + var brushIncrementedValue = 1;
  1759 + $("#btnBrushSize").val(brushIncrementedValue);
  1760 + $("#slider-range-min-2").slider("value", parseInt(brushIncrementedValue));
  1761 + }
  1762 + else {
  1763 +
  1764 + var brushIncrementedValue = parseInt(brushIncrementVar) + 1;
  1765 +
  1766 + $("#btnBrushSize").val(brushIncrementedValue);
  1767 + $("#slider-range-min-2").slider("value", parseInt(brushIncrementedValue));
  1768 + }
  1769 + });
  1770 + $("#btnBrushSizeDecrease").click(function () {
  1771 +
  1772 + onBrushSizeChange();
  1773 + var brushDecreaseVar = $("#btnBrushSize").val();
  1774 + if (brushDecreaseVar == "") {
  1775 +
  1776 + $("#btnBrushSizeDecrease").css({ "pointer-events": "none", "opacity": ".5" });
  1777 + $("#btnBrushSizeDecrease").css({ "pointer-events": "none", "opacity": ".5" });
  1778 +
  1779 + }
  1780 + else if (brushDecreaseVar <= 1) {
  1781 + $("#slider-range-min-2").slider("value", 1);
  1782 + if ($("#annotationpaintbrushsize").css('pointer-events') == 'none') {
  1783 + $("#annotationpaintbrushsize").css({ "pointer-events": "auto", "opacity": "1" });
  1784 + $("#annotationpainteraser").css({ "pointer-events": "auto", "opacity": "1" });
  1785 + $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": ".5" });
  1786 + $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": ".5" });
  1787 + }
  1788 +
  1789 + }
  1790 + else {
  1791 + var brushDecrementedValue = parseInt(brushDecreaseVar) - 1;
  1792 + if ($("#annotationpaintbrushsize").css('pointer-events') == 'none') {
  1793 + $("#annotationpaintbrushsize").css({ "pointer-events": "auto", "opacity": "1" });
  1794 + $("#annotationpainteraser").css({ "pointer-events": "auto", "opacity": "1" });
  1795 + $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": "1" });
  1796 + $("#btnBrushSizeDecrease").css({ "pointer-events": "auto", "opacity": "1" });
  1797 + }
  1798 + $("#btnBrushSize").val(brushDecrementedValue);
  1799 + $("#slider-range-min-2").slider("value", parseInt(brushDecrementedValue));
  1800 + }
  1801 + });
  1802 +
  1803 + $("#btnBrushSize").val($("#slider-range-min-2").slider("value"));
  1804 + });
  1805 + </script>
1672 1806
1673 <script> 1807 <script>
1674 $(function () { 1808 $(function () {
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @f5775bf
@@ -1017,7 +1017,10 @@ background-size:cover; @@ -1017,7 +1017,10 @@ background-size:cover;
1017 height: 95px !important; 1017 height: 95px !important;
1018 } 1018 }
1019 1019
1020 - 1020 + #bodySystemList
  1021 + {
  1022 + z-index:100000;
  1023 + }
1021 .GridViewDataDivHeight 1024 .GridViewDataDivHeight
1022 { 1025 {
1023 height:175px; 1026 height:175px;