Merge pull request SORMAS-Foundation#3148 from hzi-braunschweig/3110-Incorrect_behavior_on_Person_forms_related_to_Facility_fields

3110 incorrect behavior on person forms related to facility fields

Author: MateStrysewske

sormas-backend/src/main/java/de/symeda/sormas/backend/location/LocationFacadeEjb.java

@@ -88,9 +88,7 @@ public Location fromDto(LocationDto source) {
 		target.setAddressTypeDetails(source.getAddressTypeDetails());
 		target.setFacility(facilityService.getByReferenceDto(source.getFacility()));
 		target.setFacilityDetails(source.getFacilityDetails());
-		if (source.getFacility() != null) {
-			target.setFacilityType(source.getFacilityType());
-		}
+		target.setFacilityType(source.getFacilityType());
 
 		return target;
 	}

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

@@ -114,6 +114,7 @@ public void setFieldsRequirement(boolean required, String... fieldIds) {
 		setRequired(required, fieldIds);
 	}
 
+	@SuppressWarnings("deprecation")
 	@Override
 	protected void addFields() {
 
@@ -141,7 +142,6 @@ protected void addFields() {
 		facilityTypeGroup.addItems(FacilityTypeGroup.values());
 		getContent().addComponent(facilityTypeGroup, FACILITY_TYPE_GROUP_LOC);
 		ComboBox facilityType = addField(LocationDto.FACILITY_TYPE);
-		FieldHelper.removeItems(facilityType);
 		ComboBox facility = addInfrastructureField(LocationDto.FACILITY);
 		facility.setImmediate(true);
 		TextField facilityDetails = addField(LocationDto.FACILITY_DETAILS, TextField.class);
@@ -180,7 +180,6 @@ protected void addFields() {
 				.updateItems(district, regionDto != null ? FacadeProvider.getDistrictFacade().getAllActiveByRegion(regionDto.getUuid()) : null);
 		});
 		district.addValueChangeListener(e -> {
-			FieldHelper.removeItems(community);
 			DistrictReferenceDto districtDto = (DistrictReferenceDto) e.getProperty().getValue();
 			FieldHelper.updateItems(
 				community,
@@ -215,9 +214,13 @@ protected void addFields() {
 		facilityTypeGroup.addValueChangeListener(e -> {
 			FieldHelper.removeItems(facility);
 			FieldHelper.updateEnumData(facilityType, FacilityType.getTypes((FacilityTypeGroup) facilityTypeGroup.getValue()));
+			facilityType.setRequired(facilityTypeGroup.getValue() != null);
 		});
 		facilityType.addValueChangeListener(e -> {
 			FieldHelper.removeItems(facility);
+			if (facilityType.getValue() != null && facilityTypeGroup.getValue() == null) {
+				facilityTypeGroup.setValue(((FacilityType) facilityType.getValue()).getFacilityTypeGroup());
+			}
 			if (facilityType.getValue() != null && district.getValue() != null) {
 				if (community.getValue() != null) {
 					FieldHelper.updateItems(
@@ -249,36 +252,20 @@ protected void addFields() {
 
 				if (!visibleAndRequired) {
 					facilityDetails.clear();
+				} else {
+					facilityDetails.setValue(getValue().getFacilityDetails());
 				}
 			} else {
 				facilityDetails.setVisible(false);
 				facilityDetails.setRequired(false);
 				facilityDetails.clear();
 			}
-			this.getValue().setFacilityType((FacilityType) facilityType.getValue());
 		});
 		region.addItems(FacadeProvider.getRegionFacade().getAllActiveAsReference());
 
 		Stream.of(LocationDto.LATITUDE, LocationDto.LONGITUDE)
 			.<Field<?>> map(this::getField)
 			.forEach(f -> f.addValueChangeListener(e -> this.updateLeafletMapContent()));
-
-		addValueChangeListener(e -> {
-			if (getValue().getFacility() != null) {
-				boolean facilityTypeGroupReadOnly = facilityTypeGroup.isReadOnly();
-				facilityTypeGroup.setReadOnly(false);
-
-				FacilityType caseFacilityType = getValue().getFacilityType();
-				facilityTypeGroup.setValue(caseFacilityType.getFacilityTypeGroup());
-				if (!facilityType.isReadOnly()) {
-					facilityType.setValue(caseFacilityType);
-				}
-
-				facilityTypeGroup.setReadOnly(facilityTypeGroupReadOnly);
-				facility.setValue(getValue().getFacility());
-				facilityDetails.setValue(getValue().getFacilityDetails());
-			}
-		});
 	}
 
 	private HorizontalLayout createGeoButton() {