2644 move warning label below chart diagram + remove "view data table" option

Author: danRosca

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

@@ -251,9 +251,9 @@ 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
-errorNoPopulationDataFound = There is no population data available. Switching to default view
-errorFormIdPopulationAgeGroup = Both "Form Id" and "Population Age Group" options are set 
+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
 headingAccessDenied = Access denied
 headingAdditionalTests = Additional tests

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

@@ -25,6 +25,9 @@
 import de.symeda.sormas.api.region.AreaReferenceDto;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
 import de.symeda.sormas.api.region.RegionReferenceDto;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CampaignDashboardDataProvider {
 
@@ -38,6 +41,8 @@ public class CampaignDashboardDataProvider {
 	private final Map<CampaignDashboardDiagramDto, List<CampaignDiagramDataDto>> campaignFormDataMap = new HashMap<>();
 	private final Map<CampaignDashboardDiagramDto, Map<CampaignDashboardTotalsReference, Double>> campaignFormTotalsMap = new HashMap<>();
 
+	private final Logger logger = LoggerFactory.getLogger(getClass());
+
 	public void refreshDashboardData() {
 
 		if (campaign != null) {
@@ -65,15 +70,16 @@ protected void refreshDiagramsData(String tabId, String subTabId) {
 				if (campaignDashboardDiagramDto.getCampaignDiagramDefinitionDto().getCampaignSeriesTotal() != null) {
 					Optional populationGroup = campaignSeriesTotal.stream().filter(e -> Objects.nonNull(e.getPopulationGroup())).findFirst();
 					Optional formIdOptional = campaignSeriesTotal.stream().filter(e -> Objects.nonNull(e.getFormId())).findFirst();
-					if (populationGroup.isPresent() && formIdOptional.isPresent()) {
-						Notification.show(String.format(I18nProperties.getString(Strings.errorFormIdPopulationAgeGroup)), ERROR_MESSAGE);
-					} else {
+					{
 						if (populationGroup.isPresent()) {
 							percentageDiagramData = FacadeProvider.getCampaignFormDataFacade()
 								.getDiagramDataByAgeGroup(
 									(CampaignDiagramSeries) populationGroup.get(),
 									campaignDashboardDiagramDto.getCampaignDiagramDefinitionDto().getCampaignDiagramSeries().get(0),
 									new CampaignDiagramCriteria(campaign, area, region, district));
+							if (formIdOptional.isPresent()) {
+								logger.warn(String.format(I18nProperties.getString(Strings.errorFormIdPopulationAgeGroup)));
+							}
 						} else {
 							percentageDiagramData = FacadeProvider.getCampaignFormDataFacade()
 								.getDiagramData(
@@ -94,46 +100,6 @@ protected void refreshDiagramsData(String tabId, String subTabId) {
 		});
 	}
 
-	private void buildCampaignFormTotalsMap(CampaignDashboardDiagramDto campaignDashboardDiagramDto) {
-		List<CampaignDiagramDataDto> diagramData = FacadeProvider.getCampaignFormDataFacade()
-			.getDiagramData(
-				campaignDashboardDiagramDto.getCampaignDiagramDefinitionDto().getCampaignDiagramSeries(),
-				new CampaignDiagramCriteria(campaign, area, region, district));
-		campaignFormDataMap.put(campaignDashboardDiagramDto, diagramData);
-		List<CampaignDiagramSeries> campaignSeriesTotal = campaignDashboardDiagramDto.getCampaignDiagramDefinitionDto().getCampaignSeriesTotal();
-		List<CampaignDiagramDataDto> percentageDiagramData = null;
-		if (campaignSeriesTotal != null) {
-			if (Objects.nonNull(campaignSeriesTotal)) {
-				Optional populationGroup = campaignSeriesTotal.stream().filter(e -> Objects.nonNull(e.getPopulationGroup())).findFirst();
-				Optional formIdOptional = campaignSeriesTotal.stream().filter(e -> Objects.nonNull(e.getFormId())).findFirst();
-				if (populationGroup.isPresent()) {
-					if (formIdOptional.isPresent()) {
-						Notification.show(String.format(I18nProperties.getString(Strings.errorFormIdPopulationAgeGroup)), ERROR_MESSAGE);
-					} else {
-						percentageDiagramData = FacadeProvider.getCampaignFormDataFacade()
-							.getDiagramDataByAgeGroup(
-								(CampaignDiagramSeries) populationGroup.get(),
-								campaignDashboardDiagramDto.getCampaignDiagramDefinitionDto().getCampaignDiagramSeries().get(0),
-								new CampaignDiagramCriteria(campaign, area, region, district));
-					}
-				} else {
-					percentageDiagramData = FacadeProvider.getCampaignFormDataFacade()
-						.getDiagramData(
-							campaignDashboardDiagramDto.getCampaignDiagramDefinitionDto().getCampaignSeriesTotal(),
-							new CampaignDiagramCriteria(campaign, area, region, district));
-				}
-				Map<CampaignDashboardTotalsReference, Double> percentageMap = new HashMap<>();
-				for (CampaignDiagramDataDto data : percentageDiagramData) {
-					CampaignDashboardTotalsReference totals = new CampaignDashboardTotalsReference(data.getGroupingKey(), data.getStack());
-					Double value = percentageMap.getOrDefault(totals, 0D);
-					value += data.getValueSum().doubleValue();
-					percentageMap.put(totals, value);
-				}
-				campaignFormTotalsMap.put(campaignDashboardDiagramDto, percentageMap);
-			}
-		}
-	}
-
 	private void createCampaignDashboardDiagramDefinitionsMap() {
 		if (!campaignDiagramDefinitionsMap.containsKey(campaign)) {
 			final List<CampaignDashboardDiagramDto> campaignDashboardDiagramDtos = new ArrayList<>();

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

@@ -15,6 +15,9 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import com.vaadin.ui.Label;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.text.StringEscapeUtils;
 
 import com.vaadin.ui.Notification;
@@ -39,21 +42,19 @@ public class CampaignDashboardDiagramComponent extends VerticalLayout {
 	private final Map<CampaignDashboardTotalsReference, Double> totalValuesMap;
 	private boolean totalValuesWithoutStacks;
 	private boolean showPercentages;
-	private String populationGroupDiagramTitle;
-
+	private List<String> noPopulationDataLocations;
 	private final HighChart campaignColumnChart;
 
 	public CampaignDashboardDiagramComponent(
 		CampaignDiagramDefinitionDto diagramDefinition,
 		List<CampaignDiagramDataDto> diagramDataList,
 		Map<CampaignDashboardTotalsReference, Double> totalValuesMap,
 		boolean showPercentages,
-		String populationGroupDiagramTitle,
-		boolean isCampaignGrouping) {
-		this.populationGroupDiagramTitle = populationGroupDiagramTitle;
+		boolean isCommunityGrouping) {
 		this.diagramDefinition = diagramDefinition;
 		this.showPercentages = showPercentages;
 		this.totalValuesMap = totalValuesMap;
+		noPopulationDataLocations = new LinkedList<>();
 
 		if (this.totalValuesMap != null && this.totalValuesMap.keySet().stream().noneMatch(r -> r.getStack() != null)) {
 			totalValuesWithoutStacks = true;
@@ -84,10 +85,10 @@ public CampaignDashboardDiagramComponent(
 			objectCampaignDiagramDataDtoMap.put(diagramData.getGroupingKey(), diagramData);
 		}
 
-		buildDiagramChart(diagramDefinition.getDiagramCaption(), isCampaignGrouping);
+		buildDiagramChart(diagramDefinition.getDiagramCaption(), isCommunityGrouping);
 	}
 
-	public void buildDiagramChart(String title, boolean isCampaignGrouping) {
+	public void buildDiagramChart(String title, boolean isCommunityGrouping) {
 		final StringBuilder hcjs = new StringBuilder();
 
 		//@formatter:off
@@ -174,7 +175,14 @@ public void buildDiagramChart(String title, boolean isCampaignGrouping) {
 		}
 
 		hcjs.append("series: [");
-		List<String> noPopulationLocations = new LinkedList<>();
+		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))
@@ -183,12 +191,19 @@ public void buildDiagramChart(String title, boolean isCampaignGrouping) {
 			Map<Object, CampaignDiagramDataDto> seriesData = diagramDataBySeriesAndXAxis.get(seriesKey);
 			Collection<CampaignDiagramDataDto> values = seriesData.values();
 			Iterator<CampaignDiagramDataDto> iterator = values.iterator();
-			String fieldName;
-			if (Objects.nonNull(populationGroupDiagramTitle)) {
-				fieldName = populationGroupDiagramTitle;
-			} else {
-				fieldName = iterator.hasNext() ? iterator.next().getFieldCaption() : seriesKey;
+			String fieldName = (iterator.hasNext() ? iterator.next().getFieldCaption() : seriesKey);
+			if (showPercentages) {
+				if (isCommunityGrouping) {
+					fieldName = I18nProperties.getString(Strings.populationDataByCommunity);
+				} /*
+					 * else if (!noPopulationLocations.isEmpty()) {
+					 * fieldName = fieldName
+					 * + ("<br/>" + String
+					 * .format(I18nProperties.getString(Strings.errorNoPopulationDataLocations), String.join(",", noPopulationLocations)));
+					 * }
+					 */
 			}
+
 			hcjs.append("{ name:'").append(StringEscapeUtils.escapeEcmaScript(fieldName)).append("', data: [");
 			for (Object axisKey : axisKeys) {
 				if (seriesData.containsKey(axisKey)) {
@@ -198,9 +213,7 @@ public void buildDiagramChart(String title, boolean isCampaignGrouping) {
 								seriesData.get(axisKey).getGroupingKey(),
 								totalValuesWithoutStacks ? null : series.getStack()));
 						if (totalValue == null) {
-							if (isCampaignGrouping) {
-								Notification.show(String.format(I18nProperties.getString(Strings.populationDataByCommunity)), ERROR_MESSAGE);
-							} else {
+							if (!isCommunityGrouping) {
 								Notification.show(
 									String.format(
 										I18nProperties.getString(Strings.errorCampaignDiagramTotalsCalculationError),
@@ -216,9 +229,6 @@ public void buildDiagramChart(String title, boolean isCampaignGrouping) {
 						} else {
 							hcjs.append("0,");
 						}
-						if ((Double.valueOf(0)).equals(totalValue)) {
-							noPopulationLocations.add(seriesData.get(axisKey).getGroupingCaption());
-						}
 					} else {
 						hcjs.append(seriesData.get(axisKey).getValueSum().toString()).append(",");
 					}
@@ -234,13 +244,6 @@ public void buildDiagramChart(String title, boolean isCampaignGrouping) {
 		}
 		hcjs.append("]");
 		hcjs.append("}");
-		if (!noPopulationLocations.isEmpty() && showPercentages)
-
-		{
-			Notification.show(
-				String.format(I18nProperties.getString(Strings.errorNoPopulationDataLocations), String.join(",", noPopulationLocations)),
-				ERROR_MESSAGE);
-		}
 		campaignColumnChart.setHcjs(hcjs.toString());
 	}
 
@@ -251,4 +254,12 @@ public boolean isShowPercentages() {
 	public void setShowPercentages(boolean showPercentages) {
 		this.showPercentages = showPercentages;
 	}
+
+	public List<String> getNoPopulationDataLocations() {
+		return noPopulationDataLocations;
+	}
+
+	public void setNoPopulationDataLocations(List<String> noPopulationDataLocations) {
+		this.noPopulationDataLocations = noPopulationDataLocations;
+	}
 }

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

@@ -7,6 +7,8 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Label;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -181,32 +183,19 @@ 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();
 				final String diagramId = campaignDiagramDefinitionDto.getDiagramId();
 				final String diagramCssClass = diagramId + generateRandomString();
-				String diagramTitle = null;
-				List<CampaignDiagramSeries> campaignSeriesTotal = campaignDiagramDefinitionDto.getCampaignSeriesTotal();
-				if (!CollectionUtils.isEmpty(campaignSeriesTotal) && campaignDiagramDefinitionDto.isPercentageDefault()) {
-					if (campaignSeriesTotal.stream().filter(e -> Objects.nonNull(e.getPopulationGroup())).findAny().isPresent()) {
-						if (Objects.isNull(dataProvider.getArea())) {
-							diagramTitle = I18nProperties.getString(Strings.populationDataByArea);
-						} else if (Objects.isNull(dataProvider.getRegion())) {
-							diagramTitle = I18nProperties.getString(Strings.populationDataByRegion);
-						} else if (Objects.isNull(dataProvider.getDistrict())) {
-							diagramTitle = I18nProperties.getString(Strings.populationDataByDistrict);
-						} else {
-							diagramTitle = I18nProperties.getString(Strings.populationDataByCommunity);
-						}
-					}
-				}
+
 				final CampaignDashboardDiagramComponent diagramComponent = new CampaignDashboardDiagramComponent(
 					campaignDiagramDefinitionDto,
 					diagramData,
 					dataProvider.getCampaignFormTotalsMap().get(campaignDashboardDiagramDto),
 					campaignDiagramDefinitionDto.isPercentageDefault(),
-					diagramTitle,
 					Objects.nonNull(dataProvider.getDistrict()));
 				styles.add(createDiagramStyle(diagramCssClass, diagramId));
 				diagramComponent.setStyleName(diagramCssClass);
@@ -219,6 +208,20 @@ 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);