Skip to content

Commit 780ff4d

Browse files
authored
Merge pull request #13478 from SORMAS-Foundation/bugfix-13453_enable_onsetdate_no_symptom_diseases
#13453 - Enable onset date for diseases without symptoms
2 parents bc24bf2 + 6ee700b commit 780ff4d

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomsDto.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1370,10 +1370,7 @@ public static SymptomsDto build() {
13701370
MATERNAL_DEATHS,
13711371
PERINATAL_DEATHS,
13721372
INFLUENZA,
1373-
INFLUENZA_A,
1374-
INFLUENZA_B,
13751373
H_METAPNEUMOVIRUS,
1376-
RESPIRATORY_SYNCYTIAL_VIRUS,
13771374
PARAINFLUENZA_1_4,
13781375
ADENOVIRUS,
13791376
RHINOVIRUS,

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,6 +1182,10 @@ public boolean isAnySymptomSetToYes(FieldGroup fieldGroup, List<String> sourcePr
11821182
return false;
11831183
}
11841184

1185+
public boolean isAnySymptomVisible(FieldGroup fieldGroup, List<String> sourcePropertyIds, List<Object> sourceValues) {
1186+
return true;
1187+
}
1188+
11851189
@SuppressWarnings("rawtypes")
11861190
private void addListenerForOnsetFields(ComboBox onsetSymptom, DateField onsetDateField) {
11871191
List<String> allPropertyIds =
@@ -1196,9 +1200,9 @@ private void addListenerForOnsetFields(ComboBox onsetSymptom, DateField onsetDat
11961200
onsetDateField.setEnabled(true);
11971201
} else {
11981202
onsetSymptom.removeItem(sourceField.getCaption());
1203+
final Date onsetDate = getValue().getOnsetDate();
11991204
boolean isOnsetDateFieldEnabled = isAnySymptomSetToYes(getFieldGroup(), allPropertyIds, Arrays.asList(SymptomState.YES));
1200-
onsetDateField.setEnabled(isOnsetDateFieldEnabled);
1201-
Date onsetDate = getValue().getOnsetDate();
1205+
onsetDateField.setEnabled(isOnsetDateFieldEnabled || !onsetSymptom.isVisible());
12021206
if (onsetDate != null) {
12031207
onsetDateField.setValue(onsetDate);
12041208
} else if (!isOnsetDateFieldEnabled) {
@@ -1209,7 +1213,9 @@ private void addListenerForOnsetFields(ComboBox onsetSymptom, DateField onsetDat
12091213
});
12101214
}
12111215
onsetSymptom.setEnabled(false); // will be updated by listener if needed
1212-
onsetDateField.setEnabled(false); // will be updated by listener if needed
1216+
1217+
// make onsetDate editable for diseases that have no symptoms (a.k. no first symptom)
1218+
onsetDateField.setEnabled(!onsetSymptom.isVisible());
12131219
}
12141220

12151221
private void setUpMonkeypoxVisibilities() {

0 commit comments

Comments
 (0)