Save Extract button activity

Sandeep Kumar
1 parent 04cfd211
Showing 2 changed files with 66 additions and 18 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -197,6 +197,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
         $("#openCBJsonFile").trigger("click");
         var fileupload = document.getElementById("openCBJsonFile");        
+        
         fileupload.onchange = function () {
@@ -1800,7 +1800,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             }
             else if($scope.daOpenInOtherModules.mode=='EXTRACT')
-            {
+            {               
+
                 $scope.SetwindowStoreData(windowviewid,'isExtract',true);
                 //Normal only 
@@ -2788,8 +2789,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                             // Scroll canvas based on CB data
                             var isHighlightBodyWithCBTermData = $scope.GetwindowStoreData(windowviewid, 'isHighlightBodyWithCBTermData');
                             if (isHighlightBodyWithCBTermData == true) {
-                                $('#canvasDivDA_' + windowviewid).scrollLeft($scope.daOpenInOtherModules.canvasHScrollX);
-                                $('#canvasDivDA_' + windowviewid).scrollTop($scope.daOpenInOtherModules.canvasVScrollX);
+                                var canvasHScrollX = $scope.daOpenInOtherModules.canvasHScrollX;
+                                var  canvasVScrollX = $scope.daOpenInOtherModules.canvasVScrollX;
+                                $('#canvasDivDA_' + windowviewid).scrollLeft(canvasHScrollX);
+                                $('#canvasDivDA_' + windowviewid).scrollTop(canvasVScrollX);
                                 $scope.SetwindowStoreData(windowviewid, 'CanvasDivTopPosition', $("#canvasDivDA_" + windowviewid).scrollTop());
                                 $scope.SetwindowStoreData(windowviewid, 'CanvasDivLeftPosition', $("#canvasDivDA_" + windowviewid).scrollLeft());
@@ -3123,13 +3126,20 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                             $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windowviewid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windowviewid).offset().top, true, 0, 0, windowviewid, RGBColor);
                         }
                         //Remove previous SpeechBubble with termnumber
