From 6a8a53b35a0685828ffaedf64328d97c3e52f97b Mon Sep 17 00:00:00 2001
From: David Kaufmann <david.kaufmann@student.tuwien.ac.at>
Date: Wed, 7 Nov 2018 00:57:13 +0100
Subject: [PATCH] add forms

---
 sentiment-analysis/camunda-deploy.sh          |  3 +-
 .../main/resources/sentiment-analysis.bpmn    | 85 ++++++++++++-------
 .../src/main/webapp/forms/download-pdf.html   |  1 +
 .../src/main/webapp/forms/input-terms.html    | 13 ++-
 4 files changed, 69 insertions(+), 33 deletions(-)
 create mode 100644 sentiment-analysis/src/main/webapp/forms/download-pdf.html

diff --git a/sentiment-analysis/camunda-deploy.sh b/sentiment-analysis/camunda-deploy.sh
index ea60a30..de0031f 100755
--- a/sentiment-analysis/camunda-deploy.sh
+++ b/sentiment-analysis/camunda-deploy.sh
@@ -18,4 +18,5 @@ curl -i "${camunda_deployment}/create" \
 	 -H "Expect:" \
 	 -F "deployment-name=${deployment_name}" \
 	 -F "${file_name}=@${file_path}${file_name}" \
-	 -F "input-forms.html=@./src/main/webapp/forms/input-terms.html"
+	 -F "input-forms.html=@./src/main/webapp/forms/input-terms.html" \
+	 -F "download-pdf.html=@./src/main/webapp/forms/download-pdf.html"
diff --git a/sentiment-analysis/src/main/resources/sentiment-analysis.bpmn b/sentiment-analysis/src/main/resources/sentiment-analysis.bpmn
index 6d89483..13ff102 100644
--- a/sentiment-analysis/src/main/resources/sentiment-analysis.bpmn
+++ b/sentiment-analysis/src/main/resources/sentiment-analysis.bpmn
@@ -33,17 +33,8 @@
       <bpmn:incoming>SequenceFlow_1xc6g12</bpmn:incoming>
       <bpmn:incoming>SequenceFlow_0azv06r</bpmn:incoming>
     </bpmn:subProcess>
-    <bpmn:endEvent id="EndEvent_0bmuv13">
-      <bpmn:property id="Property_00nk8ci" name="__targetRef_placeholder" />
-      <bpmn:dataInputAssociation id="DataInputAssociation_1mm9v77">
-        <bpmn:sourceRef>DataObjectReference_10ouwro</bpmn:sourceRef>
-        <bpmn:targetRef>Property_00nk8ci</bpmn:targetRef>
-      </bpmn:dataInputAssociation>
-    </bpmn:endEvent>
     <bpmn:startEvent id="StartEvent_1t6nxib" camunda:formKey="embedded:deployment:input-terms.html">
-      <bpmn:dataOutputAssociation id="DataOutputAssociation_1czr06p">
-        <bpmn:targetRef>DataObjectReference_0y1eo6i</bpmn:targetRef>
-      </bpmn:dataOutputAssociation>
+      <bpmn:outgoing>SequenceFlow_1ijha11</bpmn:outgoing>
     </bpmn:startEvent>
     <bpmn:exclusiveGateway id="ExclusiveGateway_0onybdl">
       <bpmn:incoming>SequenceFlow_032ipyi</bpmn:incoming>
@@ -63,8 +54,6 @@
     <bpmn:sequenceFlow id="SequenceFlow_0azrswq" sourceRef="Task_05u1qwp" targetRef="Task_1n6iu8h" />
     <bpmn:sequenceFlow id="SequenceFlow_1xc6g12" sourceRef="Task_05u1qwp" targetRef="Task_1cfglzc" />
     <bpmn:sequenceFlow id="SequenceFlow_0utq8ut" sourceRef="Task_05u1qwp" targetRef="Task_1rt5mbt" />
