Merge branch 'master' into feat/CIV-16514

hmcts · Feb 4, 2025 · f3b4aaa · f3b4aaa
2 parents bb05f96 + bbe5a7a
commit f3b4aaa
Show file tree

Hide file tree

Showing 242 changed files with 3,793 additions and 1,396 deletions.
diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-MINTI-nonprod.json
@@ -352,6 +352,30 @@
       }
     ]
   },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "orderAfterHearingDate",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "judge-profile"
+        ],
+        "CRUD": "CRU"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "showOrderAfterHearingDatePage",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "judge-profile"
+        ],
+        "CRUD": "CRU"
+      }
+    ]
+  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseFieldID": "confirmListingTickBox",

diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json
@@ -460,6 +460,18 @@
       }
     ]
   },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseFieldID": "gaEaCourtLocation",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-systemupdate"
+        ],
+        "CRUD": "CRU"
+      }
+    ]
+  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseFieldID": "obligationWAFlag",

diff --git a/ccd-definition/CaseEvent/Camunda/CaseEventsGASpec.json b/ccd-definition/CaseEvent/Camunda/CaseEventsGASpec.json
@@ -73,7 +73,8 @@
     "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit",
     "ShowSummary": "N",
     "ShowEventNotes": "N",
-    "RetriesTimeoutURLAboutToSubmitEvent": 0
+    "RetriesTimeoutURLAboutToSubmitEvent": 0,
+    "Publish": "Y"
   },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
@@ -86,6 +87,7 @@
     "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit",
     "ShowSummary": "N",
     "ShowEventNotes": "N",
-    "RetriesTimeoutURLAboutToSubmitEvent": 0
+    "RetriesTimeoutURLAboutToSubmitEvent": 0,
+    "Publish": "Y"
   }
 ]
diff --git a/ccd-definition/CaseEventToComplexTypes/FinalOrders-MINTI-nonprod.json b/ccd-definition/CaseEventToComplexTypes/FinalOrders-MINTI-nonprod.json
@@ -0,0 +1,43 @@
+[
+  {
+    "ID": "OrderAfterHearingDate",
+    "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
+    "CaseFieldID": "orderAfterHearingDate",
+    "ListElementCode": "dateType",
+    "FieldDisplayOrder": 1,
+    "DisplayContext": "MANDATORY",
+    "EventElementLabel": "Enter date(s) of hearing"
+  },
+  {
+    "ID": "OrderAfterHearingDate",
+    "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
+    "CaseFieldID": "orderAfterHearingDate",
+    "ListElementCode": "date",
+    "FieldDisplayOrder": 2,
+    "DisplayContext": "MANDATORY"
+  },
+  {
+    "ID": "OrderAfterHearingDate",
+    "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
+    "CaseFieldID": "orderAfterHearingDate",
+    "ListElementCode": "fromDate",
+    "FieldDisplayOrder": 3,
+    "DisplayContext": "MANDATORY"
+  },
+  {
+    "ID": "OrderAfterHearingDate",
+    "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
+    "CaseFieldID": "orderAfterHearingDate",
+    "ListElementCode": "toDate",
+    "FieldDisplayOrder": 4,
+    "DisplayContext": "MANDATORY"
+  },
+  {
+    "ID": "OrderAfterHearingDate",
+    "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
+    "CaseFieldID": "orderAfterHearingDate",
+    "ListElementCode": "bespokeDates",
+    "FieldDisplayOrder": 5,
+    "DisplayContext": "MANDATORY"
+  }
+]
diff --git a/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json b/ccd-definition/CaseEventToFields/FinalOrders-MINTI-nonprod.json
@@ -1,4 +1,29 @@
 [
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
+    "CaseFieldID": "allocatedTrack",
+    "PageFieldDisplayOrder": 98,
+    "DisplayContext": "READONLY",
+    "PageID": "TrackAllocation",
+    "PageDisplayOrder": 1,
+    "FieldShowCondition": "finalOrderAllocateToTrack=\"DO_NOT_SHOW\"",
+    "RetainHiddenValue": "Y",
+    "Publish": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
+    "DisplayContext": "READONLY",
+    "CaseFieldID": "responseClaimTrack",
+    "PageFieldDisplayOrder": 99,
+    "DisplayContext": "READONLY",
+    "PageID": "TrackAllocation",
+    "PageDisplayOrder": 1,
+    "FieldShowCondition": "finalOrderAllocateToTrack=\"DO_NOT_SHOW\"",
+    "RetainHiddenValue": "Y",
+    "Publish": "Y"
+  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
@@ -10,6 +35,17 @@
     "FieldShowCondition": "finalOrderAllocateToTrack=\"DO_NOT_SHOW\"",
     "ShowSummaryChangeOption": "N"
   },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
+    "CaseFieldID": "showOrderAfterHearingDatePage",
+    "PageDisplayOrder": 1,
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "MANDATORY",
+    "PageID": "TrackAllocation",
+    "FieldShowCondition": "finalOrderAllocateToTrack=\"DO_NOT_SHOW\"",
+    "ShowSummaryChangeOption": "N"
+  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
@@ -26,7 +62,7 @@
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
     "PageLabel": "Select track",
-    "CaseEventFieldLabel": "Are you allocating the claim to a track?",
+    "CaseEventFieldLabel": "Are you allocating or re-allocating the claim to a track or are you changing the complexity band?",
     "CaseFieldID": "finalOrderAllocateToTrack",
     "PageDisplayOrder": 1,
     "PageFieldDisplayOrder": 1,
@@ -39,7 +75,7 @@
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
     "CaseFieldID": "finalOrderTrackAllocation",
