Merge branch 'ModestySettIssue' into Develop

Nikita Kulshreshtha
2 parents e6065c82 df546f12
Showing 2 changed files with 293 additions and 108 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -34,6 +34,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.bagartDetails;
     $scope.transNumber = 50;
+    $rootScope.modestyCanvasZindex = 12100;
+    $rootScope.isModestyCanvasVisible = false;
     //for transarency scale
     $scope.TBDrawStartX;
     $scope.TBDrawStartY;
@@ -737,7 +739,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             //set max for LayerNumber input
             $rootScope.totalLayers = dataLength - 1;
-            //   debugger
+          
             $('#txtLayerNumber').attr('max', $rootScope.totalLayers);
             $('#layerChangeSlider').slider("option", "max", $rootScope.totalLayers);
@@ -1564,7 +1566,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 //    $scope.createDynamicSpeechBubble(evt, annotationText, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top);
                 $scope.MultiLanguageAnnationArray = [];
                 $scope.MultiLanguageAnnationArray.push(annotationText);
-                
+               
                 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
             }
             else {
@@ -1590,7 +1592,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     $scope.MultiLanguageAnnationArray = [];
                     $scope.MultiLanguageAnnationArray.push(annotationText);
-                    
+                   
                     $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, true);
                 }
@@ -2801,7 +2803,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             return null;
         }
     }