-                        if (preTermData != undefined && preTermData.length > 0) {
-                            for (var i = 0; i < preTermData.length; i++) {
-                                if ($('#sppeachBubble_' + windowviewid + '-' + preTermData[i].termNumber).length > 0) {
-                                    $('#sppeachBubble_' + windowviewid + '-' + preTermData[i].termNumber).remove();
+                        var TermAnnotationText = $scope.GetwindowStoreData(windowviewid, 'TermAnnotationText');
+                        //if (TermAnnotationText[0] != "Skin") {
+                            if (preTermData != undefined && preTermData.length > 0) {
+                                for (var i = 0; i < preTermData.length; i++) {
+                                    if (preTermData[i].termNumber != parseInt(RGBColor)) {
+                                        if ($('#sppeachBubble_' + windowviewid + '-' + preTermData[i].termNumber).length > 0) {
+                                            $('#sppeachBubble_' + windowviewid + '-' + preTermData[i].termNumber).remove();
+                                        }
+                                    }
+                                    
                                 }
                             }
-                        }
+                        //}
+                        
                     }
                     else {
                         $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
                                 // Scroll canvas based on CB data
                                 var isHighlightBodyWithCBTermData = $scope.GetwindowStoreData(windowviewid, 'isHighlightBodyWithCBTermData');
                                 if (isHighlightBodyWithCBTermData == true) {
-                                    $('#canvasDivDA_' + windowviewid).scrollLeft($scope.daOpenInOtherModules.canvasHScrollX);
-                                    $('#canvasDivDA_' + windowviewid).scrollTop($scope.daOpenInOtherModules.canvasVScrollX);
+                                    var canvasHScrollX = $scope.daOpenInOtherModules.canvasHScrollX;
+                                    var canvasVScrollX = $scope.daOpenInOtherModules.canvasVScrollX;
+                                    $('#canvasDivDA_' + windowviewid).scrollLeft(canvasHScrollX);
+                                    $('#canvasDivDA_' + windowviewid).scrollTop(canvasVScrollX);
                                     $scope.SetwindowStoreData(windowviewid, 'CanvasDivTopPosition', $("#canvasDivDA_" + windowviewid).scrollTop());
                                     $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
                                         $('#spinner').css('visibility', 'visible');
                                         $scope.DisableUI();
                                         $scope.highLightBody(windowviewid);
+
+                                        //Add code for Showing Annotation in Extract mode
+                                        var isHighlightBodyWithCBTermData = $scope.GetwindowStoreData(windowviewid, 'isHighlightBodyWithCBTermData');
+                                        if (isHighlightBodyWithCBTermData == true) {
+                                            $scope.ShowCBDataBodyView(windowviewid);
+                                        }
+                                        $rootScope.isLoading = false;
+                                        $('#spinner').css('visibility', 'hidden');
+                                        $scope.EnableUI();
+
                                     }
                                     else if (isHighLight == true || (isListManagerSelected == true) || ((isGenderChnage == true) && (isHighLight == true))
                                              || ((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
             $('#dot_'+windowviewid).remove();
             $('#sppeachBubble_'+windowviewid).remove();
             $('.com_'+windowviewid).remove();
-            $('#bord_'+windowviewid).remove();
+            $('#bord_' + windowviewid).remove();
+
+            //Remove Annotaion for Slide Changes to Save CB
+            $scope.SetwindowStoreData(windowviewid, 'previousHighlightList', []);
+            $scope.SetwindowStoreData(windowviewid, 'AllTerms', []);
+            $scope.SetwindowStoreData(windowviewid, 'fullTermlist', []);
+            $scope.SetwindowStoreData(windowviewid, 'CurriculumTermData', []);
+            //$scope.SetwindowStoreData(windowviewid, 'isListManagerSelected', false);
+            //$scope.SetwindowStoreData(windowviewid, 'multiAnnotationIsON', false);
+            //$('#typedTermName_' + windowviewid).val('');
+
+            $('#typedTermName_' + windowviewid).val('');
             if (($("#canvasPaintDA_"+windowviewid).css("display") == "block") && ($("#canvasDA_"+windowviewid).css("display") == "block")) {
                 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
                         // $scope.SetwindowStoreData(windowviewid,'speechbubbleList',$scope.speechList);	
                     }
                     $('.appendDragg').draggable({
+                        containment: '#canvasDivDA_' + windowviewid,
                         drag: function (evt) {
                             var bubbleId = (evt.target.id).split("-")[0];
                             //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
                     $scope.SetwindowStoreData(windowviewid,'multiAnnotationIsON',false);	
                     //history maintained issue
                     if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
-                        $('#sppeachBubble_'+windowviewid).remove();
-                        $('#dot_'+windowviewid).remove();
+                        //$('#sppeachBubble_'+windowviewid).remove();
+                        $('#dot_' + windowviewid).remove();
+                        $('#sppeachBubble_' + windowviewid + '-' + termNumber).remove();
                     }
                     $('.com_'+windowviewid).remove();
                     $('#bord_'+windowviewid).remove();
                     $scope.createSpeechBubbleBasedOnAnnotationLengthwithoutCtrl(x, y, windowviewid, termNumber);
                     //history maintained issue                   
                     if ($rootScope.isAnnotaionToolBarDrawingModeActive == false) {
-                        document.getElementById('sppeachBubble_' + windowviewid + '-' + termNumber).style.zIndex = "60000";
+                        //document.getElementById('sppeachBubble_' + windowviewid + '-' + termNumber).style.zIndex = "60000";
+                        $('#sppeachBubble_' + windowviewid + '-' + termNumber).css("zIndex", "60000");
                     }
+
+                    $("#bord_" + windowviewid).draggable({
+                        containment: '#canvasDivDA_' + windowviewid
+                    });
+
                     $('#sppeachBubble_' + windowviewid + '-' + termNumber).draggable(
                     {
+                        containment: '#canvasDivDA_' + windowviewid,
                         drag: function (evt) {
+                           
                             var bubbleId = (evt.target.id).split("-")[0];
                             //var len=  (evt.target.id).split("_").length;
                             //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
                     $scope.speechbubbleList.push({ xaxis: x, yaxis: y, ids: sub_id_annotation });
                     $scope.SetwindowStoreData(windowviewid,'speachBubbleArrayAnnotation',$scope.speechList1);                   
                     $('.appendDragg_annotation').draggable({
+
+                        containment: '#canvasDivDA_' + windowviewid,
+
                         drag: function (evt) {
                             var len=  (evt.target.id).split("_").length;
                             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
                     $('.dynCross_anno_'+windowviewid).parent().parent().parent().remove();
                     $scope.createSpeechBubbleBasedOnTransparencyWithoutCtrl(x, y,windowviewid);
                     $('#sppeachBubble_annotation_'+windowviewid).draggable(
-                {
+                    {
+                        containment: '#canvasDivDA_' + windowviewid,
                     drag: function (evt) {
                         var len=  (evt.target.id).split("_").length;
                         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
             $('#dot_'+windowviewid).show();
             $('#bord_'+windowviewid).show();
             //$('#sppeachBubble_' + windowviewid).show();
-            $('#sppeachBubble_' + windowviewid + '-' + termNumber).show();
+            
             $('#sppeachBubble_annotation_'+windowviewid).show();
             $('#bord_annotation_'+windowviewid).show();
             $('#dot_annotation_'+windowviewid).show();
             $('.dynCross_anno_' + windowviewid).parent().parent().parent().show();
-            
+            $('#sppeachBubble_' + windowviewid + '-' + termNumber).show();
         }
         $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
             }
         }
-        //// #7972 Mozilla Firefox> Incorrect navigation
+        // #7972 Mozilla Firefox> Incorrect navigation
         $("#canvasDiv").scroll(function (event) {
             var len=  (event.currentTarget.id).split("_").length;
             var windowviewid = (event.currentTarget.id).split("_")[len-1];