-    <bpmn:dataObjectReference id="DataObjectReference_10ouwro" name="&#60;output&#62;&#10;report" dataObjectRef="DataObject_1aetk4r" />
-    <bpmn:dataObject id="DataObject_1aetk4r" />
     <bpmn:task id="Task_1tosag4" name="Generate Report">
       <bpmn:incoming>SequenceFlow_0okj60f</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_03ohp0o</bpmn:outgoing>
@@ -81,11 +70,35 @@
     </bpmn:subProcess>
     <bpmn:dataObjectReference id="DataObjectReference_0y1eo6i" name="&#60;input&#62;&#10;terms" dataObjectRef="DataObject_1dc69ww" />
     <bpmn:dataObject id="DataObject_1dc69ww" />
+    <bpmn:sequenceFlow id="SequenceFlow_1ijha11" sourceRef="StartEvent_1t6nxib" targetRef="StartEvent_1ad6v2b" />
+    <bpmn:intermediateCatchEvent id="StartEvent_1ad6v2b">
+      <bpmn:incoming>SequenceFlow_1ijha11</bpmn:incoming>
+      <bpmn:dataOutputAssociation id="DataOutputAssociation_05c6ls9">
+        <bpmn:targetRef>DataObjectReference_0y1eo6i</bpmn:targetRef>
+      </bpmn:dataOutputAssociation>
+      <bpmn:timerEventDefinition>
+        <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">PT2M</bpmn:timeDuration>
+      </bpmn:timerEventDefinition>
+    </bpmn:intermediateCatchEvent>
+    <bpmn:endEvent id="EndEvent_0bmuv13">
+      <bpmn:incoming>SequenceFlow_0jebdb9</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="SequenceFlow_0jebdb9" sourceRef="Task_1e7059p" targetRef="EndEvent_0bmuv13" />
+    <bpmn:userTask id="Task_1e7059p" name="download pdf" camunda:formKey="embedded:deployment:download-pdf.html">
+      <bpmn:outgoing>SequenceFlow_0jebdb9</bpmn:outgoing>
+      <bpmn:property id="Property_0hvydxw" name="__targetRef_placeholder" />
+      <bpmn:dataInputAssociation id="DataInputAssociation_1r8dfi4">
+        <bpmn:sourceRef>DataObjectReference_10ouwro</bpmn:sourceRef>
+        <bpmn:targetRef>Property_0hvydxw</bpmn:targetRef>
+      </bpmn:dataInputAssociation>
+    </bpmn:userTask>
+    <bpmn:dataObjectReference id="DataObjectReference_10ouwro" name="&#60;output&#62;&#10;report" dataObjectRef="DataObject_1aetk4r" />
+    <bpmn:dataObject id="DataObject_1aetk4r" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_1x8eoy3">
       <bpmndi:BPMNShape id="Participant_0gzc3m9_di" bpmnElement="Participant_0gzc3m9">
-        <dc:Bounds x="-2" y="-248" width="1147" height="543" />
+        <dc:Bounds x="-2" y="-248" width="1236" height="543" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="SubProcess_06upc1d_di" bpmnElement="Task_05u1qwp">
         <dc:Bounds x="622" y="-196" width="100" height="80" />
@@ -100,28 +113,24 @@
         <dc:Bounds x="282" y="-25" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0bmuv13_di" bpmnElement="EndEvent_0bmuv13">
-        <dc:Bounds x="1085" y="174" width="36" height="36" />
+        <dc:Bounds x="1159" y="174" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="DataObjectReference_10ouwro_di" bpmnElement="DataObjectReference_10ouwro">
-        <dc:Bounds x="992" y="167" width="36" height="50" />
+        <dc:Bounds x="960" y="167" width="36" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="989" y="224" width="44" height="27" />
+          <dc:Bounds x="957" y="224" width="44" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="DataInputAssociation_1mm9v77_di" bpmnElement="DataInputAssociation_1mm9v77">
-        <di:waypoint x="1028" y="192" />
-        <di:waypoint x="1085" y="192" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="Task_1tosag4_di" bpmnElement="Task_1tosag4">
         <dc:Bounds x="830" y="152" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="DataOutputAssociation_0iwh0gi_di" bpmnElement="DataOutputAssociation_0iwh0gi">
         <di:waypoint x="930" y="192" />
