sartography
/
cr-connect-workflow
mirror of https://github.com/sartography/cr-connect-workflow.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

This commit is contained in:
Aaron Louie 2020-05-12 22:46:20 -04:00
parent cdfe45dc00 13c16ec179
commit fbdff7a5e6
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Pipfile.lock generated
View File

@ -783,7 +783,7 @@
"spiffworkflow": { "spiffworkflow": {
"editable": true, "editable": true,
"git": "https://github.com/sartography/SpiffWorkflow.git", "git": "https://github.com/sartography/SpiffWorkflow.git",
"ref": "f626ac6d4f035f3a65a058320efd8d33d1ec652a" "ref": "bb83497f5128f6221113b090d8de84401b0f108f"
}, },
"sqlalchemy": { "sqlalchemy": {
"hashes": [ "hashes": [

3
crc/api/workflow.py
View File

@ -85,8 +85,7 @@ def delete_workflow_specification(spec_id):
def __get_workflow_api_model(processor: WorkflowProcessor): def __get_workflow_api_model(processor: WorkflowProcessor):
spiff_tasks = processor.get_all_user_tasks() spiff_tasks = processor.get_all_user_tasks()
user_tasks = list(map(WorkflowService.spiff_task_to_api_task, spiff_tasks)) user_tasks = [WorkflowService.spiff_task_to_api_task(t, add_docs_and_forms=True) for t in spiff_tasks]
workflow_api = WorkflowApi( workflow_api = WorkflowApi(
id=processor.get_workflow_id(), id=processor.get_workflow_id(),
status=processor.get_status(), status=processor.get_status(),

12
crc/services/workflow_processor.py
View File

@ -163,10 +163,14 @@ class WorkflowProcessor(object):
Useful for running the master specification, which should not persist. """ Useful for running the master specification, which should not persist. """
version = WorkflowProcessor.get_latest_version_string(spec_model.id) version = WorkflowProcessor.get_latest_version_string(spec_model.id)
spec = WorkflowProcessor.get_spec(spec_model.id, version) spec = WorkflowProcessor.get_spec(spec_model.id, version)
bpmn_workflow = BpmnWorkflow(spec, script_engine=WorkflowProcessor._script_engine) try:
bpmn_workflow.data[WorkflowProcessor.STUDY_ID_KEY] = study.id bpmn_workflow = BpmnWorkflow(spec, script_engine=WorkflowProcessor._script_engine)
bpmn_workflow.data[WorkflowProcessor.VALIDATION_PROCESS_KEY] = False bpmn_workflow.data[WorkflowProcessor.STUDY_ID_KEY] = study.id
bpmn_workflow.do_engine_steps() bpmn_workflow.data[WorkflowProcessor.VALIDATION_PROCESS_KEY] = False
bpmn_workflow.do_engine_steps()
except WorkflowException as we:
raise ApiError.from_task_spec("error_running_master_spec", str(we), we.sender)
if not bpmn_workflow.is_completed(): if not bpmn_workflow.is_completed():
raise ApiError("master_spec_not_automatic", raise ApiError("master_spec_not_automatic",
"The master spec should only contain fully automated tasks, it failed to complete.") "The master spec should only contain fully automated tasks, it failed to complete.")