Update CampaignFormDataImporter.java

Martin Wahnschaffe · Martin Wahnschaffe · commit 3c11d5e7fbc5 · 2020-12-01T12:03:38.000+01:00
SORMAS-Foundation#3005 also convert from true/false
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/importer/CampaignFormDataImporter.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/importer/CampaignFormDataImporter.java
@@ -240,9 +240,12 @@ private void insertImportRowIntoData(CampaignFormDataDto campaignFormData, Strin
 
 				// Convert yes/no values to true/false
 				if (CampaignFormElementType.YES_NO.toString().equals(existingFormElement.get().getType())) {
-					if ("yes".equals(formEntry.getValue())) {
+					String value = formEntry.getValue().toString();
+					if ("yes".equalsIgnoreCase(value)
+							|| "true".equalsIgnoreCase(value)) {
 						formEntry.setValue(true);
-					} else if ("no".equals(formEntry.getValue())) {
+					} else if ("no".equalsIgnoreCase(value)
+							|| "false".equalsIgnoreCase(value)) {
 						formEntry.setValue(false);
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -240,9 +240,12 @@ private void insertImportRowIntoData(CampaignFormDataDto campaignFormData, Strin`
`240`	`240`
`241`	`241`	`// Convert yes/no values to true/false`
`242`	`242`	`if (CampaignFormElementType.YES_NO.toString().equals(existingFormElement.get().getType())) {`
`243`		`- if ("yes".equals(formEntry.getValue())) {`
	`243`	`+ String value = formEntry.getValue().toString();`
	`244`	`+ if ("yes".equalsIgnoreCase(value)`
	`245`	`+ \|\| "true".equalsIgnoreCase(value)) {`
`244`	`246`	`formEntry.setValue(true);`
`245`		`- } else if ("no".equals(formEntry.getValue())) {`
	`247`	`+ } else if ("no".equalsIgnoreCase(value)`
	`248`	`+ \|\| "false".equalsIgnoreCase(value)) {`
`246`	`249`	`formEntry.setValue(false);`
`247`	`250`	`}`
`248`	`251`	`}`