Merge pull request SORMAS-Foundation#4172 from hzi-braunschweig/3163-allow_custom_series_caption

SORMAS-Foundation#3163 allow custom series caption

Author: BarnaBartha

sormas-api/src/main/java/de/symeda/sormas/api/campaign/diagram/CampaignDiagramSeries.java

@@ -3,8 +3,10 @@
 import java.io.Serializable;
 import java.util.Objects;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import de.symeda.sormas.api.AgeGroup;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class CampaignDiagramSeries implements Serializable {
 
 	private static final long serialVersionUID = 1420672609912364060L;
@@ -14,6 +16,7 @@ public class CampaignDiagramSeries implements Serializable {
 	private String referenceValue;
 	private String stack;
 	private AgeGroup populationGroup;
+	private String caption;
 
 	public CampaignDiagramSeries() {
 	}
@@ -57,6 +60,14 @@ public void setStack(String stack) {
 		this.stack = stack;
 	}
 
+	public String getCaption() {
+		return caption;
+	}
+
+	public void setCaption(String caption) {
+		this.caption = caption;
+	}
+
 	/**
 	 * Needed. Otherwise hibernate will persist whenever loading,
 	 * because hibernate types creates new instances that aren't equal.
@@ -72,6 +83,7 @@ public boolean equals(Object o) {
 			&& Objects.equals(formId, that.formId)
 			&& Objects.equals(referenceValue, that.referenceValue)
 			&& Objects.equals(stack, that.stack)
+			&& Objects.equals(caption, that.caption)
 			&& Objects.equals(populationGroup, that.populationGroup);
 	}
 
@@ -85,6 +97,6 @@ public void setPopulationGroup(AgeGroup populationGroup) {
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(fieldId, formId, referenceValue, stack, populationGroup);
+		return Objects.hash(fieldId, formId, referenceValue, stack, caption, populationGroup);
 	}
 }

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

@@ -32,10 +32,13 @@
 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<>();
@@ -155,8 +158,8 @@ public void buildDiagramChart(String title, CampaignJurisdictionLevel campaignJu
 
 		final Map<String, Long> stackMap = diagramDefinition.getCampaignDiagramSeries()
 			.stream()
-			.filter(campaignDiagramSeries -> campaignDiagramSeries.getStack() != null)
 			.map(CampaignDiagramSeries::getStack)
+			.filter(Objects::nonNull)
 			.collect(Collectors.groupingBy(Function.identity(), Collectors.counting()));
 
 		//@formatter:off
@@ -231,8 +234,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 +252,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,