From 799747d638c55457b7c5befac34bdf43b73a524a Mon Sep 17 00:00:00 2001 From: Kelly McDonald Date: Tue, 27 Apr 2021 12:13:49 -0400 Subject: [PATCH] Add filter for non-active studies so that the events for them do not get returned to the front end for the 'InProgress' data pane. --- crc/api/workflow.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crc/api/workflow.py b/crc/api/workflow.py index 3c942ea8..4bcfdabc 100644 --- a/crc/api/workflow.py +++ b/crc/api/workflow.py @@ -6,7 +6,7 @@ from crc import session from crc.api.common import ApiError, ApiErrorSchema from crc.models.api_models import WorkflowApiSchema from crc.models.file import FileModel, LookupDataSchema -from crc.models.study import StudyModel, WorkflowMetadata +from crc.models.study import StudyModel, WorkflowMetadata, StudyStatus from crc.models.task_event import TaskEventModel, TaskEvent, TaskEventSchema from crc.models.user import UserModelSchema from crc.models.workflow import WorkflowModel, WorkflowSpecModelSchema, WorkflowSpecModel, WorkflowSpecCategoryModel, \ @@ -145,7 +145,8 @@ def get_task_events(action = None, workflow = None, study = None): study = session.query(StudyModel).filter(StudyModel.id == event.study_id).first() workflow = session.query(WorkflowModel).filter(WorkflowModel.id == event.workflow_id).first() workflow_meta = WorkflowMetadata.from_workflow(workflow) - task_events.append(TaskEvent(event, study, workflow_meta)) + if study.status in [StudyStatus.open_for_enrollment, StudyStatus.in_progress]: + task_events.append(TaskEvent(event, study, workflow_meta)) return TaskEventSchema(many=True).dump(task_events)