Merge branch 'Bugs_v2' of http://52.6.196.163/ADAM/AIAHTML5 into BugV2Merge

Nikita Kulshreshtha
2 parents f25031a9 77cf2dee
Showing 5 changed files with 44 additions and 31 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/index.html
@@ -406,7 +406,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         if ($rootScope.disableAnnotationTB == true)
         {
-            $('#AnnotaionPopupDiv').find('input, textarea, button, select').attr('disabled', 'disabled');
+            $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
             $('#slider-range-min-2').slider('disable');
         }
         $rootScope.isLoading = true;
@@ -431,7 +431,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     $scope.openView = function ($event) {
-
+        $rootScope.disableAnnotationTB = false;
         $rootScope.CIAnotationIdentifyModeOff = true;
         $rootScope.currentBodyViewId = $event.currentTarget.id;
         if ($event.currentTarget.textContent !== null && typeof ($event.currentTarget.textContent) !== "undefined") {
@@ -265,7 +265,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.openView = function ($event) {
-
+        $rootScope.disableAnnotationTB = false;
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
@@ -6836,7 +6836,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
         if ($rootScope.disableAnnotationtoolOnListManager == true)
         {
-            $('#AnnotaionPopupDiv').find('input, textarea, button, select').attr('disabled', 'disabled');
+            $('#AnnotaionPopupDiv').find('input, textarea, button, select,img,div').attr('disabled', 'disabled');
             $('#slider-range-min-2').slider('disable');
             if ($rootScope.setListManagerZindex == true)
             {
@@ -385,6 +385,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");
@@ -472,16 +473,22 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         }
         $rootScope.enableAnnotationToolBar = function () {
-           
-            document.getElementById('modelbackground').style.display = "block";
-            //$("#editshapestyle").modal('show');
-            document.getElementById('modeleditstyle').style.display = "block";
-            if ($('#modeleditstyle').css("display") == "block") { //Check if the modal is already showing
-                var previewOpacity = $('#imgOpacity').css("opacity");
-                $('#slider-range-min-4 div.ui-slider-range-min').css("width", (previewOpacity*100) + "%");
-                $('#slider-range-min-4 span.ui-slider-handle').css("left", (previewOpacity * 100) + "%");
-               
-            };
+            if ($rootScope.disableAnnotationTB == true) {
+                document.getElementById('modelbackground').style.display = "none";
+                //$("#editshapestyle").modal('show');
+                document.getElementById('modeleditstyle').style.display = "none";
+            }
+            else {
+                document.getElementById('modelbackground').style.display = "block";
+                //$("#editshapestyle").modal('show');
+                document.getElementById('modeleditstyle').style.display = "block";
+                if ($('#modeleditstyle').css("display") == "block") { //Check if the modal is already showing
+                    var previewOpacity = $('#imgOpacity').css("opacity");
+                    $('#slider-range-min-4 div.ui-slider-range-min').css("width", (previewOpacity * 100) + "%");
+                    $('#slider-range-min-4 span.ui-slider-handle').css("left", (previewOpacity * 100) + "%");
+
+                };
+            }
         }
@@ -972,6 +979,8 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                     $rootScope.TextID = TextAreaRectNameConcat;
                     $rootScope.rectDimension.push({ width: layer.width, height: layer.height, x: layer.x, y: layer.y });
+                    $("#annotationTextModal").css("padding-right", "0px");
+                    document.getElementById('modelbackground').style.display = "block";
                     $("#annotationTextModal").modal("toggle");
                     $("#text_area").val('');
@@ -1023,7 +1032,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                 }
             });
-
+            $("#annotationTextModal").css("padding-right", "0px");
             $("#annotationTextModal").modal("toggle");
             $('.btnCursor').trigger('click');
             $("#font-color .minicolors .minicolors-swatch .minicolors-swatch-color").css({ "background-color": "#000000" });
@@ -1159,6 +1168,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                     break;
                 case "TextArea":
+                    document.getElementById('modelbackground').style.display = "block";
                     $rootScope.IsTextAlreadySave = false;
                     $("#text_area").val('');
                     // Draw text
@@ -1184,7 +1194,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         ///-----
         $rootScope.saveText = function () {
-           
+            document.getElementById('modelbackground').style.display = "none";
             // this part will work first time when save button will be clicked
             if ($rootScope.IsTextAlreadySave == false) {
                 // getting textarea style properties
@@ -1421,6 +1431,8 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
                               //  _rectLayerOnSaveSplitInt = '';
                               textArrVal = '';
+                              $("#annotationTextModal").css("padding-right", "0px");
+                              document.getElementById('modelbackground').style.display = "block";
                               $("#annotationTextModal").modal("toggle");
@@ -1624,7 +1636,7 @@ 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");
                           },
                           mouseout: function (layer) {
@@ -1709,12 +1721,13 @@ 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();
-            if ($rootScope.isTextAreaClosedButtonActive == true) {
-                $("#canvas").removeLayer('TextArea_' + $rootScope.TextNumber).drawLayers();
-                $("#canvas").removeLayer("TextRect_" + $rootScope.resetTextRect).drawLayers();
-
-            }
+            //}
         }
         //-- End ----------------------------
@@ -1809,6 +1822,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;, 
         $rootScope.disableAnnotationtoolOnListManager = false;
         $rootScope.ShowListManager = function () {
             console.log('ShowListManager')
+
             $rootScope.disableAnnotationtoolOnListManager = true;
             $rootScope.isLoading = true;
@@ -510,7 +510,7 @@
                                 <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div>
                                 <div class="outlinediv">
-                                    <div id="shapeStyleDiv" class="fullcolordiv" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()">
+                                    <div id="shapeStyleDiv" class="fullcolordiv"  ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()">
                                     </div>
@@ -561,8 +561,8 @@
     </div>
     <!--Modal For Annotation Text Box-->
-    <div class="modal fade" id="annotationTextModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" style="z-index: 1200000!important;">
-        <div class="modal-dialog" role="document">
+    <div  id="annotationTextModal" style="display:none;z-index: 1000000000;width:500px;height:241px;padding-right:0!important;position:fixed;left:0;right:0;top:0px;bottom:0;margin:auto;">
+       
             <div class="modal-content">
                 <div class="modal-header" style="background-color: #808D43;padding:10px;border-bottom:0;">
                     <!--<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>-->
@@ -572,9 +572,7 @@
                     <div class="col-xs-12" style="padding:20px 0;">
                         <div class="form-inline">
                             <!--Annotation: Text in different font style is same.-->
-                            <select class="form-control" id="selected-font-family">
-                              
-                            </select>
+                            <select class="form-control" id="selected-font-family"></select>
                             <select class="form-control" id="selected-font-size">
                                 <option>14</option>
                                 <option>16</option>
@@ -629,11 +627,11 @@
                 </div>
                 <div class="modal-footer">
                     <!--<button type="button" class="btn btn-default" ng-click="closeModal()" data-dismiss="modal">Close</button>-->
-                    <button type="button" class="btn btn-default" id="closeEditText" data-dismiss="modal">Close</button>
-                     <button type="button" id="saveBtn" class="btn btn-primary" data-dismiss="modal" ng-click="saveText()">Save</button>
+                    <button type="button" class="btn btn-default" ng-click="closeModal()" id="closeEditText" data-dismiss="modal">Close</button>
+                    <button type="button" id="saveBtn" class="btn btn-primary" data-dismiss="modal" ng-click="saveText()">Save</button>
                 </div>
             </div>
-        </div>
+       
     </div>
@@ -1255,6 +1253,7 @@
             $(".modal").draggable();
             $(".annotationTollbar").draggable();
             $(".modeleditstyle").draggable();
+            $("#annotationTextModal").draggable();
         });
     </script>