Merge branch 'Bugv6Merge1' into Develop

Nikita Kulshreshtha
2 parents 3df3c248 b5e0633f
Showing 3 changed files with 130 additions and 77 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -372,7 +372,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     $scope.openView = function ($event) {
         $rootScope.disableAnnotationTBFn();
-      
+        $rootScope.MenuModuleName = "CA";
+        //alert($rootScope.MenuModuleName);
         $rootScope.currentBodyViewId = $event.currentTarget.id;
         if ($event.currentTarget.textContent !== null && typeof ($event.currentTarget.textContent) !== "undefined") {
             var CITitle = [];
@@ -266,6 +266,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.openView = function ($event) {
         $rootScope.disableAnnotationTB = false;
+        $rootScope.MenuModuleName = "DA";
+        //alert($rootScope.MenuModuleName);
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
@@ -6860,11 +6862,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     //list manager
     $scope.$on('listManagerEvent', function (event, data) {
-        
-        if ($rootScope.disableAnnotationtoolOnListManager == true)
-        {
-            $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
-            $('#slider-range-min-2').slider('disable');
+       
+        //if ($rootScope.MenuModuleName == "DA") {
+        //    if ($rootScope.disableAnnotationtoolOnListManager == true) {
+        //        $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
+        //        $('#slider-range-min-2').slider('disable');
+        //    }
+        //} 
             if ($rootScope.setListManagerZindex == true)
             {
                 var canvasPaintZindex = $('#canvasPaint').css("z-index");  //x
@@ -6886,7 +6890,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                 }
             }
-        }
+        
@@ -80,14 +80,13 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                 $rootScope.CloseListManager();
                 angular.element('#modal-settings').modal('hide');
                 if ($location.url() == "/lab-exercises") {
-                   
+
                     $rootScope.menuLabExer = 0;
                 }
-                if($rootScope.menuLabExer==1)
-                {
+                if ($rootScope.menuLabExer == 1) {
                     $rootScope.disableMenuoption = " ";
                 }
-               
+
             }
         });
@@ -140,15 +139,15 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             }
         }
