Fixed SORMAS-Foundation#3685

Author: MateStrysewske

sormas-api/src/main/java/de/symeda/sormas/api/utils/InfoProvider.java

@@ -49,7 +49,7 @@ public static synchronized InfoProvider get() {
 	 * @return
 	 */
 	public String getMinimumRequiredVersion() {
-		return "1.52.0";
+		return "1.52.1";
 	}
 
 	/**

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

@@ -53,10 +53,12 @@
 import de.symeda.sormas.api.caze.CaseDataDto;
 import de.symeda.sormas.api.caze.CaseIndexDto;
 import de.symeda.sormas.api.caze.CaseReferenceDto;
+import de.symeda.sormas.api.contact.ContactClassification;
 import de.symeda.sormas.api.contact.ContactCriteria;
 import de.symeda.sormas.api.contact.ContactDto;
 import de.symeda.sormas.api.contact.ContactIndexDto;
 import de.symeda.sormas.api.contact.ContactRelation;
+import de.symeda.sormas.api.contact.ContactStatus;
 import de.symeda.sormas.api.contact.FollowUpStatus;
 import de.symeda.sormas.api.contact.SimilarContactDto;
 import de.symeda.sormas.api.event.EventParticipantDto;
@@ -249,10 +251,15 @@ public CommitDiscardWrapperComponent<ContactCreateForm> getContactCreateComponen
 				if (asSourceContact && alternativeCallback != null && casePerson != null) {
 					selectOrCreateContact(dto, casePerson, I18nProperties.getString(Strings.infoSelectOrCreateContact), selectedContactUuid -> {
 						if (selectedContactUuid != null) {
-							if (!selectedContactUuid.equals(dto.getUuid())) {
-								dto.setResultingCase(caze.toReference());
-								FacadeProvider.getContactFacade().saveContact(dto);
-							}
+							ContactDto selectedContact = FacadeProvider.getContactFacade().getContactByUuid(selectedContactUuid);
+							selectedContact.setResultingCase(caze.toReference());
+							selectedContact.setResultingCaseUser(UserProvider.getCurrent().getUserReference());
+							selectedContact.setContactStatus(ContactStatus.CONVERTED);
+							selectedContact.setContactClassification(ContactClassification.CONFIRMED);
+							FacadeProvider.getContactFacade().saveContact(selectedContact);
+
+							// Avoid asking the user to discard unsaved changes
+							createComponent.discard();
 							alternativeCallback.run();
 						}
 					});

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

@@ -300,6 +300,8 @@ protected void addFields() {
 					PersonDto.PHONE,
 					PersonDto.EMAIL_ADDRESS);
 
+				setRequired(false, PersonDto.SEX);
+
 				TextField personNameField = addCustomField(PERSON_NAME_LOC, String.class, TextField.class);
 				personNameField.setCaption(I18nProperties.getPrefixCaption(ContactDto.I18N_PREFIX, ContactDto.PERSON));
 				personNameField.setValue(getValue().getPerson().getCaption());

sormas-ui/src/main/java/de/symeda/sormas/ui/exposure/ExposuresField.java

@@ -157,7 +157,7 @@ private void addGeneratedColumns(Table table) {
 		table.addGeneratedColumn(COLUMN_SOURCE_CASE_NAME, (Table.ColumnGenerator) (source, itemId, columnId) -> {
 			ExposureDto exposure = (ExposureDto) itemId;
 			return !isPseudonymized
-				? DataHelper.toStringNullable(exposure.getContactToCase().getCaseName())
+				? DataHelper.toStringNullable(exposure.getContactToCase() != null ? exposure.getContactToCase().getCaseName() : "")
 				: I18nProperties.getCaption(Captions.inaccessibleValue);
 		});
 	}