SORMAS-Foundation#3110 - Incorrect behavior on Person forms related to Facility fields

Author: sergiupacurariu

sormas-ui/src/main/java/de/symeda/sormas/ui/location/LocationEditForm.java

@@ -214,11 +214,7 @@ protected void addFields() {
 		facilityTypeGroup.addValueChangeListener(e -> {
 			FieldHelper.removeItems(facility);
 			FieldHelper.updateEnumData(facilityType, FacilityType.getTypes((FacilityTypeGroup) facilityTypeGroup.getValue()));
-			if (facilityTypeGroup.getValue() != null) {
-				facilityType.setRequired(true);
-			} else {
-				facilityType.setRequired(false);
-			}
+			facilityType.setRequired(facilityTypeGroup.getValue() != null);
 		});
 		facilityType.addValueChangeListener(e -> {
 			FieldHelper.removeItems(facility);
@@ -256,6 +252,8 @@ protected void addFields() {
 
 				if (!visibleAndRequired) {
 					facilityDetails.clear();
+				} else {
+					facilityDetails.setValue(getValue().getFacilityDetails());
 				}
 			} else {
 				facilityDetails.setVisible(false);