-
+   
     //layer change function
     $scope.LayerChange = function () {
@@ -2811,7 +2813,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         // $rootScope.isListManagerSelected = false;
         $rootScope.CloseListManager();
-       
         $scope.isLayerChange = true;
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
@@ -2953,17 +2954,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         $('#sppeachBubble').remove();
         $(".com").remove();
         $("#bord").remove();
-
-
-        if (($("#canvasPaint").css("display") == "block") && ($("#canvas").css("display") == "block")){
+     
+        if (($("#canvasPaint").css("display") == "block") && ($("#canvas").css("display") == "block")) {
             if ($rootScope.isAnnotatiomToolBarPopupActive == false) {
-                
-            if ($("#transparencyScale").css("display") == "block") {
+                if ($("#transparencyScale").css("display") == "block") {
                 $rootScope.switchToTransparencycanvas();
             }
         }
         else {
-
                 if ($("#OnIdentify").hasClass("annotationtoolbartab")) {
                     $rootScope.switchToTransparencycanvas();
                 }
@@ -2972,14 +2970,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                     $rootScope.switchCanvas();
                 }
         }
-
         }
         else
         {
             if ($rootScope.isAnnotatiomToolBarPopupActive == true) {
-
                 $rootScope.CloseAnnotationTool();
-
             }
         }
     }
@@ -2989,15 +2984,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.DisableProgressBar = function () {
-        // alert('Disabled wait cursor is called');
-
         if ($rootScope.isHighLight) {
-            //alert('isHighlight: ' + $scope.isHighLight);
-
-            //$('#btnHighLight').removeClass('btn btn-black');
-            //$('#btnHighLight').addClass('btn-primary');
-
+          
             $("#btnHighLight").addClass("btn-primary");
             $("#btnHighLight").removeClass("btn-black");
@@ -3059,7 +3048,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.createDynamicSpeechBubble = function (event, x, y, isAnnotationForTBox) {
-        //debugger;
+     
         if (isAnnotationForTBox == true) {
             //1. In transparency box we shows two annotation at a time, so we need to decide the max length of annotation in btween two annotation because based on that 
             // we decide the size of speech bubble
@@ -3297,7 +3286,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 var Exists_annotation = $("#canvasDiv").find("div[id=" + pointClicked_annotation + "]").length;
                 // alert(Exists_annotation);
                 //  alert(pointClicked_annotation);
-                var sppechBubbleHTML_annotation = "<div id ='" + pointClicked_annotation + "' class='com_anno'><div style='z-index:10000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.j + "'></div><div data=" + $scope.j + " id=" + sub_id_annotation + " class='appendDragg_annotation' style='z-index:60000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.j + " class='dynCross_anno' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord_annotation" + $scope.j + "'></div></div>";
+                var sppechBubbleHTML_annotation = "<div id ='" + pointClicked_annotation + "' class='com_anno'><div style='z-index:59000;position:absolute;border-top:2px solid #000;transform:rotate(40deg);-moz-transform:rotate(40deg);-o-transform:rotate(40deg);-ms-transform:rotate(40deg);-webkit-transform:rotate(40deg);height:15px;width:35px;left:" + (x - 10) + "px;top:" + (y + 10) + "px;'' id='bubble" + $scope.j + "'></div><div data=" + $scope.j + " id=" + sub_id_annotation + " class='appendDragg_annotation' style='z-index:60000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + x + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + $scope.j + " class='dynCross_anno' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:59000;' id='bord_annotation" + $scope.j + "'></div></div>";
                 if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) {
                     if (Exists_annotation == 0) {
                         $("#canvasDiv").append(sppechBubbleHTML_annotation);
@@ -3522,12 +3511,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 $(".com_annotation").css("display", "none");
                 $("#bord_annotation").css({ "width": "0px", "display": "none" });
                 $('.dynCross_anno').parent().parent().parent().remove();
-                var sppechBubbleDotHTML_annotation = '<div id="dot_annotation" style="position:absolute;height:15px;width:35px;display:none;z-index:10000;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>'
+                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;">'
            + '<img class="crossDiv_temp_annotation" style="width:18px" src=' + $rootScope.path + '></span></div>'
-           + '<div style="position:absolute;border:1px solid #000;display:none;z-index:9000;" id="bord_annotation">'
+           + '<div style="position:absolute;border:1px solid #000;display:none;z-index:59000;" id="bord_annotation">'
           + '</div>';
@@ -3978,6 +3967,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
     function mouseDownListener(e) {
+      
         //Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
         var tCanvas = document.getElementById('transparencyCanvas');
         if ($('#transparencyScale').css("visibility") == 'visible') {
@@ -4253,18 +4243,26 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $("#annotationpainteraser").removeClass("activebtncolor");
             if ($("#DrawMode").hasClass("annotationtoolbartab"))
             {
-                var drawCanvasZindex = $("#canvas").css("z-index");
-                var paintCanvasZindex = $("#canvasPaint").css("z-index");
-                drawCanvasZindex = parseInt(drawCanvasZindex) - 1;
-                paintCanvasZindex = parseInt(paintCanvasZindex) - 1;
-                if (drawCanvasZindex > paintCanvasZindex) {
-                    $(".ui-wrapper").css("z-index", drawCanvasZindex);
-                    $rootScope.UIWrapperZIndex = drawCanvasZindex;
+                if ($rootScope.isModestyCanvasVisible == true) {
+
+                    $rootScope.switchCanvas();
+
                 }
                 else {
-                    $(".ui-wrapper").css("z-index", paintCanvasZindex);
-                    $rootScope.UIWrapperZIndex = paintCanvasZindex;
+                    var drawCanvasZindex = $("#canvas").css("z-index");
+                    var paintCanvasZindex = $("#canvasPaint").css("z-index");
+                    drawCanvasZindex = parseInt(drawCanvasZindex) - 1;
+                    paintCanvasZindex = parseInt(paintCanvasZindex) - 1;
+                    if (drawCanvasZindex > paintCanvasZindex) {
+                        $(".ui-wrapper").css("z-index", drawCanvasZindex);
+                        $rootScope.UIWrapperZIndex = drawCanvasZindex;
+                    }
+                    else {
+                        $(".ui-wrapper").css("z-index", paintCanvasZindex);
+                        $rootScope.UIWrapperZIndex = paintCanvasZindex;
+                    }
                 }
+                
             }
             else {
                 $rootScope.switchToTransparencycanvas();
@@ -4474,6 +4472,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             }
             if (document.getElementById(modestyTransCanvasId) == null || document.getElementById(modestyTransCanvasId) == undefined) {
+                $rootScope.isModestyCanvasVisible = true;
                 var canvasModesty = document.createElement('canvas');
                 canvasModesty.id = modestyTransCanvasId;
                 canvasModesty.height = Height;
@@ -4482,7 +4481,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 canvasModesty.style.left = X + 'px';
                 canvasModesty.style.top = Y + 'px';
                 canvasModesty.style.visibility = 'visible';
-                canvasModesty.style.zIndex = '2000';
+                canvasModesty.style.zIndex = $rootScope.modestyCanvasZindex;
                 canvasModesty.addEventListener('click', OnClickModestyTransCanvas);
                 document.getElementById('canvasDiv').appendChild(canvasModesty);
@@ -5405,8 +5404,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 $scope.annotationTextArrayT2 = [];
                 $scope.annotationTextArrayT1.push(annotations.annotationT1);
                 $scope.annotationTextArrayT2.push(annotations.annotationT2);
-
-               
+              
                 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
             }
             else
@@ -5418,7 +5416,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 $scope.annotationTextArrayT1.push(annotations.annotationT1);
                 $scope.annotationTextArrayT2.push(annotations.annotationT2);
-            
                 $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
             }
@@ -5503,8 +5500,24 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         if ($('#speechBubbleTrns').length > 0) {
             $('#speechBubbleTrns').remove();
         }
+        
+        var tCanvasTopPos = $(".ui-wrapper").css("top");
+        var tCanvasTopPosAftrSplit = tCanvasTopPos.split("p");
+        var tCanvasHeight = $(".ui-wrapper").css("height");
+        var tCanvasHeightAftrSplit = tCanvasHeight.split("p");
+        var tCanvasAttr = parseInt(tCanvasTopPosAftrSplit[0]) + parseInt(tCanvasHeightAftrSplit[0]);
+
+        if ((evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top) >= parseInt(tCanvasTopPosAftrSplit[0]) && (evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top) <= tCanvasAttr) {
+
             $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
+        }
+        else {
+            
+            $rootScope.getAnnotationTextBasedOnSelectedBodyRegion(evt);
+
+        }
+
     }
@@ -5549,7 +5562,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $scope.annotationTextArrayT2 = [];
             $scope.annotationTextArrayT1.push(annotations.annotationT1);
             $scope.annotationTextArrayT2.push(annotations.annotationT2);
-
+       
             $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
         }
         else
@@ -5558,7 +5571,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             $scope.annotationTextArrayT2 = [];
             $scope.annotationTextArrayT1.push(annotations.annotationT1);
             $scope.annotationTextArrayT2.push(annotations.annotationT2);
-
+        
             $scope.createDynamicSpeechBubble(evt, evt.pageX + horizontlScrollPosition - $('#canvasDiv').offset().left, evt.pageY + verticalScrollPosition - $('#canvasDiv').offset().top, false);
         }
   }
@@ -5657,8 +5670,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.onTransparencyChange = function (ev, ui) {
-        //debugger;
-        // alert('t change')
+       
         $scope.transNumber = ui.value;
         var tCanvas = document.getElementById('transparencyCanvas');
@@ -5716,7 +5728,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     }
     $scope.CloseTransparencyBox = function () {
-     
+        $rootScope.isModestyCanvasVisible = false;
         //for enabling annoataions. 
         //Now everything si done on canavases uswed in annotation toolbar.
@@ -8425,8 +8437,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                           .from($scope.VocabTermTxt)
                           .where('_TermText == ' + $scope.searchFilter)
                           .select('_ActualTermNumber', '_TermText', '_cdId');
-
+          
             if (EnteredDASearchTerm.length > 0) {
+               
                 $scope.HighlightBodyOnListManagerSelection(EnteredDASearchTerm[0]._ActualTermNumber);
                 $scope.IsSearchVisible = false;
@@ -466,7 +466,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $rootScope.openParent = function (slug) {
-        // debugger;
+      
         var openViews = $rootScope.openViews;
         if (openViews.length > 0) {
             $rootScope.openViews.splice(openViews.length - 1);
@@ -641,21 +641,15 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $rootScope.CIAnotationIdentifyModeOff = false;
     $rootScope.OnIdentifyClick = function () {
-
+       
         $("#OnIdentify").addClass("annotationtoolbartab");
         $("#DrawMode").removeClass("annotationtoolbartab");
-        //  $rootScope.isIdetifyClicked = true;
-        //  $rootScope.isDrawingToolSelected = false;
-        //  debugger;
+       
         if ($rootScope.CIAnotationIdentifyModeOff == true) {
             $('.btnCursor').removeClass('activebtncolor');
         } else {
-            //  $("#canvasPaint").css("display", "none");
-            //   $("#canvas").css("display", "none");
-
-            //    $("#canvasPaint").css("z-index", "0");
-            //    $("#canvas").css("z-index", "0");
+          
             $('.btnCursor').removeClass('activebtncolor');
         }
@@ -674,26 +668,86 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     }
     $rootScope.switchToTransparencycanvas = function () {
+       
+        if ($rootScope.isModestyCanvasVisible == true) {
+            var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']");
+            if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) {
+                for (var j = 0; j < modestyTransCanvases.length; j++) {
+                    var ctx = document.getElementById(modestyTransCanvases[j].id);
+                   
+                    if (ctx.style.visibility == "visible") {
-        var x = $("#canvas").css("z-index");
-        var y = $("#canvasPaint").css("z-index");
-        x = parseInt(x) + 1;
-        y = parseInt(y) + 1;
-        if (x > y) {
-            $(".ui-wrapper").css("z-index", x);
-            $("#canvas").css("z-index", x);
-            $rootScope.UIWrapperZIndex = x;
+                        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);
+
+                        }
+                        else {
+                            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 = parseInt(MaxZindexVal + 1);
+                           
+                            if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) {
+
+                                $("#canvasPaint").css("z-index", MaxZindexVal);
+                            }
+                            else {
+                                $("#canvas").css("z-index", MaxZindexVal);
+                            }
+
+                        }
+                    }
+                    else
+                    {
+                        var drawCanvasZindex = $("#canvas").css("z-index");
+                        var paintCanvasZindex = $("#canvasPaint").css("z-index");
+                        drawCanvasZindex = parseInt(drawCanvasZindex) + 1;
+                        paintCanvasZindex = parseInt(paintCanvasZindex) + 1;
+                        if (drawCanvasZindex > paintCanvasZindex) {
+                            $(".ui-wrapper").css("z-index", drawCanvasZindex);
+                            $("#canvas").css("z-index", drawCanvasZindex);
+                            $rootScope.UIWrapperZIndex = drawCanvasZindex;
+                        }
+                        else {
+                            $(".ui-wrapper").css("z-index", paintCanvasZindex);
+                            $("#canvas").css("z-index", paintCanvasZindex);
+                            $rootScope.UIWrapperZIndex = paintCanvasZindex;
+                        }
+
+                    }
+                }
+            }
+         
+        }
+        else
+            {
+            var drawCanvasZindex = $("#canvas").css("z-index");
+            var paintCanvasZindex = $("#canvasPaint").css("z-index");
+            drawCanvasZindex = parseInt(drawCanvasZindex) + 1;
+            paintCanvasZindex = parseInt(paintCanvasZindex) + 1;
+            if (drawCanvasZindex > paintCanvasZindex) {
+                $(".ui-wrapper").css("z-index", drawCanvasZindex);
+                $("#canvas").css("z-index", drawCanvasZindex);
+                $rootScope.UIWrapperZIndex = drawCanvasZindex;
         }
         else {
-            $(".ui-wrapper").css("z-index", y);
-            $("#canvas").css("z-index", y);
-            $rootScope.UIWrapperZIndex = y;
+                $(".ui-wrapper").css("z-index", paintCanvasZindex);
+                $("#canvas").css("z-index", paintCanvasZindex);
+                $rootScope.UIWrapperZIndex = paintCanvasZindex;
         }
-
+      }
     }
     $rootScope.DrawingMode = function () {
+       
         //Annotation History
         $rootScope.isAnnotaionToolBarDrawingModeActive = true;
         $("#OnIdentify").removeClass("annotationtoolbartab");
@@ -727,14 +781,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $("#canvasPaint").css("display", "block");
         $("#canvas").css("display", "block");
-        $rootScope.switchCanvas();
-        $rootScope.shapeType = "Line";
-
         $('.btnCursor').removeClass('activebtncolor');
         $(".btn-annotation").removeClass("activebtncolor");
         $(".btn-annotation-line").addClass("activebtncolor");
         $("#OnIdentify").removeClass('annotationtoolbartab');
         $("#DrawMode").addClass('annotationtoolbartab');
+
+
+        $rootScope.switchCanvas();
+        $rootScope.shapeType = "Line";
+
+    
         $rootScope.isAnnotaionToolBarDrawingModeActive = true;
     }
@@ -743,16 +800,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $("#canvasPaint").css("display", "block");
         $("#canvas").css("display", "block");
-        $rootScope.switchCanvas();
-        $rootScope.switchCanvas();
-        $rootScope.setListManagerZindex = true;
-        $rootScope.shapeType = "Pin";
-
         $('.btnCursor').removeClass('activebtncolor');
         $(".btn-annotation").removeClass("activebtncolor");
         $(".btn-annotation-pin").addClass("activebtncolor");
         $("#OnIdentify").removeClass('annotationtoolbartab');
         $("#DrawMode").addClass('annotationtoolbartab');
+
+        $rootScope.switchCanvas();
+        $rootScope.setListManagerZindex = true;
+        $rootScope.shapeType = "Pin";
+
+      
         $rootScope.isAnnotaionToolBarDrawingModeActive = true;
     }
@@ -773,17 +831,25 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $rootScope.setListManagerZindex = true;
         $("#canvasPaint").css("display", "block");
         $("#canvas").css("display", "block");
-        $rootScope.switchCanvas();
-        $rootScope.shapeType = "Rectangle";
+
         $('.btnCursor').removeClass('activebtncolor');
         $(".btn-annotation").removeClass("activebtncolor");
         $(".btn-annotation-rectangle").addClass("activebtncolor");
         $("#OnIdentify").removeClass('annotationtoolbartab');
         $("#DrawMode").addClass('annotationtoolbartab');
+
+        $rootScope.switchCanvas();
+        $rootScope.shapeType = "Rectangle";
+      
         $rootScope.isAnnotaionToolBarDrawingModeActive = true;
     }
     $rootScope.paintBrush = function () {
+        $('.btnCursor').removeClass('activebtncolor');
+        $(".btn-annotation").removeClass("activebtncolor");
+        $(".btn-annotation-brush").addClass("activebtncolor");
+        $("#OnIdentify").removeClass('annotationtoolbartab');
+        $("#DrawMode").addClass('annotationtoolbartab');
         $rootScope.isAnnotaionToolBarDrawingModeActive = true;
         if ($rootScope.disableAnnotationtoolOnListManager == true) {
             $rootScope.switchCanvas();
@@ -802,7 +868,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         } else {
-            //  $('.btnCursor').addClass('activebtncolor');
             $rootScope.setListManagerZindex = true;
             $("#canvasPaint").css("display", "block");
             $("#canvas").css("display", "block");
@@ -828,8 +893,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             $("#annotationpaintbrushsize").attr("data-color", $rootScope.shapestyleColorWithOpacity);
-
-
             if ($rootScope.shapeSize == '') {
                 $('#canvasPaint').sketch({ defaultSize: 1 });
             }
@@ -837,17 +900,58 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                 $('#canvasPaint').sketch();
             }
-
         }
-
-        $('.btnCursor').removeClass('activebtncolor');
-        $(".btn-annotation").removeClass("activebtncolor");
-        $(".btn-annotation-brush").addClass("activebtncolor");
-        $("#OnIdentify").removeClass('annotationtoolbartab');
-        $("#DrawMode").addClass('annotationtoolbartab');
     }
     $rootScope.switchCanvasToPaintCanvas = function (e) {
+        if ($rootScope.isModestyCanvasVisible == true) {
+            var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']");
+            if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) {
+                for (var j = 0; j < modestyTransCanvases.length; j++) {
+                    var ctx = document.getElementById(modestyTransCanvases[j].id);
+                    if (ctx.style.visibility == "visible") {
+                        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;
+                        if (($("#canvasPaint").css("display") == "block") && ($("#canvas").css("display") == "block")) {
+                        if ($("#OnIdentify").hasClass("annotationtoolbartab")) {
+                            $("#canvas").css("z-index", MaxZindexVal);
+                            $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
+                        }
+                        else {
+                         
+                            if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) {
+                                $("#canvasPaint").css("z-index", MaxZindexVal);
+                            }
+                            else {
+                                $("#canvas").css("z-index", MaxZindexVal);
+                            }
+                        }
+                   }
+             }
+                    else {
+                      
+                        var drawCanvasZindex = $("#canvas").css("z-index");
+                        var paintCanvasZindex = $("#canvasPaint").css("z-index");
+                        var MaxZindexVal = Math.max(drawCanvasZindex, paintCanvasZindex);
+                        MaxZindexVal = parseInt(MaxZindexVal + 1);
+
+                        if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) {
+                            $("#canvasPaint").css("z-index", MaxZindexVal);
+                        }
+
+                        else {
+                            $("#canvas").css("z-index", MaxZindexVal);
+                        }
+
+                    }
+                }
+            }
+
+        }
+    else {
         var canvasPaint_zIndex = $('#canvasPaint').css("z-index");
         var canvas_zIndex = $('#canvas').css("z-index");
         if (canvas_zIndex > canvasPaint_zIndex) {
@@ -859,18 +963,22 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         }
         $('#canvasPaint').css("z-index", canvasPaint_zIndex);
     }
