Merge pull request #200 from hmcts/RET-5258

RET-5258: Tidy Up of DMNs.
hmcts · Jul 1, 2024 · d10dbe2 · d10dbe2
2 parents 80303d0 + 7c1f043
commit d10dbe2
Show file tree

Hide file tree

Showing 16 changed files with 119 additions and 126 deletions.
diff --git a/src/main/resources/wa-task-cancellation-employment-et_englandwales_multiple.dmn b/src/main/resources/wa-task-cancellation-employment-et_englandwales_multiple.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:camunda="http://camunda.org/schema/1.0/dmn" id="wa-cancellation-definition-et_englandwales" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.20.0">
+<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:camunda="http://camunda.org/schema/1.0/dmn" id="wa-cancellation-definition-et_englandwales_multiple" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.24.0">
   <decision id="wa-task-cancellation-employment-et_englandwales_multiple" name="ET Multiple Task cancellation DMN" camunda:historyTimeToLive="P30D">
     <decisionTable id="DecisionTable_0z3jx1g" hitPolicy="COLLECT">
       <input id="Input_1" label="From State">

diff --git a/src/main/resources/wa-task-cancellation-employment-et_scotland_multiple.dmn b/src/main/resources/wa-task-cancellation-employment-et_scotland_multiple.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:camunda="http://camunda.org/schema/1.0/dmn" id="wa-cancellation-definition-et_scotland" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.20.0">
+<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:camunda="http://camunda.org/schema/1.0/dmn" id="wa-cancellation-definition-et_scotland_multiple" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.24.0">
   <decision id="wa-task-cancellation-employment-et_scotland_multiple" name="ET Multiple Task cancellation DMN" camunda:historyTimeToLive="P30D">
     <decisionTable id="DecisionTable_0z3jx1g" hitPolicy="COLLECT">
       <input id="Input_1" label="From State">

diff --git a/src/main/resources/wa-task-completion-employment-et_englandwales_multiple.dmn b/src/main/resources/wa-task-completion-employment-et_englandwales_multiple.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:camunda="http://camunda.org/schema/1.0/dmn" id="wa-completion-definition-et_scotland" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.23.0">
+<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:camunda="http://camunda.org/schema/1.0/dmn" id="wa-completion-definition-et_englandwales_multiple" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.24.0">
   <decision id="wa-task-completion-employment-et_englandwales_multiple" name="ET Multiple Task completion DMN" camunda:historyTimeToLive="P30D">
     <decisionTable id="DecisionTable_01re27m" hitPolicy="COLLECT">
       <input id="eventId" label="Event ID" biodi:width="392">

diff --git a/src/main/resources/wa-task-completion-employment-et_scotland_multiple.dmn b/src/main/resources/wa-task-completion-employment-et_scotland_multiple.dmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:camunda="http://camunda.org/schema/1.0/dmn" id="wa-completion-definition-et_scotland" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.23.0">
+<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:camunda="http://camunda.org/schema/1.0/dmn" id="wa-completion-definition-et_scotland_multiple" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.24.0">
   <decision id="wa-task-completion-employment-et_scotland_multiple" name="ET Multiple Task completion DMN" camunda:historyTimeToLive="P30D">
     <decisionTable id="DecisionTable_01re27m" hitPolicy="COLLECT">
       <input id="eventId" label="Event ID" biodi:width="392">

diff --git a/src/main/resources/wa-task-configuration-employment-et_englandwales.dmn b/src/main/resources/wa-task-configuration-employment-et_englandwales.dmn
@@ -9,12 +9,11 @@
       </input>
       <input id="InputClause_00c59gm" label="Task type" biodi:width="436" camunda:inputVariable="taskType">
         <inputExpression id="LiteralExpression_1ngi22k" typeRef="string">
-          <text>
-          if(taskAttributes != null and taskAttributes.taskType != null)
-          then taskAttributes.taskType
-          else if(taskType != null)
-          then taskType
-          else null</text>
+          <text>if(taskAttributes != null and taskAttributes.taskType != null)
+then taskAttributes.taskType
+else if(taskType != null)
+then taskType
+else null</text>
         </inputExpression>
       </input>
       <output id="Output_1" label="Name" name="name" typeRef="string" biodi:width="258" />