-    "CaseEventFieldLabel": "What track are you allocating the claim to?",
+    "CaseEventFieldLabel": "What track are you allocating or re-allocating the claim to?",
     "PageDisplayOrder": 1,
     "PageFieldDisplayOrder": 2,
     "DisplayContext": "MANDATORY",
@@ -57,7 +93,7 @@
     "DisplayContext": "READONLY",
     "PageID": "IntermediateTrackComplexityBand",
     "ShowSummaryChangeOption": "N",
-    "PageShowCondition": "finalOrderTrackToggle=\"INTERMEDIATE_CLAIM\""
+    "PageShowCondition": "finalOrderTrackToggle=\"INTERMEDIATE_CLAIM\" AND finalOrderAllocateToTrack=\"Yes\""
   },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
@@ -681,12 +717,25 @@
     "ShowSummaryChangeOption": "Y",
     "PageShowCondition": "finalOrderTrackToggle= \"SMALL_CLAIM\" OR finalOrderTrackToggle= \"FAST_CLAIM\""
   },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
+    "CaseFieldID": "orderAfterHearingDate",
+    "PageLabel": "Order Made",
+    "PageDisplayOrder": 5,
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "COMPLEX",
+    "PageID": "OrderAfterHearingDate",
+    "ShowSummaryChangeOption": "Y",
+    "PageShowCondition": "showOrderAfterHearingDatePage=\"Yes\"",
+    "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/hearing-date-order"
+  },
   {
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
     "CaseFieldID": "downloadTemplateLabel1",
     "PageLabel": "Download template",
-    "PageDisplayOrder": 5,
+    "PageDisplayOrder": 6,
     "PageFieldDisplayOrder": 1,
     "DisplayContext": "READONLY",
     "PageID": "DownloadTemplate",
@@ -697,7 +746,7 @@
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
     "CaseFieldID": "finalOrderDownloadTemplateDocument",
-    "PageDisplayOrder": 5,
+    "PageDisplayOrder": 6,
     "PageFieldDisplayOrder": 2,
     "DisplayContext": "COMPLEX",
     "PageID": "DownloadTemplate",
@@ -708,7 +757,7 @@
     "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
     "CaseFieldID": "downloadTemplateLabel2",
     "PageLabel": "Download template",
-    "PageDisplayOrder": 5,
+    "PageDisplayOrder": 6,
     "PageFieldDisplayOrder": 3,
     "DisplayContext": "READONLY",
     "PageID": "DownloadTemplate",
@@ -719,7 +768,7 @@
     "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
     "CaseFieldID": "uploadOrderDocumentFromTemplateLabel",
     "PageLabel": "Upload order",
-    "PageDisplayOrder": 6,
+    "PageDisplayOrder": 7,
     "PageFieldDisplayOrder": 1,
     "DisplayContext": "READONLY",
     "PageID": "UploadOrder",
@@ -730,7 +779,7 @@
     "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
     "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
     "CaseFieldID": "uploadOrderDocumentFromTemplate",
-    "PageDisplayOrder": 6,
+    "PageDisplayOrder": 7,
     "PageFieldDisplayOrder": 2,
     "DisplayContext": "MANDATORY",
     "PageID": "UploadOrder",

diff --git a/ccd-definition/CaseEventToFields/FinalOrders-MINTI-prod.json b/ccd-definition/CaseEventToFields/FinalOrders-MINTI-prod.json
@@ -584,5 +584,25 @@
     "DisplayContext": "COMPLEX",
     "PageID": "FinalOrderPreview",
     "ShowSummaryChangeOption": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
+    "CaseFieldID": "allocatedTrack",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocationIntegrationFields",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
+    "CaseFieldID": "responseClaimTrack",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocationIntegrationFields",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
   }
 ]
diff --git a/ccd-definition/CaseEventToFields/ManageStay-caseworkerEvents-nonprod.json b/ccd-definition/CaseEventToFields/ManageStay-caseworkerEvents-nonprod.json
@@ -85,5 +85,25 @@
     "PageDisplayOrder": 2,
     "ShowSummaryChangeOption": "N",
     "PageShowCondition": "manageStayOption = \"REQUEST_UPDATE\""
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "MANAGE_STAY",
+    "CaseFieldID": "applicant1Represented",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocationIntegrationFields",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "MANAGE_STAY",
+    "CaseFieldID": "respondent1Represented",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocationIntegrationFields",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
   }
 ]
diff --git a/ccd-definition/CaseEventToFields/SettleClaimPaidInFull-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEventToFields/SettleClaimPaidInFull-SettleDiscontinue-nonprod.json
@@ -86,5 +86,85 @@
     "ShowSummaryChangeOption": "N",
     "FieldShowCondition": "markPaidForAllClaimants=\"DO NOT SHOW IN UI\"",
     "Publish": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "SETTLE_CLAIM_MARK_PAID_FULL",
+    "CaseFieldID": "applicant1Represented",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocation",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "SETTLE_CLAIM_MARK_PAID_FULL",
+    "CaseFieldID": "respondent1Represented",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocation",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "SETTLE_CLAIM_MARK_PAID_FULL",
+    "CaseFieldID": "allocatedTrack",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocation",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "SETTLE_CLAIM_MARK_PAID_FULL",
+    "CaseFieldID": "responseClaimTrack",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocation",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "SETTLE_CLAIM",
+    "CaseFieldID": "applicant1Represented",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocation",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "SETTLE_CLAIM",
+    "CaseFieldID": "respondent1Represented",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocation",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "SETTLE_CLAIM",
+    "CaseFieldID": "allocatedTrack",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocation",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
+    "CaseEventID": "SETTLE_CLAIM",
+    "CaseFieldID": "responseClaimTrack",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocation",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
   }
 ]