ADAM / AIAHTML5

Commit ab14330dfbc314c7f1603863ef781cf3ce3034f6

Authored by Nikita Kulshreshtha
2 parents f25031a9 77cf2dee

Merge branch 'Bugs_v2' of http://52.6.196.163/ADAM/AIAHTML5 into BugV2Merge

Inline Side-by-side
Showing 5 changed files with 44 additions and 31 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @ab14330
... ... @@ -406,7 +406,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
406 406  
407 407 if ($rootScope.disableAnnotationTB == true)
408 408 {
409   - $('#AnnotaionPopupDiv').find('input, textarea, button, select').attr('disabled', 'disabled');
  409 + $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
410 410 $('#slider-range-min-2').slider('disable');
411 411 }
412 412 $rootScope.isLoading = true;
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @ab14330
... ... @@ -431,7 +431,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
431 431  
432 432  
433 433 $scope.openView = function ($event) {
434   -
  434 + $rootScope.disableAnnotationTB = false;
435 435 $rootScope.CIAnotationIdentifyModeOff = true;
436 436 $rootScope.currentBodyViewId = $event.currentTarget.id;
437 437 if ($event.currentTarget.textContent !== null && typeof ($event.currentTarget.textContent) !== "undefined") {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @ab14330
... ... @@ -265,7 +265,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
265 265  
266 266  
267 267 $scope.openView = function ($event) {
268   -
  268 + $rootScope.disableAnnotationTB = false;
269 269 $rootScope.isLoading = true;
270 270 $('#spinner').css('visibility', 'visible');
271 271  
... ... @@ -6836,7 +6836,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6836 6836  
6837 6837 if ($rootScope.disableAnnotationtoolOnListManager == true)
6838 6838 {
6839   - $('#AnnotaionPopupDiv').find('input, textarea, button, select').attr('disabled', 'disabled');
  6839 + $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
6840 6840 $('#slider-range-min-2').slider('disable');
6841 6841 if ($rootScope.setListManagerZindex == true)
6842 6842 {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @ab14330
... ... @@ -385,6 +385,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
385 385 $(".btn-annotation-arrow").addClass("activebtncolor");
386 386 }
387 387 $rootScope.DrawText = function () {
  388 +
388 389 $rootScope.setListManagerZindex = true;
389 390 $("#canvasPaint").css("display", "block");
390 391 $("#canvas").css("display", "block");
... ... @@ -472,16 +473,22 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
472 473 }
473 474  
474 475 $rootScope.enableAnnotationToolBar = function () {
475   -
476   - document.getElementById('modelbackground').style.display = "block";
477   - //$("#editshapestyle").modal('show');
478   - document.getElementById('modeleditstyle').style.display = "block";
479   - if ($('#modeleditstyle').css("display") == "block") { //Check if the modal is already showing
480   - var previewOpacity = $('#imgOpacity').css("opacity");
481   - $('#slider-range-min-4 div.ui-slider-range-min').css("width", (previewOpacity*100) + "%");
482   - $('#slider-range-min-4 span.ui-slider-handle').css("left", (previewOpacity * 100) + "%");
483   -
484   - };
  476 + if ($rootScope.disableAnnotationTB == true) {
  477 + document.getElementById('modelbackground').style.display = "none";
  478 + //$("#editshapestyle").modal('show');
  479 + document.getElementById('modeleditstyle').style.display = "none";
  480 + }
  481 + else {
  482 + document.getElementById('modelbackground').style.display = "block";
  483 + //$("#editshapestyle").modal('show');
  484 + document.getElementById('modeleditstyle').style.display = "block";
  485 + if ($('#modeleditstyle').css("display") == "block") { //Check if the modal is already showing
  486 + var previewOpacity = $('#imgOpacity').css("opacity");
  487 + $('#slider-range-min-4 div.ui-slider-range-min').css("width", (previewOpacity * 100) + "%");
  488 + $('#slider-range-min-4 span.ui-slider-handle').css("left", (previewOpacity * 100) + "%");
  489 +
  490 + };
  491 + }
485 492 }
486 493  
487 494  
... ... @@ -972,6 +979,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
972 979 $rootScope.TextID = TextAreaRectNameConcat;
973 980  
974 981 $rootScope.rectDimension.push({ width: layer.width, height: layer.height, x: layer.x, y: layer.y });
  982 + $("#annotationTextModal").css("padding-right", "0px");
  983 + document.getElementById('modelbackground').style.display = "block";
975 984 $("#annotationTextModal").modal("toggle");
976 985  
977 986 $("#text_area").val('');
... ... @@ -1023,7 +1032,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1023 1032 }
1024 1033 });
1025 1034  
1026   -
  1035 + $("#annotationTextModal").css("padding-right", "0px");
1027 1036 $("#annotationTextModal").modal("toggle");
1028 1037 $('.btnCursor').trigger('click');
1029 1038 $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": "#000000" });
... ... @@ -1159,6 +1168,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1159 1168  
1160 1169 break;
1161 1170 case "TextArea":
  1171 + document.getElementById('modelbackground').style.display = "block";
1162 1172 $rootScope.IsTextAlreadySave = false;
1163 1173 $("#text_area").val('');
1164 1174 // Draw text
... ... @@ -1184,7 +1194,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1184 1194 ///-----
1185 1195  
1186 1196 $rootScope.saveText = function () {
1187   -
  1197 + document.getElementById('modelbackground').style.display = "none";
1188 1198 // this part will work first time when save button will be clicked
1189 1199 if ($rootScope.IsTextAlreadySave == false) {
1190 1200 // getting textarea style properties
... ... @@ -1421,6 +1431,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1421 1431  
1422 1432 // _rectLayerOnSaveSplitInt = '';
1423 1433 textArrVal = '';
  1434 + $("#annotationTextModal").css("padding-right", "0px");
  1435 + document.getElementById('modelbackground').style.display = "block";
1424 1436 $("#annotationTextModal").modal("toggle");
1425 1437  
1426 1438  
... ... @@ -1624,7 +1636,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1624 1636  
1625 1637 }
1626 1638  
1627   -
  1639 + document.getElementById('modelbackground').style.display = "block";
1628 1640 $("#annotationTextModal").modal("toggle");
1629 1641 },
1630 1642 mouseout: function (layer) {
... ... @@ -1709,12 +1721,13 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1709 1721  
1710 1722 $rootScope.closeModal = function () {
1711 1723  
  1724 + document.getElementById('modelbackground').style.display = "none";
  1725 +
  1726 + //if ($rootScope.isTextAreaClosedButtonActive == true) {
  1727 + // $("#canvas").removeLayer('TextArea_' + $rootScope.TextNumber).drawLayers();
  1728 + // $("#canvas").removeLayer("TextRect_" + $rootScope.resetTextRect).drawLayers();
1712 1729  
1713   - if ($rootScope.isTextAreaClosedButtonActive == true) {
1714   - $("#canvas").removeLayer('TextArea_' + $rootScope.TextNumber).drawLayers();
1715   - $("#canvas").removeLayer("TextRect_" + $rootScope.resetTextRect).drawLayers();
1716   -
1717   - }
  1730 + //}
1718 1731  
1719 1732 }
1720 1733 //-- End ----------------------------
... ... @@ -1809,6 +1822,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
1809 1822 $rootScope.disableAnnotationtoolOnListManager = false;
1810 1823 $rootScope.ShowListManager = function () {
1811 1824 console.log('ShowListManager')
  1825 +
1812 1826 $rootScope.disableAnnotationtoolOnListManager = true;
1813 1827  
1814 1828 $rootScope.isLoading = true;
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @ab14330
... ... @@ -510,7 +510,7 @@
510 510  
511 511 <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div>
512 512 <div class="outlinediv">
513   - <div id="shapeStyleDiv" class="fullcolordiv" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()">
  513 + <div id="shapeStyleDiv" class="fullcolordiv" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()">
514 514  
515 515 </div>
516 516  
... ... @@ -561,8 +561,8 @@
561 561 </div>
562 562  
563 563 <!--Modal For Annotation Text Box-->
564   - <div class="modal fade" id="annotationTextModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="z-index: 1200000!important;">
565   - <div class="modal-dialog" role="document">
  564 + <div id="annotationTextModal" style="display:none;z-index: 1000000000;width:500px;height:241px;padding-right:0!important;position:fixed;left:0;right:0;top:0px;bottom:0;margin:auto;">
  565 +
566 566 <div class="modal-content">
567 567 <div class="modal-header" style="background-color: #808D43;padding:10px;border-bottom:0;">
568 568 <!--<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>-->
... ... @@ -572,9 +572,7 @@
572 572 <div class="col-xs-12" style="padding:20px 0;">
573 573 <div class="form-inline">
574 574 <!--Annotation: Text in different font style is same.-->
575   - <select class="form-control" id="selected-font-family">
576   -
577   - </select>
  575 + <select class="form-control" id="selected-font-family"></select>
578 576 <select class="form-control" id="selected-font-size">
579 577 <option>14</option>
580 578 <option>16</option>
... ... @@ -629,11 +627,11 @@
629 627 </div>
630 628 <div class="modal-footer">
631 629 <!--<button type="button" class="btn btn-default" ng-click="closeModal()" data-dismiss="modal">Close</button>-->
632   - <button type="button" class="btn btn-default" id="closeEditText" data-dismiss="modal">Close</button>
633   - <button type="button" id="saveBtn" class="btn btn-primary" data-dismiss="modal" ng-click="saveText()">Save</button>
  630 + <button type="button" class="btn btn-default" ng-click="closeModal()" id="closeEditText" data-dismiss="modal">Close</button>
  631 + <button type="button" id="saveBtn" class="btn btn-primary" data-dismiss="modal" ng-click="saveText()">Save</button>
634 632 </div>
635 633 </div>
636   - </div>
  634 +
637 635 </div>
638 636  
639 637  
... ... @@ -1255,6 +1253,7 @@
1255 1253 $(".modal").draggable();
1256 1254 $(".annotationTollbar").draggable();
1257 1255 $(".modeleditstyle").draggable();
  1256 + $("#annotationTextModal").draggable();
1258 1257 });
1259 1258 </script>
1260 1259  
... ...