SORMAS-Foundation#3290 - show all diagramId's in dashboard grid not only ones already associated to a campaign (SORMAS-Foundation#3335)

Co-authored-by: barnabartha <[email protected]>

Author: BarnaBartha

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

@@ -1,63 +1,83 @@
 package de.symeda.sormas.api.campaign.diagram;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 public class CampaignDashboardElement implements Serializable {
 
-    private String diagramId;
-    private String tabId;
-    private Integer order;
-    private Integer width;
-    private Integer height;
-
-    public CampaignDashboardElement() {
-    }
-
-    public CampaignDashboardElement(String diagramId, String tabId, Integer order, Integer width, Integer height) {
-        this.diagramId = diagramId;
-        this.tabId = tabId;
-        this.order = order;
-        this.width = width;
-        this.height = height;
-    }
-
-    public String getDiagramId() {
-        return diagramId;
-    }
-
-    public void setDiagramId(String diagramId) {
-        this.diagramId = diagramId;
-    }
-
-    public String getTabId() {
-        return tabId;
-    }
-
-    public void setTabId(String tabId) {
-        this.tabId = tabId;
-    }
-
-    public Integer getOrder() {
-        return order;
-    }
-
-    public void setOrder(Integer order) {
-        this.order = order;
-    }
-
-    public Integer getWidth() {
-        return width;
-    }
-
-    public void setWidth(Integer width) {
-        this.width = width;
-    }
-
-    public Integer getHeight() {
-        return height;
-    }
-
-    public void setHeight(Integer height) {
-        this.height = height;
-    }
+	private String diagramId;
+	private String tabId;
+	private Integer order;
+	private Integer width;
+	private Integer height;
+
+	public CampaignDashboardElement() {
+	}
+
+	public CampaignDashboardElement(String diagramId, String tabId, Integer order, Integer width, Integer height) {
+		this.diagramId = diagramId;
+		this.tabId = tabId;
+		this.order = order;
+		this.width = width;
+		this.height = height;
+	}
+
+	public String getDiagramId() {
+		return diagramId;
+	}
+
+	public void setDiagramId(String diagramId) {
+		this.diagramId = diagramId;
+	}
+
+	public String getTabId() {
+		return tabId;
+	}
+
+	public void setTabId(String tabId) {
+		this.tabId = tabId;
+	}
+
+	public Integer getOrder() {
+		return order;
+	}
+
+	public void setOrder(Integer order) {
+		this.order = order;
+	}
+
+	public Integer getWidth() {
+		return width;
+	}
+
+	public void setWidth(Integer width) {
+		this.width = width;
+	}
+
+	public Integer getHeight() {
+		return height;
+	}
+
+	public void setHeight(Integer height) {
+		this.height = height;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		CampaignDashboardElement that = (CampaignDashboardElement) o;
+		return Objects.equals(diagramId, that.diagramId)
+			&& Objects.equals(tabId, that.tabId)
+			&& Objects.equals(order, that.order)
+			&& Objects.equals(width, that.width)
+			&& Objects.equals(height, that.height);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(diagramId, tabId, order, width, height);
+	}
 }

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigns/CampaignDashboardElementsGridComponent.java

