#13204 - RSV disease variants - add support for similar Customizable …

…disease values
SORMAS-Foundation · Dec 19, 2024 · 3988839 · 3988839
1 parent 3bc290d
commit 3988839
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestDto.java
@@ -58,7 +58,7 @@ public class PathogenTestDto extends PseudonymizableDto {
 	public static final String TESTED_DISEASE = "testedDisease";
 	public static final String TESTED_DISEASE_VARIANT = "testedDiseaseVariant";
 	public static final String TESTED_DISEASE_VARIANT_DETAILS = "testedDiseaseVariantDetails";
-	public static final String TESTED_PATHOGEN_VALUE = "testedPathogenValue";
+	public static final String TESTED_PATHOGEN = "testedPathogen";
 	public static final String TESTED_PATHOGEN_DETAILS = "testedPathogenDetails";
 	public static final String TYPING_ID = "typingId";
 	public static final String TEST_TYPE = "testType";

diff --git a/...java/de/symeda/sormas/backend/environment/environmentsample/EnvironmentSampleService.java b/...java/de/symeda/sormas/backend/environment/environmentsample/EnvironmentSampleService.java
@@ -167,7 +167,7 @@ public Predicate buildCriteriaFilter(EnvironmentSampleCriteria criteria, Environ
 			filter = CriteriaBuilderHelper.and(
 				cb,
 				filter,
-				cb.equal(joins.getPathogenTests().get(PathogenTestDto.TESTED_PATHOGEN_VALUE), criteria.getTestedPathogen().getValue()));
+				cb.equal(joins.getPathogenTests().get(PathogenTest.TESTED_PATHOGEN_VALUE), criteria.getTestedPathogen().getValue()));
 		}
 		if (criteria.getReportDateFrom() != null && criteria.getReportDateTo() != null) {
 			filter = CriteriaBuilderHelper

diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/PathogenTestForm.java
@@ -87,7 +87,7 @@ public class PathogenTestForm extends AbstractEditForm<PathogenTestDto> {
 			fluidRowLocs(PathogenTestDto.PCR_TEST_SPECIFICATION, "") +
 			fluidRowLocs(PathogenTestDto.TESTED_DISEASE, PathogenTestDto.TESTED_DISEASE_DETAILS) +
 			fluidRowLocs(PathogenTestDto.TESTED_DISEASE_VARIANT, PathogenTestDto.TESTED_DISEASE_VARIANT_DETAILS) +
-			fluidRowLocs(PathogenTestDto.TESTED_PATHOGEN_VALUE, PathogenTestDto.TESTED_PATHOGEN_DETAILS) +
+			fluidRowLocs(PathogenTestDto.TESTED_PATHOGEN, PathogenTestDto.TESTED_PATHOGEN_DETAILS) +
 			fluidRowLocs(PathogenTestDto.TYPING_ID, "") +
 			fluidRowLocs(PathogenTestDto.TEST_DATE_TIME, PathogenTestDto.LAB) +
 			fluidRowLocs("", PathogenTestDto.LAB_DETAILS) +
@@ -260,7 +260,7 @@ protected void addFields() {
 		TextField diseaseVariantDetailsField = addField(PathogenTestDto.TESTED_DISEASE_VARIANT_DETAILS, TextField.class);
 		diseaseVariantDetailsField.setVisible(false);
 
-		ComboBox testedPathogenField = addCustomizableEnumField(PathogenTestDto.TESTED_PATHOGEN_VALUE);
+		ComboBox testedPathogenField = addCustomizableEnumField(PathogenTestDto.TESTED_PATHOGEN);
 		TextField testedPathogenDetailsField = addField(PathogenTestDto.TESTED_PATHOGEN_DETAILS, TextField.class);
 		testedPathogenDetailsField.setVisible(false);
 		FieldHelper.updateItems(testedPathogenField, FacadeProvider.getCustomizableEnumFacade().getEnumValues(CustomizableEnumType.PATHOGEN, null));