2644 - Enable the usage of population data in campaign diagrams (SORMAS-Foundation#3778)

* 2644 - fix warning message placement

* SORMAS-Foundation#2644-move no-population-data-label inside chart diagram

* SORMAS-Foundation#2644 - add extra checks for warning message display

Author: danRosca

sormas-api/src/main/resources/strings.properties

@@ -250,8 +250,8 @@ errorReadingTemplate = Error reading template '%s'
 errorReadingDocument = Error reading document '%s'
 errorProcessingTemplate = Error processing template '%s'
 errorSormasToSormasNotEditable = Readonly data can not be shared.
-errorCampaignDiagramTotalsCalculationError = At least part of the percentage values for the diagram '%s' could not be calculated. Please check the diagram definitions for errors.
-errorNoPopulationDataLocations=No population data was found for the following locations : %s
+errorCampaignDiagramTotalsCalculationError=At least part of the percentage values for the diagram '%s' could not be calculated. Please check the diagram definitions for errors.
+errorNoPopulationDataLocations=No population data was found for the following locations: %s
 errorNoPopulationDataFound=There is no population data available. Switching to absolute data view
 errorFormIdPopulationAgeGroup=Both "Form Id" and "Population Age Group" options are set 
 # headings

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

@@ -12,9 +12,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Label;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.text.StringEscapeUtils;
 
 import com.vaadin.ui.Notification;
@@ -136,7 +140,28 @@ public void buildDiagramChart(String title, boolean isCommunityGrouping) {
 				+ "title:{ text: '" + StringEscapeUtils.escapeEcmaScript(title) + "', style: { fontSize: '15px' } },");
 		//@formatter:on
 
+		noPopulationDataLocations.clear();
+		if (Objects.nonNull(totalValuesMap)) {
+			for (Object key : axisCaptions.keySet()) {
+				if ((Double.valueOf(0)).equals(totalValuesMap.get(new CampaignDashboardTotalsReference(key, null)))) {
+					noPopulationDataLocations.add(axisCaptions.get(key));
+				}
+			}
+		}
+
 		hcjs.append("xAxis: {");
+		if (Objects.nonNull(diagramDefinition.getCampaignSeriesTotal())) {
+			Optional isPopulationGroupUsed =
+				diagramDefinition.getCampaignSeriesTotal().stream().filter(series -> Objects.nonNull(series.getPopulationGroup())).findFirst();
+			if (showPercentages && isPopulationGroupUsed.isPresent() && !CollectionUtils.isEmpty(this.getNoPopulationDataLocations())) {
+				hcjs.append(
+					"title: {" + "        text:'"
+						+ String.format(
+							I18nProperties.getString(Strings.errorNoPopulationDataLocations),
+							String.join(", ", this.getNoPopulationDataLocations()))
+						+ "' },");
+			}
+		}
 		if (stackMap.size() > 1) {
 			hcjs.append("opposite: true,");
 		}
@@ -175,14 +200,6 @@ public void buildDiagramChart(String title, boolean isCommunityGrouping) {
 		}
 
 		hcjs.append("series: [");
-		noPopulationDataLocations.clear();
-		if (Objects.nonNull(totalValuesMap)) {
-			for (Object key : axisCaptions.keySet()) {
-				if ((Double.valueOf(0)).equals(totalValuesMap.get(new CampaignDashboardTotalsReference(key, null)))) {
-					noPopulationDataLocations.add(axisCaptions.get(key));
-				}
-			}
-		}
 		for (CampaignDiagramSeries series : diagramDefinition.getCampaignDiagramSeries()) {
 			String seriesKey = series.getFormId() + series.getFieldId();
 			if (!diagramDataBySeriesAndXAxis.containsKey(seriesKey))

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

@@ -1,6 +1,7 @@
 package de.symeda.sormas.ui.dashboard.campaigns;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -183,8 +184,6 @@ private void refreshDiagrams(Page page, VerticalLayout layout, String tabId, Str
 					gridTemplateAreaCreator.getGridRows(),
 					gridTemplateAreaCreator.getGridColumns()));
 			diagramsLayout.setStyleName(gridCssClass);
-			Label noPopulationLocationsLabel = new Label();
-			VerticalLayout locationLayout = new VerticalLayout();
 
 			campaignFormDataMap.forEach((campaignDashboardDiagramDto, diagramData) -> {
 				final CampaignDiagramDefinitionDto campaignDiagramDefinitionDto = campaignDashboardDiagramDto.getCampaignDiagramDefinitionDto();
@@ -208,20 +207,6 @@ private void refreshDiagrams(Page page, VerticalLayout layout, String tabId, Str
 						diagramComponent
 							.buildDiagramChart(campaignDiagramDefinitionDto.getDiagramCaption(), Objects.nonNull(dataProvider.getDistrict()));
 						diagramsLayout.addComponent(diagramComponent, index);
-						if (diagramComponent.isShowPercentages()) {
-							if (!diagramComponent.getNoPopulationDataLocations().isEmpty()) {
-
-								noPopulationLocationsLabel.setValue(
-									String.format(
-										I18nProperties.getString(Strings.errorNoPopulationDataLocations),
-										String.join(",", diagramComponent.getNoPopulationDataLocations())));
-								locationLayout.addComponent(noPopulationLocationsLabel);
-								locationLayout.setComponentAlignment(noPopulationLocationsLabel, Alignment.MIDDLE_CENTER);
-								diagramsLayout.addComponent(locationLayout);
-							}
-						} else {
-							locationLayout.removeComponent(noPopulationLocationsLabel);
-						}
 					});
 
 				diagramsLayout.addComponent(diagramComponent);