diff --git a/src/main/resources/wa-task-configuration-employment-et_englandwales_multiple.dmn b/src/main/resources/wa-task-configuration-employment-et_englandwales_multiple.dmn
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:camunda="http://camunda.org/schema/1.0/dmn" id="wa-configuration-definition-et_englandwales" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.23.0">
+<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:camunda="http://camunda.org/schema/1.0/dmn" id="wa-configuration-definition-et_englandwales_multiple" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.24.0">
   <decision id="wa-task-configuration-employment-et_englandwales_multiple" name="ET Multiple Task configuration DMN" camunda:historyTimeToLive="P30D">
     <decisionTable id="DecisionTable_14cx079" hitPolicy="COLLECT">
-      <input id="InputClause_1gxyo7f" label="CCD Case Data" camunda:inputVariable="caseData">
+      <input id="InputClause_1gxyo7f" label="CCD Case Data" biodi:width="150" camunda:inputVariable="caseData">
         <inputExpression id="LiteralExpression_0mra7c4" typeRef="string">
           <text></text>
         </inputExpression>
       </input>
-      <input id="InputClause_00c59gm" label="Task type" biodi:width="388" camunda:inputVariable="taskType">
+      <input id="InputClause_00c59gm" label="Task type" biodi:width="362" camunda:inputVariable="taskType">
         <inputExpression id="LiteralExpression_1ngi22k" typeRef="string">
-          <text>
-          if(taskAttributes != null and taskAttributes.taskType != null)
-          then taskAttributes.taskType
-          else if(taskType != null)
-          then taskType
-          else null</text>
+          <text>if(taskAttributes != null and taskAttributes.taskType != null)
+then taskAttributes.taskType
+else if(taskType != null)
+then taskType
+else null</text>
         </inputExpression>
       </input>
       <output id="Output_1" label="Name" name="name" typeRef="string" biodi:width="258" />
@@ -130,7 +129,10 @@
           <text></text>
         </inputEntry>
         <inputEntry id="UnaryTests_1s942lt">
-          <text>"ReviewReferralAdminMultiple", "ReviewReferralLegalOpsMultiple", "MultiplesReviewReferralResponseLegalOps", "ReviewReferralResponseAdminMultiple"</text>
+          <text>"ReviewReferralAdminMultiple",
+"ReviewReferralLegalOpsMultiple",
+"MultiplesReviewReferralResponseLegalOps",
+"ReviewReferralResponseAdminMultiple"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_0n9qju5">
           <text>"workType"</text>
@@ -165,7 +167,8 @@
           <text></text>
         </inputEntry>
         <inputEntry id="UnaryTests_1faq2jo">
-          <text>"ReviewReferralAdminMultiple", "ReviewReferralResponseAdminMultiple"</text>
+          <text>"ReviewReferralAdminMultiple",
+"ReviewReferralResponseAdminMultiple"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_158s3ny">
           <text>"roleCategory"</text>
@@ -200,7 +203,8 @@
           <text></text>
         </inputEntry>
         <inputEntry id="UnaryTests_1usq9ui">
-          <text>"ReviewReferralLegalOpsMultiple", "MultiplesReviewReferralResponseLegalOps"</text>
+          <text>"ReviewReferralLegalOpsMultiple",
+"MultiplesReviewReferralResponseLegalOps"</text>
         </inputEntry>
         <outputEntry id="LiteralExpression_0d8to5q">
           <text>"roleCategory"</text>

diff --git a/src/main/resources/wa-task-configuration-employment-et_scotland.dmn b/src/main/resources/wa-task-configuration-employment-et_scotland.dmn
@@ -9,12 +9,11 @@
       </input>
       <input id="InputClause_00c59gm" label="Task type" biodi:width="436" camunda:inputVariable="taskType">
         <inputExpression id="LiteralExpression_1ngi22k" typeRef="string">
-          <text>
-          if(taskAttributes != null and taskAttributes.taskType != null)
-          then taskAttributes.taskType
-          else if(taskType != null)
-          then taskType
-          else null</text>
+          <text>if(taskAttributes != null and taskAttributes.taskType != null)
+then taskAttributes.taskType
+else if(taskType != null)
+then taskType
+else null</text>
         </inputExpression>
       </input>
       <output id="Output_1" label="Name" name="name" typeRef="string" biodi:width="260" />

