DFPL-2546 Show Refuge Address- address option for Respondent/Other pe…

…rsons Journeys (#5696) * add refuge address option * fix code scan * rename enum * rename enum * update IsAddressKnowType * fix unit test * fix code scan * dix code scan * fix unit test * update changeOtherToRespondent * Update RespondentService.java * Revert "Update RespondentService.java" This reverts commit 9ed9f2e. * fix change other to respondent * push dummy changes to trigger CCD import --------- Co-authored-by: prabhamuthu15 <78162288+prabhamuthu15@users.noreply.github.com>
hmcts · Nov 27, 2024 · 8bae45a · 8bae45a
1 parent fee640e
commit 8bae45a
Show file tree

Hide file tree

Showing 24 changed files with 287 additions and 149 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"
   },
   {

diff --git a/ccd-definition/ComplexTypes/CareSupervision/2_Others.json b/ccd-definition/ComplexTypes/CareSupervision/2_Others.json
@@ -47,18 +47,28 @@
     "LiveFrom": "01/01/2017",
     "ID": "Others",
     "ListElementCode": "addressKnow",
-    "FieldType": "YesOrNo",
+    "FieldType": "FixedRadioList",
+    "FieldTypeParameter": "IsAddressKnowList",
     "ElementLabel": "*Current address known?",
     "SecurityClassification": "Public"
   },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "Others",
+    "ListElementCode": "addressAutoConfidentialLabel",
+    "FieldType": "Label",
+    "ElementLabel": "## This address is automatically made confidential",
+    "SecurityClassification": "Public",
+    "FieldShowCondition": "addressKnow=\"LIVE_IN_REFUGE\""
+  },
   {
     "LiveFrom": "01/01/2017",
     "ID": "Others",
     "ListElementCode": "address",
     "FieldType": "AddressUK",
     "ElementLabel": "Current address",
     "SecurityClassification": "Public",
-    "FieldShowCondition": "addressKnow=\"Yes\""
+    "FieldShowCondition": "addressKnow=\"Yes\" OR addressKnow=\"LIVE_IN_REFUGE\""
   },
   {
     "LiveFrom": "01/01/2017",
@@ -79,30 +89,31 @@
     "Max": "24",
     "SecurityClassification": "Public"
   },
-  {
-    "LiveFrom": "01/01/2017",
-    "ID": "Others",
-    "ListElementCode": "childInformation",
-    "FieldType": "TextArea",
-    "ElementLabel": "What is this person's relationship to the child or children in this case?",
-    "HintText": "Include: the name of the child or children, this person's relationship to them and whether this person has parental responsibility",
-    "SecurityClassification": "Public"
-  },
   {
     "LiveFrom": "01/01/2017",
     "ID": "Others",
     "ListElementCode": "detailsHidden",
     "FieldType": "YesOrNo",
     "ElementLabel": "Do you need contact details hidden from other parties?",
-    "SecurityClassification": "Public"
+    "SecurityClassification": "Public",
+    "FieldShowCondition": "addressKnow!=\"LIVE_IN_REFUGE\""
   },
   {
     "LiveFrom": "01/01/2017",
     "ID": "Others",
     "ListElementCode": "detailsHiddenReason",
     "FieldType": "TextArea",
     "ElementLabel": "Give reason",
-    "FieldShowCondition": "detailsHidden=\"Yes\"",
+    "FieldShowCondition": "detailsHidden=\"Yes\" AND addressKnow!=\"LIVE_IN_REFUGE\"",
+    "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "01/01/2017",
+    "ID": "Others",
+    "ListElementCode": "childInformation",
+    "FieldType": "TextArea",
+    "ElementLabel": "What is this person's relationship to the child or children in this case?",
+    "HintText": "Include: the name of the child or children, this person's relationship to them and whether this person has parental responsibility",
     "SecurityClassification": "Public"
   },
   {