@@ -31,35 +31,35 @@ public CampaignDashboardElementsGridComponent(List<CampaignDashboardElement> sav
 	protected Binder<CampaignDashboardElement> addColumnsBinder(List<CampaignDashboardElement> allElements) {
 		Binder<CampaignDashboardElement> binder = new Binder<>();
 
-		ComboBox<String> diagramIdCombo = new ComboBox<>(
-			Captions.campaignDashboardChart,
-			allElements.stream()
-				.map(campaignDiagramDefinitionDto -> campaignDiagramDefinitionDto.getDiagramId())
-				.distinct()
-				.collect(Collectors.toList()));
+		final List<String> existingDiagramIds = allElements.stream()
+			.map(campaignDiagramDefinitionDto -> campaignDiagramDefinitionDto.getDiagramId())
+			.distinct()
+			.collect(Collectors.toList());
+		final ComboBox<String> diagramIdCombo = new ComboBox<>(Captions.campaignDashboardChart, existingDiagramIds);
 		diagramIdCombo.setEmptySelectionAllowed(false);
-		Binder.Binding<CampaignDashboardElement, String> diagramIdBind =
+		final Binder.Binding<CampaignDashboardElement, String> diagramIdBind =
 			binder.bind(diagramIdCombo, CampaignDashboardElement::getDiagramId, CampaignDashboardElement::setDiagramId);
-		Grid.Column<CampaignDashboardElement, String> diagramIdColumn =
+		final Grid.Column<CampaignDashboardElement, String> diagramIdColumn =
 			grid.addColumn(campaignDashboardElement -> campaignDashboardElement.getDiagramId())
 				.setCaption(I18nProperties.getCaption(Captions.campaignDashboardChart));
 		diagramIdColumn.setEditorBinding(diagramIdBind);
 
-		ComboBox<String> tabIdCombo = new ComboBox<>(
-			Captions.campaignDashboardTabName,
-			allElements.stream()
-				.map(campaignDiagramDefinitionDto -> campaignDiagramDefinitionDto.getTabId())
-				.distinct()
-				.collect(Collectors.toList()));
+		final List<String> existingTabIds = allElements.stream()
+			.map(campaignDiagramDefinitionDto -> campaignDiagramDefinitionDto.getTabId())
+			.filter(s -> StringUtils.isNotEmpty(s))
+			.distinct()
+			.collect(Collectors.toList());
+		final ComboBox<String> tabIdCombo = new ComboBox<>(Captions.campaignDashboardTabName, existingTabIds);
 
 		tabIdCombo.setEmptySelectionAllowed(false);
 		tabIdCombo.setTextInputAllowed(true);
 		tabIdCombo.setNewItemProvider((ComboBox.NewItemProvider<String>) s -> Optional.of(s));
 
-		Binder.Binding<CampaignDashboardElement, String> tabIdBind =
+		final Binder.Binding<CampaignDashboardElement, String> tabIdBind =
 			binder.bind(tabIdCombo, CampaignDashboardElement::getTabId, CampaignDashboardElement::setTabId);
-		Grid.Column<CampaignDashboardElement, String> tabIdColumn = grid.addColumn(campaignDashboardElement -> campaignDashboardElement.getTabId())
-			.setCaption(I18nProperties.getCaption(Captions.campaignDashboardTabName));
+		final Grid.Column<CampaignDashboardElement, String> tabIdColumn =
+			grid.addColumn(campaignDashboardElement -> campaignDashboardElement.getTabId())
+				.setCaption(I18nProperties.getCaption(Captions.campaignDashboardTabName));
 		tabIdColumn.setEditorBinding(tabIdBind);
 
 		TextField width = new TextField(Captions.campaignDashboardChartWidth);

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigns/CampaignEditForm.java

@@ -23,6 +23,8 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
@@ -150,11 +152,22 @@ protected void addFields() {
 			FacadeProvider.getCampaignFormMetaFacade().getAllCampaignFormMetasAsReferences());
 		getContent().addComponent(campaignFormsGridComponent, CAMPAIGN_DATA_LOC);
 
+		final List<CampaignDashboardElement> campaignDashboardElements = FacadeProvider.getCampaignFacade().getCampaignDashboardElements(null);
+		FacadeProvider.getCampaignDiagramDefinitionFacade().getAll().forEach(campaignDiagramDefinitionDto -> {
+			final String diagramId = campaignDiagramDefinitionDto.getDiagramId();
+			final Optional<CampaignDashboardElement> diagramAlreadyUsed =
+				campaignDashboardElements.stream().filter(cde -> cde.getDiagramId().equals(diagramId)).findAny();
+			if (!diagramAlreadyUsed.isPresent()) {
+				final CampaignDashboardElement campaignDashboardElement = new CampaignDashboardElement();
+				campaignDashboardElement.setDiagramId(diagramId);
+				campaignDashboardElements.add(campaignDashboardElement);
+			}
+		});
 		campaignDashboardGridComponent = new CampaignDashboardElementsGridComponent(
 			this.campaignDto == null
 				? Collections.EMPTY_LIST
 				: FacadeProvider.getCampaignFacade().getCampaignDashboardElements(campaignDto.getUuid()),
-			FacadeProvider.getCampaignFacade().getCampaignDashboardElements(null));
+			campaignDashboardElements);
 		getContent().addComponent(campaignDashboardGridComponent, CAMPAIGN_DASHBOARD_LOC);
 
 		final Label spacer = new Label();