fixed custom report bar and line chart labels, as well as tooltips (#…

…11170)
pimcore · Jan 19, 2022 · 74cbd22 · 74cbd22
1 parent 929d869
commit 74cbd22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bundles/AdminBundle/Resources/public/js/pimcore/layout/portlets/customreports.js b/bundles/AdminBundle/Resources/public/js/pimcore/layout/portlets/customreports.js
@@ -216,7 +216,7 @@ pimcore.layout.portlets.customreports = Class.create(pimcore.layout.portlets.abs
             for(var i = 0; i < data.yAxis.length; i++) {
                 var yAxis = data.yAxis[i];
                 series.push({
-                    displayName: this.columnLabels[data.yAxis[i]],
+                    title: this.columnLabels[data.yAxis[i]],
                     type: (data.chartType == 'line' ? 'line' : 'bar'),
                     xField: data.xAxis,
                     yField: yAxis,
@@ -227,7 +227,7 @@ pimcore.layout.portlets.customreports = Class.create(pimcore.layout.portlets.abs
                     tooltip: {
                         trackMouse: true,
                         renderer: function (tooltip, record, item) {
-                            tooltip.setHtml(record.get(data.xAxis) + ': ' + record.get(yAxis));
+                            tooltip.setHtml(record.get(data.xAxis) + ': ' + record.get(item.field));
                         }
                     }
                 });

diff --git a/bundles/AdminBundle/Resources/public/js/pimcore/report/custom/report.js b/bundles/AdminBundle/Resources/public/js/pimcore/report/custom/report.js
@@ -347,7 +347,7 @@ pimcore.report.custom.report = Class.create(pimcore.report.abstract, {
             for(var i = 0; i < data.yAxis.length; i++) {
                 var yAxis = data.yAxis[i];
                 series.push({
-                    displayName: this.columnLabels[data.yAxis[i]],
+                    title: this.columnLabels[data.yAxis[i]],
                     type: (data.chartType == 'line' ? 'line' : 'bar'),
                     xField: data.xAxis,
                     yField: yAxis,
@@ -358,7 +358,7 @@ pimcore.report.custom.report = Class.create(pimcore.report.abstract, {
                     tooltip: {
                         trackMouse: true,
                         renderer: function (tooltip, record, item) {
-                            tooltip.setHtml(record.get(data.xAxis) + ': ' + record.get(yAxis));
+                            tooltip.setHtml(record.get(data.xAxis) + ': ' + record.get(item.field));
                         }
                     }
                 });