From f6bab33c2bdf8444c2cb5e3e4dab8bfeb48a6452 Mon Sep 17 00:00:00 2001 From: Stefania Martziou Date: Wed, 19 Jun 2024 17:33:37 +0300 Subject: [PATCH] One more fix for the support of the option to drilldown in column and bar charts --- .../DataFormatter/HighChartsDataFormatter.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ChartDataFormatter/src/main/java/gr/uoa/di/madgik/ChartDataFormatter/DataFormatter/HighChartsDataFormatter.java b/ChartDataFormatter/src/main/java/gr/uoa/di/madgik/ChartDataFormatter/DataFormatter/HighChartsDataFormatter.java index c27bff6..b496991 100644 --- a/ChartDataFormatter/src/main/java/gr/uoa/di/madgik/ChartDataFormatter/DataFormatter/HighChartsDataFormatter.java +++ b/ChartDataFormatter/src/main/java/gr/uoa/di/madgik/ChartDataFormatter/DataFormatter/HighChartsDataFormatter.java @@ -215,7 +215,9 @@ private HighChartsJsonResponse HCDoubleGroupByDrilldown(SupportedChartTypes char String yValue = XValueToYValueMapping.get(xValue); Number value = parseValue(yValue); - drillDownSliceValuesArray.add(new DataObject(xValue, value)); + + if (yValue != null) + drillDownSliceValuesArray.add(new DataObject(xValue, value)); if (value != null) { pieSliceSum += value.floatValue(); } @@ -248,6 +250,7 @@ private HighChartsJsonResponse HCDoubleGroupByNoDrilldown(SupportedChartTypes ch if (XValueToYValueMapping.containsKey(xValue)) { String yValue = XValueToYValueMapping.get(xValue); + yValuesArray.add(parseValue(yValue)); } else