Merge branch 'master' into DFPL-2566

hmcts · Jan 7, 2025 · f713d26 · f713d26
2 parents e2275b7 + 514a4ae
commit f713d26
Show file tree

Hide file tree

Showing 31 changed files with 675 additions and 394 deletions.
diff --git a/ccd-definition/CaseEventToComplexTypes/others/changeOtherToRespondent.json b/ccd-definition/CaseEventToComplexTypes/others/changeOtherToRespondent.json
@@ -56,11 +56,20 @@
     "DisplayContext": "MANDATORY"
   },
   {
+    "LiveFrom": "01/01/2017",
     "ID": "ChangeOtherToRespondent",
     "CaseEventID": "changeOtherToRespondent",
     "CaseFieldID": "transformedRespondent",
-    "ListElementCode": "party.address",
+    "ListElementCode": "party.addressAutoConfidentialLabel",
     "FieldDisplayOrder": 7,
+    "DisplayContext": "OPTIONAL"
+  },
+  {
+    "ID": "ChangeOtherToRespondent",
+    "CaseEventID": "changeOtherToRespondent",
+    "CaseFieldID": "transformedRespondent",
+    "ListElementCode": "party.address",
+    "FieldDisplayOrder": 8,
     "DisplayContext": "MANDATORY"
   },
   {
@@ -117,7 +126,7 @@
     "CaseEventID": "changeOtherToRespondent",
     "CaseFieldID": "transformedRespondent",
     "ListElementCode": "party.telephoneNumber",
-    "FieldDisplayOrder": 8,
+    "FieldDisplayOrder": 9,
     "DisplayContext": "OPTIONAL"
   },
   {
@@ -139,41 +148,41 @@
     "ID": "ChangeOtherToRespondent",
     "CaseEventID": "changeOtherToRespondent",
     "CaseFieldID": "transformedRespondent",
-    "ListElementCode": "party.relationshipLabel",
-    "FieldDisplayOrder": 9,
-    "DisplayContext": "READONLY",
-    "FieldShowCondition": "party!=\"SHOW_LABEL\""
+    "ListElementCode": "party.contactDetailsHidden",
+    "FieldDisplayOrder": 10,
+    "DisplayContext": "OPTIONAL"
   },
   {
     "ID": "ChangeOtherToRespondent",
     "CaseEventID": "changeOtherToRespondent",
     "CaseFieldID": "transformedRespondent",
-    "ListElementCode": "party.relationshipToChild",
-    "FieldDisplayOrder": 10,
+    "ListElementCode": "party.contactDetailsHiddenReason",
+    "FieldDisplayOrder": 11,
     "DisplayContext": "OPTIONAL"
   },
   {
     "ID": "ChangeOtherToRespondent",
     "CaseEventID": "changeOtherToRespondent",
     "CaseFieldID": "transformedRespondent",
-    "ListElementCode": "party.contactDetailsHidden",
-    "FieldDisplayOrder": 11,
-    "DisplayContext": "OPTIONAL"
+    "ListElementCode": "party.relationshipLabel",
+    "FieldDisplayOrder": 12,
+    "DisplayContext": "READONLY",
+    "FieldShowCondition": "party!=\"SHOW_LABEL\""
   },
   {
     "ID": "ChangeOtherToRespondent",
     "CaseEventID": "changeOtherToRespondent",
     "CaseFieldID": "transformedRespondent",
-    "ListElementCode": "party.contactDetailsHiddenReason",
-    "FieldDisplayOrder": 12,
+    "ListElementCode": "party.relationshipToChild",
+    "FieldDisplayOrder": 13,
     "DisplayContext": "OPTIONAL"
   },
   {
     "ID": "ChangeOtherToRespondent",
     "CaseEventID": "changeOtherToRespondent",
     "CaseFieldID": "transformedRespondent",
     "ListElementCode": "party.proceedingsLabel",
-    "FieldDisplayOrder": 13,
+    "FieldDisplayOrder": 14,
     "DisplayContext": "READONLY",
     "FieldShowCondition": "party!=\"SHOW_LABEL\""
   },
@@ -182,15 +191,15 @@
     "CaseEventID": "changeOtherToRespondent",
     "CaseFieldID": "transformedRespondent",
     "ListElementCode": "party.litigationIssues",
