fix pivot datastore request for non measure data in excel export

eng-dedalus · eng-dedalus · commit 6f942c2b155d · 2025-11-21T16:37:33.000+01:00
(cherry picked from commit a600ae8)
diff --git a/knowage-export/src/main/java/it/eng/knowage/engine/api/export/dashboard/DashboardExporter.java b/knowage-export/src/main/java/it/eng/knowage/engine/api/export/dashboard/DashboardExporter.java
@@ -977,8 +977,8 @@ private JSONObject buildPivotSelections(JSONObject fields, String datasetLabel)
                 addToCategoriesOrMeasuresArray(row, categories, sortingColumnId, sortingOrder, measures);
             }
             for (int i = 0; i < data.length(); i++) {
-                JSONObject datum = getMeasure(data.getJSONObject(i));
-                measures.put(datum);
+                JSONObject datum = data.getJSONObject(i);
+                addToCategoriesOrMeasuresArray(datum, categories, sortingColumnId, sortingOrder, measures);
             }
             for (int i = 0; i < filters.length(); i++) {
                 JSONObject filter = filters.getJSONObject(i);

Original file line number	Diff line number	Diff line change
`@@ -977,8 +977,8 @@ private JSONObject buildPivotSelections(JSONObject fields, String datasetLabel)`
`977`	`977`	`addToCategoriesOrMeasuresArray(row, categories, sortingColumnId, sortingOrder, measures);`
`978`	`978`	`}`
`979`	`979`	`for (int i = 0; i < data.length(); i++) {`
`980`		`- JSONObject datum = getMeasure(data.getJSONObject(i));`
`981`		`- measures.put(datum);`
	`980`	`+ JSONObject datum = data.getJSONObject(i);`
	`981`	`+ addToCategoriesOrMeasuresArray(datum, categories, sortingColumnId, sortingOrder, measures);`
`982`	`982`	`}`
`983`	`983`	`for (int i = 0; i < filters.length(); i++) {`
`984`	`984`	`JSONObject filter = filters.getJSONObject(i);`