ADAM / AIAHTML5

Commit d6da4a518733f6d06d20ceba33a61f1c7d21aefc

Authored by Sandeep Kumar
1 parent 04cfd211

Save Extract button activity

Inline Side-by-side
Showing 2 changed files with 66 additions and 18 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @d6da4a5
... ... @@ -197,6 +197,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
197 197  
198 198 $("#openCBJsonFile").trigger("click");
199 199 var fileupload = document.getElementById("openCBJsonFile");
  200 +
200 201  
201 202 fileupload.onchange = function () {
202 203  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @d6da4a5
... ... @@ -1800,7 +1800,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1800 1800  
1801 1801 }
1802 1802 else if($scope.daOpenInOtherModules.mode=='EXTRACT')
1803   - {
  1803 + {
  1804 +
1804 1805 $scope.SetwindowStoreData(windowviewid,'isExtract',true);
1805 1806 //Normal only
1806 1807  
... ... @@ -2788,8 +2789,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
2788 2789 // Scroll canvas based on CB data
2789 2790 var isHighlightBodyWithCBTermData = $scope.GetwindowStoreData(windowviewid, 'isHighlightBodyWithCBTermData');
2790 2791 if (isHighlightBodyWithCBTermData == true) {
2791   - $('#canvasDivDA_' + windowviewid).scrollLeft($scope.daOpenInOtherModules.canvasHScrollX);
2792   - $('#canvasDivDA_' + windowviewid).scrollTop($scope.daOpenInOtherModules.canvasVScrollX);
  2792 + var canvasHScrollX = $scope.daOpenInOtherModules.canvasHScrollX;
  2793 + var canvasVScrollX = $scope.daOpenInOtherModules.canvasVScrollX;
  2794 + $('#canvasDivDA_' + windowviewid).scrollLeft(canvasHScrollX);
  2795 + $('#canvasDivDA_' + windowviewid).scrollTop(canvasVScrollX);
2793 2796  
2794 2797 $scope.SetwindowStoreData(windowviewid, 'CanvasDivTopPosition', $("#canvasDivDA_" + windowviewid).scrollTop());
2795 2798 $scope.SetwindowStoreData(windowviewid, 'CanvasDivLeftPosition', $("#canvasDivDA_" + windowviewid).scrollLeft());
... ... @@ -3123,13 +3126,20 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
3123 3126 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windowviewid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windowviewid).offset().top, true, 0, 0, windowviewid, RGBColor);
3124 3127 }
3125 3128 //Remove previous SpeechBubble with termnumber
3126   - if (preTermData != undefined && preTermData.length > 0) {
3127   - for (var i = 0; i < preTermData.length; i++) {
3128   - if ($('#sppeachBubble_' + windowviewid + '-' + preTermData[i].termNumber).length > 0) {
3129   - $('#sppeachBubble_' + windowviewid + '-' + preTermData[i].termNumber).remove();
  3129 + var TermAnnotationText = $scope.GetwindowStoreData(windowviewid, 'TermAnnotationText');
  3130 + //if (TermAnnotationText[0] != "Skin") {
  3131 + if (preTermData != undefined && preTermData.length > 0) {
  3132 + for (var i = 0; i < preTermData.length; i++) {
  3133 + if (preTermData[i].termNumber != parseInt(RGBColor)) {
  3134 + if ($('#sppeachBubble_' + windowviewid + '-' + preTermData[i].termNumber).length > 0) {
  3135 + $('#sppeachBubble_' + windowviewid + '-' + preTermData[i].termNumber).remove();
  3136 + }
  3137 + }
  3138 +
3130 3139 }
3131 3140 }
3132   - }
  3141 + //}
  3142 +
3133 3143 }
3134 3144 else {
3135 3145 $scope.MultiLanguageAnnationArray = [];
... ... @@ -3253,8 +3263,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3253 3263 // Scroll canvas based on CB data
3254 3264 var isHighlightBodyWithCBTermData = $scope.GetwindowStoreData(windowviewid, 'isHighlightBodyWithCBTermData');
3255 3265 if (isHighlightBodyWithCBTermData == true) {
3256   - $('#canvasDivDA_' + windowviewid).scrollLeft($scope.daOpenInOtherModules.canvasHScrollX);
3257   - $('#canvasDivDA_' + windowviewid).scrollTop($scope.daOpenInOtherModules.canvasVScrollX);
  3266 + var canvasHScrollX = $scope.daOpenInOtherModules.canvasHScrollX;
  3267 + var canvasVScrollX = $scope.daOpenInOtherModules.canvasVScrollX;
  3268 + $('#canvasDivDA_' + windowviewid).scrollLeft(canvasHScrollX);
  3269 + $('#canvasDivDA_' + windowviewid).scrollTop(canvasVScrollX);
3258 3270  
3259 3271 $scope.SetwindowStoreData(windowviewid, 'CanvasDivTopPosition', $("#canvasDivDA_" + windowviewid).scrollTop());
3260 3272 $scope.SetwindowStoreData(windowviewid, 'CanvasDivLeftPosition', $("#canvasDivDA_" + windowviewid).scrollLeft());
... ... @@ -3276,6 +3288,16 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3276 3288 $('#spinner').css('visibility', 'visible');
3277 3289 $scope.DisableUI();
3278 3290 $scope.highLightBody(windowviewid);
  3291 +
  3292 + //Add code for Showing Annotation in Extract mode
  3293 + var isHighlightBodyWithCBTermData = $scope.GetwindowStoreData(windowviewid, 'isHighlightBodyWithCBTermData');
  3294 + if (isHighlightBodyWithCBTermData == true) {
  3295 + $scope.ShowCBDataBodyView(windowviewid);
  3296 + }
  3297 + $rootScope.isLoading = false;
  3298 + $('#spinner').css('visibility', 'hidden');
  3299 + $scope.EnableUI();
  3300 +
3279 3301 }
3280 3302 else if (isHighLight == true || (isListManagerSelected == true) || ((isGenderChnage == true) && (isHighLight == true))
3281 3303 || ((isViewChange == true) && (isHighLight == true)) || isExtract == true || isHighlightBodyByBodySystem == true) {
... ... @@ -4696,7 +4718,18 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4696 4718 $('#dot_'+windowviewid).remove();
4697 4719 $('#sppeachBubble_'+windowviewid).remove();
4698 4720 $('.com_'+windowviewid).remove();
4699   - $('#bord_'+windowviewid).remove();
  4721 + $('#bord_' + windowviewid).remove();
  4722 +
  4723 + //Remove Annotaion for Slide Changes to Save CB
  4724 + $scope.SetwindowStoreData(windowviewid, 'previousHighlightList', []);
  4725 + $scope.SetwindowStoreData(windowviewid, 'AllTerms', []);
  4726 + $scope.SetwindowStoreData(windowviewid, 'fullTermlist', []);
  4727 + $scope.SetwindowStoreData(windowviewid, 'CurriculumTermData', []);
  4728 + //$scope.SetwindowStoreData(windowviewid, 'isListManagerSelected', false);
  4729 + //$scope.SetwindowStoreData(windowviewid, 'multiAnnotationIsON', false);
  4730 + //$('#typedTermName_' + windowviewid).val('');
  4731 +
  4732 + $('#typedTermName_' + windowviewid).val('');
4700 4733  
4701 4734 if (($("#canvasPaintDA_"+windowviewid).css("display") == "block") && ($("#canvasDA_"+windowviewid).css("display") == "block")) {
4702 4735 if ($rootScope.isAnnotatiomToolBarPopupActive == false) {
... ... @@ -4819,6 +4852,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4819 4852 // $scope.SetwindowStoreData(windowviewid,'speechbubbleList',$scope.speechList);
4820 4853 }
4821 4854 $('.appendDragg').draggable({
  4855 + containment: '#canvasDivDA_' + windowviewid,
4822 4856 drag: function (evt) {
4823 4857 var bubbleId = (evt.target.id).split("-")[0];
4824 4858 //var len = (evt.target.id).split("_").length;
... ... @@ -4897,19 +4931,28 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4897 4931 $scope.SetwindowStoreData(windowviewid,'multiAnnotationIsON',false);
4898 4932 //history maintained issue
4899 4933 if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
4900   - $('#sppeachBubble_'+windowviewid).remove();
4901   - $('#dot_'+windowviewid).remove();
  4934 + //$('#sppeachBubble_'+windowviewid).remove();
  4935 + $('#dot_' + windowviewid).remove();
  4936 + $('#sppeachBubble_' + windowviewid + '-' + termNumber).remove();
4902 4937 }
4903 4938 $('.com_'+windowviewid).remove();
4904 4939 $('#bord_'+windowviewid).remove();
4905 4940 $scope.createSpeechBubbleBasedOnAnnotationLengthwithoutCtrl(x, y, windowviewid, termNumber);
4906 4941 //history maintained issue
4907 4942 if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
4908   - document.getElementById('sppeachBubble_' + windowviewid + '-' + termNumber).style.zIndex = "60000";
  4943 + //document.getElementById('sppeachBubble_' + windowviewid + '-' + termNumber).style.zIndex = "60000";
  4944 + $('#sppeachBubble_' + windowviewid + '-' + termNumber).css("zIndex", "60000");
4909 4945 }
  4946 +
  4947 + $("#bord_" + windowviewid).draggable({
  4948 + containment: '#canvasDivDA_' + windowviewid
  4949 + });
  4950 +
4910 4951 $('#sppeachBubble_' + windowviewid + '-' + termNumber).draggable(
4911 4952 {
  4953 + containment: '#canvasDivDA_' + windowviewid,
4912 4954 drag: function (evt) {
  4955 +
4913 4956 var bubbleId = (evt.target.id).split("-")[0];
4914 4957 //var len= (evt.target.id).split("_").length;
4915 4958 //var windid = (evt.target.id).split("_")[len-1];
... ... @@ -4983,6 +5026,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4983 5026 $scope.speechbubbleList.push({ xaxis: x, yaxis: y, ids: sub_id_annotation });
4984 5027 $scope.SetwindowStoreData(windowviewid,'speachBubbleArrayAnnotation',$scope.speechList1);
4985 5028 $('.appendDragg_annotation').draggable({
  5029 +
  5030 + containment: '#canvasDivDA_' + windowviewid,
  5031 +
4986 5032 drag: function (evt) {
4987 5033 var len= (evt.target.id).split("_").length;
4988 5034 var windid = (evt.target.id).split("_")[len-1];
... ... @@ -5021,7 +5067,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5021 5067 $('.dynCross_anno_'+windowviewid).parent().parent().parent().remove();
5022 5068 $scope.createSpeechBubbleBasedOnTransparencyWithoutCtrl(x, y,windowviewid);
5023 5069 $('#sppeachBubble_annotation_'+windowviewid).draggable(
5024   - {
  5070 + {
  5071 + containment: '#canvasDivDA_' + windowviewid,
5025 5072 drag: function (evt) {
5026 5073 var len= (evt.target.id).split("_").length;
5027 5074 var windid = (evt.target.id).split("_")[len-1];
... ... @@ -5065,13 +5112,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5065 5112 $('#dot_'+windowviewid).show();
5066 5113 $('#bord_'+windowviewid).show();
5067 5114 //$('#sppeachBubble_' + windowviewid).show();
5068   - $('#sppeachBubble_' + windowviewid + '-' + termNumber).show();
  5115 +
5069 5116 $('#sppeachBubble_annotation_'+windowviewid).show();
5070 5117  
5071 5118 $('#bord_annotation_'+windowviewid).show();
5072 5119 $('#dot_annotation_'+windowviewid).show();
5073 5120 $('.dynCross_anno_' + windowviewid).parent().parent().parent().show();
5074   -
  5121 + $('#sppeachBubble_' + windowviewid + '-' + termNumber).show();
5075 5122 }
5076 5123  
5077 5124 $scope.hideAnnotation = function (windowviewid) {
... ... @@ -8314,7 +8361,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8314 8361 }
8315 8362 }
8316 8363  
8317   - //// #7972 Mozilla Firefox> Incorrect navigation
  8364 + // #7972 Mozilla Firefox> Incorrect navigation
8318 8365 $("#canvasDiv").scroll(function (event) {
8319 8366 var len= (event.currentTarget.id).split("_").length;
8320 8367 var windowviewid = (event.currentTarget.id).split("_")[len-1];
... ...