-    "FieldDisplayOrder": 14,
+    "FieldDisplayOrder": 15,
     "DisplayContext": "OPTIONAL"
   },
   {
     "ID": "ChangeOtherToRespondent",
     "CaseEventID": "changeOtherToRespondent",
     "CaseFieldID": "transformedRespondent",
     "ListElementCode": "party.litigationIssuesDetails",
-    "FieldDisplayOrder": 15,
+    "FieldDisplayOrder": 16,
     "DisplayContext": "OPTIONAL"
   },
   {

diff --git a/ccd-definition/CaseEventToComplexTypes/respondents/amendRespondents.json b/ccd-definition/CaseEventToComplexTypes/respondents/amendRespondents.json
@@ -67,8 +67,17 @@
     "ID": "AmendRespondents",
     "CaseEventID": "amendRespondents",
     "CaseFieldID": "respondents1",
-    "ListElementCode": "party.address",
+    "ListElementCode": "party.addressAutoConfidentialLabel",
     "FieldDisplayOrder": 7,
+    "DisplayContext": "OPTIONAL"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "AmendRespondents",
+    "CaseEventID": "amendRespondents",
+    "CaseFieldID": "respondents1",
+    "ListElementCode": "party.address",
+    "FieldDisplayOrder": 8,
     "DisplayContext": "MANDATORY"
   },
   {
@@ -126,7 +135,7 @@
     "CaseEventID": "amendRespondents",
     "CaseFieldID": "respondents1",
     "ListElementCode": "party.telephoneNumber",
-    "FieldDisplayOrder": 8,
+    "FieldDisplayOrder": 9,
     "DisplayContext": "OPTIONAL"
   },
   {
@@ -151,36 +160,36 @@
     "ID": "AmendRespondents",
     "CaseEventID": "amendRespondents",
     "CaseFieldID": "respondents1",
-    "ListElementCode": "party.relationshipLabel",
-    "FieldDisplayOrder": 9,
-    "DisplayContext": "READONLY",
-    "FieldShowCondition": "party!=\"SHOW_LABEL\""
+    "ListElementCode": "party.contactDetailsHidden",
+    "FieldDisplayOrder": 10,
+    "DisplayContext": "OPTIONAL"
   },
   {
     "LiveFrom": "01/01/2017",
     "ID": "AmendRespondents",
     "CaseEventID": "amendRespondents",
     "CaseFieldID": "respondents1",
-    "ListElementCode": "party.relationshipToChild",
-    "FieldDisplayOrder": 10,
+    "ListElementCode": "party.contactDetailsHiddenReason",
+    "FieldDisplayOrder": 11,
     "DisplayContext": "OPTIONAL"
   },
   {
     "LiveFrom": "01/01/2017",
     "ID": "AmendRespondents",
     "CaseEventID": "amendRespondents",
     "CaseFieldID": "respondents1",
-    "ListElementCode": "party.contactDetailsHidden",
-    "FieldDisplayOrder": 11,
-    "DisplayContext": "OPTIONAL"
+    "ListElementCode": "party.relationshipLabel",
+    "FieldDisplayOrder": 12,
+    "DisplayContext": "READONLY",
+    "FieldShowCondition": "party!=\"SHOW_LABEL\""
   },
   {
     "LiveFrom": "01/01/2017",
     "ID": "AmendRespondents",
     "CaseEventID": "amendRespondents",
     "CaseFieldID": "respondents1",
-    "ListElementCode": "party.contactDetailsHiddenReason",
-    "FieldDisplayOrder": 12,
+    "ListElementCode": "party.relationshipToChild",
+    "FieldDisplayOrder": 13,
     "DisplayContext": "OPTIONAL"
   },
   {
@@ -189,7 +198,7 @@
     "CaseEventID": "amendRespondents",
     "CaseFieldID": "respondents1",
     "ListElementCode": "party.proceedingsLabel",
-    "FieldDisplayOrder": 13,
+    "FieldDisplayOrder": 14,
     "DisplayContext": "READONLY",
     "FieldShowCondition": "party!=\"SHOW_LABEL\""
   },
@@ -199,7 +208,7 @@
     "CaseEventID": "amendRespondents",
     "CaseFieldID": "respondents1",
     "ListElementCode": "party.litigationIssues",
