SORMAS-Foundation#2527 - fix width + height issues of diagrams within the dashboard page

Author: barnabartha

sormas-ui/src/main/java/de/symeda/sormas/ui/dashboard/AbstractDashboardView.java

@@ -77,6 +77,7 @@ protected AbstractDashboardView(String viewName) {
 		dashboardLayout.setStyleName("crud-main-layout");
 
 		addComponent(dashboardLayout);
+		setExpandRatio(dashboardLayout, 1);
 	}
 
 	protected void navigateToDashboardView(Property.ValueChangeEvent e) {

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

@@ -50,7 +50,8 @@ public CampaignDashboardView() {
 		dashboardSwitcher.addValueChangeListener(e -> navigateToDashboardView(e));
 
 		filterLayout.setInfoLabelText(I18nProperties.getString(Strings.infoCampaignsDashboard));
-		dashboardLayout.setHeightUndefined();
+		dashboardLayout.setExpandRatio(filterLayout, 0);
+		dashboardLayout.setSizeFull();
 	}
 
 	@Override
@@ -72,12 +73,14 @@ public void refreshDashboard() {
 		tabLayout.setSpacing(false);
 		campaignDashboardDiagramComponents.add(tabLayout);
 		dashboardLayout.addComponent(tabLayout);
+		dashboardLayout.setExpandRatio(tabLayout, 1);
 
 		final OptionGroup tabSwitcher = new OptionGroup();
 		final VerticalLayout tabSwitcherLayout = new VerticalLayout(tabSwitcher);
 		tabSwitcherLayout.setMargin(new MarginInfo(false, false, false, true));
 		tabSwitcherLayout.setSpacing(false);
 		tabLayout.addComponent(tabSwitcherLayout);
+		tabLayout.setExpandRatio(tabSwitcherLayout, 0);
 
 		final Map<String, Map<CampaignDashboardDiagramDto, List<CampaignDiagramDataDto>>> campaignFormDataTabMap =
 			groupCampaignFormDataByTab(dataProvider.getCampaignFormDataMap());
@@ -118,7 +121,8 @@ public void refreshDashboard() {
 			diagramsWrapper.setSizeFull();
 
 			final CssLayout diagramsLayout = new CssLayout();
-			diagramsLayout.setWidth(gridTemplateAreaCreator.getWidthsSum() < 100 ? gridTemplateAreaCreator.getWidthsSum() : 100, Unit.PERCENTAGE);
+			diagramsLayout
+				.setWidth(gridTemplateAreaCreator.getNrOfGridAreaColumns() == 1 ? gridTemplateAreaCreator.getWidthsSum() : 100, Unit.PERCENTAGE);
 			diagramsLayout.setHeight(gridTemplateAreaCreator.getGridContainerHeight(), Unit.PERCENTAGE);
 			final String gridCssClass = tabId.replaceAll("[^a-zA-Z]+", "") + generateRandomString() + GRID_CONTAINER;
 
@@ -139,6 +143,7 @@ public void refreshDashboard() {
 
 			diagramsWrapper.setVisible(false);
 			tabLayout.addComponent(diagramsWrapper);
+			tabLayout.setExpandRatio(diagramsWrapper, 1);
 		});
 
 		tabSwitcher.setValue(tabs.isEmpty() ? StringUtils.EMPTY : tabs.get(0));

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

@@ -86,6 +86,10 @@ public Integer getWidthsSum() {
 		return widthsSum;
 	}
 
+	public Integer getNrOfGridAreaColumns() {
+		return nrOfGridAreaColumns;
+	}
+
 	private boolean rowIsNull(int x, Integer nrOfGridColumnAreas) {
 		for (int y = 0; y < nrOfGridColumnAreas; y++) {
 			if (grid[y][x] != null)