Skip to content

Commit b45326c

Browse files
Test failures and minor UI adjustments
1 parent c5106fc commit b45326c

2 files changed

Lines changed: 8 additions & 9 deletions

File tree

sormas-api/src/main/java/de/symeda/sormas/api/sample/PathogenTestType.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -399,15 +399,13 @@ public enum PathogenTestType {
399399
Disease.DENGUE })
400400
@PathogenTestCategoryRel(PathogenTestCategory.SEROLOGICAL_TESTS)
401401
@ResultValueTypeRel({
402-
ResultValueType.QUALITATIVE,
403-
ResultValueType.NUMERIC })
402+
ResultValueType.QUALITATIVE })
404403
IGG_ELISA,
405404
@Diseases(value = {
406405
Disease.DENGUE })
407406
@PathogenTestCategoryRel(PathogenTestCategory.SEROLOGICAL_TESTS)
408407
@ResultValueTypeRel({
409-
ResultValueType.QUALITATIVE,
410-
ResultValueType.NUMERIC })
408+
ResultValueType.QUALITATIVE })
411409
IGM_ELISA,
412410

413411
@Diseases(value = {

sormas-ui/src/main/java/de/symeda/sormas/ui/exposure/ExposureForm.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -704,11 +704,12 @@ public void setValue(ExposureDto newFieldValue) throws ReadOnlyException, Conver
704704
subSettingsDetailsField.setValue(subSettingDetails);
705705
}
706706

707-
boolean hasTraveledAbroad = subSettings != null && subSettings.contains(ExposureSubSetting.TRAVELED_ABROAD);
708-
prophylaxisAdherenceField.setVisible(hasTraveledAbroad);
709-
travelPurposeField.setVisible(hasTraveledAbroad);
710-
// If the person has traveled abroad, show the prophylaxis adherence and travel purpose fields
711-
if (hasTraveledAbroad) {
707+
boolean isMalariaCaseTraveled =
708+
subSettings != null && disease == Disease.MALARIA && subSettings.contains(ExposureSubSetting.TRAVELED_ABROAD);
709+
prophylaxisAdherenceField.setVisible(isMalariaCaseTraveled);
710+
travelPurposeField.setVisible(isMalariaCaseTraveled);
711+
// If the Malaria-effected person traveled abroad, show the prophylaxis adherence and travel purpose fields
712+
if (isMalariaCaseTraveled) {
712713
if (prophylaxisAdherence != null) {
713714
prophylaxisAdherenceField.setValue(prophylaxisAdherence);
714715
}

0 commit comments

Comments
 (0)