diff --git a/src/main/java/ca/on/oicr/gsi/dimsum/util/reporting/reports/DonorAssayReport.java b/src/main/java/ca/on/oicr/gsi/dimsum/util/reporting/reports/DonorAssayReport.java index 7cf3c4c..4494e04 100644 --- a/src/main/java/ca/on/oicr/gsi/dimsum/util/reporting/reports/DonorAssayReport.java +++ b/src/main/java/ca/on/oicr/gsi/dimsum/util/reporting/reports/DonorAssayReport.java @@ -30,6 +30,9 @@ public class DonorAssayReport extends Report { Column.forString("Start Date", kase -> kase.getStartDate().toString()), Column.forString("Latest Activity", kase -> kase.getLatestActivityDate().toString()), Column.forString("Status", DonorAssayReport::getCaseStatus), + Column.forString("Completed", + kase -> CompletedGate.RELEASE.qualifyCase(kase) ? "Yes" : "No"), + Column.forString("Stopped/Paused", DonorAssayReport::getStoppedPausedStatus), Column.forString("Stop/Pause Reason", DonorAssayReport::getStopPauseReason))) { @Override public List getData(CaseService caseService, JsonNode parameters) { @@ -57,8 +60,6 @@ private static String getProjectPipelines(Case kase) { private static String getCaseStatus(Case kase) { if (CompletedGate.RELEASE.qualifyCase(kase)) { return "Completed"; - } else if (kase.isStopped()) { - return "Failed"; } else if (kase.getRequisition().isPaused()) { return "Paused"; } else { @@ -66,6 +67,16 @@ private static String getCaseStatus(Case kase) { } } + private static String getStoppedPausedStatus(Case kase) { + if (kase.isStopped()) { + return "Stopped"; + } else if (kase.getRequisition().isPaused()) { + return "Paused"; + } else { + return "Neither"; + } + } + private static String getStopPauseReason(Case kase) { if (kase.isStopped()) { return kase.getRequisition().getStopReason() != null