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

Commit 1bebb02

Browse files
author
barnabartha
committed
SORMAS-Foundation#2855 - allow definition of new tab id for dashboard diagram elements + increase stack labels Y axis size to 24
1 parent 4b6c248 commit 1bebb02

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.ArrayList;
44
import java.util.List;
5+
import java.util.Optional;
56
import java.util.stream.Collectors;
67

78
import org.apache.commons.lang3.StringUtils;
@@ -49,6 +50,10 @@ protected Binder<CampaignDashboardElement> addColumnsBinder(List<CampaignDashboa
4950
.map(campaignDiagramDefinitionDto -> campaignDiagramDefinitionDto.getTabId())
5051
.distinct()
5152
.collect(Collectors.toList()));
53+
54+
tabIdCombo.setTextInputAllowed(true);
55+
tabIdCombo.setNewItemProvider((ComboBox.NewItemProvider<String>) s -> Optional.of(s));
56+
5257
Binder.Binding<CampaignDashboardElement, String> tabIdBind =
5358
binder.bind(tabIdCombo, CampaignDashboardElement::getTabId, CampaignDashboardElement::setTabId);
5459
Grid.Column<CampaignDashboardElement, String> tabIdColumn = grid.addColumn(campaignDashboardElement -> campaignDashboardElement.getTabId())

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public void buildDiagramChart(String title) {
138138
}
139139
if (stackMap.size() > 1) {
140140
hcjs.append(
141-
", stackLabels: {enabled: true,verticalAlign: 'bottom', allowOverlap: true, crop: false, rotation: 45, x:20,y: 20, overflow: 'none',y: 20,formatter: function() { return this.stack;},style: { color: 'grey'}}");
141+
", stackLabels: {enabled: true,verticalAlign: 'bottom', allowOverlap: true, crop: false, rotation: 45, x:20,y: 20, overflow: 'none',y: 24,formatter: function() { return this.stack;},style: { color: 'grey'}}");
142142
}
143143
hcjs.append("},");
144144
//@formatter:on

0 commit comments

Comments
 (0)