Merge branch 'Bug#15864' into Develop

Amrita Vishnoi
2 parents 513e72b8 a1080444
Showing 1 changed file with 17 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -6261,8 +6261,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
     $scope.enableNormalMode = function () {
         $("#btnTranparency").removeClass("disabled");
  
+        if ($scope.isTransparencyActivated) {
+            $scope.layerNumber = $scope.currentLayerNumber;
+        }
+        else {
+            $scope.layerNumber = $('#txtlayerNumber').val();
+        }
         //   $("#btnTranparency").remove("disabled");
  
+        $('#txtlayerNumber').val($scope.layerNumber)
+
         $rootScope.isNormalMode = false;
         console.log('enableNormalMode is called');
  
@@ -6283,7 +6291,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
  
         }
         else {
-
+           
             //1.
             $scope.flushCanvas();
  
@@ -6308,7 +6316,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
  
             //7.
  
-            $scope.layerNumber = $('#txtlayerNumber').val();
+           // $scope.layerNumber = $('#txtlayerNumber').val();
             $scope.CalculateImageCordinates($rootScope.viewOrientationId);
             //      alert($rootScope.viewOrientationId + "gadash")
  
@@ -6917,6 +6925,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
  
     $scope.OnGenderChange = function (event) {
  
+
         var canvasDiv = document.getElementById('canvasDiv');
         $scope.imageVerticalScrollPosition = canvasDiv.scrollTop;
         $scope.imageHorizontlScrollPosition = canvasDiv.scrollLeft;
@@ -6978,6 +6987,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
             //3.
  
             $scope.layerNumber = 0;
+
             $scope.loadSelectedBodyView(currentBodyViewId);
  
  
@@ -7130,6 +7140,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                  else {
  
                      $scope.CalculateImageCordinates($rootScope.viewOrientationId);
+                    
+                     //   $("#btnTranparency").remove("disabled");
+                     $('#txtlayerNumber').val($scope.layerNumber)
+                     
+
  
                  }