From e13e3c2b4619184ff755b894c7829e66cb70d31c Mon Sep 17 00:00:00 2001
From: burnettk <burnettk@users.noreply.github.com>
Date: Wed, 27 Mar 2024 12:40:27 -0400
Subject: [PATCH] add request form

---
 .../basic-approval/basic-approval.bpmn        | 29 ++++++++++++-------
 .../basic-approval/request-exampledata.json   |  3 ++
 .../basic-approval/request-schema.json        | 13 +++++++++
 .../basic-approval/request-uischema.json      |  5 ++++
 4 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 process_models/approvals/basic-approval/request-exampledata.json
 create mode 100644 process_models/approvals/basic-approval/request-schema.json
 create mode 100644 process_models/approvals/basic-approval/request-uischema.json

diff --git a/process_models/approvals/basic-approval/basic-approval.bpmn b/process_models/approvals/basic-approval/basic-approval.bpmn
index 1b7580b..0b9084e 100644
--- a/process_models/approvals/basic-approval/basic-approval.bpmn
+++ b/process_models/approvals/basic-approval/basic-approval.bpmn
@@ -20,13 +20,6 @@
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>Flow_17db3yp</bpmn:outgoing>
     </bpmn:startEvent>
-    <bpmn:manualTask id="Activity_0qpzdpu" name="Submit request">
-      <bpmn:extensionElements>
-        <spiffworkflow:instructionsForEndUser>This is a request for something. What it is, who knows. You could make a form for that in a more complete example.</spiffworkflow:instructionsForEndUser>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_17db3yp</bpmn:incoming>
-      <bpmn:outgoing>Flow_12pkbxb</bpmn:outgoing>
-    </bpmn:manualTask>
     <bpmn:sequenceFlow id="Flow_17db3yp" sourceRef="StartEvent_1" targetRef="Activity_0qpzdpu" />
     <bpmn:sequenceFlow id="Flow_12pkbxb" sourceRef="Activity_0qpzdpu" targetRef="Activity_1m7ezna" />
     <bpmn:sequenceFlow id="Flow_1cxor6o" sourceRef="Activity_1m7ezna" targetRef="Gateway_did_approve" />
@@ -34,7 +27,11 @@
       <bpmn:extensionElements>
         <spiffworkflow:properties>
           <spiffworkflow:property name="formJsonSchemaFilename" value="approval-schema.json" />
+          <spiffworkflow:property name="formUiSchemaFilename" value="approval-uischema.json" />
         </spiffworkflow:properties>
+        <spiffworkflow:instructionsForEndUser>The person requested this:
+
+{{request_item}}</spiffworkflow:instructionsForEndUser>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_12pkbxb</bpmn:incoming>
       <bpmn:outgoing>Flow_1cxor6o</bpmn:outgoing>
@@ -65,6 +62,17 @@
       <bpmn:incoming>Flow_0axwlk2</bpmn:incoming>
       <bpmn:outgoing>Flow_1nv6x7q</bpmn:outgoing>
     </bpmn:manualTask>
+    <bpmn:userTask id="Activity_0qpzdpu" name="Submit request">
+      <bpmn:extensionElements>
+        <spiffworkflow:instructionsForEndUser>This is a request for something. What it is, who knows. You could make a form for that in a more complete example.</spiffworkflow:instructionsForEndUser>
+        <spiffworkflow:properties>
+          <spiffworkflow:property name="formJsonSchemaFilename" value="request-schema.json" />
+          <spiffworkflow:property name="formUiSchemaFilename" value="request-uischema.json" />
+        </spiffworkflow:properties>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_17db3yp</bpmn:incoming>
+      <bpmn:outgoing>Flow_12pkbxb</bpmn:outgoing>
+    </bpmn:userTask>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_approval">
@@ -81,10 +89,6 @@
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
         <dc:Bounds x="25" y="-9" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0zqotmb_di" bpmnElement="Activity_0qpzdpu">
-        <dc:Bounds x="116" y="-31" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1lwca13_di" bpmnElement="Activity_1m7ezna">
         <dc:Bounds x="297" y="130" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -104,6 +108,9 @@
       <bpmndi:BPMNShape id="Activity_0cykmm0_di" bpmnElement="Activity_1c22616">
         <dc:Bounds x="540" y="130" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0lh4c5p_di" bpmnElement="Activity_0qpzdpu">
+        <dc:Bounds x="116" y="-31" width="100" height="80" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_17db3yp_di" bpmnElement="Flow_17db3yp">
         <di:waypoint x="61" y="9" />
         <di:waypoint x="116" y="9" />
diff --git a/process_models/approvals/basic-approval/request-exampledata.json b/process_models/approvals/basic-approval/request-exampledata.json
new file mode 100644
index 0000000..1d39866
--- /dev/null
+++ b/process_models/approvals/basic-approval/request-exampledata.json
@@ -0,0 +1,3 @@
+{
+  "firstName": ""
+}
\ No newline at end of file
diff --git a/process_models/approvals/basic-approval/request-schema.json b/process_models/approvals/basic-approval/request-schema.json
new file mode 100644
index 0000000..64ddbd9
--- /dev/null
+++ b/process_models/approvals/basic-approval/request-schema.json
@@ -0,0 +1,13 @@
+{
+  "title": "Request form",
+  "description": "We are about to ask you what you need.",
+  "type": "object",
+  "required": [
+    "request_item"
+  ],
+  "properties": {
+    "request_item": {
+      "type": "string",
+      "title": "What item would you like to request?"    }
+  }
+}
\ No newline at end of file
diff --git a/process_models/approvals/basic-approval/request-uischema.json b/process_models/approvals/basic-approval/request-uischema.json
new file mode 100644
index 0000000..ca2efeb
--- /dev/null
+++ b/process_models/approvals/basic-approval/request-uischema.json
@@ -0,0 +1,5 @@
+{
+  "firstName": {
+    "ui:autofocus": true
+  }
+}
\ No newline at end of file