+    }
     $rootScope.DrawCircle = function (e) {
         $rootScope.setListManagerZindex = true;
         $("#canvasPaint").css("display", "block");
         $("#canvas").css("display", "block");
-        $rootScope.switchCanvas();
-        $rootScope.shapeType = "Circle";
+
         $('.btnCursor').removeClass('activebtncolor');
         $(".btn-annotation").removeClass("activebtncolor");
         $(".btn-annotation-circle").addClass("activebtncolor");
         $("#OnIdentify").removeClass('annotationtoolbartab');
         $("#DrawMode").addClass('annotationtoolbartab');
+
+        $rootScope.switchCanvas();
+        $rootScope.shapeType = "Circle";
+       
         $rootScope.isAnnotaionToolBarDrawingModeActive = true;
     }
@@ -878,13 +986,16 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $rootScope.setListManagerZindex = true;
         $("#canvasPaint").css("display", "block");
         $("#canvas").css("display", "block");
-        $rootScope.switchCanvas();
-        $rootScope.shapeType = "Arrow";
+
         $('.btnCursor').removeClass('activebtncolor');
         $(".btn-annotation").removeClass("activebtncolor");
         $(".btn-annotation-arrow").addClass("activebtncolor");
         $("#OnIdentify").removeClass('annotationtoolbartab');
         $("#DrawMode").addClass('annotationtoolbartab');
