Skip to content

#13454 - Fixes Popup after declaring someone deceased says will chang… #13780

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

Open
roldy wants to merge 1 commit into
base: development
Choose a base branch
from
Open

#13454 - Fixes Popup after declaring someone deceased says will chang… #13780

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
19 changes: 17 additions & 2 deletions sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1582,8 +1582,7 @@ private void saveCaseWithOutcomeChangedWarning(CaseDataDto caze, CaseDataDto old
Label valuesLabel = new Label(I18nProperties.getCaption(Captions.confirmChangesValue));
valuesLabel.addStyleName(CssStyles.LABEL_SECONDARY);
valuesLayout.addComponent(valuesLabel);
valuesLayout.addComponent(
new Label((person.getPresentCondition() == null ? PresentCondition.DEAD : person.getPresentCondition()).toString()));
valuesLayout.addComponent(new Label(getNewPresentConditionFromOutcome(caze.getOutcome()).toString()));
valuesLayout.addComponent(new Label(CauseOfDeath.EPIDEMIC_DISEASE.toString()));
valuesLayout.addComponent(new Label(caze.getDisease().toString()));
valuesLayout.addComponent(new Label(DateFormatHelper.formatDate(caze.getOutcomeDate())));
Expand All @@ -1610,6 +1609,22 @@ private void saveCaseWithOutcomeChangedWarning(CaseDataDto caze, CaseDataDto old
saveCase(caze);
}

private PresentCondition getNewPresentConditionFromOutcome(CaseOutcome outcome) {
if (outcome == null) {
return PresentCondition.UNKNOWN;
}
switch (outcome) {
case DECEASED:
return PresentCondition.DEAD;
case RECOVERED:
return PresentCondition.ALIVE;
case NO_OUTCOME:
case UNKNOWN:
default:
return PresentCondition.UNKNOWN;
}
}

public void referFromPointOfEntry(CaseDataDto caze) {

CaseFacilityChangeForm form = new CaseFacilityChangeForm();
Expand Down
Loading