mirror of
https://github.com/sartography/cr-connect-workflow.git
synced 2025-02-22 12:48:25 +00:00
Fix test workflows to use new data_store scripts
This commit is contained in:
mike cullerton
parent
be24b598b8
commit
19da7ecd7e
@ -8,10 +8,9 @@
|
||||
<bpmn:scriptTask id="Activity_SetDataStore" name="Set Data Store">
|
||||
<bpmn:incoming>Flow_1er0zqt</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_1vocvzo</bpmn:outgoing>
|
||||
<bpmn:script>study_data_set(key, value)
|
||||
user_data_set(key, value)
|
||||
if file_id:
|
||||
file_data_set(file_id=file_id, key=key, value=value)</bpmn:script>
|
||||
<bpmn:script>data_store_set(type='study', key=key, value=value)
|
||||
data_store_set(type='user', key=key, value=value)
|
||||
data_store_set(type='file', key=key, value=value, file_id=file_id)</bpmn:script>
|
||||
</bpmn:scriptTask>
|
||||
<bpmn:endEvent id="Event_1r0sf3h">
|
||||
<bpmn:incoming>Flow_1vocvzo</bpmn:incoming>
|
||||
@ -38,10 +37,10 @@ if file_id:
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_DataStoreSet">
|
||||
<bpmndi:BPMNEdge id="Flow_1er0zqt_di" bpmnElement="Flow_1er0zqt">
|
||||
<di:waypoint x="382" y="117" />
|
||||
<di:waypoint x="454" y="117" />
|
||||
<di:waypoint x="460" y="117" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_1vocvzo_di" bpmnElement="Flow_1vocvzo">
|
||||
<di:waypoint x="554" y="117" />
|
||||
<di:waypoint x="560" y="117" />
|
||||
<di:waypoint x="622" y="117" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_11kii8u_di" bpmnElement="Flow_11kii8u">
|
||||
@ -51,15 +50,15 @@ if file_id:
|
||||
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
|
||||
<dc:Bounds x="179" y="99" width="36" height="36" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_0b1x0oc_di" bpmnElement="Activity_SetDataStore">
|
||||
<dc:Bounds x="454" y="77" width="100" height="80" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Event_1r0sf3h_di" bpmnElement="Event_1r0sf3h">
|
||||
<dc:Bounds x="622" y="99" width="36" height="36" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_0v2v553_di" bpmnElement="Activity_GetData">
|
||||
<dc:Bounds x="282" y="77" width="100" height="80" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_0b1x0oc_di" bpmnElement="Activity_SetDataStore">
|
||||
<dc:Bounds x="460" y="77" width="100" height="80" />
|
||||
</bpmndi:BPMNShape>
|
||||
</bpmndi:BPMNPlane>
|
||||
</bpmndi:BPMNDiagram>
|
||||
</bpmn:definitions>
|
||||
|
||||
@ -8,27 +8,25 @@
|
||||
<bpmn:scriptTask id="Activity_SetDataStore" name="Set Data Store">
|
||||
<bpmn:incoming>Flow_0nstzm8</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_08r3ga0</bpmn:outgoing>
|
||||
<bpmn:script>study_data_set('study_data_key', 'study_data_value')
|
||||
file_data_set(file_id=1, key='file_data_key', value='file_data_value')
|
||||
user_data_set('user_data_key', 'user_data_value')</bpmn:script>
|
||||
<bpmn:script>data_store_set(type='study', key='study_data_key', value='study_data_value')
|
||||
data_store_set(type='user', key='user_data_key', value='user_data_value')
|
||||
data_store_set(type='file', key='file_data_key', value='file_data_value', file_id=1)</bpmn:script>
|
||||
</bpmn:scriptTask>
|
||||
<bpmn:sequenceFlow id="Flow_08r3ga0" sourceRef="Activity_SetDataStore" targetRef="Activity_GetDataStore" />
|
||||
<bpmn:scriptTask id="Activity_GetDataStore" name="Get Data Store">
|
||||
<bpmn:incoming>Flow_08r3ga0</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_02l0u2v</bpmn:outgoing>
|
||||
<bpmn:script>
|
||||
previous_study_data_value = study_data_get('previous_study_data_key')
|
||||
previous_file_data_value = file_data_get(file_id=1, key='previous_file_data_key')
|
||||
previous_user_data_value = user_data_get('previous_user_data_key')
|
||||
<bpmn:script>previous_study_data_value = data_store_get(type='study', key='previous_study_data_key')
|
||||
previous_file_data_value = data_store_get(type='file', file_id=1, key='previous_file_data_key')
|
||||
previous_user_data_value = data_store_get(type='user', key='previous_user_data_key')
|
||||
|
||||
study_data_value = study_data_get('study_data_key')
|
||||
file_data_value = file_data_get(file_id=1, key='file_data_key')
|
||||
user_data_value = user_data_get('user_data_key')
|
||||
study_data_value = data_store_get(type='study', key='study_data_key')
|
||||
file_data_value = data_store_get(type='file', file_id=1, key='file_data_key')
|
||||
user_data_value = data_store_get(type='user', key='user_data_key')
|
||||
|
||||
bad_study_data_value = study_data_get('bad_study_data_key', 'bad_study_data_value')
|
||||
bad_file_data_value = file_data_get(file_id=1, key='bad_file_data_key', default='bad_file_data_value')
|
||||
bad_user_data_value = user_data_get('bad_user_data_key', 'bad_user_data_value')
|
||||
</bpmn:script>
|
||||
bad_study_data_value = data_store_get(type='study', key='bad_study_data_key', default='bad_study_data_value')
|
||||
bad_file_data_value = data_store_get(type='file', file_id=1, key='bad_file_data_key', default='bad_file_data_value')
|
||||
bad_user_data_value = data_store_get(type='user', key='bad_user_data_key', default='bad_user_data_value')</bpmn:script>
|
||||
</bpmn:scriptTask>
|
||||
<bpmn:sequenceFlow id="Flow_02l0u2v" sourceRef="Activity_GetDataStore" targetRef="Activity_DisplayDataStore" />
|
||||
<bpmn:manualTask id="Activity_DisplayDataStore" name="Display Data Store">
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_1j7idla" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.10.0">
|
||||
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_1j7idla" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.2.0">
|
||||
<bpmn:process id="Process_18biih5" isExecutable="true">
|
||||
<bpmn:startEvent id="StartEvent_1">
|
||||
<bpmn:outgoing>SequenceFlow_1pnq3kg</bpmn:outgoing>
|
||||
@ -22,7 +22,7 @@ fileurl = documents['UVACompl_PRCAppr'].files[0]['url']
|
||||
|
||||
filename = documents['UVACompl_PRCAppr'].files[0]['name']
|
||||
|
||||
file_data_set(file_id=fileid,key='test',value='me')</bpmn:script>
|
||||
data_store_set(type='file', file_id=fileid, key='test', value='me')</bpmn:script>
|
||||
</bpmn:scriptTask>
|
||||
<bpmn:endEvent id="Event_1pdyoyv">
|
||||
<bpmn:incoming>Flow_02bgcrp</bpmn:incoming>
|
||||
@ -32,54 +32,54 @@ file_data_set(file_id=fileid,key='test',value='me')</bpmn:script>
|
||||
<bpmn:scriptTask id="Activity_19x6e2e" name="get output">
|
||||
<bpmn:incoming>Flow_0z7kamo</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_15mmymi</bpmn:outgoing>
|
||||
<bpmn:script>output=file_data_get(file_id=fileid,key='test')</bpmn:script>
|
||||
<bpmn:script>output=data_store_get(type='file', file_id=fileid, key='test')</bpmn:script>
|
||||
</bpmn:scriptTask>
|
||||
<bpmn:scriptTask id="Activity_0oaeqxs" name="get output2">
|
||||
<bpmn:incoming>Flow_15mmymi</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_02bgcrp</bpmn:outgoing>
|
||||
<bpmn:script>output2=file_data_get(file_id=fileid,key='unobtainium',default='nope')</bpmn:script>
|
||||
<bpmn:script>output2=data_store_get(type='file', file_id=fileid, key='unobtainium', default='nope')</bpmn:script>
|
||||
</bpmn:scriptTask>
|
||||
<bpmn:sequenceFlow id="Flow_02bgcrp" sourceRef="Activity_0oaeqxs" targetRef="Event_1pdyoyv" />
|
||||
</bpmn:process>
|
||||
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_18biih5">
|
||||
<bpmndi:BPMNEdge id="Flow_02bgcrp_di" bpmnElement="Flow_02bgcrp">
|
||||
<di:waypoint x="860" y="117" />
|
||||
<di:waypoint x="894" y="117" />
|
||||
<di:waypoint x="962" y="117" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_15mmymi_di" bpmnElement="Flow_15mmymi">
|
||||
<di:waypoint x="690" y="117" />
|
||||
<di:waypoint x="760" y="117" />
|
||||
<di:waypoint x="723" y="117" />
|
||||
<di:waypoint x="794" y="117" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_0z7kamo_di" bpmnElement="Flow_0z7kamo">
|
||||
<di:waypoint x="530" y="117" />
|
||||
<di:waypoint x="590" y="117" />
|
||||
<di:waypoint x="552" y="117" />
|
||||
<di:waypoint x="623" y="117" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_1xqewuk_di" bpmnElement="Flow_1xqewuk">
|
||||
<di:waypoint x="370" y="117" />
|
||||
<di:waypoint x="430" y="117" />
|
||||
<di:waypoint x="381" y="117" />
|
||||
<di:waypoint x="452" y="117" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="SequenceFlow_1pnq3kg_di" bpmnElement="SequenceFlow_1pnq3kg">
|
||||
<di:waypoint x="215" y="117" />
|
||||
<di:waypoint x="270" y="117" />
|
||||
<di:waypoint x="281" y="117" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
|
||||
<dc:Bounds x="179" y="99" width="36" height="36" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_01ekdl8_di" bpmnElement="Task_Has_Bananas">
|
||||
<dc:Bounds x="270" y="77" width="100" height="80" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_0g5namy_di" bpmnElement="Activity_0yikdu7">
|
||||
<dc:Bounds x="430" y="77" width="100" height="80" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Event_1pdyoyv_di" bpmnElement="Event_1pdyoyv">
|
||||
<dc:Bounds x="962" y="99" width="36" height="36" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_01ekdl8_di" bpmnElement="Task_Has_Bananas">
|
||||
<dc:Bounds x="281" y="77" width="100" height="80" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_0g5namy_di" bpmnElement="Activity_0yikdu7">
|
||||
<dc:Bounds x="452" y="77" width="100" height="80" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_0ma7ela_di" bpmnElement="Activity_19x6e2e">
|
||||
<dc:Bounds x="590" y="77" width="100" height="80" />
|
||||
<dc:Bounds x="623" y="77" width="100" height="80" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_0oaeqxs_di" bpmnElement="Activity_0oaeqxs">
|
||||
<dc:Bounds x="760" y="77" width="100" height="80" />
|
||||
<dc:Bounds x="794" y="77" width="100" height="80" />
|
||||
</bpmndi:BPMNShape>
|
||||
</bpmndi:BPMNPlane>
|
||||
</bpmndi:BPMNDiagram>
|
||||
|
||||
@ -32,7 +32,7 @@ for assoc in assoc_list:
|
||||
assoc_info = assoc
|
||||
assoc_status = "Found"
|
||||
assoc_cid = assoc_info["uid"]
|
||||
if assoc_cid != study_data_get("sdsPI_ComputingID", False):
|
||||
if assoc_cid != data_store_get(type='study', key="sdsPI_ComputingID", value=False):
|
||||
assoc_status = "New"
|
||||
</bpmn:script>
|
||||
</bpmn:scriptTask>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_0kmksnn" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="3.7.0">
|
||||
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_0kmksnn" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.2.0">
|
||||
<bpmn:process id="Process_0exnnpv" isExecutable="true">
|
||||
<bpmn:startEvent id="StartEvent_1">
|
||||
<bpmn:outgoing>SequenceFlow_1nfe5m9</bpmn:outgoing>
|
||||
@ -18,24 +18,24 @@
|
||||
<bpmn:scriptTask id="Activity_0cm6tn2" name="setval">
|
||||
<bpmn:incoming>SequenceFlow_1bqiin0</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_09cika8</bpmn:outgoing>
|
||||
<bpmn:script>study_data_set('testme','newval')</bpmn:script>
|
||||
<bpmn:script>data_store_set(type='study', key='testme', value='newval')</bpmn:script>
|
||||
</bpmn:scriptTask>
|
||||
<bpmn:sequenceFlow id="Flow_1oeqjuy" sourceRef="Activity_0d8iftx" targetRef="Activity_1yup9u7" />
|
||||
<bpmn:scriptTask id="Activity_0d8iftx" name="getval">
|
||||
<bpmn:incoming>Flow_09cika8</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_1oeqjuy</bpmn:outgoing>
|
||||
<bpmn:script>out = study_data_get('testme','bogus')</bpmn:script>
|
||||
<bpmn:script>out = data_store_get(type='study', key='testme', default='bogus')</bpmn:script>
|
||||
</bpmn:scriptTask>
|
||||
<bpmn:sequenceFlow id="Flow_0g9waf3" sourceRef="Activity_1yup9u7" targetRef="Activity_0xw717o" />
|
||||
<bpmn:scriptTask id="Activity_1yup9u7" name="reset value">
|
||||
<bpmn:incoming>Flow_1oeqjuy</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_0g9waf3</bpmn:outgoing>
|
||||
<bpmn:script>study_data_set('testme','badval')</bpmn:script>
|
||||
<bpmn:script>data_store_set(type='study', key='testme', value='badval')</bpmn:script>
|
||||
</bpmn:scriptTask>
|
||||
<bpmn:scriptTask id="Activity_0xw717o" name="Make sure user_data_get doesn't get the study_data_set variable">
|
||||
<bpmn:scriptTask id="Activity_0xw717o" name="Make sure user data_store_get doesn't get the study data_store_set variable">
|
||||
<bpmn:incoming>Flow_0g9waf3</bpmn:incoming>
|
||||
<bpmn:outgoing>Flow_05136ua</bpmn:outgoing>
|
||||
<bpmn:script>empty = user_data_get('testme','empty')</bpmn:script>
|
||||
<bpmn:script>empty = data_store_get(type='user', key='testme', default='empty')</bpmn:script>
|
||||
</bpmn:scriptTask>
|
||||
<bpmn:sequenceFlow id="Flow_05136ua" sourceRef="Activity_0xw717o" targetRef="Gateway_06osfqz" />
|
||||
<bpmn:exclusiveGateway id="Gateway_06osfqz" default="Flow_00s638e">
|
||||
@ -44,7 +44,7 @@
|
||||
<bpmn:outgoing>Flow_00s638e</bpmn:outgoing>
|
||||
</bpmn:exclusiveGateway>
|
||||
<bpmn:sequenceFlow id="Flow_1efanns" name="test flow expression" sourceRef="Gateway_06osfqz" targetRef="EndEvent_171dj09">
|
||||
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">user_data_get('nothing','default') == 'default'</bpmn:conditionExpression>
|
||||
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">data_store_get(type='user', key='nothing', default='default') == 'default'</bpmn:conditionExpression>
|
||||
</bpmn:sequenceFlow>
|
||||
<bpmn:endEvent id="Event_1yebjqg">
|
||||
<bpmn:incoming>Flow_00s638e</bpmn:incoming>
|
||||
@ -53,6 +53,33 @@
|
||||
</bpmn:process>
|
||||
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
|
||||
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_0exnnpv">
|
||||
<bpmndi:BPMNEdge id="Flow_00s638e_di" bpmnElement="Flow_00s638e">
|
||||
<di:waypoint x="835" y="410" />
|
||||
<di:waypoint x="1012" y="410" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_1efanns_di" bpmnElement="Flow_1efanns">
|
||||
<di:waypoint x="810" y="435" />
|
||||
<di:waypoint x="810" y="672" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds x="798" y="551" width="54" height="27" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_05136ua_di" bpmnElement="Flow_05136ua">
|
||||
<di:waypoint x="810" y="330" />
|
||||
<di:waypoint x="810" y="385" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_0g9waf3_di" bpmnElement="Flow_0g9waf3">
|
||||
<di:waypoint x="810" y="157" />
|
||||
<di:waypoint x="810" y="250" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_1oeqjuy_di" bpmnElement="Flow_1oeqjuy">
|
||||
<di:waypoint x="700" y="117" />
|
||||
<di:waypoint x="760" y="117" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="Flow_09cika8_di" bpmnElement="Flow_09cika8">
|
||||
<di:waypoint x="540" y="117" />
|
||||
<di:waypoint x="600" y="117" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge id="SequenceFlow_1bqiin0_di" bpmnElement="SequenceFlow_1bqiin0">
|
||||
<di:waypoint x="370" y="117" />
|
||||
<di:waypoint x="440" y="117" />
|
||||
@ -70,51 +97,24 @@
|
||||
<bpmndi:BPMNShape id="EndEvent_171dj09_di" bpmnElement="EndEvent_171dj09">
|
||||
<dc:Bounds x="792" y="672" width="36" height="36" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNEdge id="Flow_09cika8_di" bpmnElement="Flow_09cika8">
|
||||
<di:waypoint x="540" y="117" />
|
||||
<di:waypoint x="600" y="117" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNShape id="Activity_0wnwluq_di" bpmnElement="Activity_0cm6tn2">
|
||||
<dc:Bounds x="440" y="77" width="100" height="80" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNEdge id="Flow_1oeqjuy_di" bpmnElement="Flow_1oeqjuy">
|
||||
<di:waypoint x="700" y="117" />
|
||||
<di:waypoint x="760" y="117" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNShape id="Activity_0cq37mm_di" bpmnElement="Activity_0d8iftx">
|
||||
<dc:Bounds x="600" y="77" width="100" height="80" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNEdge id="Flow_0g9waf3_di" bpmnElement="Flow_0g9waf3">
|
||||
<di:waypoint x="810" y="157" />
|
||||
<di:waypoint x="810" y="250" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNShape id="Activity_0cj83fx_di" bpmnElement="Activity_1yup9u7">
|
||||
<dc:Bounds x="760" y="77" width="100" height="80" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNShape id="Activity_0pqth07_di" bpmnElement="Activity_0xw717o">
|
||||
<dc:Bounds x="760" y="250" width="100" height="80" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNEdge id="Flow_05136ua_di" bpmnElement="Flow_05136ua">
|
||||
<di:waypoint x="810" y="330" />
|
||||
<di:waypoint x="810" y="385" />
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNShape id="Gateway_06osfqz_di" bpmnElement="Gateway_06osfqz" isMarkerVisible="true">
|
||||
<dc:Bounds x="785" y="385" width="50" height="50" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNEdge id="Flow_1efanns_di" bpmnElement="Flow_1efanns">
|
||||
<di:waypoint x="810" y="435" />
|
||||
<di:waypoint x="810" y="672" />
|
||||
<bpmndi:BPMNLabel>
|
||||
<dc:Bounds x="798" y="551" width="54" height="27" />
|
||||
</bpmndi:BPMNLabel>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNShape id="Event_1yebjqg_di" bpmnElement="Event_1yebjqg">
|
||||
<dc:Bounds x="1012" y="392" width="36" height="36" />
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNEdge id="Flow_00s638e_di" bpmnElement="Flow_00s638e">
|
||||
<di:waypoint x="835" y="410" />
|
||||
<di:waypoint x="1012" y="410" />
|
||||
</bpmndi:BPMNEdge>
|
||||
</bpmndi:BPMNPlane>
|
||||
</bpmndi:BPMNDiagram>
|
||||
</bpmn:definitions>
|
||||
|
||||
@ -12,7 +12,7 @@ from crc.models.study import StudyModel
|
||||
from crc.scripts.study_info import StudyInfo
|
||||
from crc.services.study_service import StudyService
|
||||
from crc.services.workflow_processor import WorkflowProcessor
|
||||
from crc.scripts.file_data_set import FileDataSet
|
||||
from crc.scripts.data_store_set import DataStoreSet
|
||||
from crc.services.document_service import DocumentService
|
||||
from crc.services.user_file_service import UserFileService
|
||||
from crc.services.reference_file_service import ReferenceFileService
|
||||
@ -104,7 +104,7 @@ class TestStudyDetailsDocumentsScript(BaseTest):
|
||||
binary_data=b'1234', irb_doc_code=irb_code)
|
||||
processor = WorkflowProcessor(workflow_model)
|
||||
task = processor.next_task()
|
||||
FileDataSet().do_task(task, study.id, workflow_model.id, key="ginger", value="doodle", file_id=file.id)
|
||||
DataStoreSet().do_task(task, study.id, workflow_model.id, type='file', key="ginger", value="doodle", file_id=file.id)
|
||||
docs = StudyInfo().do_task(task, study.id, workflow_model.id, "documents")
|
||||
self.assertTrue(isinstance(docs, Box))
|
||||
docs = StudyService.get_documents_status(study.id, force=True)
|
||||
@ -127,7 +127,7 @@ class TestStudyDetailsDocumentsScript(BaseTest):
|
||||
binary_data=b'1234', irb_doc_code=irb_code)
|
||||
processor = WorkflowProcessor(workflow_model)
|
||||
task = processor.next_task()
|
||||
FileDataSet().do_task(task, study.id, workflow_model.id, key="irb_code", value="Study_App_Doc", file_id=file.id)
|
||||
DataStoreSet().do_task(task, study.id, workflow_model.id, type='file', key="irb_code", value="Study_App_Doc", file_id=file.id)
|
||||
docs = StudyInfo().do_task(task, study.id, workflow_model.id, "documents")
|
||||
self.assertTrue(isinstance(docs, Box))
|
||||
self.assertEqual(1, len(docs.Study_App_Doc.files))
|
||||
@ -151,5 +151,5 @@ class TestStudyDetailsDocumentsScript(BaseTest):
|
||||
processor = WorkflowProcessor(workflow_model)
|
||||
task = processor.next_task()
|
||||
with self.assertRaises(ApiError):
|
||||
FileDataSet().do_task(task, study.id, workflow_model.id, key="irb_code", value="My_Pretty_Pony",
|
||||
file_id=file.id)
|
||||
DataStoreSet().do_task(task, study.id, workflow_model.id, type='file',
|
||||
key="irb_code", value="My_Pretty_Pony", file_id=file.id)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user