SORMAS-Foundation#3163: check if a caption is defined and apply it to the series name

Author: ssferrazza

sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/campaigns/CampaignDashboardDiagramComponent.java

@@ -32,10 +32,14 @@
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Strings;
 import de.symeda.sormas.ui.highcharts.HighChart;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @SuppressWarnings("serial")
 public class CampaignDashboardDiagramComponent extends VerticalLayout {
 
+	private static final Logger LOG = LoggerFactory.getLogger(CampaignDashboardDiagramComponent.class);
+
 	private final CampaignDiagramDefinitionDto diagramDefinition;
 
 	private final Map<String, Map<Object, CampaignDiagramDataDto>> diagramDataBySeriesAndXAxis = new HashMap<>();
@@ -231,8 +235,7 @@ private void appendSeries(CampaignJurisdictionLevel campaignJurisdictionLevelGro
 
 			Map<Object, CampaignDiagramDataDto> seriesData = diagramDataBySeriesAndXAxis.get(seriesKey);
 			Collection<CampaignDiagramDataDto> values = seriesData.values();
-			Iterator<CampaignDiagramDataDto> iterator = values.iterator();
-			String fieldName = (iterator.hasNext() ? iterator.next().getFieldCaption() : seriesKey);
+			String fieldName = assembleFieldname(values, series, seriesKey);
 			if (showPercentages) {
 				if (campaignJurisdictionLevelGroupBy == CampaignJurisdictionLevel.COMMUNITY) {
 					fieldName = I18nProperties.getString(Strings.populationDataByCommunity);
@@ -250,6 +253,14 @@ private void appendSeries(CampaignJurisdictionLevel campaignJurisdictionLevelGro
 		hcjs.append("]");
 	}
 
+	private String assembleFieldname(final Collection<CampaignDiagramDataDto> values, final CampaignDiagramSeries series, final String defaultValue) {
+		if (series.getCaption() != null && !series.getCaption().isEmpty()) {
+			return series.getCaption();
+		}
+		Iterator<CampaignDiagramDataDto> iterator = values.iterator();
+		return iterator.hasNext() ? iterator.next().getFieldCaption() : defaultValue;
+	}
+
 	private void appendData(
 		boolean isCommunityGrouping,
 		StringBuilder hcjs,