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

Commit ac8c020

Browse files
Merge pull request SORMAS-Foundation#2962 from hzi-braunschweig/2938-Link_event_error_when_no_event_exists_for_case_disease
SORMAS-Foundation#2938 - Link event error when no event exists for case disease
2 parents a89aa5b + b7e4317 commit ac8c020

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/eventLink/EventSelectionField.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,8 @@ public HorizontalLayout buildWeekAndDateFilter() {
219219

220220
Button applyButton = ButtonHelper.createButton(Captions.actionApplyDateFilter, null);
221221

222-
EpiWeekAndDateFilterComponent<DateFilterOption> weekAndDateFilter = new EpiWeekAndDateFilterComponent<>(applyButton, false, false, null, null);
222+
EpiWeekAndDateFilterComponent<DateFilterOption> weekAndDateFilter =
223+
new EpiWeekAndDateFilterComponent<>(applyButton, false, false, null, null);
223224

224225
weekAndDateFilter.getWeekFromFilter().setInputPrompt(I18nProperties.getString(Strings.promptEventEpiWeekFrom));
225226
weekAndDateFilter.getWeekToFilter().setInputPrompt(I18nProperties.getString(Strings.promptEventEpiWeekTo));
@@ -287,4 +288,8 @@ public HorizontalLayout buildWeekAndDateFilter() {
287288

288289
return dateFilterRowLayout;
289290
}
291+
292+
public EventSelectionGrid getEventGrid() {
293+
return eventGrid;
294+
}
290295
}

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/eventLink/EventSelectionGrid.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,11 @@ public void setLazyDataProvider() {
103103

104104
EventSelectionGrid tempGrid = this;
105105
dataProvider.addDataProviderListener((DataProviderListener<EventIndexDto>) dataChangeEvent -> {
106-
tempGrid.setHeightByRows(Math.min(tempGrid.getItemCount(), 5));
106+
if (tempGrid.getItemCount() > 0) {
107+
tempGrid.setHeightByRows(Math.min(tempGrid.getItemCount(), 5));
108+
} else {
109+
tempGrid.setHeightByRows(1);
110+
}
107111
});
108112
}
109113

0 commit comments

Comments
 (0)