-        <di:waypoint x="992" y="192" />
+        <di:waypoint x="960" y="192" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="DataOutputAssociation_1ustd8r_di" bpmnElement="DataOutputAssociation_1ustd8r">
         <di:waypoint x="930" y="192" />
-        <di:waypoint x="992" y="192" />
+        <di:waypoint x="960" y="192" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="Task_0fs65yp_di" bpmnElement="Task_0fs65yp">
         <dc:Bounds x="465" y="152" width="100" height="80" />
@@ -184,19 +193,37 @@
         <dc:Bounds x="647" y="167" width="50" height="50" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="DataObjectReference_0y1eo6i_di" bpmnElement="DataObjectReference_0y1eo6i">
-        <dc:Bounds x="179" y="167" width="36" height="50" />
+        <dc:Bounds x="218" y="167" width="36" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="180" y="224" width="37" height="27" />
+          <dc:Bounds x="219" y="224" width="37" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="DataOutputAssociation_1czr06p_di" bpmnElement="DataOutputAssociation_1czr06p">
-        <di:waypoint x="107" y="192" />
-        <di:waypoint x="179" y="192" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="DataInputAssociation_1eww56a_di" bpmnElement="DataInputAssociation_1eww56a">
-        <di:waypoint x="215" y="192" />
+        <di:waypoint x="254" y="192" />
         <di:waypoint x="282" y="192" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="IntermediateCatchEvent_0iz9cf9_di" bpmnElement="StartEvent_1ad6v2b">
+        <dc:Bounds x="144" y="174" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1ijha11_di" bpmnElement="SequenceFlow_1ijha11">
+        <di:waypoint x="107" y="192" />
+        <di:waypoint x="144" y="192" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="DataOutputAssociation_05c6ls9_di" bpmnElement="DataOutputAssociation_05c6ls9">
+        <di:waypoint x="180" y="192" />
+        <di:waypoint x="218" y="192" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="SequenceFlow_0jebdb9_di" bpmnElement="SequenceFlow_0jebdb9">
+        <di:waypoint x="1129" y="192" />
+        <di:waypoint x="1159" y="192" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="DataInputAssociation_1r8dfi4_di" bpmnElement="DataInputAssociation_1r8dfi4">
+        <di:waypoint x="996" y="192" />
+        <di:waypoint x="1029" y="192" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="UserTask_0iooc2g_di" bpmnElement="Task_1e7059p">
+        <dc:Bounds x="1029" y="152" width="100" height="80" />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>
diff --git a/sentiment-analysis/src/main/webapp/forms/download-pdf.html b/sentiment-analysis/src/main/webapp/forms/download-pdf.html
new file mode 100644
index 0000000..3fc7e07
--- /dev/null
+++ b/sentiment-analysis/src/main/webapp/forms/download-pdf.html
@@ -0,0 +1 @@
+<p>There is no pdf right now.</p>
diff --git a/sentiment-analysis/src/main/webapp/forms/input-terms.html b/sentiment-analysis/src/main/webapp/forms/input-terms.html
index ffbd7b5..3c9e6c8 100644
--- a/sentiment-analysis/src/main/webapp/forms/input-terms.html
+++ b/sentiment-analysis/src/main/webapp/forms/input-terms.html
@@ -5,7 +5,7 @@
 
     // scope function which adds a new term
     $scope.addTerm = function() {
-      terms.push({});
+	  terms.push({});
     };
 
     camForm.on('form-loaded', function() {
@@ -15,9 +15,15 @@
         type: 'json',
         value: terms
       });
-
     });
 
+    camForm.on('submit', function() {
+      // remove '$$hashKey' properties
+      angular.forEach($scope.terms, function(term) {
+        delete term.$$hashKey;
+      });
+	});
+
   </script>
 
   <h3>Terms</h3>
@@ -28,7 +34,8 @@
         <input id="term"
                class="form-control"
                type="text"
-               required>
+               required
+			   ng-model="term.term">
       </div>
     </div>
   </div>
-- 
2.43.0