fixing a stupid mistake that made all the people I care about suffer yesterday afternoon.
This commit is contained in:
parent
cd35c7bcfe
commit
92b9fea08d
|
@ -1,5 +1,6 @@
|
||||||
import re
|
import re
|
||||||
|
|
||||||
|
from SpiffWorkflow.bpmn.PythonScriptEngine import PythonScriptEngine
|
||||||
from SpiffWorkflow.serializer.exceptions import MissingSpecError
|
from SpiffWorkflow.serializer.exceptions import MissingSpecError
|
||||||
from SpiffWorkflow.util.metrics import timeit, firsttime, sincetime
|
from SpiffWorkflow.util.metrics import timeit, firsttime, sincetime
|
||||||
from lxml import etree
|
from lxml import etree
|
||||||
|
@ -8,7 +9,6 @@ from datetime import datetime
|
||||||
from typing import List
|
from typing import List
|
||||||
|
|
||||||
from SpiffWorkflow import Task as SpiffTask, WorkflowException, Task
|
from SpiffWorkflow import Task as SpiffTask, WorkflowException, Task
|
||||||
from SpiffWorkflow.bpmn.BpmnScriptEngine import BpmnScriptEngine
|
|
||||||
from SpiffWorkflow.bpmn.parser.ValidationException import ValidationException
|
from SpiffWorkflow.bpmn.parser.ValidationException import ValidationException
|
||||||
from SpiffWorkflow.bpmn.serializer.BpmnSerializer import BpmnSerializer
|
from SpiffWorkflow.bpmn.serializer.BpmnSerializer import BpmnSerializer
|
||||||
from SpiffWorkflow.bpmn.specs.EndEvent import EndEvent
|
from SpiffWorkflow.bpmn.specs.EndEvent import EndEvent
|
||||||
|
@ -30,9 +30,8 @@ from crc.services.file_service import FileService
|
||||||
from crc import app
|
from crc import app
|
||||||
from crc.services.user_service import UserService
|
from crc.services.user_service import UserService
|
||||||
|
|
||||||
from difflib import SequenceMatcher
|
|
||||||
|
|
||||||
class CustomBpmnScriptEngine(BpmnScriptEngine):
|
class CustomBpmnScriptEngine(PythonScriptEngine):
|
||||||
"""This is a custom script processor that can be easily injected into Spiff Workflow.
|
"""This is a custom script processor that can be easily injected into Spiff Workflow.
|
||||||
It will execute python code read in from the bpmn. It will also make any scripts in the
|
It will execute python code read in from the bpmn. It will also make any scripts in the
|
||||||
scripts directory available for execution. """
|
scripts directory available for execution. """
|
||||||
|
@ -79,7 +78,7 @@ class CustomBpmnScriptEngine(BpmnScriptEngine):
|
||||||
augmentMethods = Script.generate_augmented_validate_list(task, study_id, workflow_id)
|
augmentMethods = Script.generate_augmented_validate_list(task, study_id, workflow_id)
|
||||||
else:
|
else:
|
||||||
augmentMethods = Script.generate_augmented_list(task, study_id, workflow_id)
|
augmentMethods = Script.generate_augmented_list(task, study_id, workflow_id)
|
||||||
exp, valid = self.validateExpression(expression)
|
exp, valid = self.validate_expression(expression)
|
||||||
return self._eval(exp, external_methods=augmentMethods, **task.data)
|
return self._eval(exp, external_methods=augmentMethods, **task.data)
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|
|
@ -1,9 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<definitions xmlns="http://www.omg.org/spec/DMN/20151101/dmn.xsd" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/1.0" id="Definitions_1p34ouw" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
|
<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" id="Definitions_1p34ouw" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="4.10.0">
|
||||||
<decision id="sponsor_funding_source" name="Sponsor Funding Source">
|
<decision id="sponsor_funding_source" name="Sponsor Funding Source">
|
||||||
<extensionElements>
|
|
||||||
<biodi:bounds x="280" y="90" width="180" height="80" />
|
|
||||||
</extensionElements>
|
|
||||||
<decisionTable id="DecisionTable_00zdxg0">
|
<decisionTable id="DecisionTable_00zdxg0">
|
||||||
<input id="InputClause_02n3ccs" label="CoCApplication Required?">
|
<input id="InputClause_02n3ccs" label="CoCApplication Required?">
|
||||||
<inputExpression id="LiteralExpression_1ju4o1o" typeRef="boolean" expressionLanguage="feel">
|
<inputExpression id="LiteralExpression_1ju4o1o" typeRef="boolean" expressionLanguage="feel">
|
||||||
|
@ -13,7 +10,7 @@
|
||||||
<output id="OutputClause_1ybi1ud" label="sponsor_funding_source" name="sponsor_funding_source" typeRef="string" />
|
<output id="OutputClause_1ybi1ud" label="sponsor_funding_source" name="sponsor_funding_source" typeRef="string" />
|
||||||
<rule id="DecisionRule_1t97mw4">
|
<rule id="DecisionRule_1t97mw4">
|
||||||
<inputEntry id="UnaryTests_0ym4ln2">
|
<inputEntry id="UnaryTests_0ym4ln2">
|
||||||
<text>true</text>
|
<text>True</text>
|
||||||
</inputEntry>
|
</inputEntry>
|
||||||
<outputEntry id="LiteralExpression_1pweuqc">
|
<outputEntry id="LiteralExpression_1pweuqc">
|
||||||
<text>"required"</text>
|
<text>"required"</text>
|
||||||
|
@ -22,7 +19,7 @@
|
||||||
<rule id="DecisionRule_1q965wz">
|
<rule id="DecisionRule_1q965wz">
|
||||||
<description>was "disabled"</description>
|
<description>was "disabled"</description>
|
||||||
<inputEntry id="UnaryTests_1mlhh3t">
|
<inputEntry id="UnaryTests_1mlhh3t">
|
||||||
<text>false</text>
|
<text>False</text>
|
||||||
</inputEntry>
|
</inputEntry>
|
||||||
<outputEntry id="LiteralExpression_073vd6i">
|
<outputEntry id="LiteralExpression_073vd6i">
|
||||||
<text>"required"</text>
|
<text>"required"</text>
|
||||||
|
@ -38,4 +35,11 @@
|
||||||
</rule>
|
</rule>
|
||||||
</decisionTable>
|
</decisionTable>
|
||||||
</decision>
|
</decision>
|
||||||
|
<dmndi:DMNDI>
|
||||||
|
<dmndi:DMNDiagram id="DMNDiagram_1vnvmg2">
|
||||||
|
<dmndi:DMNShape id="DMNShape_04xj0eb" dmnElementRef="sponsor_funding_source">
|
||||||
|
<dc:Bounds height="80" width="180" x="280" y="90" />
|
||||||
|
</dmndi:DMNShape>
|
||||||
|
</dmndi:DMNDiagram>
|
||||||
|
</dmndi:DMNDI>
|
||||||
</definitions>
|
</definitions>
|
||||||
|
|
Loading…
Reference in New Issue