Fix several bugs, most had an issue with the bpmn document
This commit is contained in:
parent
a124e13c6a
commit
70ad3872a7
|
@ -53,10 +53,17 @@ class CustomBpmnScriptEngine(BpmnScriptEngine):
|
||||||
|
|
||||||
super().execute(task, script, data, externalMethods=augmentMethods)
|
super().execute(task, script, data, externalMethods=augmentMethods)
|
||||||
except SyntaxError as e:
|
except SyntaxError as e:
|
||||||
raise ApiError.from_task('syntax_error',
|
del(task.data['task'])
|
||||||
f'If you are running a pre-defined script, please'
|
raise ApiError('syntax_error',
|
||||||
f' proceed the script with "#!", otherwise this is assumed to be'
|
f'Something is wrong with your python script '
|
||||||
f' pure python: {script}, {e.msg}', task=task)
|
f'please correct the following:'
|
||||||
|
f' {script}, {e.msg}')
|
||||||
|
except NameError as e:
|
||||||
|
del(task.data['task'])
|
||||||
|
raise ApiError('name_error',
|
||||||
|
f'something you are referencing does not exist:'
|
||||||
|
f' {script}, {e.name}')
|
||||||
|
|
||||||
# else:
|
# else:
|
||||||
# self.run_predefined_script(task, script[2:], data) # strip off the first two characters.
|
# self.run_predefined_script(task, script[2:], data) # strip off the first two characters.
|
||||||
|
|
||||||
|
|
|
@ -453,7 +453,7 @@ Indicate all the possible formats in which you will transmit your data outside o
|
||||||
<bpmn:incoming>SequenceFlow_0k2r83n</bpmn:incoming>
|
<bpmn:incoming>SequenceFlow_0k2r83n</bpmn:incoming>
|
||||||
<bpmn:incoming>SequenceFlow_0t6xl9i</bpmn:incoming>
|
<bpmn:incoming>SequenceFlow_0t6xl9i</bpmn:incoming>
|
||||||
<bpmn:outgoing>SequenceFlow_16kyite</bpmn:outgoing>
|
<bpmn:outgoing>SequenceFlow_16kyite</bpmn:outgoing>
|
||||||
<bpmn:script>complete_template('NEW_DSP_template.docx','Study_DataSecurityPlan')/bpmn:script>
|
<bpmn:script>complete_template('NEW_DSP_template.docx','Study_DataSecurityPlan')</bpmn:script>
|
||||||
</bpmn:scriptTask>
|
</bpmn:scriptTask>
|
||||||
<bpmn:manualTask id="Task_0q6ir2l" name="View Instructions">
|
<bpmn:manualTask id="Task_0q6ir2l" name="View Instructions">
|
||||||
<bpmn:documentation>##### Instructions
|
<bpmn:documentation>##### Instructions
|
||||||
|
|
|
@ -598,7 +598,7 @@ Use the EHS [Lab Safety Plan During COVID 19 template](https://www.google.com/ur
|
||||||
This step is internal to the system and do not require and user interaction</bpmn:documentation>
|
This step is internal to the system and do not require and user interaction</bpmn:documentation>
|
||||||
<bpmn:incoming>Flow_11uqavk</bpmn:incoming>
|
<bpmn:incoming>Flow_11uqavk</bpmn:incoming>
|
||||||
<bpmn:outgoing>Flow_0aqgwvu</bpmn:outgoing>
|
<bpmn:outgoing>Flow_0aqgwvu</bpmn:outgoing>
|
||||||
<bpmn:script>complete_template('ResearchRampUpPlan.docx','RESEARCH_RAMPUP')/bpmn:script>
|
<bpmn:script>complete_template('ResearchRampUpPlan.docx','RESEARCH_RAMPUP')</bpmn:script>
|
||||||
</bpmn:scriptTask>
|
</bpmn:scriptTask>
|
||||||
<bpmn:sequenceFlow id="Flow_0aqgwvu" sourceRef="Activity_GenerateRRP" targetRef="Activity_AcknowledgePlanReview" />
|
<bpmn:sequenceFlow id="Flow_0aqgwvu" sourceRef="Activity_GenerateRRP" targetRef="Activity_AcknowledgePlanReview" />
|
||||||
<bpmn:sequenceFlow id="Flow_0j4rs82" sourceRef="Activity_SubmitPlan" targetRef="Activity_0absozl" />
|
<bpmn:sequenceFlow id="Flow_0j4rs82" sourceRef="Activity_SubmitPlan" targetRef="Activity_0absozl" />
|
||||||
|
@ -755,7 +755,7 @@ Notify the Area Monitor for
|
||||||
This step is internal to the system and do not require and user interaction</bpmn:documentation>
|
This step is internal to the system and do not require and user interaction</bpmn:documentation>
|
||||||
<bpmn:incoming>Flow_0j4rs82</bpmn:incoming>
|
<bpmn:incoming>Flow_0j4rs82</bpmn:incoming>
|
||||||
<bpmn:outgoing>Flow_07ge8uf</bpmn:outgoing>
|
<bpmn:outgoing>Flow_07ge8uf</bpmn:outgoing>
|
||||||
<bpmn:script>#!RequestApproval ApprvlApprvr1 ApprvlApprvr2</bpmn:script>
|
<bpmn:script>request_approval('ApprvlApprvr1','ApprvlApprvr2')</bpmn:script>
|
||||||
</bpmn:scriptTask>
|
</bpmn:scriptTask>
|
||||||
<bpmn:scriptTask id="Activity_1u58hox" name="Update Request">
|
<bpmn:scriptTask id="Activity_1u58hox" name="Update Request">
|
||||||
<bpmn:documentation>#### Script Task
|
<bpmn:documentation>#### Script Task
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
</bpmn:extensionElements>
|
</bpmn:extensionElements>
|
||||||
<bpmn:incoming>SequenceFlow_1i7hk1a</bpmn:incoming>
|
<bpmn:incoming>SequenceFlow_1i7hk1a</bpmn:incoming>
|
||||||
<bpmn:outgoing>SequenceFlow_11c35oq</bpmn:outgoing>
|
<bpmn:outgoing>SequenceFlow_11c35oq</bpmn:outgoing>
|
||||||
<bpmn:script>complete_template('Letter.docx AD_CoCApp')/bpmn:script>
|
<bpmn:script>complete_template('Letter.docx','AD_CoCApp')</bpmn:script>
|
||||||
</bpmn:scriptTask>
|
</bpmn:scriptTask>
|
||||||
<bpmn:endEvent id="EndEvent_0evb22x">
|
<bpmn:endEvent id="EndEvent_0evb22x">
|
||||||
<bpmn:incoming>SequenceFlow_11c35oq</bpmn:incoming>
|
<bpmn:incoming>SequenceFlow_11c35oq</bpmn:incoming>
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
<bpmn:sequenceFlow id="Flow_0ugjw69" sourceRef="MultiInstanceTask" targetRef="Event_End" />
|
<bpmn:sequenceFlow id="Flow_0ugjw69" sourceRef="MultiInstanceTask" targetRef="Event_End" />
|
||||||
<bpmn:userTask id="MultiInstanceTask" name="Gather more information" camunda:formKey="GetEmail">
|
<bpmn:userTask id="MultiInstanceTask" name="Gather more information" camunda:formKey="GetEmail">
|
||||||
<bpmn:documentation># Please provide addtional information about:
|
<bpmn:documentation># Please provide addtional information about:
|
||||||
## Investigator ID: {{investigator.user_id}}
|
## Investigator ID: {{investigator.user_id}}
|
||||||
## Role: {{investigator.type_full}}</bpmn:documentation>
|
## Role: {{investigator.type_full}}</bpmn:documentation>
|
||||||
<bpmn:extensionElements>
|
<bpmn:extensionElements>
|
||||||
<camunda:formData>
|
<camunda:formData>
|
||||||
|
|
|
@ -132,7 +132,7 @@ Autoconverted link https://github.com/nodeca/pica (enable linkify to see)
|
||||||
</bpmn:extensionElements>
|
</bpmn:extensionElements>
|
||||||
<bpmn:incoming>SequenceFlow_0641sh6</bpmn:incoming>
|
<bpmn:incoming>SequenceFlow_0641sh6</bpmn:incoming>
|
||||||
<bpmn:outgoing>SequenceFlow_0t29gjo</bpmn:outgoing>
|
<bpmn:outgoing>SequenceFlow_0t29gjo</bpmn:outgoing>
|
||||||
<bpmn:script>fact_service()</bpmn:script>
|
<bpmn:script>FactService = fact_service()</bpmn:script>
|
||||||
</bpmn:scriptTask>
|
</bpmn:scriptTask>
|
||||||
<bpmn:endEvent id="EndEvent_0u1cgrf">
|
<bpmn:endEvent id="EndEvent_0u1cgrf">
|
||||||
<bpmn:documentation># Great Job!
|
<bpmn:documentation># Great Job!
|
||||||
|
|
|
@ -89,7 +89,7 @@ class TestWorkflowSpecValidation(BaseTest):
|
||||||
self.load_example_data()
|
self.load_example_data()
|
||||||
errors = self.validate_workflow("invalid_script")
|
errors = self.validate_workflow("invalid_script")
|
||||||
self.assertEqual(2, len(errors))
|
self.assertEqual(2, len(errors))
|
||||||
self.assertEqual("error_loading_workflow", errors[0]['code'])
|
self.assertEqual("workflow_validation_exception", errors[0]['code'])
|
||||||
self.assertTrue("NoSuchScript" in errors[0]['message'])
|
self.assertTrue("NoSuchScript" in errors[0]['message'])
|
||||||
self.assertEqual("Invalid_Script_Task", errors[0]['task_id'])
|
self.assertEqual("Invalid_Script_Task", errors[0]['task_id'])
|
||||||
self.assertEqual("An Invalid Script Reference", errors[0]['task_name'])
|
self.assertEqual("An Invalid Script Reference", errors[0]['task_name'])
|
||||||
|
@ -99,7 +99,7 @@ class TestWorkflowSpecValidation(BaseTest):
|
||||||
self.load_example_data()
|
self.load_example_data()
|
||||||
errors = self.validate_workflow("invalid_script2")
|
errors = self.validate_workflow("invalid_script2")
|
||||||
self.assertEqual(2, len(errors))
|
self.assertEqual(2, len(errors))
|
||||||
self.assertEqual("error_loading_workflow", errors[0]['code'])
|
self.assertEqual("workflow_validation_exception", errors[0]['code'])
|
||||||
self.assertEqual("Invalid_Script_Task", errors[0]['task_id'])
|
self.assertEqual("Invalid_Script_Task", errors[0]['task_id'])
|
||||||
self.assertEqual("An Invalid Script Reference", errors[0]['task_name'])
|
self.assertEqual("An Invalid Script Reference", errors[0]['task_name'])
|
||||||
self.assertEqual("invalid_script2.bpmn", errors[0]['file_name'])
|
self.assertEqual("invalid_script2.bpmn", errors[0]['file_name'])
|
||||||
|
|
Loading…
Reference in New Issue