-      //  $rootScope.DrawLine = function () {
-            //$rootScope.isIdetifyClicked = false;
-            //$rootScope.isDrawingToolSelected = true;
-            //$rootScope.isLineDrawSelecyed = true;
-         //   $rootScope.shapeType = "Line";
-            //  alert($rootScope.shapeType);
+        //  $rootScope.DrawLine = function () {
+        //$rootScope.isIdetifyClicked = false;
+        //$rootScope.isDrawingToolSelected = true;
+        //$rootScope.isLineDrawSelecyed = true;
+        //   $rootScope.shapeType = "Line";
+        //  alert($rootScope.shapeType);
-      //  }
+        //  }
         $rootScope.ClearIframe = function () {
             if ($('#daImagePanel') != null)
@@ -169,7 +168,20 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         //annotation tool custom events
         $rootScope.ShowAnnotationWindow = function () {
             //7904
+            if ($rootScope.MenuModuleName == "DA") {
+                if ($rootScope.disableAnnotationtoolOnListManager == true) {
+                    $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
+                    $('#slider-range-min-2').slider('disable');
+
+                    //   $rootScope.disableAnnotationTB = false;
+                } else {
+                    $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').removeAttr('disabled', 'disabled');
+                    $('#slider-range-min-2').slider('enable');
+                }
+                // document.getElementById('modelbackground').style.display = "block";
+                // document.getElementById('modeleditstyle').style.display = "block";
+            }
             $("#OnIdentify").addClass("annotationtoolbartab");
             $("#annotationToolBarOptions").addClass("active");
             $("#annotationButton").addClass("active");
@@ -179,7 +191,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             $rootScope.$broadcast('annotationToolEvent', true);
             $("#canvasPaint").css("display", "none");
             $("#canvas").css("display", "none");
-           
+
             var FontFamilyJson = '~/../content/data/json/settings/fontstyle.json';
             if ($rootScope.isFontFamilyLoaded == false) {
@@ -193,8 +205,8 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                 for (var i = 0; i <= $rootScope.AnnotationFontFamily.FontFamily.length - 1; i++) {
-                    $("#selected-font-family").append("<option>" + $rootScope.AnnotationFontFamily.FontFamily[i].FontName + "</option>");
-                   
+                    $("#selected-font-family").append("<option value=" + $rootScope.AnnotationFontFamily.FontFamily[i].FontName + ">" + $rootScope.AnnotationFontFamily.FontFamily[i].FontName + "</option>");
+
                 }
                 $rootScope.isFontFamilyLoaded = true;
@@ -231,7 +243,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             $("#DrawMode").removeClass("annotationtoolbartab");
             //  $rootScope.isIdetifyClicked = true;
             //  $rootScope.isDrawingToolSelected = false;
-          //  debugger;
+            //  debugger;
             if ($rootScope.CIAnotationIdentifyModeOff == true) {
                 $('.btnCursor').removeClass('activebtncolor');
@@ -273,19 +285,19 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         //----Annotation Toolbar: Jcanvas-----
-       
+
         $rootScope.DrLine = function (e) {
             $rootScope.setListManagerZindex = true;
             $("#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");
+            $(".btn-annotation").removeClass("activebtncolor");
+            $(".btn-annotation-line").addClass("activebtncolor");
         }
@@ -314,7 +326,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             $('.btnCursor').addClass('activebtncolor');
         }
-       
+
         $rootScope.DrawRectangle = function (e) {
             $rootScope.setListManagerZindex = true;
             $("#canvasPaint").css("display", "block");
@@ -385,7 +397,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             $(".btn-annotation-arrow").addClass("activebtncolor");
         }
         $rootScope.DrawText = function () {
-         
+
             $rootScope.setListManagerZindex = true;
             $("#canvasPaint").css("display", "block");
             $("#canvas").css("display", "block");
@@ -442,7 +454,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         $rootScope.shapestyleborderWidth = 2;
         $rootScope.shapestyleborderStyles = "solid";
         $rootScope.shapestyle = function (id) {
-          //  debugger;
+            //  debugger;
             document.getElementById('modelbackground').style.display = "none";
             document.getElementById('modeleditstyle').style.display = "none";
@@ -468,7 +480,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             //   $("#canvas").removeLayer("TextRect_" + $rootScope.resetTextRect).drawLayers();
             //Edit Shape Style popup should open at it's default position
-            $("#modeleditstyle").css({ "left": "40%", "right": "0", "top":"70px"});
+            $("#modeleditstyle").css({ "left": "40%", "right": "0", "top": "70px" });
         }
@@ -513,7 +525,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             document.getElementById('modelbackground').style.display = "none";
             document.getElementById('modeleditstyle').style.display = "none";
             //Edit Shape Style popup should open at it's default position
-            $("#modeleditstyle").css({"left":"40%", "right":"0", "top":"70px"});
+            $("#modeleditstyle").css({ "left": "40%", "right": "0", "top": "70px" });
         }
@@ -522,8 +534,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         //----End-------------
         //--Common code of  Annotation Toolbar for CI and DA-------
-        $rootScope.LineFn = function (canvasId, LineNumber, shapestyleborderColor, shapestyleborderWidth, offsetX1, offsetY1, x, y)
-        {
+        $rootScope.LineFn = function (canvasId, LineNumber, shapestyleborderColor, shapestyleborderWidth, offsetX1, offsetY1, x, y) {
             $(canvasId).addLayer({
                 name: 'Line_' + LineNumber,
                 layer: true,
@@ -532,8 +543,8 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                 strokeStyle: shapestyleborderColor,
                 strokeWidth: shapestyleborderWidth,
                 rounded: true,
-                x1: offsetX1, y1:offsetY1,
-                x2: x, y2:y,
+                x1: offsetX1, y1: offsetY1,
+                x2: x, y2: y,
                 click: function (layer) {
                     $rootScope.canvasLayerNameCollection = [];
@@ -586,7 +597,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             $('.btnCursor').addClass('activebtncolor');
         }
-        $rootScope.RectangleFn = function (canvasId, RectNumber, shapestyleFillColor, shapestyleborderColor, shapestyleOpacity, shapestyleborderWidth, offsetX1, offsetY1, x,y) {
+        $rootScope.RectangleFn = function (canvasId, RectNumber, shapestyleFillColor, shapestyleborderColor, shapestyleOpacity, shapestyleborderWidth, offsetX1, offsetY1, x, y) {
             $(canvasId).addLayer({
                 layer: true,
                 name: 'Rect_' + RectNumber,
@@ -673,7 +684,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                 strokeStyle: shapestyleborderColor,
                 strokeWidth: shapestyleborderWidth,
                 fillStyle: shapestyleFillColor,
-                x: offsetX1, y:offsetY1,
+                x: offsetX1, y: offsetY1,
                 width: (x - offsetX1) * 2, height: (y - offsetY1) * 2,
                 // Place a handle at each side and each corner
                 handlePlacement: 'both',
@@ -908,11 +919,11 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             $('.btnCursor').addClass('activebtncolor');
         }
-        $rootScope.TextAreaFn = function (canvasId, TextNumber, offsetX1, offsetY1, resetTextRect, shapestyleOpacity, shapestyleborderColor, shapestyleborderWidth, shapestyleFillColor,x,y) {
+        $rootScope.TextAreaFn = function (canvasId, TextNumber, offsetX1, offsetY1, resetTextRect, shapestyleOpacity, shapestyleborderColor, shapestyleborderWidth, shapestyleFillColor, x, y) {
-           
-          
+            debugger;
+
             $('#canvas').drawText({
                 layer: true,
                 draggable: true,
@@ -971,7 +982,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                 },
                 dblclick: function (layer) {
-                 
+
                     $rootScope.IsTextAlreadySave = false;
                     var RectNameArray = (layer.name).split("_");
@@ -986,10 +997,13 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                     $("#annotationTextModal").modal("toggle");
                     $("#text_area").val('');
-                    $("#text_area").css({ " font-family": "'Verdana, sans-serif'", "font-size": "14px", "font-weight": "normal", "font-style": "normal", "color": "#000", "text-align": "left", "text-decoration": "none" });
+                    $("#text_area").css({ "font-family": "Arial", "font-size": "14px", "font-weight": "normal", "font-style": "normal", "color": "#000", "text-align": "left", "text-decoration": "none" });
                     $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": "#000000" });
                     // $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").addClass("ActiveDefaultColorAnnotation");
+                    $("#selected-font-family option:eq(0)").prop('selected', true);
+                    $("#selected-font-size option:eq(0)").prop('selected', true);
+
                     $("#text-italic").removeClass("ActiveFormattingButtonClass");
                     $("#text-bold").removeClass("ActiveFormattingButtonClass");
@@ -1033,9 +1047,9 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                 }
             });
-           // Annotation: Edit Text option is missing.
-           // alert($rootScope.CurrentWidth);
-          //  alert($rootScope.CurrentHeight);
+            // Annotation: Edit Text option is missing.
+            //  alert($rootScope.CurrentWidth);
+            //  alert($rootScope.CurrentHeight);
             $("#annotationTextModal").css("padding-right", "0px");
             if (($rootScope.CurrentWidth > 0 && $rootScope.CurrentHeight > 0) || ($rootScope.CurrentWidth > 0 && $rootScope.CurrentHeight <= 0) || ($rootScope.CurrentWidth <= 0 && $rootScope.CurrentHeight > 0)) {
                 $("#annotationTextModal").modal("toggle");
@@ -1046,7 +1060,12 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             $("#text_area").val('');
-            $("#text_area").css({ " font-family": 'Verdana, sans-serif', "font-size": "14px", "font-weight": "normal", "font-style": "normal", "color": "#000", "text-align": "left", "text-decoration": "none" });
+            $("#text_area").css({ "font-family": "Arial", "font-size": "14px", "font-weight": "normal", "font-style": "normal", "color": "#000", "text-align": "left", "text-decoration": "none" });
+
+            $("#selected-font-family option:eq(0)").prop('selected', true);
+            $("#selected-font-size option:eq(0)").prop('selected', true);
+
+            // $("#text_area").css({ " font-family": 'Verdana, sans-serif', "font-size": "14px", "font-weight": "normal", "font-style": "normal", "color": "#000", "text-align": "left", "text-decoration": "none" });
             $("#text-italic").removeClass("ActiveFormattingButtonClass");
@@ -1065,7 +1084,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             $('.btnCursor').addClass('activebtncolor');
-           
+
         }
@@ -1093,7 +1112,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             ctx.clearRect(0, 0, 2277, 3248);
             $rootScope.clicked = true;
-        //    alert("x:"+$rootScope.offsetX1 + " y:" + $rootScope.offsetY1);
+            //    alert("x:"+$rootScope.offsetX1 + " y:" + $rootScope.offsetY1);
         }
         $rootScope.rectNumber = 0;
@@ -1175,7 +1194,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                     break;
                 case "TextArea":
-                  
+
                     $rootScope.IsTextAlreadySave = false;
                     $("#text_area").val('');
                     // Draw text
@@ -1194,13 +1213,14 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         }
-     
+
         ///-----
         $rootScope.saveText = function () {
+            debugger;
             document.getElementById('modelbackground').style.display = "none";
             // this part will work first time when save button will be clicked
             if ($rootScope.IsTextAlreadySave == false) {
@@ -1282,7 +1302,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                               }).drawLayers();
                           },
                           dblclick: function (layer) {
-                             
+
                               $rootScope.isTextAreaClosedButtonActive = false;
                               $rootScope.IsTextAlreadySave = true;
@@ -1333,7 +1353,15 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                                       $("#text_area").css("text-decoration", $rootScope.TextPropertyArray[i].TextDecoration);
                                       $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": $rootScope.TextPropertyArray[i].FontColor });
+                                      var CurrentFontFamily = $rootScope.TextPropertyArray[i].FontFamily;
+                                      //  alert(CurrentFontFamily);
+                                      // CurrentFontFamily = CurrentFontFamily.replace(/'/g, "");
+                                      var CurrentFontSize = parseInt($rootScope.TextPropertyArray[i].FontSize);
+                                      $("#selected-font-family option[value=" + CurrentFontFamily + "]").prop('selected', true);
+                                      $("#selected-font-size option[value=" + CurrentFontSize + "]").prop('selected', true);
+                                      CurrentFontFamily = '';
+                                      CurrentFontSize = '';
                                       //  $(".ActiveDefaultColorAnnotation").css({ "background-color": $rootScope.TextPropertyArray[_rectLayerOnSaveSplitInt].FontColor + "!important" });
                                       //  $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").addClass("ActiveDefaultColorAnnotation");
@@ -1442,7 +1470,8 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                               document.getElementById('modelbackground').style.display = "block";
                               $("#annotationTextModal").modal("toggle");
-
+                              //  $("#selected-font-family").val(CurrentFontFamily);
+                              //  $("#selected-font-size").val(CurrentFontSize);
                           },
@@ -1474,7 +1503,16 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                           }
                       });
                 $("#text_area").val('');
-                $("#text_area").css({ " font-family": "'Verdana, sans-serif'", "font-size": "14px", "font-weight": "normal", "font-style": "normal", "color": "#000", "text-align": "left", "text-decoration": "none" });
+                $("#text_area").css({ " font-family": "Arial", "font-size": "14px", "font-weight": "normal", "font-style": "normal", "color": "#000", "text-align": "left", "text-decoration": "none" });
+
+                $("#selected-font-family option:eq(0)").prop('selected', true);
+                $("#selected-font-size option:eq(0)").prop('selected', true);
+
+                //   $("#selected-font-family option:eq(0)").prop('selected', true);
+                //   $("#selected-font-size option:eq(0)").prop('selected', true);
+
+                //   $("#selected-font-family option[value='Arial']").prop('selected', true);
+                //   $("#selected-font-size option[value=14]").prop('selected', true);
                 $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": "#000000" });
                 $("#text-italic").removeClass("ActiveFormattingButtonClass");
@@ -1568,8 +1606,8 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                           },
                           dblclick: function (layer) {
-                             
-                            
+
+
                               $rootScope.isTextAreaClosedButtonActive = false;
                               $rootScope.IsTextAlreadySave = true;
                               var _rectLayerOnSave = layer.name;
@@ -1591,9 +1629,19 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                               $("#text_area").css("font-family", _modifiedFontFamily);
                               $("#text_area").css("text-decoration", _modifiedFontDecoration);
                               $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": _modifiedFontColor });
+
                               //  $(".ActiveDefaultColorAnnotation").css({ "background-color": _modifiedFontColor + "!important" });
                               //  $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").addClass("ActiveDefaultColorAnnotation");
+                              //khushbu
+                              var CurrentFontFamily = _modifiedFontFamily;
+                              //   alert(CurrentFontFamily);
+                              //   CurrentFontFamily = CurrentFontFamily.replace(/'/g, "");
+                              var CurrentFontSize = parseInt(_modifiedFontSize);
+                              $("#selected-font-family option[value=" + CurrentFontFamily + "]").prop('selected', true);
+                              $("#selected-font-size option[value=" + CurrentFontSize + "]").prop('selected', true);
+                              CurrentFontFamily = '';
+                              CurrentFontSize = '';
                               //adding text text decoration active class in text edit pop-up
                               if (_modifiedFontDecoration == "underline") {
                                   $("#text-underline").addClass("ActiveFormattingButtonClass");
@@ -1680,16 +1728,16 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         $rootScope.BindCanvasDrawingListners = function (event) {
-        $rootScope.clicked = true;
-        //  OnPaintCanvasMouseDown(event);
+            $rootScope.clicked = true;
+            //  OnPaintCanvasMouseDown(event);
-        var annotationCanvas = document.getElementById('canvas');
-        if (annotationCanvas != null || annotationCanvas != undefined) {
-            annotationCanvas.addEventListener('mousedown', $rootScope.OnPaintCanvasMouseDown, false);
-            annotationCanvas.addEventListener('mouseup', $rootScope.OnPaintCanvasMouseUp, false);
-        }
-        //  alert("doclick");
-    };
+            var annotationCanvas = document.getElementById('canvas');
+            if (annotationCanvas != null || annotationCanvas != undefined) {
+                annotationCanvas.addEventListener('mousedown', $rootScope.OnPaintCanvasMouseDown, false);
+                annotationCanvas.addEventListener('mouseup', $rootScope.OnPaintCanvasMouseUp, false);
+            }
+            //  alert("doclick");
+        };
         $(document).keydown(function (event) {
@@ -1729,7 +1777,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         $rootScope.closeModal = function () {
             document.getElementById('modelbackground').style.display = "none";
-          
+
             //if ($rootScope.isTextAreaClosedButtonActive == true) {
             //    $("#canvas").removeLayer('TextArea_' + $rootScope.TextNumber).drawLayers();
             //    $("#canvas").removeLayer("TextRect_" + $rootScope.resetTextRect).drawLayers();
@@ -1817,21 +1865,21 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         }
         $rootScope.disableAnnotationTB = false;
-        $rootScope.disableAnnotationTBFn = function()
-        {
+        $rootScope.disableAnnotationTBFn = function () {
             $rootScope.disableAnnotationTB = true;
         }
         //list manager function
         //list manager function
-       
+
         $rootScope.disableAnnotationtoolOnListManager = false;
         $rootScope.ShowListManager = function () {
             console.log('ShowListManager')
             $rootScope.disableAnnotationtoolOnListManager = true;
-
+            $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
+            $('#slider-range-min-2').slider('disable');
             $rootScope.isLoading = true;
             $('#spinner').css('visibility', 'visible');
@@ -1847,13 +1895,14 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         $rootScope.CloseListManager = function () {
             console.log('close')
-            
             $rootScope.disableAnnotationtoolOnListManager = false;
-            if ($rootScope.disableAnnotationtoolOnListManager == false) {
-                $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').removeAttr('disabled', 'disabled');
-                $('#slider-range-min-2').slider('enable');
+            if ($rootScope.MenuModuleName == "DA") {
+
+                if ($rootScope.disableAnnotationtoolOnListManager == false) {
+                    $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').removeAttr('disabled', 'disabled');
+                    $('#slider-range-min-2').slider('enable');
+                }
             }
-            //$rootScope.isListManagerSelected = false;
             $('#listManager').css('display', 'none');
             $("#listManager").css("visibility", "hidden");
@@ -2022,8 +2071,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
             if (len > 0) {
                 $rootScope.reloadChildController();
             }
-            else
-            {
+            else {
                 $('#modal-settings').modal('hide');
             }