Merge branch 'feature/protocol_status' into feature/previous_task

This commit is contained in:
Dan Funk 2020-05-04 11:12:12 -04:00
commit ce76b0d3e8
1 changed files with 16 additions and 24 deletions

View File

@ -13,10 +13,14 @@
<bpmn:documentation># Documents &amp; Approvals <bpmn:documentation># Documents &amp; Approvals
&gt; ## Protocol Document Management &gt; ## Protocol Document Management
{% if StudyInfo.protocol is defined -%} {% if StudyInfo.documents.Study_Protocol_Document is defined -%}
{%- set p = StudyInfo.protocol -%} {%- set p = StudyInfo.documents.Study_Protocol_Document -%}
{% if p.files|length -%}
&gt; [{{p.name}}](/study/{{p.study_id}}/workflow/{{p.workflow_id}}/task/{{p.task_id}}) {%- set f = p.files[0] -%}
&gt; [{{p.display_name}}](/study/{{p.study_id}}/workflow/{{f.workflow_id}}/task/{{f.task_id}})
{%- else -%}
&gt; No protocol uploaded yet.
{% endif %}
{%- else -%} {%- else -%}
&gt; No protocol uploaded yet. &gt; No protocol uploaded yet.
{% endif %} {% endif %}
@ -31,13 +35,14 @@
&gt; ## Documents &gt; ## Documents
&gt; | Name | Status | Help | Download | &gt; | Name | Status | Help | Download |
|:---- |:------ |:---- |:-------- | |:---- |:------ |:---- |:-------- |
{% for doc in StudyInfo.documents -%} {% for key, doc in StudyInfo.documents.items() %}{% if doc.required -%}
{% if doc.file_id is defined -%} {% if doc.files|length -%}
| [{{doc.display_name}}](/study/{{doc.study_id}}/workflow/{{doc.workflow_id}}/task/{{doc.task_id}}) | {{doc.status}} | [Context here](/help/documents/{{doc.code}}) | [Download](/file/{{doc.file_id}}/data) | | [{{doc.display_name}}](/study/{{doc.study_id}}/workflow/{{doc.workflow_id}}/task/{{doc.task_id}}) | {{doc.status}} | [Context here](/help/documents/{{doc.code}}) | [Download](/file/{{doc.file_id}}/data) |
{%- else -%} {%- else -%}
| {{doc.display_name}} | Not started | [?](/help/documents/{{doc.code}}) | No file yet | | {{doc.display_name}} | Not started | [?](/help/documents/{{doc.code}}) | No file yet |
{%- endif %} {%- endif %}
{% endfor %}</bpmn:documentation> {% endif %}{% endfor %}
</bpmn:documentation>
<bpmn:extensionElements> <bpmn:extensionElements>
<camunda:properties> <camunda:properties>
<camunda:property name="display_name" value="Documents and Approvals" /> <camunda:property name="display_name" value="Documents and Approvals" />
@ -52,25 +57,19 @@
<bpmn:script>StudyInfo approvals</bpmn:script> <bpmn:script>StudyInfo approvals</bpmn:script>
</bpmn:scriptTask> </bpmn:scriptTask>
<bpmn:scriptTask id="Activity_1aju60t" name="Load Documents"> <bpmn:scriptTask id="Activity_1aju60t" name="Load Documents">
<bpmn:incoming>Flow_0w20w9j</bpmn:incoming> <bpmn:incoming>Flow_1k3su2q</bpmn:incoming>
<bpmn:outgoing>Flow_0c7ryff</bpmn:outgoing> <bpmn:outgoing>Flow_0c7ryff</bpmn:outgoing>
<bpmn:script>StudyInfo documents_status</bpmn:script> <bpmn:script>StudyInfo documents</bpmn:script>
</bpmn:scriptTask> </bpmn:scriptTask>
<bpmn:sequenceFlow id="Flow_142jtxs" sourceRef="Activity_0a14x7j" targetRef="Activity_DisplayDocsAndApprovals" /> <bpmn:sequenceFlow id="Flow_142jtxs" sourceRef="Activity_0a14x7j" targetRef="Activity_DisplayDocsAndApprovals" />
<bpmn:sequenceFlow id="Flow_0c7ryff" sourceRef="Activity_1aju60t" targetRef="Activity_0a14x7j" /> <bpmn:sequenceFlow id="Flow_0c7ryff" sourceRef="Activity_1aju60t" targetRef="Activity_0a14x7j" />
<bpmn:sequenceFlow id="Flow_1k3su2q" sourceRef="StartEvent_1" targetRef="Activity_0b4ojeq" /> <bpmn:sequenceFlow id="Flow_1k3su2q" sourceRef="StartEvent_1" targetRef="Activity_1aju60t" />
<bpmn:scriptTask id="Activity_0b4ojeq" name="Load Protocol">
<bpmn:incoming>Flow_1k3su2q</bpmn:incoming>
<bpmn:outgoing>Flow_0w20w9j</bpmn:outgoing>
<bpmn:script>StudyInfo protocol</bpmn:script>
</bpmn:scriptTask>
<bpmn:sequenceFlow id="Flow_0w20w9j" sourceRef="Activity_0b4ojeq" targetRef="Activity_1aju60t" />
</bpmn:process> </bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1"> <bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1gmf4la"> <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1gmf4la">
<bpmndi:BPMNEdge id="Flow_1k3su2q_di" bpmnElement="Flow_1k3su2q"> <bpmndi:BPMNEdge id="Flow_1k3su2q_di" bpmnElement="Flow_1k3su2q">
<di:waypoint x="188" y="117" /> <di:waypoint x="188" y="117" />
<di:waypoint x="240" y="117" /> <di:waypoint x="390" y="117" />
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0c7ryff_di" bpmnElement="Flow_0c7ryff"> <bpmndi:BPMNEdge id="Flow_0c7ryff_di" bpmnElement="Flow_0c7ryff">
<di:waypoint x="490" y="117" /> <di:waypoint x="490" y="117" />
@ -99,13 +98,6 @@
<bpmndi:BPMNShape id="Activity_07ytvmv_di" bpmnElement="Activity_1aju60t"> <bpmndi:BPMNShape id="Activity_07ytvmv_di" bpmnElement="Activity_1aju60t">
<dc:Bounds x="390" y="77" width="100" height="80" /> <dc:Bounds x="390" y="77" width="100" height="80" />
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0wf6u3m_di" bpmnElement="Activity_0b4ojeq">
<dc:Bounds x="240" y="77" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_0w20w9j_di" bpmnElement="Flow_0w20w9j">
<di:waypoint x="340" y="117" />
<di:waypoint x="390" y="117" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane> </bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram> </bpmndi:BPMNDiagram>
</bpmn:definitions> </bpmn:definitions>