fix: Chart overwrite data series.

adempiere · Jan 19, 2024 · d365d3e · d365d3e
1 parent dd25c72
commit d365d3e
Showing 1 changed file with 31 additions and 8 deletions.
diff --git a/src/main/java/org/spin/eca50/controller/ChartBuilder.java b/src/main/java/org/spin/eca50/controller/ChartBuilder.java
@@ -15,6 +15,7 @@
  *************************************************************************************/
 package org.spin.eca50.controller;
 
+import java.math.BigDecimal;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
@@ -194,9 +195,9 @@ public static ChartValue getChartData(int chartId, Map<String, Object> customPar
 				dataSources.add(queryDefinition);
 			});
 		//	Run queries
-		if (dataSources.size() > 0) {
+		if (dataSources != null && dataSources.size() > 0) {
+			Map<String, List<Map<String, BigDecimal>>> seriesMap = new HashMap<String, List<Map<String, BigDecimal>>>();
 			dataSources.forEach(dataSource -> {
-				ChartSeriesValue series = new ChartSeriesValue(dataSource.getName());
 				PreparedStatement pstmt = null;
 				ResultSet rs = null;
 				try {
@@ -207,16 +208,22 @@ public static ChartValue getChartData(int chartId, Map<String, Object> customPar
 					while(rs.next()) {
 						String key = rs.getString(2);
 						String seriesName = rs.getString(3);
-						if (seriesName != null) {
-							series.setName(seriesName);
-						}
 						if(chart.isTimeSeries()) {
 							//	TODO: Define it with dates
 						}
-						ChartDataValue data = new ChartDataValue(key, rs.getBigDecimal(1));
-						series.addData(data);
+						BigDecimal amount = rs.getBigDecimal(1);
+
+						// series values
+						List<Map<String, BigDecimal>> valuesList = new ArrayList<Map<String, BigDecimal>>();
+						if (seriesMap.containsKey(seriesName)) {
+							valuesList = seriesMap.get(seriesName);
+						}
+						HashMap<String, BigDecimal> valuesMap = new HashMap<String, BigDecimal>();
+						valuesMap.put(key, amount);
+						valuesList.add(valuesMap);
+
+						seriesMap.put(seriesName, valuesList);
 					}
-					metrics.addSerie(series);
 				} catch (Exception e) {
 					throw new AdempiereException(e);
 				} finally {
@@ -225,6 +232,21 @@ public static ChartValue getChartData(int chartId, Map<String, Object> customPar
 					pstmt = null;
 				}
 			});
+
+			seriesMap.entrySet().stream().forEach(seriesEntry -> {
+				ChartSeriesValue chartSerie = new ChartSeriesValue(seriesEntry.getKey());
+				// each values list
+				seriesEntry.getValue().stream().forEach(serie -> {
+					serie.entrySet().stream().forEach(value -> {
+						String name = value.getKey();
+						BigDecimal amount = value.getValue();
+						ChartDataValue data = new ChartDataValue(name, amount);
+						// fill series with value data
+						chartSerie.addData(data);
+					});
+				});
+				metrics.addSerie(chartSerie);
+			});
 		}
 		//	
 		return metrics;
@@ -263,4 +285,5 @@ public static void main(String[] args) {
 		ChartValue data = getChartData(1000000, customParameters);
 		System.out.println(data);
 	}
+
 }