SORMAS-Foundation#3221 (and SORMAS-Foundation#3214) - fix issues created by nullableoptiongroup

Author: barnabartha

sormas-ui/src/main/java/de/symeda/sormas/ui/action/ActionEditForm.java

@@ -24,6 +24,7 @@
 import static de.symeda.sormas.ui.utils.LayoutUtil.locs;
 
 import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.Field;
 import com.vaadin.v7.ui.Label;
 import com.vaadin.v7.ui.RichTextArea;
 import com.vaadin.v7.ui.TextField;
@@ -161,7 +162,8 @@ private void updateByCreating() {
 	}
 
 	private void updateByActionContext() {
-		ActionContext actionContext = (ActionContext) getFieldGroup().getField(ActionDto.ACTION_CONTEXT).getValue();
+		NullableOptionGroup field = (NullableOptionGroup) getFieldGroup().getField(ActionDto.ACTION_CONTEXT);
+		ActionContext actionContext = (ActionContext) field.getNullableValue();
 
 		// context reference depending on action context
 		// ready for adding new context

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigndata/CampaignFormBuilder.java

@@ -309,8 +309,8 @@ private boolean fieldValueMatchesDependingOnValues(Field<?> dependingOnField, Li
 		}
 
 		if (dependingOnField instanceof NullableOptionGroup) {
-			String booleanValue = Boolean.TRUE.equals(dependingOnField.getValue()) ? "true" : "false";
-			String stringValue = Boolean.TRUE.equals(dependingOnField.getValue()) ? "yes" : "no";
+			String booleanValue = Boolean.TRUE.equals(((NullableOptionGroup) dependingOnField).getNullableValue()) ? "true" : "false";
+			String stringValue = Boolean.TRUE.equals(((NullableOptionGroup) dependingOnField).getNullableValue()) ? "yes" : "no";
 
 			return dependingOnValuesList.stream()
 				.anyMatch(v -> v.toString().equalsIgnoreCase(booleanValue) || v.toString().equalsIgnoreCase(stringValue));

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

@@ -310,7 +310,7 @@ protected void addFields() {
 		warningLayout = VaadinUiUtil.createWarningComponent(I18nProperties.getString(Strings.pseudonymizedCasesSelectedWarning));
 		facilityOrHome.addValueChangeListener(e -> {
 			FieldHelper.removeItems(facility);
-			if (TypeOfPlace.FACILITY.equals(facilityOrHome.getValue())) {
+			if (TypeOfPlace.FACILITY.equals(facilityOrHome.getNullableValue())) {
 				if (facilityTypeGroup.getValue() == null) {
 					facilityTypeGroup.setValue(FacilityTypeGroup.MEDICAL_FACILITY);
 				}

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

@@ -205,7 +205,7 @@ protected void addFields() {
 				.updateItems(district, regionDto != null ? FacadeProvider.getDistrictFacade().getAllActiveByRegion(regionDto.getUuid()) : null);
 		});
 		district.addValueChangeListener(e -> {
-			if (!TypeOfPlace.HOME.equals(facilityOrHome.getValue())) {
+			if (!TypeOfPlace.HOME.equals(facilityOrHome.getNullableValue())) {
 				FieldHelper.removeItems(facility);
 			}
 			FieldHelper.removeItems(community);

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

@@ -475,7 +475,7 @@ protected void addFields() {
 				facility));
 		facilityOrHome.addValueChangeListener(e -> {
 			FieldHelper.removeItems(facility);
-			if (TypeOfPlace.FACILITY.equals(facilityOrHome.getValue())) {
+			if (TypeOfPlace.FACILITY.equals(facilityOrHome.getNullableValue())) {
 
 				// default values
 				if (facilityTypeGroup.getValue() == null && !facilityTypeGroup.isReadOnly()) {

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

@@ -229,7 +229,7 @@ protected void addFields() {
 
 	private void setDateFieldVisibilties() {
 
-		boolean visible = YesNoUnknown.YES.equals(intensiveCareUnit.getValue());
+		boolean visible = YesNoUnknown.YES.equals(intensiveCareUnit.getNullableValue());
 		intensiveCareUnitStart.setVisible(visible);
 		intensiveCareUnitEnd.setVisible(visible);
 	}

sormas-ui/src/main/java/de/symeda/sormas/ui/symptoms/SymptomsForm.java

@@ -902,7 +902,7 @@ private void addSoftRequiredStyleWhenSymptomaticAndCooperative(
 		}
 
 		if (visitStatusField != null) {
-			if (isAnySymptomSetToYes(fieldGroup, sourcePropertyIds, sourceValues) && visitStatusField.getValue() == VisitStatus.COOPERATIVE) {
+			if (isAnySymptomSetToYes(fieldGroup, sourcePropertyIds, sourceValues) && visitStatusField.getNullableValue() == VisitStatus.COOPERATIVE) {
 				FieldHelper.addSoftRequiredStyle(targetField);
 			} else {
 				FieldHelper.removeSoftRequiredStyle(targetField);