Merge pull request #47 from qlik-oss/hva/QB-21289

fix: axis tick value formatting
qlik-oss · Oct 26, 2023 · bc46cff · bc46cff
2 parents 7a46276 + d33d726
commit bc46cff
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 12 deletions.
diff --git a/src/bridgepicassospec.js b/src/bridgepicassospec.js
@@ -1,7 +1,7 @@
 import ThemeManager from './theme';
 import { interactionsSetup } from './interactions.js';
 
-export default function (element, layout, direction, isInteractable) {
+export default function (element, layout, direction, isInteractable, ds) {
   let labels = {
     startvalue: layout.labelsshow ? "Start Value" : layout.startName,
     endvalue: layout.labelsshow ? "End Value" : layout.endName,
@@ -33,6 +33,26 @@ export default function (element, layout, direction, isInteractable) {
     dockRight = 'left';
   }
 
+  const shouldUseFormat = (measureInfo) => !measureInfo.isCustomFormatted && (measureInfo.qIsAutoFormat || measureInfo.qNumFormat.qType === 'U');
+
+  const setFormatCell = (cell, field) => {
+    const measureInfo = ds.field(field).raw();
+    const formatter = ds.field(field).formatter();
+    const useFormatter = shouldUseFormat(measureInfo);
+    const formatCell = (cell) => (cell.qNum === 'NaN' ? '-' : formatter(cell.qNum));
+    return (useFormatter ? formatCell(cell) : cell.qText);
+  };
+
+  const startLabelFn = (cell) => {
+    const field = 'qMeasureInfo/1';
+    return setFormatCell(cell, field);
+  };
+
+  const endLabelFn = (cell) => {
+    const field = 'qMeasureInfo/0';
+    return setFormatCell(cell, field);
+  };
+
   return {
     interactions: (!isInteractable ? [] : interactionsSetup()),
     scales: {
@@ -165,18 +185,21 @@ export default function (element, layout, direction, isInteractable) {
       layout: {
         displayOrder: 1
       },
-      data: {
+      data: { 
         extract: {
           field: 'qDimensionInfo/0',
           props: {
             start: {
-              field: 'qMeasureInfo/0'
+              field: 'qMeasureInfo/0',
+              label: startLabelFn
             },
             end: {
-              field: 'qMeasureInfo/1'
+              field: 'qMeasureInfo/1',
+              label: endLabelFn
             },
             var: {
-              field: 'qMeasureInfo/2'
+              field: 'qMeasureInfo/2',
+              label: endLabelFn
             }
           }
         }

diff --git a/src/controller.js b/src/controller.js
@@ -16,7 +16,8 @@ export default ['$scope', '$element', function($scope, $element) {
   $scope.updated = false;
 
   $scope.app = qlik.currApp(this);
-
+  const localeInfo = $scope.app.model.layout.qLocaleInfo;
+
   picasso.use(pq);
   picasso.use(picassoHammer);
 
@@ -43,22 +44,29 @@ export default ['$scope', '$element', function($scope, $element) {
   $scope.chartBrush
     = enableSelectionOnFirstDimension($scope, $scope.chart, 'highlight', $scope.layout);
   $scope.updatedData = async function(layout, isEditMode, dataUpdate) {
+    const data = {
+      type: 'q',
+      key: 'qHyperCube',
+      config: {
+        localeInfo,
+      },
+      data: await initVarianceCube($scope, layout)
+    };
+    const ds = picasso.data('q')(data);
+
     let up = {};
 
     if (dataUpdate) {
-      up.data = [{
-        type: 'q',
-        key: 'qHyperCube',
-        data: await initVarianceCube($scope, layout)
-      }];
+      up.data = [data];
     }
 
     if (isEditMode || typeof $scope.chart.settings === 'undefined') {
       up.settings = bridgepicassospec(
         $scope.chart.element,
         layout,
         $scope.$parent.options.direction,
-        !isEditMode && !$scope.backendApi.isSnapshot && !layout.qHyperCube.qDimensionInfo[0].qLocked);
+        !isEditMode && !$scope.backendApi.isSnapshot && !layout.qHyperCube.qDimensionInfo[0].qLocked,
+        ds);
     }
 
     $scope.chart.update(up);

diff --git a/src/converthypercube.js b/src/converthypercube.js
@@ -70,6 +70,7 @@ class ConvertHypercube {
       qAttrExprInfo: mesInfo.qAttrExprInfo.map(i => i),
       qCardinal: mesInfo.qCardinal,
       qFallbackTitle: mesInfo.qFallbackTitle,
+      qIsAutoFormat: mesInfo.qIsAutoFormat,
       qMax: max, //mesInfo.qMax,
       qMin: min, //mesInfo.qMin,
       qSortIndicator: mesInfo.qSortIndicator,