Merge branch 'Bug#23119_1' of http://52.6.196.163/ADAM/AIAHTML5 into Develop

# Conflicts: # 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js # 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js

Merge branch 'Bug#23119_1' of http://52.6.196.163/ADAM/AIAHTML5 into Develop
# Conflicts: # 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js # 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
Amrita Vishnoi
2 parents 89a3c155 3f0d1415
Showing 2 changed files with 78 additions and 29 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -35,7 +35,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
     $scope.transNumber = 100;
     $rootScope.modestyCanvasZindex = 12100;
-    $rootScope.isModestyCanvasVisible = false;
+    $rootScope.isTBoxModestyVisible = false;
     //for transarency scale
     $scope.TBDrawStartX;
     $scope.TBDrawStartY;
@@ -3252,7 +3252,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
         if (parseInt(termNumber) != parseInt(figLeafTermNo)) {
             $scope.TermNumber = termNumber;
             for (var j = 0; j <= $rootScope.lexiconLanguageArray.length - 1; j++) {
-                if ($rootScope.TermNumberData != null || $rootScope.TermNumberData != undefined) {
+                if ($rootScope.TermNumberData != null || $rootScope.TermNumberData != undefined) 
+                {
                     $scope.matchedTermNoData = new jinqJs()
                                                .from($rootScope.TermNumberData.TermData.Term)
                                                .where('_TermNumber == ' + termNumber)
@@ -3279,8 +3280,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                     }
                 }
                 else {
-                    $rootScope.loadSearchData();
-                    $scope.GetAnnotationText(termNumber);
+                    var currentBodyViewId = $rootScope.voId;
+                    var termJsonPath = '~/../content/data/json/da/body-views/' + currentBodyViewId + '/da_dat_tm_sg_' + currentBodyViewId + '.json';
+                    DataService.getAnotherJson(termJsonPath)
+                   .then(
+                    function (result) {
+                        $rootScope.TermNumberData = result;
+                        $scope.GetAnnotationText(termNumber);
+                    })
                 }
             }
         }
@@ -3650,7 +3657,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             // we decide the size of speech bubble
             //2.
-              if (event.ctrlKey) {
+            if (event.ctrlKey) {
                 console.log('ctrl pressed');
                 $scope.multiAnnotationIsON = true;
                 //2.1 create unique speech bubbles
@@ -3769,12 +3776,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 });
             }
         }
+     
         if (document.getElementById("btnStrutureBox").name == "showAnnotationStructure") {
             $scope.showAnnotation()
         }
         else {
             $scope.hideAnnotation()
         }
