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

Jump to bottom

CIV-14392 CIV-14387 CIV-14393 CIV-14394: Added elec docs, non elec docs and disclosure reports for multi/intermediate cases for claim details page #4587

Merged
merged 15 commits into from
Aug 6, 2024
Merged

CIV-14392 CIV-14387 CIV-14393 CIV-14394: Added elec docs, non elec docs and disclosure reports for multi/intermediate cases for claim details page #4587

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a004acd
test
sherlynkhaw Jul 4, 2024
95f00a2
Merge branch 'master' into CIV-14392
sherlynkhaw Jul 4, 2024
edc89b3
add extra pages to claim details tab
sherlynkhaw Jul 4, 2024
b56bcf9
Merge branch 'CIV-14392' of github.com:hmcts/civil-ccd-definition int…
sherlynkhaw Jul 4, 2024
15e653a
fixed ccd issues
sherlynkhaw Jul 5, 2024
ee08615
renaming fields
sherlynkhaw Jul 5, 2024
a5f55ad
Merge branch 'master' into CIV-14392
sherlynkhaw Jul 8, 2024
6e04ed4
fix api tests
sherlynkhaw Jul 9, 2024
e601b27
Merge branch 'master' into CIV-14392
sherlynkhaw Jul 9, 2024
f7eaa8a
CIV-14393 CIV-14394 Show minti fields in claim details
sankaviv1 Jul 15, 2024
71d8415
Merge branch 'master' into CIV-14392
sankaviv1 Jul 15, 2024
ba22af2
Merge branch 'master' into CIV-14392
vasudevganesanhmcts Jul 16, 2024
4f92f9e
Merge branch 'master' into CIV-14392
vasudevganesanhmcts Jul 31, 2024
413cb49
Merge branch 'master' into CIV-14392
vasudevganesanhmcts Aug 1, 2024
0b7ce4f
Merge branch 'master' into CIV-14392
vasudevganesanhmcts Aug 5, 2024
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
6 changes: 6 additions & 0 deletions ccd-definition/CaseEventToFields/ClaimantResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@
"PageFieldDisplayOrder": 1,
"DisplayContext": "MANDATORY",
"PageID": "DisclosureOfElectronicDocuments",
"CaseEventFieldLabel": "Disclosure of electronic documents",
"PageShowCondition": "respondent1ClaimResponseType=\"FULL_DEFENCE\" AND applicantsProceedIntention = \"Yes\" AND (allocatedTrack=\"MULTI_CLAIM\" OR allocatedTrack=\"INTERMEDIATE_CLAIM\")",
"FieldShowCondition": "claimant2ResponseFlag=\"No\"",
"ShowSummaryChangeOption": "Y"
Expand All @@ -305,6 +306,7 @@
"PageFieldDisplayOrder": 2,
"DisplayContext": "MANDATORY",
"PageID": "DisclosureOfElectronicDocuments",
"CaseEventFieldLabel": "Disclosure of electronic documents",
"ShowSummaryChangeOption": "Y",
"FieldShowCondition": "claimant2ResponseFlag=\"Yes\""
},
Expand All @@ -316,6 +318,7 @@
"PageFieldDisplayOrder": 1,
"DisplayContext": "MANDATORY",
"PageID": "DisclosureOfNonElectronicDocuments",
"CaseEventFieldLabel": "Disclosure of non-electronic documents",
"PageShowCondition": "respondent1ClaimResponseType=\"FULL_DEFENCE\" AND applicantsProceedIntention = \"Yes\" AND allocatedTrack !=\"SMALL_CLAIM\"",
"FieldShowCondition": "claimant2ResponseFlag=\"No\"",
"ShowSummaryChangeOption": "Y"
Expand All @@ -328,6 +331,7 @@
"PageFieldDisplayOrder": 2,
"DisplayContext": "MANDATORY",
"PageID": "DisclosureOfNonElectronicDocuments",
"CaseEventFieldLabel": "Disclosure of non-electronic documents",
"ShowSummaryChangeOption": "Y",
"FieldShowCondition": "claimant2ResponseFlag=\"Yes\""
},
Expand All @@ -339,6 +343,7 @@
"PageFieldDisplayOrder": 1,
"DisplayContext": "COMPLEX",
"PageID": "DisclosureReport",
"CaseEventFieldLabel": "Disclosure report",
"PageShowCondition": "respondent1ClaimResponseType=\"FULL_DEFENCE\" AND (allocatedTrack=\"MULTI_CLAIM\" OR allocatedTrack=\"INTERMEDIATE_CLAIM\") AND claimType!=\"PERSONAL_INJURY\" AND applicantsProceedIntention = \"Yes\"",
"FieldShowCondition": "claimant2ResponseFlag=\"No\"",
"ShowSummaryChangeOption": "Y"
Expand All @@ -351,6 +356,7 @@
"PageFieldDisplayOrder": 2,
"DisplayContext": "COMPLEX",
"PageID": "DisclosureReport",
"CaseEventFieldLabel": "Disclosure report",
"FieldShowCondition": "claimant2ResponseFlag=\"Yes\"",
"ShowSummaryChangeOption": "Y"
},
Expand Down
3 changes: 3 additions & 0 deletions ccd-definition/CaseEventToFields/ClaimantResponseLRspec-CUI.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,6 +855,7 @@
"PageFieldDisplayOrder": 1,
"DisplayContext": "MANDATORY",
"PageID": "DisclosureOfElectronicDocuments",
"CaseEventFieldLabel": "Disclosure of electronic documents",
"PageShowCondition": "responseClaimTrack !=\"SMALL_CLAIM\" AND applicantDefenceResponseDocumentAndDQFlag =\"Yes\"",
"ShowSummaryChangeOption": "Y"
},
Expand All @@ -866,6 +867,7 @@
"PageFieldDisplayOrder": 1,
"DisplayContext": "OPTIONAL",
"PageID": "DisclosureOfNonElectronicDocuments",
"CaseEventFieldLabel": "Disclosure of non-electronic documents",
"PageShowCondition": "responseClaimTrack != \"SMALL_CLAIM\" AND applicantDefenceResponseDocumentAndDQFlag =\"Yes\"",
"ShowSummaryChangeOption": "Y"
},
Expand All @@ -877,6 +879,7 @@
"PageFieldDisplayOrder": 1,
"DisplayContext": "COMPLEX",
"PageID": "DisclosureReport",
"CaseEventFieldLabel": "Disclosure report",
"PageShowCondition": "responseClaimTrack != \"SMALL_CLAIM\" AND applicantDefenceResponseDocumentAndDQFlag =\"Yes\"",
"ShowSummaryChangeOption": "Y"
},
Expand Down
6 changes: 6 additions & 0 deletions ccd-definition/CaseEventToFields/DefendantResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,7 @@
"PageFieldDisplayOrder": 5,
"DisplayContext": "COMPLEX",
"PageID": "DisclosureReport",
"CaseEventFieldLabel": "Disclosure report",
"FieldShowCondition": "respondent2ClaimResponseType=\"FULL_DEFENCE\"",
"ShowSummaryChangeOption": "Y"
},
Expand Down Expand Up @@ -740,6 +741,7 @@
"PageFieldDisplayOrder": 2,
"DisplayContext": "COMPLEX",
"PageID": "DisclosureReport",
"CaseEventFieldLabel": "Disclosure report",
"PageShowCondition": "multiPartyResponseTypeFlags=\"FULL_DEFENCE\" AND claimType!=\"PERSONAL_INJURY\" AND (allocatedTrack=\"MULTI_CLAIM\" OR allocatedTrack=\"INTERMEDIATE_CLAIM\")",
"FieldShowCondition": "respondent1ClaimResponseType=\"FULL_DEFENCE\" OR respondent1ClaimResponseTypeToApplicant2=\"FULL_DEFENCE\"",
"ShowSummaryChangeOption": "Y"
Expand Down Expand Up @@ -776,6 +778,7 @@
"PageFieldDisplayOrder": 5,
"DisplayContext": "MANDATORY",
"PageID": "DisclosureOfNonElectronicDocuments",
"CaseEventFieldLabel": "Disclosure of non-electronic documents",
"FieldShowCondition": "respondent2ClaimResponseType=\"FULL_DEFENCE\"",
"ShowSummaryChangeOption": "Y"
},
Expand Down Expand Up @@ -810,6 +813,7 @@
"PageDisplayOrder": 9,
"PageFieldDisplayOrder": 2,
"DisplayContext": "MANDATORY",
"CaseEventFieldLabel": "Disclosure of non-electronic documents",
"PageID": "DisclosureOfNonElectronicDocuments",
"PageShowCondition": "multiPartyResponseTypeFlags=\"FULL_DEFENCE\" AND allocatedTrack !=\"SMALL_CLAIM\"",
"FieldShowCondition": "respondent1ClaimResponseType=\"FULL_DEFENCE\" OR respondent1ClaimResponseTypeToApplicant2=\"FULL_DEFENCE\"",
Expand Down Expand Up @@ -846,6 +850,7 @@
"PageDisplayOrder": 8,
"PageFieldDisplayOrder": 5,
"DisplayContext": "MANDATORY",
"CaseEventFieldLabel": "Disclosure of electronic documents",
"FieldShowCondition": "respondent2ClaimResponseType=\"FULL_DEFENCE\"",
"PageID": "DisclosureOfElectronicDocuments",
"ShowSummaryChangeOption": "Y"
Expand Down Expand Up @@ -881,6 +886,7 @@
"PageDisplayOrder": 8,
"PageFieldDisplayOrder": 2,
"DisplayContext": "MANDATORY",
"CaseEventFieldLabel": "Disclosure of electronic documents",
"PageID": "DisclosureOfElectronicDocuments",
"PageShowCondition": "multiPartyResponseTypeFlags=\"FULL_DEFENCE\" AND (allocatedTrack=\"MULTI_CLAIM\" OR allocatedTrack=\"INTERMEDIATE_CLAIM\")",
"FieldShowCondition": "respondent1ClaimResponseType=\"FULL_DEFENCE\" OR respondent1ClaimResponseTypeToApplicant2=\"FULL_DEFENCE\"",
Expand Down
6 changes: 6 additions & 0 deletions ccd-definition/CaseEventToFields/DefendantResponseLRspec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1264,6 +1264,7 @@
"PageFieldDisplayOrder": 1,
"DisplayContext": "MANDATORY",
"PageID": "DisclosureOfElectronicDocumentsLRspec",
"CaseEventFieldLabel": "Disclosure of electronic documents",
"PageShowCondition": "responseClaimTrack != \"SMALL_CLAIM\" AND showConditionFlags CONTAINS \"SOMEONE_DISPUTES\"",
"FieldShowCondition": "showConditionFlags CONTAINS \"CAN_ANSWER_RESPONDENT_1\"",
"ShowSummaryChangeOption": "Y"
Expand All @@ -1276,6 +1277,7 @@
"PageFieldDisplayOrder": 1,
"DisplayContext": "MANDATORY",
"PageID": "DisclosureOfElectronicDocumentsLRspec",
"CaseEventFieldLabel": "Disclosure of electronic documents",
"ShowSummaryChangeOption": "Y",
"FieldShowCondition": "showConditionFlags CONTAINS \"CAN_ANSWER_RESPONDENT_2\" AND respondent2SameLegalRepresentative !=\"Yes\""
},
Expand All @@ -1287,6 +1289,7 @@
"PageFieldDisplayOrder": 1,
"DisplayContext": "OPTIONAL",
"PageID": "DisclosureOfNonElectronicDocumentsLRspec",
"CaseEventFieldLabel": "Disclosure of non-electronic documents",
"PageShowCondition": "responseClaimTrack != \"SMALL_CLAIM\" AND showConditionFlags CONTAINS \"SOMEONE_DISPUTES\"",
"FieldShowCondition": "showConditionFlags CONTAINS \"CAN_ANSWER_RESPONDENT_1\"",
"ShowSummaryChangeOption": "Y"
Expand All @@ -1300,6 +1303,7 @@
"DisplayContext": "OPTIONAL",
"PageID": "DisclosureOfNonElectronicDocumentsLRspec",
"ShowSummaryChangeOption": "Y",
"CaseEventFieldLabel": "Disclosure of non-electronic documents",
"FieldShowCondition": "showConditionFlags CONTAINS \"CAN_ANSWER_RESPONDENT_2\" AND respondent2SameLegalRepresentative !=\"Yes\""
},
{
Expand All @@ -1310,6 +1314,7 @@
"PageFieldDisplayOrder": 1,
"DisplayContext": "COMPLEX",
"PageID": "DisclosureReport",
"CaseEventFieldLabel": "Disclosure report",
"PageShowCondition": "responseClaimTrack != \"SMALL_CLAIM\" AND showConditionFlags CONTAINS \"SOMEONE_DISPUTES\"",
"FieldShowCondition": "showConditionFlags CONTAINS \"CAN_ANSWER_RESPONDENT_1\"",
"ShowSummaryChangeOption": "Y"
Expand All @@ -1323,6 +1328,7 @@
"DisplayContext": "COMPLEX",
"PageID": "DisclosureReport",
"ShowSummaryChangeOption": "Y",
"CaseEventFieldLabel": "Disclosure report",
"FieldShowCondition": "showConditionFlags CONTAINS \"CAN_ANSWER_RESPONDENT_2\" AND respondent2SameLegalRepresentative !=\"Yes\""
},
{
Expand Down
24 changes: 12 additions & 12 deletions ccd-definition/CaseField/CaseField.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@
{
"CaseTypeID": "CIVIL",
"ID": "respondent1DQDisclosureOfElectronicDocuments",
"Label": "Disclosure of electronic documents",
"Label": "Defendant 1 Disclosure of electronic documents",
"FieldType": "DisclosureOfElectronicDocuments",
"SecurityClassification": "Public",
"Searchable": "N"
Expand All @@ -700,7 +700,7 @@
{
"CaseTypeID": "CIVIL",
"ID": "respondent2DQDisclosureOfElectronicDocuments",
"Label": "Disclosure of electronic documents",
"Label": "Defendant 2 Disclosure of electronic documents",
"FieldType": "DisclosureOfElectronicDocuments",
"SecurityClassification": "Public",
"Searchable": "N"
Expand All @@ -716,31 +716,31 @@
{
"CaseTypeID": "CIVIL",
"ID": "respondent1DQDisclosureOfNonElectronicDocuments",
"Label": "Disclosure of non-electronic documents",
"Label": "Defendant 1 Disclosure of non-electronic documents",
"FieldType": "DisclosureOfNonElectronicDocuments",
"SecurityClassification": "Public",
"Searchable": "N"
},
{
"CaseTypeID": "CIVIL",
"ID": "respondent2DQDisclosureOfNonElectronicDocuments",
"Label": "Disclosure of non-electronic documents",
"Label": "Defendant 2 Disclosure of non-electronic documents",
"FieldType": "DisclosureOfNonElectronicDocuments",
"SecurityClassification": "Public",
"Searchable": "N"
},
{
"CaseTypeID": "CIVIL",
"ID": "respondent1DQDisclosureReport",
"Label": "Disclosure report",
"Label": "Defendant 1 Disclosure report",
"FieldType": "DisclosureReport",
"SecurityClassification": "Public",
"Searchable": "N"
},
{
"CaseTypeID": "CIVIL",
"ID": "respondent2DQDisclosureReport",
"Label": "Disclosure report",
"Label": "Defendant 2 Disclosure report",
"FieldType": "DisclosureReport",
"SecurityClassification": "Public",
"Searchable": "N"
Expand Down Expand Up @@ -928,23 +928,23 @@
{
"CaseTypeID": "CIVIL",
"ID": "applicant1DQDisclosureOfElectronicDocuments",
"Label": "Disclosure of electronic documents",
"Label": "Claimant 1 Disclosure of electronic documents",
"FieldType": "DisclosureOfElectronicDocuments",
"SecurityClassification": "Public",
"Searchable": "N"
},
{
"CaseTypeID": "CIVIL",
"ID": "applicant1DQDisclosureOfNonElectronicDocuments",
"Label": "Disclosure of non-electronic documents",
"Label": "Claimant 1 Disclosure of non-electronic documents",
"FieldType": "DisclosureOfNonElectronicDocuments",
"SecurityClassification": "Public",
"Searchable": "N"
},
{
"CaseTypeID": "CIVIL",
"ID": "applicant1DQDisclosureReport",
"Label": "Disclosure report",
"Label": "Claimant 1 Disclosure report",
"FieldType": "DisclosureReport",
"SecurityClassification": "Public",
"Searchable": "N"
Expand Down Expand Up @@ -2182,23 +2182,23 @@
{
"CaseTypeID": "CIVIL",
"ID": "applicant2DQDisclosureOfElectronicDocuments",
"Label": "Disclosure of electronic documents",
"Label": "Claimant 2 Disclosure of electronic documents",
"FieldType": "DisclosureOfElectronicDocuments",
"SecurityClassification": "Public",
"Searchable": "N"
},
{
"CaseTypeID": "CIVIL",
"ID": "applicant2DQDisclosureOfNonElectronicDocuments",
"Label": "Disclosure of non-electronic documents",
"Label": "Claimant 2 Disclosure of non-electronic documents",
"FieldType": "DisclosureOfNonElectronicDocuments",
"SecurityClassification": "Public",
"Searchable": "N"
},
{
"CaseTypeID": "CIVIL",
"ID": "applicant2DQDisclosureReport",
"Label": "Disclosure report",
"Label": "Claimant 2 Disclosure report",
"FieldType": "DisclosureReport",
"SecurityClassification": "Public",
"Searchable": "N"
Expand Down
14 changes: 7 additions & 7 deletions ccd-definition/CaseField/CaseFieldLRspec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,31 +1252,31 @@
{
"CaseTypeID": "CIVIL",
"ID": "specRespondent1DQDisclosureOfNonElectronicDocuments",
"Label": "Disclosure of non-electronic documents",
"Label": "Defendant 1 Disclosure of non-electronic documents",
"FieldType": "DisclosureOfNonElectronicDocumentsLRspec",
"SecurityClassification": "Public",
"Searchable": "N"
},
{
"CaseTypeID": "CIVIL",
"ID": "specRespondent2DQDisclosureOfNonElectronicDocuments",
"Label": "Disclosure of non-electronic documents",
"Label": "Defendant 2 Disclosure of non-electronic documents",
"FieldType": "DisclosureOfNonElectronicDocumentsLRspec",
"SecurityClassification": "Public",
"Searchable": "N"
},
{
"CaseTypeID": "CIVIL",
"ID": "specRespondent1DQDisclosureOfElectronicDocuments",
"Label": "Disclosure of electronic documents",
"Label": "Defendant 1 Disclosure of electronic documents",
"FieldType": "DisclosureOfElectronicDocumentsLRspec",
"SecurityClassification": "Public",
"Searchable": "N"
},
{
"CaseTypeID": "CIVIL",
"ID": "specRespondent2DQDisclosureOfElectronicDocuments",
"Label": "Disclosure of electronic documents",
"Label": "Defendant 2 Disclosure of electronic documents",
"FieldType": "DisclosureOfElectronicDocumentsLRspec",
"SecurityClassification": "Public",
"Searchable": "N"
Expand Down Expand Up @@ -2302,15 +2302,15 @@
{
"CaseTypeID": "CIVIL",
"ID": "specApplicant1DQDisclosureOfNonElectronicDocuments",
"Label": "Disclosure of non-electronic documents",
"Label": "Claimant 1 Disclosure of non-electronic documents",
"FieldType": "DisclosureOfNonElectronicDocumentsLRspec",
"SecurityClassification": "Public",
"Searchable": "N"
},
{
"CaseTypeID": "CIVIL",
"ID": "specApplicant2DQDisclosureOfNonElectronicDocuments",
"Label": "Disclosure of non-electronic documents",
"Label": "Claimant 2 Disclosure of non-electronic documents",
"FieldType": "DisclosureOfNonElectronicDocumentsLRspec",
"SecurityClassification": "Public",
"Searchable": "N"
Expand Down Expand Up @@ -2832,7 +2832,7 @@
{
"CaseTypeID": "CIVIL",
"ID": "specApplicant1DQDisclosureOfElectronicDocuments",
"Label": "Disclosure of electronic documents",
"Label": "Claimant 1 Disclosure of electronic documents",
"FieldType": "DisclosureOfElectronicDocuments",
"SecurityClassification": "Public",
"Searchable": "N",
Expand Down
Loading
Loading