Ensure that case and contact creation is only available for event with a disease SORMAS-Foundation#3919 (SORMAS-Foundation#4114)

Author: aponcon-atolcd

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

@@ -269,8 +269,10 @@ public interface Strings {
 	String headingCreateNewAggregateReport = "headingCreateNewAggregateReport";
 	String headingCreateNewCampaign = "headingCreateNewCampaign";
 	String headingCreateNewCase = "headingCreateNewCase";
+	String headingCreateNewCaseIssue = "headingCreateNewCaseIssue";
 	String headingCreateNewClinicalVisit = "headingCreateNewClinicalVisit";
 	String headingCreateNewContact = "headingCreateNewContact";
+	String headingCreateNewContactIssue = "headingCreateNewContactIssue";
 	String headingCreateNewEvent = "headingCreateNewEvent";
 	String headingCreateNewEventParticipant = "headingCreateNewEventParticipant";
 	String headingCreateNewFacility = "headingCreateNewFacility";
@@ -595,6 +597,7 @@ public interface Strings {
 	String messageCaseDuplicateDeleted = "messageCaseDuplicateDeleted";
 	String messageCaseIncidenceUnsupportedAgeGroup = "messageCaseIncidenceUnsupportedAgeGroup";
 	String messageCaseReferredFromPoe = "messageCaseReferredFromPoe";
+	String messageCaseRelationToEventWithoutDisease = "messageCaseRelationToEventWithoutDisease";
 	String messageCasesArchived = "messageCasesArchived";
 	String messageCaseSaved = "messageCaseSaved";
 	String messageCaseSavedClassificationChanged = "messageCaseSavedClassificationChanged";
@@ -661,6 +664,8 @@ public interface Strings {
 	String messageEventParticipantResponsibleJurisdictionUpdated = "messageEventParticipantResponsibleJurisdictionUpdated";
 	String messageEventParticipantSaved = "messageEventParticipantSaved";
 	String messageEventParticipantsDeleted = "messageEventParticipantsDeleted";
+	String messageEventParticipantToCaseWithoutEventDisease = "messageEventParticipantToCaseWithoutEventDisease";
+	String messageEventParticipantToContactWithoutEventDisease = "messageEventParticipantToContactWithoutEventDisease";
 	String messageEventsArchived = "messageEventsArchived";
 	String messageEventSaved = "messageEventSaved";
 	String messageEventsDearchived = "messageEventsDearchived";

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

@@ -300,8 +300,10 @@ headingCreateNewAction = Create new action
 headingCreateNewAggregateReport = Create a new aggregated report
 headingCreateNewCampaign = Create new campaign
 headingCreateNewCase = Create new case
+headingCreateNewCaseIssue = Case creation issue
 headingCreateNewClinicalVisit = Create new clinical assessment
 headingCreateNewContact = Create new contact
+headingCreateNewContactIssue = Contact creation issue
 headingCreateNewEvent = Create new event
 headingCreateNewEventParticipant = Add new event participant
 headingCreateNewFacility = Create new facility
@@ -632,6 +634,7 @@ messageCaseDearchived = Case has been de-archived
 messageCaseDuplicateDeleted = The duplicate case has been deleted.
 messageCaseIncidenceUnsupportedAgeGroup = Case incidence proportion can only be generated for 5 year intervals. Please remove all other age stratification filters and visualization groupings.
 messageCaseReferredFromPoe = Case has been referred to the specified facility
+messageCaseRelationToEventWithoutDisease=It is not possible to link a case to an event if the disease of the event has not been set
 messageCaseSaved = Case saved
 messageCaseSavedClassificationChanged = Case saved. The classification was automatically changed to %s.
 messageCaseTransfered = Case has been transfered to another facility
@@ -675,6 +678,8 @@ messageEventParticipantCreated = New person created
 messageEventParticipantSaved = Person data saved
 messageEventParticipantsDeleted = All selected event participants have been deleted
 messageEventParticipantResponsibleJurisdictionUpdated = Changing or removing the responsible jurisdiction of this event participant could make you lose access to its personal details and/or disallow you to edit it in the future. Are you sure you want to proceed?
+messageEventParticipantToCaseWithoutEventDisease=It is not possible to create cases from an event participant if the disease of the event has not been set
+messageEventParticipantToContactWithoutEventDisease=It is not possible to create a contact from an event participant if the disease of the event has not been set
 messageEventSaved = Event data saved
 messageEventsArchived = All selected events have been archived
 messageEventsDearchived = All selected events have been de-archived

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseController.java

@@ -158,11 +158,30 @@ public void create() {
 	}
 
 	public void createFromEventParticipant(EventParticipantDto eventParticipant) {
+		EventDto event = FacadeProvider.getEventFacade().getEventByUuid(eventParticipant.getEvent().getUuid());
+		if (event.getDisease() == null) {
+			new Notification(
+				I18nProperties.getString(Strings.headingCreateNewCaseIssue),
+				I18nProperties.getString(Strings.messageEventParticipantToCaseWithoutEventDisease),
+				Notification.Type.ERROR_MESSAGE,
+				false).show(Page.getCurrent());
+			return;
+		}
+
 		CommitDiscardWrapperComponent<CaseCreateForm> caseCreateComponent = getCaseCreateComponent(null, eventParticipant, null, false);
 		VaadinUiUtil.showModalPopupWindow(caseCreateComponent, I18nProperties.getString(Strings.headingCreateNewCase));
 	}
 
 	public void createFromEventParticipantDifferentDisease(EventParticipantDto eventParticipant, Disease disease) {
+		if (disease == null) {
+			new Notification(
+					I18nProperties.getString(Strings.headingCreateNewCaseIssue),
+					I18nProperties.getString(Strings.messageEventParticipantToCaseWithoutEventDisease),
+					Notification.Type.ERROR_MESSAGE,
+					false).show(Page.getCurrent());
+			return;
+		}
+
 		CommitDiscardWrapperComponent<CaseCreateForm> caseCreateComponent = getCaseCreateComponent(null, eventParticipant, disease, false);
 		VaadinUiUtil.showModalPopupWindow(caseCreateComponent, I18nProperties.getString(Strings.headingCreateNewCase));
 	}

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactController.java

@@ -27,6 +27,7 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
+import de.symeda.sormas.api.event.EventDto;
 import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -139,6 +140,17 @@ public void create(CaseReferenceDto caseRef, boolean asResultingCase, Runnable a
 
 	public void create(EventParticipantReferenceDto eventParticipantRef) {
 		EventParticipantDto eventParticipant = FacadeProvider.getEventParticipantFacade().getEventParticipantByUuid(eventParticipantRef.getUuid());
+		EventDto event = FacadeProvider.getEventFacade().getEventByUuid(eventParticipant.getEvent().getUuid());
+
+		if (event.getDisease() == null) {
+			new Notification(
+					I18nProperties.getString(Strings.headingCreateNewContactIssue),
+					I18nProperties.getString(Strings.messageEventParticipantToContactWithoutEventDisease),
+					Notification.Type.ERROR_MESSAGE,
+					false).show(Page.getCurrent());
+			return;
+		}
+
 		CommitDiscardWrapperComponent<ContactCreateForm> createComponent = getContactCreateComponent(eventParticipant);
 		VaadinUiUtil.showModalPopupWindow(createComponent, I18nProperties.getString(Strings.headingCreateNewContact));
 	}