+   
         if ($rootScope.isTBCompleted == true) {
             $('#sppeachBubble').remove();
             $('#dot').remove();
@@ -4044,7 +4053,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
         }
     }
     $scope.createSpeechBubbleBasedOnTransparencyWithoutCtrl = function (x, y) {
-
+        $("#bord_annotation").remove();
+        $("#sppeachBubble_annotation").remove();
+        $("#dot_annotation").remove();
         var sppechBubbleDotHTML_annotation = '<div id="dot_annotation" style="position:absolute;height:15px;width:35px;display:none;z-index:59000;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);"></div>'
                  + '<div id="sppeachBubble_annotation" style="height:auto!important;z-index:60000;margin-left:25px;border:1px solid #000;display:none;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size:12px;background-color:#19100e;font-weight:bold;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;">'
                  + '<span style="position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;">'
@@ -4633,7 +4644,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             $("#annotationpaintbrushsize").removeClass("activebtncolor");
             $("#annotationpainteraser").removeClass("activebtncolor");
             if ($("#DrawMode").hasClass("annotationtoolbartab")) {
-                if ($rootScope.isModestyCanvasVisible == true) {
+                if ($rootScope.isTBoxModestyVisible == true) {
                     $rootScope.switchCanvas();
@@ -4868,7 +4879,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             }
             if (document.getElementById(modestyTransCanvasId) == null || document.getElementById(modestyTransCanvasId) == undefined) {
-                $rootScope.isModestyCanvasVisible = true;
+                $rootScope.isTBoxModestyVisible = true;
                 var canvasModesty = document.createElement('canvas');
                 canvasModesty.id = modestyTransCanvasId;
                 canvasModesty.height = Height;
@@ -4877,7 +4888,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 canvasModesty.style.left = X + 'px';
                 canvasModesty.style.top = Y + 'px';
                 canvasModesty.style.visibility = 'visible';
-                canvasModesty.style.zIndex = $rootScope.modestyCanvasZindex;
+                if($rootScope.currentBodyViewId=="11"){
+
+                    canvasModesty.style.zIndex = 11000;
+                }
+                else
+                  canvasModesty.style.zIndex = $rootScope.modestyCanvasZindex;
                 canvasModesty.addEventListener('click', OnClickModestyTransCanvas);
                 document.getElementById('canvasDiv').appendChild(canvasModesty);
@@ -5508,11 +5524,23 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             var bodyRegionRight = parseInt(value.X) + parseInt(value.Width);
             var bodyRegionBottom = parseInt(value.Y) + parseInt(value.Height);
             if ($rootScope.Xaxis <= bodyRegionRight && $rootScope.Yaxis <= bodyRegionBottom && value.X <= $rootScope.Xaxis && value.Y <= $rootScope.Yaxis) {
-                $rootScope.BRId = value.bodyRegionId;
-                $rootScope.BodyRegionXAxis = value.X;
-                $rootScope.BodyRegionYAxis = value.Y;
-                $rootScope.isMirrorBodyRegion = value.IsMirror;
-                return false;
+                if ($rootScope.currentBodyViewId == "11" || $rootScope.currentBodyViewId == "9") {
+                    if (value.bodyRegionId == "6") {
+                        $rootScope.BRId = value.bodyRegionId;
+                        $rootScope.BodyRegionXAxis = value.X;
+                        $rootScope.BodyRegionYAxis = value.Y;
+                        $rootScope.isMirrorBodyRegion = value.IsMirror;
+                        return false;
+                    }
+                }
+                else {
+                    $rootScope.BRId = value.bodyRegionId;
+                    $rootScope.BodyRegionXAxis = value.X;
+                    $rootScope.BodyRegionYAxis = value.Y;
+                    $rootScope.isMirrorBodyRegion = value.IsMirror;
+                    return false;
+                }
+              
             }
         });
     }
@@ -6284,7 +6312,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
     }
     $scope.CloseTransparencyBox = function () {
-        $rootScope.isModestyCanvasVisible = false;
+        $rootScope.isTBoxModestyVisible = false;
         //for enabling annoataions. 
         //Now everything si done on canavases uswed in annotation toolbar.
@@ -6980,7 +7008,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
     $scope.enableShowHideStructureBox = function () {
-
+       
         //if listanager is visisble then close it
@@ -1104,8 +1104,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     }
     $rootScope.switchToTransparencycanvas = function () {
-
-        if ($rootScope.isModestyCanvasVisible == true) {
+    
+        if ($rootScope.isTBoxModestyVisible == true) {
             var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']");
             if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) {
                 for (var j = 0; j < modestyTransCanvases.length; j++) {
@@ -1114,15 +1114,21 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                     if (ctx.style.visibility == "visible") {
                         if ($("#OnIdentify").hasClass("annotationtoolbartab")) {
-
+                           
                             var drawCanvasZindex = $("#canvas").css("z-index");
                             var paintCanvasZindex = $("#canvasPaint").css("z-index");
                             var TransCanvasZindex = ctx.style.zIndex;
                             var MaxZindexVal = Math.max(drawCanvasZindex, paintCanvasZindex, TransCanvasZindex);
                             MaxZindexVal = MaxZindexVal + 1;
                             $("#canvas").css("z-index", MaxZindexVal);
-                            $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
+                            if ($rootScope.currentBodyViewId == "11") {
+                                $(".ui-wrapper").css("z-index", MaxZindexVal + 1);
+                               $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
+                            }
+                            else {
+                                $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
+                            }
                         }
                         else {
                             var drawCanvasZindex = $("#canvas").css("z-index");
@@ -1132,11 +1138,19 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                             MaxZindexVal = parseInt(MaxZindexVal + 1);
                             if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) {
-
                                 $("#canvasPaint").css("z-index", MaxZindexVal);
                             }
                             else {
+                               
                                 $("#canvas").css("z-index", MaxZindexVal);
+                                if ($rootScope.currentBodyViewId == "11") {
+                                     $(".ui-wrapper").css("z-index", MaxZindexVal);
+                                }
+                                else
+                                {
+                                    $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
+                                }
+                             
                             }
                         }
@@ -1404,7 +1418,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     }
     $rootScope.switchCanvasToPaintCanvas = function (e) {
-        if ($rootScope.isModestyCanvasVisible == true) {
+        if ($rootScope.isTBoxModestyVisible == true) {
             var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']");
             if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) {
                 for (var j = 0; j < modestyTransCanvases.length; j++) {
@@ -1549,8 +1563,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $rootScope.switchCanvas = function () {
-
-        if ($rootScope.isModestyCanvasVisible == true) {
+      
+        if ($rootScope.isTBoxModestyVisible == true) {
             var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']");
             if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) {
                 for (var j = 0; j < modestyTransCanvases.length; j++) {
@@ -1574,11 +1588,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                         else {
                             if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) {
-
-                                $("#canvasPaint").css("z-index", MaxZindexVal);
+                                if ($rootScope.currentBodyViewId == "11") { $("#canvasPaint").css("z-index", MaxZindexVal + 1); }
+                                else{ $("#canvasPaint").css("z-index", MaxZindexVal);}
                             }
                             else {
-                                $("#canvas").css("z-index", MaxZindexVal);
+                                if ($rootScope.currentBodyViewId == "11") {
+                                    $("#canvas").css("z-index", MaxZindexVal + 1);
+                                }
+                                else
+                                {
+                                    $("#canvas").css("z-index", MaxZindexVal);
+                                }
                             }
                         }
@@ -3760,7 +3780,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     }
     $rootScope.CloseListManager = function () {
-
         $("#btnTranparency").removeAttr('disabled', 'disabled');
         $("#optionsListManagerTab").removeClass("active");
         $rootScope.isListManagerMenuSelected = false;
@@ -3776,7 +3795,9 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 $("#annotationpainteraser").removeAttr('disabled', 'disabled');
                 $("#annotationpaintbrushsize").css('pointer-events', 'auto');
                 $("#annotationpainteraser").css('pointer-events', 'auto');
-                $rootScope.switchCanvasToPaintCanvas();
+                if ($(".annotationTollbar").css("display") == "block") {
+                    $rootScope.switchCanvasToPaintCanvas();
+                }
             }
         }
         if ($location.path() == "/module-item-view") {