From c9c93a1f67a78aa13b80ce550272f80b8589d890 Mon Sep 17 00:00:00 2001
From: Mana-kl20220503 <mn.kumana@gmail.com>
Date: Fri, 26 Apr 2024 10:52:11 +0900
Subject: [PATCH] [Added] Login error message on login form
---
src/main/resources/static/forms/login.form | 17 ++-
src/main/resources/ticketingSystem.bpmn | 154 ++++++++++-----------
target/classes/static/forms/login.form | 17 ++-
target/classes/ticketingSystem.bpmn | 148 +++++++++++---------
4 files changed, 186 insertions(+), 150 deletions(-)
diff --git a/src/main/resources/static/forms/login.form b/src/main/resources/static/forms/login.form
index a906afc..1f5871f 100644
--- a/src/main/resources/static/forms/login.form
+++ b/src/main/resources/static/forms/login.form
@@ -25,17 +25,22 @@
"key": "password",
"validate": {
"required": true
- }
+ },
+ "disabled": false
},
{
- "height": 60,
- "label": "Spacer",
- "type": "spacer",
+ "text": "### Failed to log in!",
+ "label": "Text view",
+ "type": "text",
"layout": {
"row": "Row_08a8ssl",
"columns": 6
},
- "id": "Field_0dfw7yp"
+ "id": "Field_0rc32bn",
+ "properties": {},
+ "conditional": {
+ "hide": "=checkUser != false"
+ }
},
{
"action": "submit",
@@ -43,7 +48,7 @@
"type": "button",
"layout": {
"row": "Row_08a8ssl",
- "columns": null
+ "columns": 9
},
"id": "Field_0udequf"
}
diff --git a/src/main/resources/ticketingSystem.bpmn b/src/main/resources/ticketingSystem.bpmn
index cded7ca..2ff8a43 100644
--- a/src/main/resources/ticketingSystem.bpmn
+++ b/src/main/resources/ticketingSystem.bpmn
@@ -6,7 +6,6 @@
<bpmn:process id="Ticketing-System" isExecutable="true" camunda:historyTimeToLive="180">
<bpmn:laneSet id="LaneSet_18mmydt">
<bpmn:lane id="Lane_1y8nlu9" name="user">
- <bpmn:flowNodeRef>Activity_0thir9e</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Event_0no3gpy</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_1ktet4n</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Event_1shf0vj</bpmn:flowNodeRef>
@@ -18,10 +17,10 @@
<bpmn:flowNodeRef>Gateway_1gvbw22</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_1w98vn8</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Event_0uxq9pi</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>Activity_0thir9e</bpmn:flowNodeRef>
</bpmn:lane>
<bpmn:lane id="Lane_1qts4jt" name="Ticket Resolver">
<bpmn:flowNodeRef>Activity_1ype7pt</bpmn:flowNodeRef>
- <bpmn:flowNodeRef>Activity_1jzstrw</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Gateway_0q02jr7</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_1vxrxea</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_1cn408k</bpmn:flowNodeRef>
@@ -38,10 +37,10 @@
<bpmn:flowNodeRef>Activity_0pko5ob</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_15ef31e</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_0xtx6b9</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>Activity_1jzstrw</bpmn:flowNodeRef>
<bpmn:childLaneSet id="LaneSet_1xmtgh3">
<bpmn:lane id="Lane_06erfpa" name="IT system">
<bpmn:flowNodeRef>Activity_1ype7pt</bpmn:flowNodeRef>
- <bpmn:flowNodeRef>Activity_1jzstrw</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Gateway_0q02jr7</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_1vxrxea</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_1cn408k</bpmn:flowNodeRef>
@@ -53,6 +52,7 @@
<bpmn:flowNodeRef>Activity_0pko5ob</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_15ef31e</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_0xtx6b9</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>Activity_1jzstrw</bpmn:flowNodeRef>
</bpmn:lane>
<bpmn:lane id="Lane_1674bv3" name="IT department">
<bpmn:flowNodeRef>Activity_0cgg53i</bpmn:flowNodeRef>
@@ -97,11 +97,6 @@
<bpmn:sequenceFlow id="Flow_0px1k4o" sourceRef="Activity_1ype7pt" targetRef="Activity_0cgg53i" />
<bpmn:sequenceFlow id="Flow_16jy9r4" sourceRef="Activity_0xtx6b9" targetRef="Activity_15ef31e" />
<bpmn:sequenceFlow id="Flow_1dixi6q" sourceRef="Activity_1o9ilqe" targetRef="Activity_0xtx6b9" />
- <bpmn:userTask id="Activity_0thir9e" name="Log in" camunda:formKey="camunda-forms:/forms/login.form">
- <bpmn:incoming>Flow_023e8ha</bpmn:incoming>
- <bpmn:incoming>Flow_0vrw9co</bpmn:incoming>
- <bpmn:outgoing>Flow_1qhqa77</bpmn:outgoing>
- </bpmn:userTask>
<bpmn:sequenceFlow id="Flow_1jw19ut" sourceRef="Activity_15ef31e" targetRef="Activity_0pko5ob" />
<bpmn:sequenceFlow id="Flow_0d9jstt" sourceRef="Activity_0cgg53i" targetRef="Activity_0xtx6b9" />
<bpmn:sequenceFlow id="Flow_19jvq5l" sourceRef="Activity_0pko5ob" targetRef="Activity_00dooxn" />
@@ -116,10 +111,6 @@
<bpmn:outgoing>Flow_023e8ha</bpmn:outgoing>
<bpmn:outgoing>Flow_0zjcyq2</bpmn:outgoing>
</bpmn:startEvent>
- <bpmn:serviceTask id="Activity_1jzstrw" name="Check email & password if this user is in database" camunda:delegateExpression="#{CheckUser}">
- <bpmn:incoming>Flow_1qhqa77</bpmn:incoming>
- <bpmn:outgoing>Flow_0ksqocj</bpmn:outgoing>
- </bpmn:serviceTask>
<bpmn:sequenceFlow id="Flow_1qhqa77" sourceRef="Activity_0thir9e" targetRef="Activity_1jzstrw" />
<bpmn:sequenceFlow id="Flow_0ksqocj" sourceRef="Activity_1jzstrw" targetRef="Gateway_0q02jr7" />
<bpmn:sequenceFlow id="Flow_0vrw9co" name="User is not registered" sourceRef="Gateway_0q02jr7" targetRef="Activity_0thir9e">
@@ -247,6 +238,15 @@
<bpmn:outgoing>Flow_16jy9r4</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:dataStoreReference id="DataStoreReference_0o5ees5" name="H2 database table called ticket_submission" />
+ <bpmn:userTask id="Activity_0thir9e" name="Log in" camunda:formKey="camunda-forms:/forms/login.form">
+ <bpmn:incoming>Flow_023e8ha</bpmn:incoming>
+ <bpmn:incoming>Flow_0vrw9co</bpmn:incoming>
+ <bpmn:outgoing>Flow_1qhqa77</bpmn:outgoing>
+ </bpmn:userTask>
+ <bpmn:serviceTask id="Activity_1jzstrw" name="Check email & password if this user is in database" camunda:delegateExpression="#{CheckUser}">
+ <bpmn:incoming>Flow_1qhqa77</bpmn:incoming>
+ <bpmn:outgoing>Flow_0ksqocj</bpmn:outgoing>
+ </bpmn:serviceTask>
<bpmn:textAnnotation id="TextAnnotation_1bmwpf3">
<bpmn:text>Extends the issue description with both the original and the extended versions of information</bpmn:text>
</bpmn:textAnnotation>
@@ -294,33 +294,6 @@
<dc:Bounds x="145" y="82" width="2019" height="298" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="TextAnnotation_1bmwpf3_di" bpmnElement="TextAnnotation_1bmwpf3">
- <dc:Bounds x="1010" y="570" width="100" height="127" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="TextAnnotation_13m72xh_di" bpmnElement="TextAnnotation_13m72xh">
- <dc:Bounds x="1340" y="530" width="100" height="84" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="TextAnnotation_15w8gjq_di" bpmnElement="TextAnnotation_15w8gjq">
- <dc:Bounds x="1210" y="390" width="100" height="84" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="TextAnnotation_18zpava_di" bpmnElement="TextAnnotation_18zpava">
- <dc:Bounds x="840" y="640" width="100" height="70" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="TextAnnotation_0ddq4mh_di" bpmnElement="TextAnnotation_0ddq4mh">
- <dc:Bounds x="820" y="780" width="100" height="155" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="TextAnnotation_0zvon6n_di" bpmnElement="TextAnnotation_0zvon6n">
- <dc:Bounds x="810" y="370" width="100" height="55" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="Activity_0713nu9_di" bpmnElement="Activity_0thir9e">
- <dc:Bounds x="370" y="160" width="100" height="80" />
- </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1qvclep_di" bpmnElement="Activity_1ype7pt">
<dc:Bounds x="220" y="405" width="100" height="80" />
<bpmndi:BPMNLabel />
@@ -331,9 +304,6 @@
<dc:Bounds x="249" y="152" width="44" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="Activity_1fxwh81_di" bpmnElement="Activity_1jzstrw">
- <dc:Bounds x="370" y="480" width="100" height="80" />
- </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_0q02jr7_di" bpmnElement="Gateway_0q02jr7" isMarkerVisible="true">
<dc:Bounds x="475" y="385" width="50" height="50" />
</bpmndi:BPMNShape>
@@ -443,30 +413,36 @@
<dc:Bounds x="816" y="532" width="90" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="Association_0okn983_di" bpmnElement="Association_0okn983">
- <di:waypoint x="1028" y="558" />
- <di:waypoint x="1043" y="570" />
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Association_0fa7l4r_di" bpmnElement="Association_0fa7l4r">
- <di:waypoint x="1184" y="471" />
- <di:waypoint x="1210" y="449" />
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Association_0re1zef_di" bpmnElement="Association_0re1zef">
- <di:waypoint x="1328" y="610" />
- <di:waypoint x="1340" y="598" />
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Association_0qtjopa_di" bpmnElement="Association_0qtjopa">
- <di:waypoint x="800" y="710" />
- <di:waypoint x="840" y="685" />
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Association_09u585y_di" bpmnElement="Association_09u585y">
- <di:waypoint x="780" y="910" />
- <di:waypoint x="820" y="860" />
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Association_16o3e1c_di" bpmnElement="Association_16o3e1c">
- <di:waypoint x="792" y="450" />
- <di:waypoint x="820" y="425" />
- </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="TextAnnotation_1bmwpf3_di" bpmnElement="TextAnnotation_1bmwpf3">
+ <dc:Bounds x="1010" y="570" width="100" height="127" />
+ <bpmndi:BPMNLabel />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="TextAnnotation_13m72xh_di" bpmnElement="TextAnnotation_13m72xh">
+ <dc:Bounds x="1340" y="530" width="100" height="84" />
+ <bpmndi:BPMNLabel />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="TextAnnotation_15w8gjq_di" bpmnElement="TextAnnotation_15w8gjq">
+ <dc:Bounds x="1210" y="390" width="100" height="84" />
+ <bpmndi:BPMNLabel />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="TextAnnotation_18zpava_di" bpmnElement="TextAnnotation_18zpava">
+ <dc:Bounds x="840" y="640" width="100" height="70" />
+ <bpmndi:BPMNLabel />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="TextAnnotation_0ddq4mh_di" bpmnElement="TextAnnotation_0ddq4mh">
+ <dc:Bounds x="820" y="780" width="100" height="155" />
+ <bpmndi:BPMNLabel />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="TextAnnotation_0zvon6n_di" bpmnElement="TextAnnotation_0zvon6n">
+ <dc:Bounds x="810" y="370" width="100" height="55" />
+ <bpmndi:BPMNLabel />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="Activity_0713nu9_di" bpmnElement="Activity_0thir9e">
+ <dc:Bounds x="360" y="160" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="Activity_1fxwh81_di" bpmnElement="Activity_1jzstrw">
+ <dc:Bounds x="360" y="497" width="100" height="80" />
+ </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1n40c9e_di" bpmnElement="Event_0uxq9pi">
<dc:Bounds x="1132" y="229" width="36" height="36" />
<bpmndi:BPMNLabel>
@@ -475,7 +451,7 @@
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_023e8ha_di" bpmnElement="Flow_023e8ha">
<di:waypoint x="288" y="200" />
- <di:waypoint x="370" y="200" />
+ <di:waypoint x="360" y="200" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_05vrxvm_di" bpmnElement="Flow_05vrxvm">
<di:waypoint x="800" y="950" />
@@ -615,20 +591,20 @@
<di:waypoint x="1140" y="327" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1qhqa77_di" bpmnElement="Flow_1qhqa77">
- <di:waypoint x="420" y="240" />
- <di:waypoint x="420" y="480" />
+ <di:waypoint x="410" y="240" />
+ <di:waypoint x="410" y="497" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0ksqocj_di" bpmnElement="Flow_0ksqocj">
- <di:waypoint x="470" y="520" />
- <di:waypoint x="500" y="520" />
+ <di:waypoint x="460" y="537" />
+ <di:waypoint x="500" y="537" />
<di:waypoint x="500" y="435" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0vrw9co_di" bpmnElement="Flow_0vrw9co">
<di:waypoint x="500" y="385" />
<di:waypoint x="500" y="200" />
- <di:waypoint x="470" y="200" />
+ <di:waypoint x="460" y="200" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="443" y="317" width="54" height="27" />
+ <dc:Bounds x="443" y="316" width="54" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_05zexdv_di" bpmnElement="Flow_05zexdv">
@@ -636,7 +612,7 @@
<di:waypoint x="580" y="410" />
<di:waypoint x="580" y="497" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="516" y="433" width="87" height="14" />
+ <dc:Bounds x="526" y="393" width="87" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ggdpjz_di" bpmnElement="Flow_1ggdpjz">
@@ -644,14 +620,38 @@
<di:waypoint x="620" y="200" />
<di:waypoint x="700" y="200" />
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="DataOutputAssociation_18sxyxf_di" bpmnElement="DataOutputAssociation_18sxyxf">
- <di:waypoint x="788" y="570" />
- <di:waypoint x="835" y="522" />
+ <bpmndi:BPMNEdge id="Association_0okn983_di" bpmnElement="Association_0okn983">
+ <di:waypoint x="1028" y="558" />
+ <di:waypoint x="1043" y="570" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="Association_0fa7l4r_di" bpmnElement="Association_0fa7l4r">
+ <di:waypoint x="1184" y="471" />
+ <di:waypoint x="1210" y="449" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="Association_0re1zef_di" bpmnElement="Association_0re1zef">
+ <di:waypoint x="1328" y="610" />
+ <di:waypoint x="1340" y="598" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="Association_0qtjopa_di" bpmnElement="Association_0qtjopa">
+ <di:waypoint x="800" y="710" />
+ <di:waypoint x="840" y="685" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="Association_09u585y_di" bpmnElement="Association_09u585y">
+ <di:waypoint x="780" y="910" />
+ <di:waypoint x="820" y="860" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="Association_16o3e1c_di" bpmnElement="Association_16o3e1c">
+ <di:waypoint x="792" y="450" />
+ <di:waypoint x="820" y="425" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="DataOutputAssociation_0n3iijf_di" bpmnElement="DataOutputAssociation_0n3iijf">
<di:waypoint x="1900" y="512" />
<di:waypoint x="1845" y="485" />
</bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="DataOutputAssociation_18sxyxf_di" bpmnElement="DataOutputAssociation_18sxyxf">
+ <di:waypoint x="788" y="570" />
+ <di:waypoint x="835" y="522" />
+ </bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>
diff --git a/target/classes/static/forms/login.form b/target/classes/static/forms/login.form
index a906afc..3f7dd01 100644
--- a/target/classes/static/forms/login.form
+++ b/target/classes/static/forms/login.form
@@ -25,7 +25,8 @@
"key": "password",
"validate": {
"required": true
- }
+ },
+ "disabled": false
},
{
"height": 60,
@@ -46,6 +47,20 @@
"columns": null
},
"id": "Field_0udequf"
+ },
+ {
+ "text": "# Failed to log in",
+ "label": "Text view",
+ "type": "text",
+ "layout": {
+ "row": "Row_1fmgj6e",
+ "columns": null
+ },
+ "id": "Field_0rc32bn",
+ "properties": {},
+ "conditional": {
+ "hide": "=checkUser != false"
+ }
}
],
"type": "default",
diff --git a/target/classes/ticketingSystem.bpmn b/target/classes/ticketingSystem.bpmn
index cded7ca..400935c 100644
--- a/target/classes/ticketingSystem.bpmn
+++ b/target/classes/ticketingSystem.bpmn
@@ -6,7 +6,6 @@
<bpmn:process id="Ticketing-System" isExecutable="true" camunda:historyTimeToLive="180">
<bpmn:laneSet id="LaneSet_18mmydt">
<bpmn:lane id="Lane_1y8nlu9" name="user">
- <bpmn:flowNodeRef>Activity_0thir9e</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Event_0no3gpy</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_1ktet4n</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Event_1shf0vj</bpmn:flowNodeRef>
@@ -18,6 +17,8 @@
<bpmn:flowNodeRef>Gateway_1gvbw22</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Activity_1w98vn8</bpmn:flowNodeRef>
<bpmn:flowNodeRef>Event_0uxq9pi</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>Activity_0thir9e</bpmn:flowNodeRef>
+ <bpmn:flowNodeRef>Activity_1beyd0t</bpmn:flowNodeRef>
</bpmn:lane>
<bpmn:lane id="Lane_1qts4jt" name="Ticket Resolver">
<bpmn:flowNodeRef>Activity_1ype7pt</bpmn:flowNodeRef>
@@ -97,11 +98,6 @@
<bpmn:sequenceFlow id="Flow_0px1k4o" sourceRef="Activity_1ype7pt" targetRef="Activity_0cgg53i" />
<bpmn:sequenceFlow id="Flow_16jy9r4" sourceRef="Activity_0xtx6b9" targetRef="Activity_15ef31e" />
<bpmn:sequenceFlow id="Flow_1dixi6q" sourceRef="Activity_1o9ilqe" targetRef="Activity_0xtx6b9" />
- <bpmn:userTask id="Activity_0thir9e" name="Log in" camunda:formKey="camunda-forms:/forms/login.form">
- <bpmn:incoming>Flow_023e8ha</bpmn:incoming>
- <bpmn:incoming>Flow_0vrw9co</bpmn:incoming>
- <bpmn:outgoing>Flow_1qhqa77</bpmn:outgoing>
- </bpmn:userTask>
<bpmn:sequenceFlow id="Flow_1jw19ut" sourceRef="Activity_15ef31e" targetRef="Activity_0pko5ob" />
<bpmn:sequenceFlow id="Flow_0d9jstt" sourceRef="Activity_0cgg53i" targetRef="Activity_0xtx6b9" />
<bpmn:sequenceFlow id="Flow_19jvq5l" sourceRef="Activity_0pko5ob" targetRef="Activity_00dooxn" />
@@ -122,7 +118,7 @@
</bpmn:serviceTask>
<bpmn:sequenceFlow id="Flow_1qhqa77" sourceRef="Activity_0thir9e" targetRef="Activity_1jzstrw" />
<bpmn:sequenceFlow id="Flow_0ksqocj" sourceRef="Activity_1jzstrw" targetRef="Gateway_0q02jr7" />
- <bpmn:sequenceFlow id="Flow_0vrw9co" name="User is not registered" sourceRef="Gateway_0q02jr7" targetRef="Activity_0thir9e">
+ <bpmn:sequenceFlow id="Flow_0vrw9co" name="User is not registered" sourceRef="Gateway_0q02jr7" targetRef="Activity_1beyd0t">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{checkUser== false}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:exclusiveGateway id="Gateway_0q02jr7">
@@ -247,6 +243,16 @@
<bpmn:outgoing>Flow_16jy9r4</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:dataStoreReference id="DataStoreReference_0o5ees5" name="H2 database table called ticket_submission" />
+ <bpmn:userTask id="Activity_0thir9e" name="Log in" camunda:formKey="camunda-forms:/forms/login.form">
+ <bpmn:incoming>Flow_023e8ha</bpmn:incoming>
+ <bpmn:incoming>Flow_1p862ia</bpmn:incoming>
+ <bpmn:outgoing>Flow_1qhqa77</bpmn:outgoing>
+ </bpmn:userTask>
+ <bpmn:userTask id="Activity_1beyd0t" name="checkUser?">
+ <bpmn:incoming>Flow_0vrw9co</bpmn:incoming>
+ <bpmn:outgoing>Flow_1p862ia</bpmn:outgoing>
+ </bpmn:userTask>
+ <bpmn:sequenceFlow id="Flow_1p862ia" sourceRef="Activity_1beyd0t" targetRef="Activity_0thir9e" />
<bpmn:textAnnotation id="TextAnnotation_1bmwpf3">
<bpmn:text>Extends the issue description with both the original and the extended versions of information</bpmn:text>
</bpmn:textAnnotation>
@@ -294,33 +300,6 @@
<dc:Bounds x="145" y="82" width="2019" height="298" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="TextAnnotation_1bmwpf3_di" bpmnElement="TextAnnotation_1bmwpf3">
- <dc:Bounds x="1010" y="570" width="100" height="127" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="TextAnnotation_13m72xh_di" bpmnElement="TextAnnotation_13m72xh">
- <dc:Bounds x="1340" y="530" width="100" height="84" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="TextAnnotation_15w8gjq_di" bpmnElement="TextAnnotation_15w8gjq">
- <dc:Bounds x="1210" y="390" width="100" height="84" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="TextAnnotation_18zpava_di" bpmnElement="TextAnnotation_18zpava">
- <dc:Bounds x="840" y="640" width="100" height="70" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="TextAnnotation_0ddq4mh_di" bpmnElement="TextAnnotation_0ddq4mh">
- <dc:Bounds x="820" y="780" width="100" height="155" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="TextAnnotation_0zvon6n_di" bpmnElement="TextAnnotation_0zvon6n">
- <dc:Bounds x="810" y="370" width="100" height="55" />
- <bpmndi:BPMNLabel />
- </bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="Activity_0713nu9_di" bpmnElement="Activity_0thir9e">
- <dc:Bounds x="370" y="160" width="100" height="80" />
- </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1qvclep_di" bpmnElement="Activity_1ype7pt">
<dc:Bounds x="220" y="405" width="100" height="80" />
<bpmndi:BPMNLabel />
@@ -443,30 +422,37 @@
<dc:Bounds x="816" y="532" width="90" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="Association_0okn983_di" bpmnElement="Association_0okn983">
- <di:waypoint x="1028" y="558" />
- <di:waypoint x="1043" y="570" />
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Association_0fa7l4r_di" bpmnElement="Association_0fa7l4r">
- <di:waypoint x="1184" y="471" />
- <di:waypoint x="1210" y="449" />
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Association_0re1zef_di" bpmnElement="Association_0re1zef">
- <di:waypoint x="1328" y="610" />
- <di:waypoint x="1340" y="598" />
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Association_0qtjopa_di" bpmnElement="Association_0qtjopa">
- <di:waypoint x="800" y="710" />
- <di:waypoint x="840" y="685" />
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Association_09u585y_di" bpmnElement="Association_09u585y">
- <di:waypoint x="780" y="910" />
- <di:waypoint x="820" y="860" />
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="Association_16o3e1c_di" bpmnElement="Association_16o3e1c">
- <di:waypoint x="792" y="450" />
- <di:waypoint x="820" y="425" />
- </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="TextAnnotation_1bmwpf3_di" bpmnElement="TextAnnotation_1bmwpf3">
+ <dc:Bounds x="1010" y="570" width="100" height="127" />
+ <bpmndi:BPMNLabel />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="TextAnnotation_13m72xh_di" bpmnElement="TextAnnotation_13m72xh">
+ <dc:Bounds x="1340" y="530" width="100" height="84" />
+ <bpmndi:BPMNLabel />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="TextAnnotation_15w8gjq_di" bpmnElement="TextAnnotation_15w8gjq">
+ <dc:Bounds x="1210" y="390" width="100" height="84" />
+ <bpmndi:BPMNLabel />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="TextAnnotation_18zpava_di" bpmnElement="TextAnnotation_18zpava">
+ <dc:Bounds x="840" y="640" width="100" height="70" />
+ <bpmndi:BPMNLabel />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="TextAnnotation_0ddq4mh_di" bpmnElement="TextAnnotation_0ddq4mh">
+ <dc:Bounds x="820" y="780" width="100" height="155" />
+ <bpmndi:BPMNLabel />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="TextAnnotation_0zvon6n_di" bpmnElement="TextAnnotation_0zvon6n">
+ <dc:Bounds x="810" y="370" width="100" height="55" />
+ <bpmndi:BPMNLabel />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="Activity_0713nu9_di" bpmnElement="Activity_0thir9e">
+ <dc:Bounds x="360" y="160" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="Activity_0hpvr5n_di" bpmnElement="Activity_1beyd0t">
+ <dc:Bounds x="450" y="247" width="100" height="80" />
+ <bpmndi:BPMNLabel />
+ </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1n40c9e_di" bpmnElement="Event_0uxq9pi">
<dc:Bounds x="1132" y="229" width="36" height="36" />
<bpmndi:BPMNLabel>
@@ -475,7 +461,7 @@
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_023e8ha_di" bpmnElement="Flow_023e8ha">
<di:waypoint x="288" y="200" />
- <di:waypoint x="370" y="200" />
+ <di:waypoint x="360" y="200" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_05vrxvm_di" bpmnElement="Flow_05vrxvm">
<di:waypoint x="800" y="950" />
@@ -615,7 +601,9 @@
<di:waypoint x="1140" y="327" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1qhqa77_di" bpmnElement="Flow_1qhqa77">
- <di:waypoint x="420" y="240" />
+ <di:waypoint x="410" y="240" />
+ <di:waypoint x="410" y="360" />
+ <di:waypoint x="420" y="360" />
<di:waypoint x="420" y="480" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0ksqocj_di" bpmnElement="Flow_0ksqocj">
@@ -625,10 +613,9 @@
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0vrw9co_di" bpmnElement="Flow_0vrw9co">
<di:waypoint x="500" y="385" />
- <di:waypoint x="500" y="200" />
- <di:waypoint x="470" y="200" />
+ <di:waypoint x="500" y="327" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="443" y="317" width="54" height="27" />
+ <dc:Bounds x="443" y="339" width="54" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_05zexdv_di" bpmnElement="Flow_05zexdv">
@@ -644,14 +631,43 @@
<di:waypoint x="620" y="200" />
<di:waypoint x="700" y="200" />
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="DataOutputAssociation_18sxyxf_di" bpmnElement="DataOutputAssociation_18sxyxf">
- <di:waypoint x="788" y="570" />
- <di:waypoint x="835" y="522" />
+ <bpmndi:BPMNEdge id="Association_0okn983_di" bpmnElement="Association_0okn983">
+ <di:waypoint x="1028" y="558" />
+ <di:waypoint x="1043" y="570" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="Association_0fa7l4r_di" bpmnElement="Association_0fa7l4r">
+ <di:waypoint x="1184" y="471" />
+ <di:waypoint x="1210" y="449" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="Association_0re1zef_di" bpmnElement="Association_0re1zef">
+ <di:waypoint x="1328" y="610" />
+ <di:waypoint x="1340" y="598" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="Association_0qtjopa_di" bpmnElement="Association_0qtjopa">
+ <di:waypoint x="800" y="710" />
+ <di:waypoint x="840" y="685" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="Association_09u585y_di" bpmnElement="Association_09u585y">
+ <di:waypoint x="780" y="910" />
+ <di:waypoint x="820" y="860" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="Association_16o3e1c_di" bpmnElement="Association_16o3e1c">
+ <di:waypoint x="792" y="450" />
+ <di:waypoint x="820" y="425" />
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="Flow_1p862ia_di" bpmnElement="Flow_1p862ia">
+ <di:waypoint x="500" y="247" />
+ <di:waypoint x="500" y="200" />
+ <di:waypoint x="460" y="200" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="DataOutputAssociation_0n3iijf_di" bpmnElement="DataOutputAssociation_0n3iijf">
<di:waypoint x="1900" y="512" />
<di:waypoint x="1845" y="485" />
</bpmndi:BPMNEdge>
+ <bpmndi:BPMNEdge id="DataOutputAssociation_18sxyxf_di" bpmnElement="DataOutputAssociation_18sxyxf">
+ <di:waypoint x="788" y="570" />
+ <di:waypoint x="835" y="522" />
+ </bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>
--
GitLab