Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DFPL-2546 Refuge Address option for Respondent/Other persons Journeys #5755

Merged
merged 28 commits into from
Jan 7, 2025
Merged

DFPL-2546 Refuge Address option for Respondent/Other persons Journeys #5755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c9fc210
Revert "Roll back DFPL 2546 (#5746)"
chak-shing-lo-justice Nov 28, 2024
f541d55
upgrade others with addressKnowV2
chak-shing-lo-justice Dec 2, 2024
cdf4b25
Merge branch 'master' into DFPL-2546
chak-shing-lo-justice Dec 2, 2024
b6a081a
Revert as master version
chak-shing-lo-justice Dec 2, 2024
eac9947
Revert "Roll back DFPL 2546 (#5746)"
chak-shing-lo-justice Dec 3, 2024
58beede
Revert "addressKnowV2"
chak-shing-lo-justice Dec 3, 2024
e32cacf
Merge branch 'master' into DFPL-2546
chak-shing-lo-justice Dec 3, 2024
2591c68
fix code check
chak-shing-lo-justice Dec 3, 2024
a45b3d2
fix test
chak-shing-lo-justice Dec 3, 2024
03ce1a6
fix test
chak-shing-lo-justice Dec 3, 2024
51e77c7
Update extract-confidential-data.json
chak-shing-lo-justice Dec 3, 2024
09dec69
Merge branch 'master' into DFPL-2546
chak-shing-lo-justice Dec 3, 2024
de296cd
Merge branch 'master' into DFPL-2546
AlistairEdwinOsborne Dec 6, 2024
117f225
Update Other.java
chak-shing-lo-justice Dec 6, 2024
ab9f2e4
Update 2_Others.json
chak-shing-lo-justice Dec 6, 2024
95e097d
Update 2_Others.json
chak-shing-lo-justice Dec 6, 2024
3faa8f0
Update 2_Others.json
chak-shing-lo-justice Dec 6, 2024
af9cf37
Update 2_Others.json
chak-shing-lo-justice Dec 6, 2024
8026175
fix code check
chak-shing-lo-justice Dec 9, 2024
49c8faa
UpdateOthersUITest
prabhamuthu15 Dec 9, 2024
b90500c
removeonlyTag
prabhamuthu15 Dec 9, 2024
f9cdd8d
update
prabhamuthu15 Dec 9, 2024
e27943b
Merge branch 'master' into DFPL-2546
chak-shing-lo-justice Dec 11, 2024
021726c
Merge branch 'master' into DFPL-2546
DanCatchpole Dec 19, 2024
a70f49d
Merge branch 'master' into DFPL-2546
chak-shing-lo-justice Jan 6, 2025
8810d75
DFPL-2641: Move address known type to confidential tab (#5797)
DanCatchpole Jan 6, 2025
0da2a55
DFPL-2639: Move living situation (+ details) to the confidential tab …
DanCatchpole Jan 6, 2025
df88bc7
Merge branch 'master' into DFPL-2546
chak-shing-lo-justice Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 25 additions & 16 deletions ccd-definition/CaseEventToComplexTypes/others/changeOtherToRespondent.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
{
Expand Down Expand Up @@ -117,7 +126,7 @@
"CaseEventID": "changeOtherToRespondent",
"CaseFieldID": "transformedRespondent",
"ListElementCode": "party.telephoneNumber",
"FieldDisplayOrder": 8,
"FieldDisplayOrder": 9,
"DisplayContext": "OPTIONAL"
},
{
Expand All @@ -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\""
},
Expand All @@ -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"
},
{
Expand Down
41 changes: 25 additions & 16 deletions ccd-definition/CaseEventToComplexTypes/respondents/amendRespondents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
{
Expand Down Expand Up @@ -126,7 +135,7 @@
"CaseEventID": "amendRespondents",
"CaseFieldID": "respondents1",
"ListElementCode": "party.telephoneNumber",
"FieldDisplayOrder": 8,
"FieldDisplayOrder": 9,
"DisplayContext": "OPTIONAL"
},
{
Expand All @@ -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"
},
{
Expand All @@ -189,7 +198,7 @@
"CaseEventID": "amendRespondents",
"CaseFieldID": "respondents1",
"ListElementCode": "party.proceedingsLabel",
"FieldDisplayOrder": 13,
"FieldDisplayOrder": 14,
"DisplayContext": "READONLY",
"FieldShowCondition": "party!=\"SHOW_LABEL\""
},
Expand All @@ -199,7 +208,7 @@
"CaseEventID": "amendRespondents",
"CaseFieldID": "respondents1",
"ListElementCode": "party.litigationIssues",
"FieldDisplayOrder": 14,
"FieldDisplayOrder": 15,
"DisplayContext": "OPTIONAL"
},
{
Expand All @@ -208,7 +217,7 @@
"CaseEventID": "amendRespondents",
"CaseFieldID": "respondents1",
"ListElementCode": "party.litigationIssuesDetails",
"FieldDisplayOrder": 15,
"FieldDisplayOrder": 16,
"DisplayContext": "OPTIONAL"
},
{
Expand Down
43 changes: 26 additions & 17 deletions ccd-definition/CaseEventToComplexTypes/respondents/enterRespondents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
{
Expand Down Expand Up @@ -128,7 +137,7 @@
"CaseEventID": "enterRespondents",
"CaseFieldID": "respondents1",
"ListElementCode": "party.telephoneNumber",
"FieldDisplayOrder": 8,
"FieldDisplayOrder": 9,
"DisplayContext": "OPTIONAL"
},
{
Expand All @@ -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"
},
{
Expand All @@ -192,7 +201,7 @@
"CaseEventID": "enterRespondents",
"CaseFieldID": "respondents1",
"ListElementCode": "party.proceedingsLabel",
"FieldDisplayOrder": 13,
"FieldDisplayOrder": 14,
"DisplayContext": "READONLY",
"FieldShowCondition": "party!=\"SHOW_LABEL\""
},
Expand All @@ -202,7 +211,7 @@
"CaseEventID": "enterRespondents",
"CaseFieldID": "respondents1",
"ListElementCode": "party.litigationIssues",
"FieldDisplayOrder": 14,
"FieldDisplayOrder": 15,
"DisplayContext": "OPTIONAL"
},
{
Expand All @@ -211,7 +220,7 @@
"CaseEventID": "enterRespondents",
"CaseFieldID": "respondents1",
"ListElementCode": "party.litigationIssuesDetails",
"FieldDisplayOrder": 15,
"FieldDisplayOrder": 16,
"DisplayContext": "OPTIONAL"
},
{
Expand Down
Loading
Loading