Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 830a846

Browse files
author
barnabartha
committed
SORMAS-Foundation#2527 - fix width + height issues of diagrams within the dashboard page
1 parent 08859b0 commit 830a846

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@ public void refreshDashboard() {
121121
diagramsWrapper.setSizeFull();
122122

123123
final CssLayout diagramsLayout = new CssLayout();
124-
diagramsLayout.setWidth(dashboardElements.size() == 1 ? gridTemplateAreaCreator.getWidthsSum() : 100, Unit.PERCENTAGE);
124+
diagramsLayout.setWidth(
125+
dashboardElements.size() == 1 && gridTemplateAreaCreator.getNrOfGridAreaColumns() == 1 ? gridTemplateAreaCreator.getWidthsSum() : 100,
126+
Unit.PERCENTAGE);
125127
diagramsLayout.setHeight(gridTemplateAreaCreator.getGridContainerHeight(), Unit.PERCENTAGE);
126128
final String gridCssClass = tabId.replaceAll("[^a-zA-Z]+", "") + generateRandomString() + GRID_CONTAINER;
127129

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ public Integer getWidthsSum() {
8686
return widthsSum;
8787
}
8888

89+
public Integer getNrOfGridAreaColumns() {
90+
return nrOfGridAreaColumns;
91+
}
92+
8993
private boolean rowIsNull(int x, Integer nrOfGridColumnAreas) {
9094
for (int y = 0; y < nrOfGridColumnAreas; y++) {
9195
if (grid[y][x] != null)

0 commit comments

Comments
 (0)