+
+        $rootScope.switchCanvas();
+        $rootScope.shapeType = "Arrow";
+      
         $rootScope.isAnnotaionToolBarDrawingModeActive = true;
     }
     $rootScope.DrawText = function () {
@@ -892,14 +1003,17 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $rootScope.setListManagerZindex = true;
         $("#canvasPaint").css("display", "block");
         $("#canvas").css("display", "block");
-        $rootScope.switchCanvas();
-        $rootScope.shapeType = "TextArea";
         $('.btnCursor').removeClass('activebtncolor');
         $(".btn-annotation").removeClass("activebtncolor");
         $(".btn-annotation-Text").addClass("activebtncolor");
         $("#OnIdentify").removeClass('annotationtoolbartab');
         $("#DrawMode").addClass('annotationtoolbartab');
+
+        $rootScope.switchCanvas();
+
+        $rootScope.shapeType = "TextArea";
+       
         $rootScope.isAnnotaionToolBarDrawingModeActive = true;
     }
@@ -915,15 +1029,75 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
     $rootScope.switchCanvas = function () {
-        var x = $('#canvasPaint').css("z-index");
+       
+        if ($rootScope.isModestyCanvasVisible == true) {
+            var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']");
+            if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) {
+                for (var j = 0; j < modestyTransCanvases.length; j++) {
+                    var ctx = document.getElementById(modestyTransCanvases[j].id);
-        var y = $('#canvas').css("z-index");
-        if (x > y) {
-            y = parseInt(x) + 1;
-        } else {
-            y = parseInt(y) + 1;
+                    if (ctx.style.visibility == "visible") {
+
+                        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;
+
+
+                        if ($("#OnIdentify").hasClass("annotationtoolbartab")) {
+                           
+                            $("#canvas").css("z-index", MaxZindexVal);
+                            $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
+
+                        }
+                        else {
+                                                    
+                            if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) {
+
+                                $("#canvasPaint").css("z-index", MaxZindexVal);
+                            }
+                            else {
+                                $("#canvas").css("z-index", MaxZindexVal);
+                            }
+
+                        }
+                    }
+                    else {
+
+                        var drawCanvasZindex = $("#canvas").css("z-index");
+                        var paintCanvasZindex = $("#canvasPaint").css("z-index");
+
+                        var MaxZindexVal = Math.max(drawCanvasZindex, paintCanvasZindex);
+                        MaxZindexVal = parseInt(MaxZindexVal + 1);
+
+                        if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) {
+
+                            $("#canvasPaint").css("z-index", MaxZindexVal);
+                        }
+
+                        else {
+                            $("#canvas").css("z-index", MaxZindexVal);
+                        }
+                    }
+                }
+            }
+        }
+        else
+        {
+
+            var drawCanvasZindex = $("#canvas").css("z-index");
+            var paintCanvasZindex = $("#canvasPaint").css("z-index");
+
+
+            if (drawCanvasZindex > paintCanvasZindex) {
+                paintCanvasZindex = parseInt(drawCanvasZindex) + 1;
+            } else {
+                paintCanvasZindex = parseInt(paintCanvasZindex) + 1;
+            }
+            $('#canvas').css("z-index", paintCanvasZindex);
         }