-    "FieldDisplayOrder": 14,
+    "FieldDisplayOrder": 15,
     "DisplayContext": "OPTIONAL"
   },
   {
@@ -208,7 +217,7 @@
     "CaseEventID": "amendRespondents",
     "CaseFieldID": "respondents1",
     "ListElementCode": "party.litigationIssuesDetails",
-    "FieldDisplayOrder": 15,
+    "FieldDisplayOrder": 16,
     "DisplayContext": "OPTIONAL"
   },
   {

diff --git a/ccd-definition/CaseEventToComplexTypes/respondents/enterRespondents.json b/ccd-definition/CaseEventToComplexTypes/respondents/enterRespondents.json
@@ -69,8 +69,17 @@
     "ID": "EnterRespondents",
     "CaseEventID": "enterRespondents",
     "CaseFieldID": "respondents1",
-    "ListElementCode": "party.address",
+    "ListElementCode": "party.addressAutoConfidentialLabel",
     "FieldDisplayOrder": 7,
+    "DisplayContext": "OPTIONAL"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "EnterRespondents",
+    "CaseEventID": "enterRespondents",
+    "CaseFieldID": "respondents1",
+    "ListElementCode": "party.address",
+    "FieldDisplayOrder": 8,
     "DisplayContext": "MANDATORY"
   },
   {
@@ -128,7 +137,7 @@
     "CaseEventID": "enterRespondents",
     "CaseFieldID": "respondents1",
     "ListElementCode": "party.telephoneNumber",
-    "FieldDisplayOrder": 8,
+    "FieldDisplayOrder": 9,
     "DisplayContext": "OPTIONAL"
   },
   {
@@ -153,37 +162,37 @@
     "ID": "EnterRespondents",
     "CaseEventID": "enterRespondents",
     "CaseFieldID": "respondents1",
-    "ListElementCode": "party.relationshipLabel",
-    "FieldDisplayOrder": 9,
-    "DisplayContext": "READONLY",
-    "FieldShowCondition": "party!=\"SHOW_LABEL\""
+    "ListElementCode": "party.contactDetailsHidden",
+    "FieldDisplayOrder": 10,
+    "DisplayContext": "OPTIONAL"
   },
   {
     "LiveFrom": "01/01/2017",
     "ID": "EnterRespondents",
     "CaseEventID": "enterRespondents",
     "CaseFieldID": "respondents1",
-    "ListElementCode": "party.relationshipToChild",
-    "EventElementLabel": "*What is the respondent's relationship to the child or children in this case?",
-    "FieldDisplayOrder": 10,
+    "ListElementCode": "party.contactDetailsHiddenReason",
+    "FieldDisplayOrder": 11,
     "DisplayContext": "OPTIONAL"
   },
   {
     "LiveFrom": "01/01/2017",
     "ID": "EnterRespondents",
     "CaseEventID": "enterRespondents",
     "CaseFieldID": "respondents1",
-    "ListElementCode": "party.contactDetailsHidden",
-    "FieldDisplayOrder": 11,
-    "DisplayContext": "OPTIONAL"
+    "ListElementCode": "party.relationshipLabel",
+    "FieldDisplayOrder": 12,
+    "DisplayContext": "READONLY",
+    "FieldShowCondition": "party!=\"SHOW_LABEL\""
   },
   {
     "LiveFrom": "01/01/2017",
     "ID": "EnterRespondents",
     "CaseEventID": "enterRespondents",
     "CaseFieldID": "respondents1",
-    "ListElementCode": "party.contactDetailsHiddenReason",
-    "FieldDisplayOrder": 12,
+    "ListElementCode": "party.relationshipToChild",
+    "EventElementLabel": "*What is the respondent's relationship to the child or children in this case?",
+    "FieldDisplayOrder": 13,
     "DisplayContext": "OPTIONAL"
   },
   {
@@ -192,7 +201,7 @@
     "CaseEventID": "enterRespondents",
     "CaseFieldID": "respondents1",
     "ListElementCode": "party.proceedingsLabel",
-    "FieldDisplayOrder": 13,
+    "FieldDisplayOrder": 14,
     "DisplayContext": "READONLY",
     "FieldShowCondition": "party!=\"SHOW_LABEL\""
   },
@@ -202,7 +211,7 @@
     "CaseEventID": "enterRespondents",
     "CaseFieldID": "respondents1",
     "ListElementCode": "party.litigationIssues",
-    "FieldDisplayOrder": 14,
+    "FieldDisplayOrder": 15,
     "DisplayContext": "OPTIONAL"
   },
   {
@@ -211,7 +220,7 @@
     "CaseEventID": "enterRespondents",
     "CaseFieldID": "respondents1",
     "ListElementCode": "party.litigationIssuesDetails",
-    "FieldDisplayOrder": 15,
+    "FieldDisplayOrder": 16,
     "DisplayContext": "OPTIONAL"
   },
   {