diff --git a/src/main/resources/wa-task-configuration-employment-et_scotland_multiple.dmn b/src/main/resources/wa-task-configuration-employment-et_scotland_multiple.dmn
@@ -1,27 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:camunda="http://camunda.org/schema/1.0/dmn" id="wa-configuration-definition-et_scotland" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.23.0">
+<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:camunda="http://camunda.org/schema/1.0/dmn" id="wa-configuration-definition-et_scotland_multiple" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.24.0">
   <decision id="wa-task-configuration-employment-et_scotland_multiple" name="ET Multiple Task configuration DMN" camunda:historyTimeToLive="P30D">
     <decisionTable id="DecisionTable_14cx079" hitPolicy="COLLECT">
-      <input id="InputClause_1gxyo7f" label="CCD Case Data" camunda:inputVariable="caseData">
+      <input id="InputClause_1gxyo7f" label="CCD Case Data" biodi:width="150" camunda:inputVariable="caseData">
         <inputExpression id="LiteralExpression_0mra7c4" typeRef="string">
           <text></text>
         </inputExpression>
       </input>
-      <input id="InputClause_00c59gm" label="Task type" biodi:width="436" camunda:inputVariable="taskType">
+      <input id="InputClause_00c59gm" label="Task type" biodi:width="363" camunda:inputVariable="taskType">
         <inputExpression id="LiteralExpression_1ngi22k" typeRef="string">
-          <text>
-          if(taskAttributes != null and taskAttributes.taskType != null)
-          then taskAttributes.taskType
-          else if(taskType != null)
-          then taskType
-          else null</text>
+          <text>if(taskAttributes != null and taskAttributes.taskType != null)
+then taskAttributes.taskType
+else if(taskType != null)
+then taskType
+else null</text>
         </inputExpression>
       </input>
       <output id="Output_1" label="Name" name="name" typeRef="string" biodi:width="260" />
       <output id="OutputClause_021y3bb" label="Value" name="value" typeRef="string" biodi:width="966" />
       <output id="OutputClause_0tefly7" label="Can Reconfigure?" name="canReconfigure" typeRef="boolean" />
       <rule id="DecisionRule_19opwhc">
-        <description></description>
         <inputEntry id="UnaryTests_11xjbt2">
           <text></text>
         </inputEntry>
@@ -146,23 +144,6 @@
           <text>true</text>
         </outputEntry>
       </rule>
-      <rule id="DecisionRule_0eldhc0">
-        <inputEntry id="UnaryTests_0q9qt5t">
-          <text></text>
-        </inputEntry>
-        <inputEntry id="UnaryTests_0y10lmy">
-          <text>"ReviewReferralAdminMultiple", "ReviewReferralResponseAdminMultiple"</text>
-        </inputEntry>
-        <outputEntry id="LiteralExpression_1j6c2sj">
-          <text>"roleCategory"</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_144mqtj">
-          <text>"ADMIN"</text>
-        </outputEntry>
-        <outputEntry id="LiteralExpression_0fcywqu">
-          <text>true</text>
-        </outputEntry>
-      </rule>
       <rule id="DecisionRule_0h3ryo3">
         <inputEntry id="UnaryTests_0qnpzgr">
           <text></text>
@@ -181,6 +162,24 @@
           <text>true</text>
         </outputEntry>
       </rule>
+      <rule id="DecisionRule_0eldhc0">
+        <inputEntry id="UnaryTests_0q9qt5t">
+          <text></text>
+        </inputEntry>
+        <inputEntry id="UnaryTests_0y10lmy">
+          <text>"ReviewReferralAdminMultiple",
+"ReviewReferralResponseAdminMultiple"</text>
+        </inputEntry>
+        <outputEntry id="LiteralExpression_1j6c2sj">
+          <text>"roleCategory"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_144mqtj">
+          <text>"ADMIN"</text>
+        </outputEntry>
+        <outputEntry id="LiteralExpression_0fcywqu">
+          <text>true</text>
+        </outputEntry>
+      </rule>
       <rule id="DecisionRule_1h3abct">
         <inputEntry id="UnaryTests_19bgtv7">
           <text></text>
@@ -292,7 +291,7 @@ else 5000</text>
           <text></text>
         </inputEntry>
         <inputEntry id="UnaryTests_1vhou0u">
-          <text>"ReviewReferralAdminMultiple"
+          <text>"ReviewReferralAdminMultiple",
 "ReviewReferralJudiciaryMultiple",
 "ReviewReferralLegalOpsMultiple"</text>
         </inputEntry>