SORMAS-Foundation#3005 - Parse yes/no values on import rather than during form building

Author: MateStrysewske

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

@@ -272,7 +272,7 @@ private float calculateComponentWidth(CampaignFormElementType type, List<Campaig
 	private <T extends Field<?>> void setFieldValue(T field, CampaignFormElementType type, Object value) {
 		switch (type) {
 		case YES_NO:
-			((NullableOptionGroup) field).setValue(Sets.newHashSet(getYesNoValue(value)));
+			((NullableOptionGroup) field).setValue(Sets.newHashSet(value));
 			break;
 		case TEXT:
 		case NUMBER:
@@ -352,19 +352,4 @@ public void resetFormValues() {
 		});
 	}
 
-	private Boolean getYesNoValue(Object value) {
-		if (value instanceof Boolean) {
-			return (Boolean) value;
-		}
-
-		if ("yes".equals(value)) {
-			return true;
-		}
-		if ("no".equals(value)) {
-			return false;
-		}
-
-		return null;
-	}
-
 }

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/importer/CampaignFormDataImporter.java

@@ -238,6 +238,15 @@ private void insertImportRowIntoData(CampaignFormDataDto campaignFormData, Strin
 					continue;
 				}
 
+				// Convert yes/no values to true/false
+				if (CampaignFormElementType.YES_NO.toString().equals(existingFormElement.get().getType())) {
+					if ("yes".equals(formEntry.getValue())) {
+						formEntry.setValue(true);
+					} else if ("no".equals(formEntry.getValue())) {
+						formEntry.setValue(false);
+					}
+				}
+
 				if (Objects.nonNull(campaignFormData.getFormValues())) {
 					List<CampaignFormDataEntry> currentElementFormValues = campaignFormData.getFormValues();
 					currentElementFormValues.add(formEntry);