Merge pull request SORMAS-Foundation#2964 from hzi-braunschweig/bug-2929-error-readonly-case

Fix Bug 2929 error when opening case in read-only mode

Author: MateStrysewske

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

@@ -488,10 +488,11 @@ protected void addFields() {
 				}
 				updateFacilityDetails(facility, facilityDetails);
 			} else {
-
-				FacilityReferenceDto noFacilityRef = FacadeProvider.getFacilityFacade().getByUuid(FacilityDto.NONE_FACILITY_UUID).toReference();
-				facility.addItem(noFacilityRef);
-				facility.setValue(noFacilityRef);
+				if (facility.getValue() == null && !facility.isReadOnly()) {
+					FacilityReferenceDto noFacilityRef = FacadeProvider.getFacilityFacade().getByUuid(FacilityDto.NONE_FACILITY_UUID).toReference();
+					facility.addItem(noFacilityRef);
+					facility.setValue(noFacilityRef);
+				}
 			}
 		});
 		facilityTypeGroup.addValueChangeListener(e -> {

sormas-ui/src/main/java/de/symeda/sormas/ui/hospitalization/HospitalizationForm.java

@@ -112,11 +112,8 @@ protected void addFields() {
 
 		TextField facilityField = addCustomField(HEALTH_FACILITY, FacilityReferenceDto.class, TextField.class);
 		FacilityReferenceDto healthFacility = caze.getHealthFacility();
-		final boolean noneFacility = healthFacility.getUuid().equalsIgnoreCase(FacilityDto.NONE_FACILITY_UUID);
-		facilityField.setValue(
-			healthFacility == null
-				|| noneFacility
-				|| !FacilityType.HOSPITAL.equals(caze.getFacilityType()) ? null : healthFacility.toString());
+		final boolean noneFacility = healthFacility == null || healthFacility.getUuid().equalsIgnoreCase(FacilityDto.NONE_FACILITY_UUID);
+		facilityField.setValue(noneFacility || !FacilityType.HOSPITAL.equals(caze.getFacilityType()) ? null : healthFacility.toString());
 		facilityField.setReadOnly(true);
 
 		final OptionGroup admittedToHealthFacilityField = addField(HospitalizationDto.ADMITTED_TO_HEALTH_FACILITY, OptionGroup.class);