Skip to content

#13453 - Enable onset date for diseases without symptoms #13478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
obinna-h-n merged 1 commit into from
Jun 20, 2025
Merged

#13453 - Enable onset date for diseases without symptoms #13478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomsDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1370,10 +1370,7 @@ public static SymptomsDto build() {
MATERNAL_DEATHS,
PERINATAL_DEATHS,
INFLUENZA,
INFLUENZA_A,
INFLUENZA_B,
H_METAPNEUMOVIRUS,
RESPIRATORY_SYNCYTIAL_VIRUS,
PARAINFLUENZA_1_4,
ADENOVIRUS,
RHINOVIRUS,
Expand Down
12 changes: 9 additions & 3 deletions sormas-ui/src/main/java/de/symeda/sormas/ui/symptoms/SymptomsForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1182,6 +1182,10 @@ public boolean isAnySymptomSetToYes(FieldGroup fieldGroup, List<String> sourcePr
return false;
}

public boolean isAnySymptomVisible(FieldGroup fieldGroup, List<String> sourcePropertyIds, List<Object> sourceValues) {
return true;
}

@SuppressWarnings("rawtypes")
private void addListenerForOnsetFields(ComboBox onsetSymptom, DateField onsetDateField) {
List<String> allPropertyIds =
Expand All @@ -1196,9 +1200,9 @@ private void addListenerForOnsetFields(ComboBox onsetSymptom, DateField onsetDat
onsetDateField.setEnabled(true);
} else {
onsetSymptom.removeItem(sourceField.getCaption());
final Date onsetDate = getValue().getOnsetDate();
boolean isOnsetDateFieldEnabled = isAnySymptomSetToYes(getFieldGroup(), allPropertyIds, Arrays.asList(SymptomState.YES));
onsetDateField.setEnabled(isOnsetDateFieldEnabled);
Date onsetDate = getValue().getOnsetDate();
onsetDateField.setEnabled(isOnsetDateFieldEnabled || !onsetSymptom.isVisible());
if (onsetDate != null) {
onsetDateField.setValue(onsetDate);
} else if (!isOnsetDateFieldEnabled) {
Expand All @@ -1209,7 +1213,9 @@ private void addListenerForOnsetFields(ComboBox onsetSymptom, DateField onsetDat
});
}
onsetSymptom.setEnabled(false); // will be updated by listener if needed
onsetDateField.setEnabled(false); // will be updated by listener if needed

// make onsetDate editable for diseases that have no symptoms (a.k. no first symptom)
onsetDateField.setEnabled(!onsetSymptom.isVisible());
}

private void setUpMonkeypoxVisibilities() {
Expand Down
Loading