Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit 9cb3bfe

Browse files
Merge pull request SORMAS-Foundation#3142 from hzi-braunschweig/bugfix-2923-TaskStatusFix
SORMAS-Foundation#2923 - set task status to done when corresponding case investigation…
2 parents f599c30 + 1a76ebf commit 9cb3bfe

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2416,12 +2416,14 @@ public void updateInvestigationByStatus(CaseDataDto existingCase, Case caze) {
24162416
if (existingCase != null) {
24172417
List<Task> pendingTasks =
24182418
taskService.findBy(new TaskCriteria().taskType(TaskType.CASE_INVESTIGATION).caze(caseRef).taskStatus(TaskStatus.PENDING), true);
2419+
final boolean caseStatusSetToDone =
2420+
caze.getInvestigationStatus() == InvestigationStatus.DONE && existingCase.getInvestigationStatus() != InvestigationStatus.DONE;
24192421
for (Task task : pendingTasks) {
2420-
task.setTaskStatus(TaskStatus.REMOVED);
2422+
task.setTaskStatus(caseStatusSetToDone ? TaskStatus.DONE : TaskStatus.REMOVED);
24212423
task.setStatusChangeDate(new Date());
24222424
}
24232425

2424-
if (caze.getInvestigationStatus() == InvestigationStatus.DONE && existingCase.getInvestigationStatus() != InvestigationStatus.DONE) {
2426+
if (caseStatusSetToDone) {
24252427
sendInvestigationDoneNotifications(caze);
24262428
}
24272429
}

0 commit comments

Comments
 (0)