Potential fix for monarc-project/MonarcAppFO#94

monarc-project · Jul 9, 2018 · 4cded3c · 4cded3c
1 parent fbc5aec
commit 4cded3c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/AnrLayoutCtrl.js b/src/AnrLayoutCtrl.js
@@ -1402,6 +1402,19 @@
             });
         };
 
+        $scope.onEditCustomColumn = function (id, newValue) {
+            AnrService.patchScaleType($scope.model.anr.id, id, newValue, $scope.scales.language, function () {
+                $scope.updateScaleTypes(function () {
+                    $timeout(function () {
+                        var scroller = document.getElementById('horiz-scrollable');
+                        scroller.scrollLeft = scroller.scrollWidth;
+                    }, 0, false);
+                });
+                // $scope.column.name = newValue;
+                $scope.$broadcast('scales-impacts-type-changed');
+            });
+        };
+
         $scope.setImpactVisibility = function (id, visible) {
             AnrService.patchScaleType($scope.model.anr.id, id, {isHidden: visible ? 0 : 1}, function () {
                 $scope.updateScaleTypes();

diff --git a/src/AnrService.js b/src/AnrService.js
@@ -267,8 +267,13 @@
              }
         };
 
-        var patchScaleType = function (anr_id, scale_type_id, data, success, error) {
-            self.ScalesTypesResource.patch({anrId: anr_id, scaleTypeId: scale_type_id}, data, success, error);
+        var patchScaleType = function (anr_id, scale_type_id, data, langue = null, success, error) {
+            if ($rootScope.OFFICE_MODE == "FO") {
+                langue = $rootScope.getAnrLanguage().toString();
+            }
+            var new_data = {};
+            new_data['label' + langue] = data
+            self.ScalesTypesResource.patch({anrId: anr_id, scaleTypeId: scale_type_id}, new_data, success, error);
         };
 
         var deleteScaleType = function (anr_id, scale_type_id, success, error) {

diff --git a/views/_anr.evalscales.html b/views/_anr.evalscales.html
@@ -33,7 +33,8 @@ <h4 ng-if="(OFFICE_MODE == 'FO' && !scalesCanChange ) || isAnrReadOnly"><span tr
                 <tr>
                     <th></th>
                     <th ng-show="!type.isHidden || display.show_hidden_impacts" ng-repeat="type in scales_types">
-                      {{ type['label' + scales.language] }}
+                      <span class="text-blue" ng-if="type.type == 'CUS' && !isAnrReadOnly" inline-edit="column.name" inline-edit-callback="onEditCustomColumn(type.id, newValue)" inline-edit-btn-edit="" inline-edit-on-blur="save" inline-edit-on-click inline-edit-placeholder="{{ type['label' + scales.language]? type['label' + scales.language] : '...' }}"></span>
+                      <span class="text-blue" ng-if="type.type != 'CUS' && !isAnrReadOnly">{{ type['label' + scales.language] }}</span>
                       <md-button class="md-icon-button md-warn" ng-if="type.type == 'CUS' && !isAnrReadOnly" ng-click="deleteCustomScaleType(type.id)">
                         <md-icon>delete</md-icon></md-button>
                       <md-button class="md-icon-button md-primary" ng-if="type.type != 'CUS' && !isAnrReadOnly" ng-click="setImpactVisibility(type.id, !!type.isHidden)">