Skip to content

Commit e0f1658

Browse files
committed
ExternalMessages are displayed **BUT** for every fetch a new message is created
1 parent e3e8ef7 commit e0f1658

2 files changed

Lines changed: 5 additions & 0 deletions

File tree

sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/ExternalMessageService.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ public Predicate createDefaultFilter(CriteriaBuilder cb, From<?, ExternalMessage
108108
messageTypes.add(ExternalMessageType.PHYSICIANS_REPORT);
109109
}
110110

111+
if (userService.hasRight(UserRight.EXTERNAL_MESSAGE_SURVEY_RESPONSE_VIEW)) {
112+
messageTypes.add(ExternalMessageType.SURVEY_RESPONSE);
113+
}
114+
111115
if (messageTypes.isEmpty()) {
112116
return cb.disjunction();
113117
}

sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/ExternalMessagesView.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ private void fetchExternalMessages(Date since) {
305305
List<ExternalMessageDto> fetchResult = FacadeProvider.getExternalMessageFacade().saveAndProcessSurveyResponses();
306306
if (!fetchResult.isEmpty()) {
307307
VaadinUiUtil.showWarningPopup(String.format("No new messages: [%s]", fetchResult));
308+
grid.reload();
308309
} else {
309310
grid.reload();
310311
}

0 commit comments

Comments
 (0)