SORMAS-Foundation#3237: Only show facility categories that allow a permanent residence when selecting home in locations

Author: ChristopherRiedel

sormas-app/app/src/main/java/de/symeda/sormas/app/component/dialog/LocationDialog.java

@@ -30,6 +30,7 @@
 import androidx.fragment.app.FragmentActivity;
 
 import de.symeda.sormas.api.CountryHelper;
+import de.symeda.sormas.api.facility.FacilityType;
 import de.symeda.sormas.api.facility.FacilityTypeGroup;
 import de.symeda.sormas.api.location.AreaType;
 import de.symeda.sormas.api.location.LocationDto;
@@ -38,6 +39,7 @@
 import de.symeda.sormas.api.utils.fieldaccess.UiFieldAccessCheckers;
 import de.symeda.sormas.app.R;
 import de.symeda.sormas.app.backend.config.ConfigProvider;
+import de.symeda.sormas.app.backend.facility.Facility;
 import de.symeda.sormas.app.backend.location.Location;
 import de.symeda.sormas.app.component.Item;
 import de.symeda.sormas.app.component.controls.ControlButtonType;
@@ -226,6 +228,23 @@ public void configureAsPersonAddressDialog(boolean showDeleteButton) {
 			contentBinding.locationAddressType.initializeSpinner(DataUtils.getEnumItems(PersonAddressType.class));
 		}
 		contentBinding.locationAddressType.setValidationCallback(() -> contentBinding.locationAddressType.getValue() != null);
+
+		contentBinding.locationAddressType.addValueChangedListener(e -> {
+			FacilityTypeGroup oldGroup = (FacilityTypeGroup) contentBinding.facilityTypeGroup.getValue();
+			FacilityType oldType = (FacilityType) contentBinding.locationFacilityType.getValue();
+			Facility oldFacility = (Facility) contentBinding.locationFacility.getValue();
+			String oldDetails = contentBinding.locationFacilityDetails.getValue();
+			contentBinding.facilityTypeGroup.setSpinnerData(null);
+			if (PersonAddressType.HOME.equals(contentBinding.locationAddressType.getValue())) {
+				contentBinding.facilityTypeGroup.setSpinnerData(DataUtils.toItems(FacilityTypeGroup.getAccomodationGroups()));
+			} else {
+				contentBinding.facilityTypeGroup.setSpinnerData(DataUtils.getEnumItems(FacilityTypeGroup.class));
+			}
+			contentBinding.facilityTypeGroup.setValue(oldGroup);
+			contentBinding.locationFacilityType.setValue(oldType);
+			contentBinding.locationFacility.setValue(oldFacility);
+			contentBinding.locationFacilityDetails.setValue(oldDetails);
+		});
 	}
 
 }

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

@@ -92,6 +92,10 @@ public class LocationEditForm extends AbstractEditForm<LocationDto> {
 
 	private MapPopupView leafletMapPopup;
 	private ComboBox addressType;
+	private ComboBox facilityTypeGroup;
+	private ComboBox facilityType;
+	private ComboBox facility;
+	private TextField facilityDetails;
 
 	public LocationEditForm(FieldVisibilityCheckers fieldVisibilityCheckers, UiFieldAccessCheckers fieldAccessCheckers) {
 		super(LocationDto.class, LocationDto.I18N_PREFIX, true, fieldVisibilityCheckers, fieldAccessCheckers);
@@ -135,18 +139,35 @@ protected void addFields() {
 			Arrays.asList(LocationDto.ADDRESS_TYPE_DETAILS),
 			Arrays.asList(PersonAddressType.OTHER_ADDRESS));
 
-		ComboBox facilityTypeGroup = new ComboBox();
+		facilityTypeGroup = new ComboBox();
 		facilityTypeGroup.setId("typeGroup");
 		facilityTypeGroup.setCaption(I18nProperties.getCaption(Captions.Facility_typeGroup));
 		facilityTypeGroup.setWidth(100, Unit.PERCENTAGE);
 		facilityTypeGroup.addItems(FacilityTypeGroup.values());
 		getContent().addComponent(facilityTypeGroup, FACILITY_TYPE_GROUP_LOC);
-		ComboBox facilityType = addField(LocationDto.FACILITY_TYPE);
-		ComboBox facility = addInfrastructureField(LocationDto.FACILITY);
+		facilityType = addField(LocationDto.FACILITY_TYPE);
+		facility = addInfrastructureField(LocationDto.FACILITY);
 		facility.setImmediate(true);
-		TextField facilityDetails = addField(LocationDto.FACILITY_DETAILS, TextField.class);
+		facilityDetails = addField(LocationDto.FACILITY_DETAILS, TextField.class);
 		facilityDetails.setVisible(false);
 
+		addressType.addValueChangeListener(e -> {
+			FacilityTypeGroup oldGroup = (FacilityTypeGroup) facilityTypeGroup.getValue();
+			FacilityType oldType = (FacilityType) facilityType.getValue();
+			FacilityReferenceDto oldFacility = (FacilityReferenceDto) facility.getValue();
+			String oldDetails = facilityDetails.getValue();
+			facilityTypeGroup.removeAllItems();
+			if (PersonAddressType.HOME.equals(addressType.getValue())) {
+				facilityTypeGroup.addItems(FacilityTypeGroup.getAccomodationGroups());
+			} else {
+				facilityTypeGroup.addItems(FacilityTypeGroup.values());
+			}
+			facilityTypeGroup.setValue(oldGroup);
+			facilityType.setValue(oldType);
+			facility.setValue(oldFacility);
+			facilityDetails.setValue(oldDetails);
+		});
+
 		addField(LocationDto.STREET, TextField.class);
 		addField(LocationDto.HOUSE_NUMBER, TextField.class);
 		addField(LocationDto.ADDITIONAL_INFORMATION, TextField.class);