SORMAS-Foundation#3392 - Added notifications when case person is already part of the event

Author: MateStrysewske

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

@@ -707,6 +707,9 @@ public interface Strings {
 	String messagePathogenTestSaved = "messagePathogenTestSaved";
 	String messagePathogenTestSavedShort = "messagePathogenTestSavedShort";
 	String messagePathogenTestsDeleted = "messagePathogenTestsDeleted";
+	String messagePersonAddedAsEventParticipant = "messagePersonAddedAsEventParticipant";
+	String messagePersonAlreadyCaseInEvent = "messagePersonAlreadyCaseInEvent";
+	String messagePersonAlreadyEventParticipant = "messagePersonAlreadyEventParticipant";
 	String messagePersonSaved = "messagePersonSaved";
 	String messagePersonSavedClassificationChanged = "messagePersonSavedClassificationChanged";
 	String messagePlagueTypeChange = "messagePlagueTypeChange";

sormas-api/src/main/resources/strings.properties

@@ -790,6 +790,9 @@ messageSetContactRegionAndDistrict = Please choose a responsible region and resp
 messageAllCampaignFormsValid = All campaign forms have been successfully validated
 messageEnterSms = Please enter your SMS message here:
 messageSelectedPeriodTooLong = You have selected a time period that exceeds the maximum number of days. Please make sure that the selected time period does not exceed %d days.
+messagePersonAlreadyEventParticipant = The case person already is an event participant in the selected event. This case has been linked to the selected event.
+messagePersonAddedAsEventParticipant = The case person was added as an event participant to the selected event.
+messagePersonAlreadyCaseInEvent = This case is already linked to the selected event.
 
 # Notifications
 notificationCaseClassificationChanged = The classification of case %s has changed to %s.

sormas-ui/src/main/java/de/symeda/sormas/ui/events/EventController.java

@@ -97,25 +97,35 @@ public void selectOrCreateEvent(CaseReferenceDto caseRef) {
 		eventSelect.setWidth(1024, Sizeable.Unit.PIXELS);
 
 		final CommitDiscardWrapperComponent<EventSelectionField> component = new CommitDiscardWrapperComponent<>(eventSelect);
-		component.addCommitListener(new CommitListener() {
-
-			@Override
-			public void onCommit() {
-				EventIndexDto selectedEvent = eventSelect.getValue();
-				if (selectedEvent != null) {
+		component.addCommitListener(() -> {
+			EventIndexDto selectedEvent = eventSelect.getValue();
+			if (selectedEvent != null) {
 
-					EventCriteria eventCriteria = new EventCriteria();
-					eventCriteria.caze(caseRef);
-					eventCriteria.setUserFilterIncluded(false);
-					List<EventIndexDto> eventIndexDto = FacadeProvider.getEventFacade().getIndexList(eventCriteria, null, null, null);
+				EventCriteria eventCriteria = new EventCriteria();
+				eventCriteria.caze(caseRef);
+				eventCriteria.setUserFilterIncluded(false);
+				List<EventIndexDto> eventIndexDto = FacadeProvider.getEventFacade().getIndexList(eventCriteria, null, null, null);
 
-					EventReferenceDto eventReferenceDto = new EventReferenceDto(selectedEvent.getUuid());
-					if (!eventIndexDto.contains(selectedEvent)) {
-						linkCaseToEvent(eventReferenceDto, caseDataDto, caseRef);
-					}
+				EventReferenceDto eventReferenceDto = new EventReferenceDto(selectedEvent.getUuid());
+				if (!eventIndexDto.contains(selectedEvent)) {
+					boolean wasEventParticipant = linkCaseToEvent(eventReferenceDto, caseDataDto, caseRef);
+					SormasUI.refreshView();
+					Notification notification = new Notification(
+						I18nProperties.getString(
+							wasEventParticipant ? Strings.messagePersonAlreadyEventParticipant : Strings.messagePersonAddedAsEventParticipant),
+						"",
+						Type.HUMANIZED_MESSAGE);
+					notification.setDelayMsec(10000);
+					notification.show(Page.getCurrent());
 				} else {
-					create(caseRef);
+					SormasUI.refreshView();
+					Notification notification =
+						new Notification(I18nProperties.getString(Strings.messagePersonAlreadyCaseInEvent), "", Type.HUMANIZED_MESSAGE);
+					notification.setDelayMsec(10000);
+					notification.show(Page.getCurrent());
 				}
+			} else {
+				create(caseRef);
 				SormasUI.refreshView();
 			}
 		});
@@ -159,7 +169,10 @@ public void selectOrCreateEvent(ContactDto contact) {
 		VaadinUiUtil.showModalPopupWindow(component, I18nProperties.getString(Strings.headingPickOrCreateEvent));
 	}
 
-	public void linkCaseToEvent(EventReferenceDto eventReferenceDto, CaseDataDto caseDataDto, CaseReferenceDto caseRef) {
+	/**
+	 * @return true if the person was already an event participant in the event, false if not
+	 */
+	public boolean linkCaseToEvent(EventReferenceDto eventReferenceDto, CaseDataDto caseDataDto, CaseReferenceDto caseRef) {
 		// Check whether Person is already enlisted as EventParticipant in this Event
 		EventParticipantReferenceDto eventParticipantRef =
 			FacadeProvider.getEventParticipantFacade().getReferenceByEventAndPerson(eventReferenceDto.getUuid(), caseDataDto.getPerson().getUuid());
@@ -168,7 +181,7 @@ public void linkCaseToEvent(EventReferenceDto eventReferenceDto, CaseDataDto cas
 				FacadeProvider.getEventParticipantFacade().getEventParticipantByUuid(eventParticipantRef.getUuid());
 			eventParticipant.setResultingCase(caseRef);
 			FacadeProvider.getEventParticipantFacade().saveEventParticipant(eventParticipant);
-			return;
+			return true;
 		}
 
 		// Create new EventParticipant for this Person
@@ -177,6 +190,7 @@ public void linkCaseToEvent(EventReferenceDto eventReferenceDto, CaseDataDto cas
 		eventParticipantDto =
 			new EventParticipantDto().buildFromCase(caseRef, personDto, eventReferenceDto, UserProvider.getCurrent().getUserReference());
 		FacadeProvider.getEventParticipantFacade().saveEventParticipant(eventParticipantDto);
+		return false;
 	}
 
 	public void createEventParticipantWithContact(EventReferenceDto eventReferenceDto, ContactDto contact) {
@@ -248,23 +262,19 @@ public CommitDiscardWrapperComponent<EventDataForm> getEventCreateComponent(Case
 			eventCreateForm.getFieldGroup());
 
 		CaseDataDto finalCaseDataDto = caseDataDto;
-		editView.addCommitListener(new CommitListener() {
-
-			@Override
-			public void onCommit() {
-				if (!eventCreateForm.getFieldGroup().isModified()) {
-					EventDto dto = eventCreateForm.getValue();
-					FacadeProvider.getEventFacade().saveEvent(dto);
-					Notification.show(I18nProperties.getString(Strings.messageEventCreated), Type.WARNING_MESSAGE);
+		editView.addCommitListener(() -> {
+			if (!eventCreateForm.getFieldGroup().isModified()) {
+				EventDto dto = eventCreateForm.getValue();
+				FacadeProvider.getEventFacade().saveEvent(dto);
+				Notification.show(I18nProperties.getString(Strings.messageEventCreated), Type.WARNING_MESSAGE);
 
-					if (caseRef != null) {
-						EventReferenceDto createdEvent = new EventReferenceDto(dto.getUuid());
+				if (caseRef != null) {
+					EventReferenceDto createdEvent = new EventReferenceDto(dto.getUuid());
 
-						linkCaseToEvent(createdEvent, finalCaseDataDto, caseRef);
-						SormasUI.refreshView();
-					} else {
-						navigateToParticipants(dto.getUuid());
-					}
+					linkCaseToEvent(createdEvent, finalCaseDataDto, caseRef);
+					SormasUI.refreshView();
+				} else {
+					navigateToParticipants(dto.getUuid());
 				}
 			}
 		});

sormas-ui/src/main/webapp/VAADIN/themes/sormas/components/notification.scss

@@ -30,4 +30,8 @@
 
 	}
 
+	.v-Notification.humanized .v-Notification-caption {
+		color: #005A9C;
+	}
+
 }