sartography/cr-connect-workflow
1
0
Fork 0
mirror of https://github.com/sartography/cr-connect-workflow.git synced 2025-02-22 12:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes that were breaking when connecting to the front end.

Browse Source
This commit is contained in:
Dan Funk 2020-03-27 14:27:50 -04:00
parent b5fca2f683
commit 907e1cbbb3
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crc/api/study.py
View File

@ -68,7 +68,7 @@ def all_studies():
""":type: crc.models.user.UserModel""" """:type: crc.models.user.UserModel"""
# Get studies matching this user from Protocol Builder # Get studies matching this user from Protocol Builder
pb_studies: List[ProtocolBuilderStudy] = ProtocolBuilderService.get_studies(g.user.id) pb_studies: List[ProtocolBuilderStudy] = ProtocolBuilderService.get_studies(g.user.uid)
# Get studies from the database # Get studies from the database
db_studies = session.query(StudyModel).filter_by(user_uid=g.user.uid).all() db_studies = session.query(StudyModel).filter_by(user_uid=g.user.uid).all()
@ -100,7 +100,7 @@ def post_update_study_from_protocol_builder(study_id):
the protocol builder.""" the protocol builder."""
db_study = session.query(StudyModel).filter_by(study_id=study_id).all() db_study = session.query(StudyModel).filter_by(study_id=study_id).all()
pb_studies: List[ProtocolBuilderStudy] = ProtocolBuilderService.get_studies(g.user.id) pb_studies: List[ProtocolBuilderStudy] = ProtocolBuilderService.get_studies(g.user.uid)
pb_study = next((pbs for pbs in pb_studies if pbs.STUDYID == study_id), None) pb_study = next((pbs for pbs in pb_studies if pbs.STUDYID == study_id), None)
if pb_study: if pb_study:
db_study.update_from_protocol_builder(pb_study) db_study.update_from_protocol_builder(pb_study)
@ -113,9 +113,10 @@ def post_update_study_from_protocol_builder(study_id):
def get_study_workflows(study_id): def get_study_workflows(study_id):
"""Returns all the workflows related to this study""" """Returns all the workflows related to this study"""
workflow_models = session.query(WorkflowModel).filter_by(study_id=study_id).all() existing_workflow_models = session.query(WorkflowModel).filter_by(study_id=study_id).all()
all_specs = session.query(WorkflowSpecModel).filter_by(is_master_spec=False).all()
api_models = [] api_models = []
for workflow_model in workflow_models: for workflow_model in existing_workflow_models:
processor = WorkflowProcessor(workflow_model, processor = WorkflowProcessor(workflow_model,
workflow_model.bpmn_workflow_json) workflow_model.bpmn_workflow_json)
api_models.append(__get_workflow_api_model(processor)) api_models.append(__get_workflow_api_model(processor))

2
crc/api/workflow.py
View File

@ -97,10 +97,8 @@ def __get_workflow_api_model(processor: WorkflowProcessor, status_data=None):
last_task=Task.from_spiff(processor.bpmn_workflow.last_task), last_task=Task.from_spiff(processor.bpmn_workflow.last_task),
next_task=None, next_task=None,
user_tasks=user_tasks, user_tasks=user_tasks,
workflow_spec_id=processor.workflow_spec_id,
spec_version=processor.get_spec_version(), spec_version=processor.get_spec_version(),
is_latest_spec=processor.get_spec_version() == processor.get_latest_version_string(processor.workflow_spec_id), is_latest_spec=processor.get_spec_version() == processor.get_latest_version_string(processor.workflow_spec_id),
is_active=is_active
) )
if processor.next_task(): if processor.next_task():
workflow_api.next_task = Task.from_spiff(processor.next_task()) workflow_api.next_task = Task.from_spiff(processor.next_task())

6
crc/models/api_models.py
View File

@ -95,17 +95,15 @@ class TaskSchema(ma.Schema):
class WorkflowApi(object): class WorkflowApi(object):
def __init__(self, id, status, user_tasks, last_task, next_task, workflow_spec_id, spec_version, def __init__(self, id, status, user_tasks, last_task, next_task,
is_latest_spec, is_active): spec_version, is_latest_spec):
self.id = id self.id = id
self.status = status self.status = status
self.user_tasks = user_tasks self.user_tasks = user_tasks
self.last_task = last_task self.last_task = last_task
self.next_task = next_task self.next_task = next_task
self.workflow_spec_id = workflow_spec_id
self.spec_version = spec_version self.spec_version = spec_version
self.is_latest_spec = is_latest_spec self.is_latest_spec = is_latest_spec
self.is_active = is_active
class WorkflowApiSchema(ma.Schema): class WorkflowApiSchema(ma.Schema):