-        $('#canvas').css("z-index", y);
+        
     }
     $rootScope.EraseDrawing = function () {
         $rootScope.isAnnotaionToolBarDrawingModeActive = true;
@@ -1085,9 +1259,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
                     $("#edit-slider-4").css({ "pointer-events": "none" });
                   $("#editstylebackgroundcolor").css({ "pointer-events": "none" });
               }
-            //$("#borderWidthCanvasElement").change(function () {
-            //    $(".marginTopBtm10 div.outlinediv").css("border-color", x);
-            //});
+          
         } else {
             document.getElementById('fill-option').checked = isfilloptionChecked;
@@ -1970,35 +2142,35 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             case "Line":
                 $(".line").remove();
                 $rootScope.isLinePreviewCompleted = true;
-                $("#canvasDiv").append("<div class='line' style='z-index:610;border:1px dashed #000000;position:absolute;left:" + $rootScope.offsetX1 + "px;top:" + $rootScope.offsetY1 + "px;'></div>");
+                $("#canvasDiv").append("<div class='line' style='z-index:12001;border:1px dashed #000000;position:absolute;left:" + $rootScope.offsetX1 + "px;top:" + $rootScope.offsetY1 + "px;'></div>");
                 $rootScope.Annotationangle();
                 break;
             case "Arrow":
                 $(".arrow").remove();
                 $rootScope.isArrowPreviewCompleted = true;
-                $("#canvasDiv").append("<div class='arrow' style='z-index:610;border:1px dashed #000000;position:absolute;left:" + $rootScope.offsetX1 + "px;top:" + $rootScope.offsetY1 + "px;width:" + Math.abs($rootScope.MouseMoveXAxis - $rootScope.offsetX1) + "px;'><div style='border-bottom: 9px solid transparent;border-right: 12px dashed #ccc;border-top: 7px solid transparent;height: 0;left: -6px;position: absolute;top: -8px;width: 0;'></div></div>");
+                $("#canvasDiv").append("<div class='arrow' style='z-index:12001;border:1px dashed #000000;position:absolute;left:" + $rootScope.offsetX1 + "px;top:" + $rootScope.offsetY1 + "px;width:" + Math.abs($rootScope.MouseMoveXAxis - $rootScope.offsetX1) + "px;'><div style='border-bottom: 9px solid transparent;border-right: 12px dashed #ccc;border-top: 7px solid transparent;height: 0;left: -6px;position: absolute;top: -8px;width: 0;'></div></div>");
                 $rootScope.Annotationangle();
                 break;
             case "Pin":
                 $(".pin").remove();
                 $rootScope.isPinPreviewCompleted = true;
-                $("#canvasDiv").append("<div class='pin' style='z-index:610;border:1px dashed #000000;position:absolute;left:" + $rootScope.offsetX1 + "px;top:" + $rootScope.offsetY1 + "px;width:" + Math.abs($rootScope.MouseMoveXAxis - $rootScope.offsetX1) + "px;'><div style='background-color:#fff;left: -8px;position: absolute;top: -6px;width: 10;height:12px;width:12px;border:2px dashed #808080;border-radius:50%;'></div></div>");
+                $("#canvasDiv").append("<div class='pin' style='z-index:12001;border:1px dashed #000000;position:absolute;left:" + $rootScope.offsetX1 + "px;top:" + $rootScope.offsetY1 + "px;width:" + Math.abs($rootScope.MouseMoveXAxis - $rootScope.offsetX1) + "px;'><div style='background-color:#fff;left: -8px;position: absolute;top: -6px;width: 10;height:12px;width:12px;border:2px dashed #808080;border-radius:50%;'></div></div>");
                 $rootScope.Annotationangle();
                 break;
             case "Circle":
                 $(".circle").remove();
                 $rootScope.isCirclePreviewCompleted = true;
-                $("#canvasDiv").append("<div class='circle' style='z-index:610;border-radius:50%;border:1px dashed #000000;position:absolute;left:" + $rootScope.offsetX1 + "px;top:" + $rootScope.offsetY1 + "px;width:" + (Math.abs($rootScope.MouseMoveXAxis - $rootScope.offsetX1)) + "px;height:" + (Math.abs($rootScope.MouseMoveYAxis - $rootScope.offsetY1)) + "px;'></div>");
+                $("#canvasDiv").append("<div class='circle' style='z-index:12001;border-radius:50%;border:1px dashed #000000;position:absolute;left:" + $rootScope.offsetX1 + "px;top:" + $rootScope.offsetY1 + "px;width:" + (Math.abs($rootScope.MouseMoveXAxis - $rootScope.offsetX1)) + "px;height:" + (Math.abs($rootScope.MouseMoveYAxis - $rootScope.offsetY1)) + "px;'></div>");
                 break;
             case "Rectangle":
                 $(".rectangle").remove();
                 $rootScope.isRectanglePreviewCompleted = true;
-                $("#canvasDiv").append("<div class='rectangle' style='z-index:610;border:1px dashed #000000;position:absolute;left:" + $rootScope.offsetX1 + "px;top:" + $rootScope.offsetY1 + "px;width:" + (Math.abs($rootScope.MouseMoveXAxis - $rootScope.offsetX1)) + "px;height:" + (Math.abs($rootScope.MouseMoveYAxis - $rootScope.offsetY1)) + "px;'></div>");
+                $("#canvasDiv").append("<div class='rectangle' style='z-index:12001;border:1px dashed #000000;position:absolute;left:" + $rootScope.offsetX1 + "px;top:" + $rootScope.offsetY1 + "px;width:" + (Math.abs($rootScope.MouseMoveXAxis - $rootScope.offsetX1)) + "px;height:" + (Math.abs($rootScope.MouseMoveYAxis - $rootScope.offsetY1)) + "px;'></div>");
                 break;
             case "TextArea":
                 $(".textarea").remove();
                 $rootScope.isTextAreaPreviewCompleted = true;
-                $("#canvasDiv").append("<div class='textarea' style='z-index:610;border:1px dashed #000000;position:absolute;left:" + $rootScope.offsetX1 + "px;top:" + $rootScope.offsetY1 + "px;width:" + (Math.abs($rootScope.MouseMoveXAxis - $rootScope.offsetX1)) + "px;height:" + (Math.abs($rootScope.MouseMoveYAxis - $rootScope.offsetY1)) + "px;'></div>");
+                $("#canvasDiv").append("<div class='textarea' style='z-index:12001;border:1px dashed #000000;position:absolute;left:" + $rootScope.offsetX1 + "px;top:" + $rootScope.offsetY1 + "px;width:" + (Math.abs($rootScope.MouseMoveXAxis - $rootScope.offsetX1)) + "px;height:" + (Math.abs($rootScope.MouseMoveYAxis - $rootScope.offsetY1)) + "px;'></div>");
                 break;
         }