From a004acd8568d1c5155a60ae6e3bd3c99cd4a8a9d Mon Sep 17 00:00:00 2001 From: Sherlyn Khaw Date: Thu, 4 Jul 2024 05:24:03 +0100 Subject: [PATCH 1/6] test --- e2e/helpers/mintiHelper.js | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e/helpers/mintiHelper.js b/e2e/helpers/mintiHelper.js index d1341ecba6..ee1c2edc5b 100644 --- a/e2e/helpers/mintiHelper.js +++ b/e2e/helpers/mintiHelper.js @@ -49,6 +49,7 @@ function getCaseAllocatedTrack(case_data, isSpecCase) { module.exports = { addSubmittedDateInCaseData: (caseData) => { + //=== caseData.valid.References.submittedDate = '2025-02-20T15:59:50'; return caseData; }, From edc89b3f7e89187e500e28d59047347448b3f3dd Mon Sep 17 00:00:00 2001 From: Sherlyn Khaw Date: Thu, 4 Jul 2024 19:04:55 +0100 Subject: [PATCH 2/6] add extra pages to claim details tab --- .../ClaimDetails-MINTI-nonprod.json | 94 ++++++++++++--- .../CaseTypeTab/ClaimDetails-MINTI-prod.json | 26 ---- ccd-definition/CaseTypeTab/ClaimDetails.json | 111 +++++++++++------- .../ClaimDetailsLRSpec-MINTI-nonprod.json | 58 +++++++++ .../ClaimDetailsLRspec-CARM-nonprod.json | 16 +-- .../CaseTypeTab/ClaimDetailsLRspec-CUI.json | 78 ++++++------ ...ClaimDetailsLRspec-HWF-R2-CUI-nonprod.json | 6 +- .../defendantResponse_Solicitor1.js | 2 +- .../defendantResponse_Solicitor2.js | 2 +- .../defendantResponse_sameSolicitor.js | 2 +- e2e/fixtures/events/claimantResponse.js | 2 +- e2e/fixtures/events/defendantResponse.js | 2 +- 12 files changed, 263 insertions(+), 136 deletions(-) delete mode 100644 ccd-definition/CaseTypeTab/ClaimDetails-MINTI-prod.json create mode 100644 ccd-definition/CaseTypeTab/ClaimDetailsLRSpec-MINTI-nonprod.json diff --git a/ccd-definition/CaseTypeTab/ClaimDetails-MINTI-nonprod.json b/ccd-definition/CaseTypeTab/ClaimDetails-MINTI-nonprod.json index fe17edafff..7297a20803 100644 --- a/ccd-definition/CaseTypeTab/ClaimDetails-MINTI-nonprod.json +++ b/ccd-definition/CaseTypeTab/ClaimDetails-MINTI-nonprod.json @@ -2,49 +2,113 @@ { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", - "CaseFieldID": "respondent1DQFixedRecoverableCosts", - "TabFieldDisplayOrder": 37 + "CaseFieldID": "respondent1DQFixedRecoverableCostsIntermediate", + "TabFieldDisplayOrder": 37, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\"" }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", - "CaseFieldID": "respondent1DQFixedRecoverableCostsIntermediate", - "TabFieldDisplayOrder": 37 + "CaseFieldID": "respondent2DQFixedRecoverableCostsIntermediate", + "TabFieldDisplayOrder": 38, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\"" }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", - "CaseFieldID": "respondent2DQFixedRecoverableCosts", - "TabFieldDisplayOrder": 38 + "CaseFieldID": "respondent1DQDisclosureOfElectronicDocuments", + "TabFieldDisplayOrder": 39, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\" OR responseClaimTrack = \"MULTI_CLAIM\" OR allocatedTrack = \"MULTI_CLAIM\"" }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", - "CaseFieldID": "respondent2DQFixedRecoverableCostsIntermediate", - "TabFieldDisplayOrder": 38 + "CaseFieldID": "respondent2DQDisclosureOfElectronicDocuments", + "TabFieldDisplayOrder": 40, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\" OR responseClaimTrack = \"MULTI_CLAIM\" OR allocatedTrack = \"MULTI_CLAIM\"" }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", - "CaseFieldID": "applicant1DQFixedRecoverableCosts", - "TabFieldDisplayOrder": 68 + "CaseFieldID": "respondent1DQDisclosureOfNonElectronicDocuments", + "TabFieldDisplayOrder": 41, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\" OR responseClaimTrack = \"MULTI_CLAIM\" OR allocatedTrack = \"MULTI_CLAIM\"" }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", - "CaseFieldID": "applicant1DQFixedRecoverableCostsIntermediate", - "TabFieldDisplayOrder": 68 + "CaseFieldID": "respondent2DQDisclosureOfNonElectronicDocuments", + "TabFieldDisplayOrder": 42, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\" OR responseClaimTrack = \"MULTI_CLAIM\" OR allocatedTrack = \"MULTI_CLAIM\"" }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", - "CaseFieldID": "applicant2DQFixedRecoverableCosts", - "TabFieldDisplayOrder": 69 + "CaseFieldID": "respondent1DQDisclosureReport", + "TabFieldDisplayOrder": 43, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\" OR responseClaimTrack = \"MULTI_CLAIM\" OR allocatedTrack = \"MULTI_CLAIM\"" + }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "respondent2DQDisclosureReport", + "TabFieldDisplayOrder": 44, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\" OR responseClaimTrack = \"MULTI_CLAIM\" OR allocatedTrack = \"MULTI_CLAIM\"" + }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "applicant1DQFixedRecoverableCostsIntermediate", + "TabFieldDisplayOrder": 74, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\"" }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "applicant2DQFixedRecoverableCostsIntermediate", - "TabFieldDisplayOrder": 69 + "TabFieldDisplayOrder": 75, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\"" + }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "applicant1DQDisclosureOfElectronicDocuments", + "TabFieldDisplayOrder": 76, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\" OR responseClaimTrack = \"MULTI_CLAIM\" OR allocatedTrack = \"MULTI_CLAIM\"" + }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "applicant2DQDisclosureOfElectronicDocuments", + "TabFieldDisplayOrder": 77, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\" OR responseClaimTrack = \"MULTI_CLAIM\" OR allocatedTrack = \"MULTI_CLAIM\"" + }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "applicant1DQDisclosureOfNonElectronicDocuments", + "TabFieldDisplayOrder": 78, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\" OR responseClaimTrack = \"MULTI_CLAIM\" OR allocatedTrack = \"MULTI_CLAIM\"" + }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "applicant2DQDisclosureOfNonElectronicDocuments", + "TabFieldDisplayOrder": 79, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\" OR responseClaimTrack = \"MULTI_CLAIM\" OR allocatedTrack = \"MULTI_CLAIM\"" + }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "applicant1DQDisclosureReport", + "TabFieldDisplayOrder": 80, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\" OR responseClaimTrack = \"MULTI_CLAIM\" OR allocatedTrack = \"MULTI_CLAIM\"" + }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "applicant2DQDisclosureReport", + "TabFieldDisplayOrder": 81, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\" OR responseClaimTrack = \"MULTI_CLAIM\" OR allocatedTrack = \"MULTI_CLAIM\"" } ] diff --git a/ccd-definition/CaseTypeTab/ClaimDetails-MINTI-prod.json b/ccd-definition/CaseTypeTab/ClaimDetails-MINTI-prod.json deleted file mode 100644 index 1f0a7b0a92..0000000000 --- a/ccd-definition/CaseTypeTab/ClaimDetails-MINTI-prod.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "CaseTypeID": "CIVIL", - "TabID": "ClaimDetails", - "CaseFieldID": "respondent1DQFixedRecoverableCosts", - "TabFieldDisplayOrder": 37 - }, - { - "CaseTypeID": "CIVIL", - "TabID": "ClaimDetails", - "CaseFieldID": "respondent2DQFixedRecoverableCosts", - "TabFieldDisplayOrder": 38 - }, - { - "CaseTypeID": "CIVIL", - "TabID": "ClaimDetails", - "CaseFieldID": "applicant1DQFixedRecoverableCosts", - "TabFieldDisplayOrder": 68 - }, - { - "CaseTypeID": "CIVIL", - "TabID": "ClaimDetails", - "CaseFieldID": "applicant2DQFixedRecoverableCosts", - "TabFieldDisplayOrder": 69 - } -] diff --git a/ccd-definition/CaseTypeTab/ClaimDetails.json b/ccd-definition/CaseTypeTab/ClaimDetails.json index 89bbd8a5de..07963feb93 100644 --- a/ccd-definition/CaseTypeTab/ClaimDetails.json +++ b/ccd-definition/CaseTypeTab/ClaimDetails.json @@ -280,13 +280,25 @@ "TabFieldDisplayOrder": 37, "FieldShowCondition": "applicant2 =\"*\"" }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "respondent1DQFixedRecoverableCosts", + "TabFieldDisplayOrder": 37 + }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "respondent2DQFixedRecoverableCosts", + "TabFieldDisplayOrder": 38 + }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "TabLabel": "Claim details", "TabDisplayOrder": 2, "CaseFieldID": "respondent1DQExperts", - "TabFieldDisplayOrder": 39 + "TabFieldDisplayOrder": 45 }, { "CaseTypeID": "CIVIL", @@ -294,7 +306,7 @@ "TabLabel": "Claim details", "TabDisplayOrder": 2, "CaseFieldID": "respondent2DQExperts", - "TabFieldDisplayOrder": 40 + "TabFieldDisplayOrder": 46 }, { "CaseTypeID": "CIVIL", @@ -302,7 +314,7 @@ "TabLabel": "Claim details", "TabDisplayOrder": 2, "CaseFieldID": "respondent1DQWitnesses", - "TabFieldDisplayOrder": 42 + "TabFieldDisplayOrder": 47 }, { "CaseTypeID": "CIVIL", @@ -310,54 +322,61 @@ "TabLabel": "Claim details", "TabDisplayOrder": 2, "CaseFieldID": "respondent2DQWitnesses", - "TabFieldDisplayOrder": 43 + "TabFieldDisplayOrder": 48 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1DQLanguage", - "TabFieldDisplayOrder": 47 + "TabFieldDisplayOrder": 53 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent2DQLanguage", - "TabFieldDisplayOrder": 48, + "TabFieldDisplayOrder": 54, "FieldShowCondition": "respondent2DetailsForClaimDetailsTab =\"*\"" }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1DQHearing", - "TabFieldDisplayOrder": 49, + "TabFieldDisplayOrder": 55, "FieldShowCondition": "responseClaimTrack != \"SMALL_CLAIM\"" }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent2DQHearing", - "TabFieldDisplayOrder": 50, + "TabFieldDisplayOrder": 56, "FieldShowCondition": "respondent2DetailsForClaimDetailsTab =\"*\" AND responseClaimTrack != \"SMALL_CLAIM\"" }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "responseClaimTrack", - "TabFieldDisplayOrder": 51, + "TabFieldDisplayOrder": 57, "FieldShowCondition": "responseClaimTrack = \"DO NOT SHOW IN UI\"" }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "allocatedTrack", + "TabFieldDisplayOrder": 57, + "FieldShowCondition": "allocatedTrack = \"DO NOT SHOW IN UI\"" + }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1DQHearingSmallClaim", - "TabFieldDisplayOrder": 52, + "TabFieldDisplayOrder": 58, "FieldShowCondition": "responseClaimTrack = \"SMALL_CLAIM\"" }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent2DQHearingSmallClaim", - "TabFieldDisplayOrder": 53, + "TabFieldDisplayOrder": 59, "FieldShowCondition": "respondent2DetailsForClaimDetailsTab =\"*\" AND responseClaimTrack = \"SMALL_CLAIM\"" }, { @@ -400,74 +419,86 @@ "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1DQHearingFastClaim", - "TabFieldDisplayOrder": 54 + "TabFieldDisplayOrder": 60 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent2DQHearingFastClaim", - "TabFieldDisplayOrder": 55, + "TabFieldDisplayOrder": 61, "FieldShowCondition": "respondent2DetailsForClaimDetailsTab =\"*\"" }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1DQRequestedCourt", - "TabFieldDisplayOrder": 56 + "TabFieldDisplayOrder": 62 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent2DQRequestedCourt", - "TabFieldDisplayOrder": 57, + "TabFieldDisplayOrder": 63, "FieldShowCondition": "respondent2DetailsForClaimDetailsTab =\"*\"" }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondToCourtLocation", - "TabFieldDisplayOrder": 58 + "TabFieldDisplayOrder": 64 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondToCourtLocation2", - "TabFieldDisplayOrder": 59, + "TabFieldDisplayOrder": 65, "FieldShowCondition": "respondent2DetailsForClaimDetailsTab =\"*\"" }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1DQHearingSupport", - "TabFieldDisplayOrder": 60 + "TabFieldDisplayOrder": 66 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent2DQHearingSupport", - "TabFieldDisplayOrder": 61, + "TabFieldDisplayOrder": 67, "FieldShowCondition": "respondent2DetailsForClaimDetailsTab =\"*\"" }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "defendantResponseDocuments", - "TabFieldDisplayOrder": 62 + "TabFieldDisplayOrder": 68 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "headingClaimantDQ", - "TabFieldDisplayOrder": 67, + "TabFieldDisplayOrder": 73, "FieldShowCondition": "applicant1DQExperts = \"*\"" }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "applicant1DQFixedRecoverableCosts", + "TabFieldDisplayOrder": 74 + }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "applicant2DQFixedRecoverableCosts", + "TabFieldDisplayOrder": 75 + } { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "TabLabel": "Claim details", "TabDisplayOrder": 2, "CaseFieldID": "applicant1DQExperts", - "TabFieldDisplayOrder":70 + "TabFieldDisplayOrder": 82 }, { "CaseTypeID": "CIVIL", @@ -475,7 +506,7 @@ "TabLabel": "Claim details", "TabDisplayOrder": 2, "CaseFieldID": "applicant2DQExperts", - "TabFieldDisplayOrder": 71 + "TabFieldDisplayOrder": 83 }, { "CaseTypeID": "CIVIL", @@ -483,7 +514,7 @@ "TabLabel": "Claim details", "TabDisplayOrder": 2, "CaseFieldID": "applicant1DQWitnesses", - "TabFieldDisplayOrder": 73 + "TabFieldDisplayOrder": 84 }, { "CaseTypeID": "CIVIL", @@ -491,49 +522,49 @@ "TabLabel": "Claim details", "TabDisplayOrder": 2, "CaseFieldID": "applicant2DQWitnesses", - "TabFieldDisplayOrder": 74 + "TabFieldDisplayOrder": 85 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "applicant1DQLanguage", - "TabFieldDisplayOrder": 75 + "TabFieldDisplayOrder": 86 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "applicant2DQLanguage", - "TabFieldDisplayOrder": 76 + "TabFieldDisplayOrder": 87 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "applicant1DQHearing", - "TabFieldDisplayOrder": 77 + "TabFieldDisplayOrder": 88 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "applicant2DQHearing", - "TabFieldDisplayOrder": 78 + "TabFieldDisplayOrder": 89 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "applicant1DQHearingLRspec", - "TabFieldDisplayOrder": 79 + "TabFieldDisplayOrder": 90 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "applicant1DQSmallClaimHearing", - "TabFieldDisplayOrder": 80 + "TabFieldDisplayOrder": 91 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "applicant1DQRequestedCourt", - "TabFieldDisplayOrder": 81 + "TabFieldDisplayOrder": 92 }, { "CaseTypeID": "CIVIL", @@ -541,52 +572,52 @@ "TabLabel": "Claim details", "TabDisplayOrder": 2, "CaseFieldID": "courtLocation", - "TabFieldDisplayOrder": 82 + "TabFieldDisplayOrder": 93 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "applicant1DQHearingSupport", - "TabFieldDisplayOrder": 83 + "TabFieldDisplayOrder": 94 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "applicant2DQHearingSupport", - "TabFieldDisplayOrder": 84 + "TabFieldDisplayOrder": 95 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "claimantResponseDocuments", - "TabFieldDisplayOrder": 85 + "TabFieldDisplayOrder": 96 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "TabLabel": "Claim details", "CaseFieldID": "applicant1DQVulnerabilityQuestions", - "TabFieldDisplayOrder": 86 + "TabFieldDisplayOrder": 97 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "TabLabel": "Claim details", "CaseFieldID": "applicant2DQVulnerabilityQuestions", - "TabFieldDisplayOrder": 87 + "TabFieldDisplayOrder": 98 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "TabLabel": "Claim details", "CaseFieldID": "respondent1DQVulnerabilityQuestions", - "TabFieldDisplayOrder": 88 + "TabFieldDisplayOrder": 99 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "TabLabel": "Claim details", "CaseFieldID": "respondent2DQVulnerabilityQuestions", - "TabFieldDisplayOrder": 89 + "TabFieldDisplayOrder": 100 } ] diff --git a/ccd-definition/CaseTypeTab/ClaimDetailsLRSpec-MINTI-nonprod.json b/ccd-definition/CaseTypeTab/ClaimDetailsLRSpec-MINTI-nonprod.json new file mode 100644 index 0000000000..20faa959a2 --- /dev/null +++ b/ccd-definition/CaseTypeTab/ClaimDetailsLRSpec-MINTI-nonprod.json @@ -0,0 +1,58 @@ +[ + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "specRespondent1DQDisclosureOfElectronicDocuments", + "TabFieldDisplayOrder": 39, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\"" + }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "specRespondent2DQDisclosureOfElectronicDocuments", + "TabFieldDisplayOrder": 40, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\"" + }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "specRespondent1DQDisclosureOfNonElectronicDocuments", + "TabFieldDisplayOrder": 41, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\"" + }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "specRespondent2DQDisclosureOfNonElectronicDocuments", + "TabFieldDisplayOrder": 42, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\"" + }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "specApplicant1DQDisclosureOfElectronicDocuments", + "TabFieldDisplayOrder": 76, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\"" + }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "specApplicant2DQDisclosureOfElectronicDocuments", + "TabFieldDisplayOrder": 77, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\"" + }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "specApplicant1DQDisclosureOfNonElectronicDocuments", + "TabFieldDisplayOrder": 78, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\"" + }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "specApplicant2DQDisclosureOfNonElectronicDocuments", + "TabFieldDisplayOrder": 79, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\"" + } +] diff --git a/ccd-definition/CaseTypeTab/ClaimDetailsLRspec-CARM-nonprod.json b/ccd-definition/CaseTypeTab/ClaimDetailsLRspec-CARM-nonprod.json index c78a309507..eb7f2e7907 100644 --- a/ccd-definition/CaseTypeTab/ClaimDetailsLRspec-CARM-nonprod.json +++ b/ccd-definition/CaseTypeTab/ClaimDetailsLRspec-CARM-nonprod.json @@ -3,48 +3,48 @@ "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "resp1MediationContactInfo", - "TabFieldDisplayOrder": 63 + "TabFieldDisplayOrder": 69 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "resp2MediationContactInfo", - "TabFieldDisplayOrder": 64 + "TabFieldDisplayOrder": 70 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "resp1MediationAvailability", - "TabFieldDisplayOrder": 65 + "TabFieldDisplayOrder": 71 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "resp2MediationAvailability", - "TabFieldDisplayOrder": 66 + "TabFieldDisplayOrder": 72 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1LiPResponseCarm", - "TabFieldDisplayOrder": 78 + "TabFieldDisplayOrder": 89 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "applicant1LiPResponseCarm", - "TabFieldDisplayOrder": 79 + "TabFieldDisplayOrder": 90 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "app1MediationContactInfo", - "TabFieldDisplayOrder": 84 + "TabFieldDisplayOrder": 95 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "app1MediationAvailability", - "TabFieldDisplayOrder": 85 + "TabFieldDisplayOrder": 96 } ] diff --git a/ccd-definition/CaseTypeTab/ClaimDetailsLRspec-CUI.json b/ccd-definition/CaseTypeTab/ClaimDetailsLRspec-CUI.json index 4f225d02cd..0016f1a504 100644 --- a/ccd-definition/CaseTypeTab/ClaimDetailsLRspec-CUI.json +++ b/ccd-definition/CaseTypeTab/ClaimDetailsLRspec-CUI.json @@ -4,272 +4,272 @@ "TabID": "ClaimDetails", "CaseFieldID": "headingManualDetermination", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 90 + "TabFieldDisplayOrder": 101 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "headingDefendantProposedPlan", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 91 + "TabFieldDisplayOrder": 102 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "defenceAdmitPartPaymentTimeRouteRequired", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 92 + "TabFieldDisplayOrder": 103 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondToClaimAdmitPartLRspec", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 93 + "TabFieldDisplayOrder": 104 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1RepaymentPlan", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 94 + "TabFieldDisplayOrder": 105 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "headingDefendantFinancialDetails", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\" AND respondent1DetailsForClaimDetailsTab.type!=\"COMPANY\" AND respondent1DetailsForClaimDetailsTab.type!=\"ORGANISATION\"", - "TabFieldDisplayOrder": 95 + "TabFieldDisplayOrder": 106 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "headingBankAccount", "FieldShowCondition": "respondent1BankAccountList = \"*\" AND applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 96 + "TabFieldDisplayOrder": 107 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1BankAccountList", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 97 + "TabFieldDisplayOrder": 108 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "headingDisabilityPremiumPayments", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\" AND disabilityPremiumPayments = \"*\"", - "TabFieldDisplayOrder": 98 + "TabFieldDisplayOrder": 109 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "disabilityPremiumPayments", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 99 + "TabFieldDisplayOrder": 110 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "severeDisabilityPremiumPayments", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 100 + "TabFieldDisplayOrder": 111 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "headingHomeDetails", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\" AND respondent1DQHomeDetails = \"*\"", - "TabFieldDisplayOrder": 101 + "TabFieldDisplayOrder": 112 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1DQHomeDetails", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 102 + "TabFieldDisplayOrder": 113 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1PartnerAndDependent", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 103 + "TabFieldDisplayOrder": 114 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1LiPFinancialDetails", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 104 + "TabFieldDisplayOrder": 115 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "headingEmployment", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\" AND defenceAdmitPartEmploymentTypeRequired = \"*\"", - "TabFieldDisplayOrder": 105 + "TabFieldDisplayOrder": 116 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "defenceAdmitPartEmploymentTypeRequired", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 106 + "TabFieldDisplayOrder": 117 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondToClaimAdmitPartEmploymentTypeLRspec", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 107 + "TabFieldDisplayOrder": 118 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondToClaimAdmitPartUnemployedLRspec", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 108 + "TabFieldDisplayOrder": 119 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "responseClaimAdmitPartEmployer", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 109 + "TabFieldDisplayOrder": 120 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "specDefendant1SelfEmploymentDetails", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 110 + "TabFieldDisplayOrder": 121 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "headingCourtOrder", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\" AND respondent1CourtOrderPaymentOption = \"*\"", - "TabFieldDisplayOrder": 111 + "TabFieldDisplayOrder": 122 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1CourtOrderPaymentOption", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 112 + "TabFieldDisplayOrder": 123 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1CourtOrderDetails", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 113 + "TabFieldDisplayOrder": 124 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "specDefendant1Debts", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 114 + "TabFieldDisplayOrder": 125 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1LoanCreditOption", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 115 + "TabFieldDisplayOrder": 126 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1LoanCreditDetails", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 116 + "TabFieldDisplayOrder": 127 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1DQCarerAllowanceCredit", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 117 + "TabFieldDisplayOrder": 128 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1DQCarerAllowanceCreditFullAdmission", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 118 + "TabFieldDisplayOrder": 129 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1DQRecurringIncomeFA", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 119 + "TabFieldDisplayOrder": 130 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1DQRecurringIncome", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 120 + "TabFieldDisplayOrder": 131 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1DQRecurringExpensesFA", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 121 + "TabFieldDisplayOrder": 132 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "respondent1DQRecurringExpenses", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 122 + "TabFieldDisplayOrder": 133 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "headingClaimantProposedPlan", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\" AND applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 123 + "TabFieldDisplayOrder": 134 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "applicant1RepaymentOptionForDefendantSpec", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 124 + "TabFieldDisplayOrder": 135 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "applicant1RequestedPaymentDateForDefendantSpec", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 125 + "TabFieldDisplayOrder": 136 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "applicant1SuggestInstalmentsPaymentAmountForDefendantSpec", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 126 + "TabFieldDisplayOrder": 137 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "applicant1SuggestInstalmentsRepaymentFrequencyForDefendantSpec", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 127 + "TabFieldDisplayOrder": 138 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "applicant1SuggestInstalmentsFirstRepaymentDateForDefendantSpec", "FieldShowCondition": "applicant1RepaymentOptionForDefendantSpec = \"*\"", - "TabFieldDisplayOrder": 128 + "TabFieldDisplayOrder": 139 } ] diff --git a/ccd-definition/CaseTypeTab/ClaimDetailsLRspec-HWF-R2-CUI-nonprod.json b/ccd-definition/CaseTypeTab/ClaimDetailsLRspec-HWF-R2-CUI-nonprod.json index 839ed30c82..d99b69fbb2 100644 --- a/ccd-definition/CaseTypeTab/ClaimDetailsLRspec-HWF-R2-CUI-nonprod.json +++ b/ccd-definition/CaseTypeTab/ClaimDetailsLRspec-HWF-R2-CUI-nonprod.json @@ -4,18 +4,18 @@ "TabID": "ClaimDetails", "CaseFieldID": "headingHelpWithFeesDetails", "FieldShowCondition": "claimIssuedHwfForTab = \"*\" OR hearingHwfForTab = \"*\"", - "TabFieldDisplayOrder": 117 + "TabFieldDisplayOrder": 128 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "claimIssuedHwfForTab", - "TabFieldDisplayOrder": 118 + "TabFieldDisplayOrder": 129 }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "hearingHwfForTab", - "TabFieldDisplayOrder": 119 + "TabFieldDisplayOrder": 130 } ] diff --git a/e2e/fixtures/events/1v2DifferentSolicitorEvents/defendantResponse_Solicitor1.js b/e2e/fixtures/events/1v2DifferentSolicitorEvents/defendantResponse_Solicitor1.js index 21f4b7fcf6..ceebbc180b 100644 --- a/e2e/fixtures/events/1v2DifferentSolicitorEvents/defendantResponse_Solicitor1.js +++ b/e2e/fixtures/events/1v2DifferentSolicitorEvents/defendantResponse_Solicitor1.js @@ -43,7 +43,7 @@ module.exports = { reactionProtocolCompliedWith: 'Yes' } }, - ...(allocatedTrack === 'FAST_CLAIM' ? { + ...(allocatedTrack === 'FAST_CLAIM' || allocatedTrack === 'MULTI_CLAIM' ? { FixedRecoverableCosts: { respondent1DQFixedRecoverableCosts: { band: 'BAND_1', diff --git a/e2e/fixtures/events/1v2DifferentSolicitorEvents/defendantResponse_Solicitor2.js b/e2e/fixtures/events/1v2DifferentSolicitorEvents/defendantResponse_Solicitor2.js index 3a9aca51bc..be781631b4 100644 --- a/e2e/fixtures/events/1v2DifferentSolicitorEvents/defendantResponse_Solicitor2.js +++ b/e2e/fixtures/events/1v2DifferentSolicitorEvents/defendantResponse_Solicitor2.js @@ -37,7 +37,7 @@ module.exports = { reactionProtocolCompliedWith: 'Yes' } }, - ...(allocatedTrack === 'FAST_CLAIM' ? { + ...(allocatedTrack === 'FAST_CLAIM' || allocatedTrack === 'MULTI_CLAIM'? { FixedRecoverableCosts: { respondent2DQFixedRecoverableCosts: { band: 'BAND_3', diff --git a/e2e/fixtures/events/1v2SameSolicitorEvents/defendantResponse_sameSolicitor.js b/e2e/fixtures/events/1v2SameSolicitorEvents/defendantResponse_sameSolicitor.js index 30d7488ed4..ff4e6737e3 100644 --- a/e2e/fixtures/events/1v2SameSolicitorEvents/defendantResponse_sameSolicitor.js +++ b/e2e/fixtures/events/1v2SameSolicitorEvents/defendantResponse_sameSolicitor.js @@ -46,7 +46,7 @@ module.exports = { reactionProtocolCompliedWith: 'Yes' } }, - ...(allocatedTrack === 'FAST_CLAIM' ? { + ...(allocatedTrack === 'FAST_CLAIM' || allocatedTrack === 'MULTI_CLAIM'? { FixedRecoverableCosts: { respondent1DQFixedRecoverableCosts: { band: 'BAND_1', diff --git a/e2e/fixtures/events/claimantResponse.js b/e2e/fixtures/events/claimantResponse.js index 4024b7482b..bec3a1a066 100644 --- a/e2e/fixtures/events/claimantResponse.js +++ b/e2e/fixtures/events/claimantResponse.js @@ -101,7 +101,7 @@ module.exports = { reactionProtocolCompliedWith: 'Yes' } }, - ...(allocatedTrack === 'FAST_CLAIM' ? { + ...(allocatedTrack === 'FAST_CLAIM' || allocatedTrack === 'MULTI_CLAIM'? { FixedRecoverableCosts: { applicant1DQFixedRecoverableCosts: { band: 'BAND_1', diff --git a/e2e/fixtures/events/defendantResponse.js b/e2e/fixtures/events/defendantResponse.js index c07ba679ad..d57828450f 100644 --- a/e2e/fixtures/events/defendantResponse.js +++ b/e2e/fixtures/events/defendantResponse.js @@ -41,7 +41,7 @@ module.exports = { reactionProtocolCompliedWith: 'Yes' } }, - ...(allocatedTrack === 'FAST_CLAIM' ? { + ...(allocatedTrack === 'FAST_CLAIM' || allocatedTrack === 'MULTI_CLAIM'? { FixedRecoverableCosts: { respondent1DQFixedRecoverableCosts: { band: 'BAND_1', From 15e653af8e64028718a6345bd81d405da53ce3da Mon Sep 17 00:00:00 2001 From: Sherlyn Khaw Date: Fri, 5 Jul 2024 10:42:36 +0100 Subject: [PATCH 3/6] fixed ccd issues --- ccd-definition/CaseTypeTab/ClaimDetails.json | 2 +- .../ClaimDetailsLRSpec-MINTI-nonprod.json | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/ccd-definition/CaseTypeTab/ClaimDetails.json b/ccd-definition/CaseTypeTab/ClaimDetails.json index 07963feb93..3f99d76119 100644 --- a/ccd-definition/CaseTypeTab/ClaimDetails.json +++ b/ccd-definition/CaseTypeTab/ClaimDetails.json @@ -491,7 +491,7 @@ "TabID": "ClaimDetails", "CaseFieldID": "applicant2DQFixedRecoverableCosts", "TabFieldDisplayOrder": 75 - } + }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", diff --git a/ccd-definition/CaseTypeTab/ClaimDetailsLRSpec-MINTI-nonprod.json b/ccd-definition/CaseTypeTab/ClaimDetailsLRSpec-MINTI-nonprod.json index 20faa959a2..99a076adfb 100644 --- a/ccd-definition/CaseTypeTab/ClaimDetailsLRSpec-MINTI-nonprod.json +++ b/ccd-definition/CaseTypeTab/ClaimDetailsLRSpec-MINTI-nonprod.json @@ -34,25 +34,11 @@ "TabFieldDisplayOrder": 76, "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\"" }, - { - "CaseTypeID": "CIVIL", - "TabID": "ClaimDetails", - "CaseFieldID": "specApplicant2DQDisclosureOfElectronicDocuments", - "TabFieldDisplayOrder": 77, - "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\"" - }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", "CaseFieldID": "specApplicant1DQDisclosureOfNonElectronicDocuments", "TabFieldDisplayOrder": 78, "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\"" - }, - { - "CaseTypeID": "CIVIL", - "TabID": "ClaimDetails", - "CaseFieldID": "specApplicant2DQDisclosureOfNonElectronicDocuments", - "TabFieldDisplayOrder": 79, - "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\"" } ] From ee0861543f86babdc470f93d41244f9f0479f9be Mon Sep 17 00:00:00 2001 From: Sherlyn Khaw Date: Fri, 5 Jul 2024 17:33:26 +0100 Subject: [PATCH 4/6] renaming fields --- .../CaseEventToFields/ClaimantResponse.json | 6 +++++ .../ClaimantResponseLRspec-CUI.json | 3 +++ .../CaseEventToFields/DefendantResponse.json | 6 +++++ .../DefendantResponseLRspec.json | 6 +++++ ccd-definition/CaseField/CaseField.json | 24 +++++++++---------- ccd-definition/CaseField/CaseFieldLRspec.json | 14 +++++------ e2e/helpers/mintiHelper.js | 1 - 7 files changed, 40 insertions(+), 20 deletions(-) diff --git a/ccd-definition/CaseEventToFields/ClaimantResponse.json b/ccd-definition/CaseEventToFields/ClaimantResponse.json index 332ea01e31..8f8c1498fc 100644 --- a/ccd-definition/CaseEventToFields/ClaimantResponse.json +++ b/ccd-definition/CaseEventToFields/ClaimantResponse.json @@ -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" @@ -305,6 +306,7 @@ "PageFieldDisplayOrder": 2, "DisplayContext": "MANDATORY", "PageID": "DisclosureOfElectronicDocuments", + "CaseEventFieldLabel": "Disclosure of electronic documents", "ShowSummaryChangeOption": "Y", "FieldShowCondition": "claimant2ResponseFlag=\"Yes\"" }, @@ -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" @@ -328,6 +331,7 @@ "PageFieldDisplayOrder": 2, "DisplayContext": "MANDATORY", "PageID": "DisclosureOfNonElectronicDocuments", + "CaseEventFieldLabel": "Disclosure of non-electronic documents", "ShowSummaryChangeOption": "Y", "FieldShowCondition": "claimant2ResponseFlag=\"Yes\"" }, @@ -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" @@ -351,6 +356,7 @@ "PageFieldDisplayOrder": 2, "DisplayContext": "COMPLEX", "PageID": "DisclosureReport", + "CaseEventFieldLabel": "Disclosure report", "FieldShowCondition": "claimant2ResponseFlag=\"Yes\"", "ShowSummaryChangeOption": "Y" }, diff --git a/ccd-definition/CaseEventToFields/ClaimantResponseLRspec-CUI.json b/ccd-definition/CaseEventToFields/ClaimantResponseLRspec-CUI.json index 210e77fdc6..65bac2b3f6 100644 --- a/ccd-definition/CaseEventToFields/ClaimantResponseLRspec-CUI.json +++ b/ccd-definition/CaseEventToFields/ClaimantResponseLRspec-CUI.json @@ -855,6 +855,7 @@ "PageFieldDisplayOrder": 1, "DisplayContext": "MANDATORY", "PageID": "DisclosureOfElectronicDocuments", + "CaseEventFieldLabel": "Disclosure of electronic documents", "PageShowCondition": "responseClaimTrack !=\"SMALL_CLAIM\" AND applicantDefenceResponseDocumentAndDQFlag =\"Yes\"", "ShowSummaryChangeOption": "Y" }, @@ -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" }, @@ -877,6 +879,7 @@ "PageFieldDisplayOrder": 1, "DisplayContext": "COMPLEX", "PageID": "DisclosureReport", + "CaseEventFieldLabel": "Disclosure report", "PageShowCondition": "responseClaimTrack != \"SMALL_CLAIM\" AND applicantDefenceResponseDocumentAndDQFlag =\"Yes\"", "ShowSummaryChangeOption": "Y" }, diff --git a/ccd-definition/CaseEventToFields/DefendantResponse.json b/ccd-definition/CaseEventToFields/DefendantResponse.json index 75bb6024a4..d4d709f44f 100644 --- a/ccd-definition/CaseEventToFields/DefendantResponse.json +++ b/ccd-definition/CaseEventToFields/DefendantResponse.json @@ -705,6 +705,7 @@ "PageFieldDisplayOrder": 5, "DisplayContext": "COMPLEX", "PageID": "DisclosureReport", + "CaseEventFieldLabel": "Disclosure report", "FieldShowCondition": "respondent2ClaimResponseType=\"FULL_DEFENCE\"", "ShowSummaryChangeOption": "Y" }, @@ -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" @@ -776,6 +778,7 @@ "PageFieldDisplayOrder": 5, "DisplayContext": "MANDATORY", "PageID": "DisclosureOfNonElectronicDocuments", + "CaseEventFieldLabel": "Disclosure of non-electronic documents", "FieldShowCondition": "respondent2ClaimResponseType=\"FULL_DEFENCE\"", "ShowSummaryChangeOption": "Y" }, @@ -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\"", @@ -846,6 +850,7 @@ "PageDisplayOrder": 8, "PageFieldDisplayOrder": 5, "DisplayContext": "MANDATORY", + "CaseEventFieldLabel": "Disclosure of electronic documents", "FieldShowCondition": "respondent2ClaimResponseType=\"FULL_DEFENCE\"", "PageID": "DisclosureOfElectronicDocuments", "ShowSummaryChangeOption": "Y" @@ -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\"", diff --git a/ccd-definition/CaseEventToFields/DefendantResponseLRspec.json b/ccd-definition/CaseEventToFields/DefendantResponseLRspec.json index cff57e80f1..006032c7f3 100644 --- a/ccd-definition/CaseEventToFields/DefendantResponseLRspec.json +++ b/ccd-definition/CaseEventToFields/DefendantResponseLRspec.json @@ -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" @@ -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\"" }, @@ -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" @@ -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\"" }, { @@ -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" @@ -1323,6 +1328,7 @@ "DisplayContext": "COMPLEX", "PageID": "DisclosureReport", "ShowSummaryChangeOption": "Y", + "CaseEventFieldLabel": "Disclosure report", "FieldShowCondition": "showConditionFlags CONTAINS \"CAN_ANSWER_RESPONDENT_2\" AND respondent2SameLegalRepresentative !=\"Yes\"" }, { diff --git a/ccd-definition/CaseField/CaseField.json b/ccd-definition/CaseField/CaseField.json index 5440e8c901..787d27562c 100644 --- a/ccd-definition/CaseField/CaseField.json +++ b/ccd-definition/CaseField/CaseField.json @@ -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" @@ -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" @@ -716,7 +716,7 @@ { "CaseTypeID": "CIVIL", "ID": "respondent1DQDisclosureOfNonElectronicDocuments", - "Label": "Disclosure of non-electronic documents", + "Label": "Defendant 1 Disclosure of non-electronic documents", "FieldType": "DisclosureOfNonElectronicDocuments", "SecurityClassification": "Public", "Searchable": "N" @@ -724,7 +724,7 @@ { "CaseTypeID": "CIVIL", "ID": "respondent2DQDisclosureOfNonElectronicDocuments", - "Label": "Disclosure of non-electronic documents", + "Label": "Defendant 2 Disclosure of non-electronic documents", "FieldType": "DisclosureOfNonElectronicDocuments", "SecurityClassification": "Public", "Searchable": "N" @@ -732,7 +732,7 @@ { "CaseTypeID": "CIVIL", "ID": "respondent1DQDisclosureReport", - "Label": "Disclosure report", + "Label": "Defendant 1 Disclosure report", "FieldType": "DisclosureReport", "SecurityClassification": "Public", "Searchable": "N" @@ -740,7 +740,7 @@ { "CaseTypeID": "CIVIL", "ID": "respondent2DQDisclosureReport", - "Label": "Disclosure report", + "Label": "Defendant 2 Disclosure report", "FieldType": "DisclosureReport", "SecurityClassification": "Public", "Searchable": "N" @@ -928,7 +928,7 @@ { "CaseTypeID": "CIVIL", "ID": "applicant1DQDisclosureOfElectronicDocuments", - "Label": "Disclosure of electronic documents", + "Label": "Claimant 1 Disclosure of electronic documents", "FieldType": "DisclosureOfElectronicDocuments", "SecurityClassification": "Public", "Searchable": "N" @@ -936,7 +936,7 @@ { "CaseTypeID": "CIVIL", "ID": "applicant1DQDisclosureOfNonElectronicDocuments", - "Label": "Disclosure of non-electronic documents", + "Label": "Claimant 1 Disclosure of non-electronic documents", "FieldType": "DisclosureOfNonElectronicDocuments", "SecurityClassification": "Public", "Searchable": "N" @@ -944,7 +944,7 @@ { "CaseTypeID": "CIVIL", "ID": "applicant1DQDisclosureReport", - "Label": "Disclosure report", + "Label": "Claimant 1 Disclosure report", "FieldType": "DisclosureReport", "SecurityClassification": "Public", "Searchable": "N" @@ -2182,7 +2182,7 @@ { "CaseTypeID": "CIVIL", "ID": "applicant2DQDisclosureOfElectronicDocuments", - "Label": "Disclosure of electronic documents", + "Label": "Claimant 2 Disclosure of electronic documents", "FieldType": "DisclosureOfElectronicDocuments", "SecurityClassification": "Public", "Searchable": "N" @@ -2190,7 +2190,7 @@ { "CaseTypeID": "CIVIL", "ID": "applicant2DQDisclosureOfNonElectronicDocuments", - "Label": "Disclosure of non-electronic documents", + "Label": "Claimant 2 Disclosure of non-electronic documents", "FieldType": "DisclosureOfNonElectronicDocuments", "SecurityClassification": "Public", "Searchable": "N" @@ -2198,7 +2198,7 @@ { "CaseTypeID": "CIVIL", "ID": "applicant2DQDisclosureReport", - "Label": "Disclosure report", + "Label": "Claimant 2 Disclosure report", "FieldType": "DisclosureReport", "SecurityClassification": "Public", "Searchable": "N" diff --git a/ccd-definition/CaseField/CaseFieldLRspec.json b/ccd-definition/CaseField/CaseFieldLRspec.json index 6858e072fe..017ed6fa32 100644 --- a/ccd-definition/CaseField/CaseFieldLRspec.json +++ b/ccd-definition/CaseField/CaseFieldLRspec.json @@ -1252,7 +1252,7 @@ { "CaseTypeID": "CIVIL", "ID": "specRespondent1DQDisclosureOfNonElectronicDocuments", - "Label": "Disclosure of non-electronic documents", + "Label": "Defendant 1 Disclosure of non-electronic documents", "FieldType": "DisclosureOfNonElectronicDocumentsLRspec", "SecurityClassification": "Public", "Searchable": "N" @@ -1260,7 +1260,7 @@ { "CaseTypeID": "CIVIL", "ID": "specRespondent2DQDisclosureOfNonElectronicDocuments", - "Label": "Disclosure of non-electronic documents", + "Label": "Defendant 2 Disclosure of non-electronic documents", "FieldType": "DisclosureOfNonElectronicDocumentsLRspec", "SecurityClassification": "Public", "Searchable": "N" @@ -1268,7 +1268,7 @@ { "CaseTypeID": "CIVIL", "ID": "specRespondent1DQDisclosureOfElectronicDocuments", - "Label": "Disclosure of electronic documents", + "Label": "Defendant 1 Disclosure of electronic documents", "FieldType": "DisclosureOfElectronicDocumentsLRspec", "SecurityClassification": "Public", "Searchable": "N" @@ -1276,7 +1276,7 @@ { "CaseTypeID": "CIVIL", "ID": "specRespondent2DQDisclosureOfElectronicDocuments", - "Label": "Disclosure of electronic documents", + "Label": "Defendant 2 Disclosure of electronic documents", "FieldType": "DisclosureOfElectronicDocumentsLRspec", "SecurityClassification": "Public", "Searchable": "N" @@ -2302,7 +2302,7 @@ { "CaseTypeID": "CIVIL", "ID": "specApplicant1DQDisclosureOfNonElectronicDocuments", - "Label": "Disclosure of non-electronic documents", + "Label": "Claimant 1 Disclosure of non-electronic documents", "FieldType": "DisclosureOfNonElectronicDocumentsLRspec", "SecurityClassification": "Public", "Searchable": "N" @@ -2310,7 +2310,7 @@ { "CaseTypeID": "CIVIL", "ID": "specApplicant2DQDisclosureOfNonElectronicDocuments", - "Label": "Disclosure of non-electronic documents", + "Label": "Claimant 2 Disclosure of non-electronic documents", "FieldType": "DisclosureOfNonElectronicDocumentsLRspec", "SecurityClassification": "Public", "Searchable": "N" @@ -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", diff --git a/e2e/helpers/mintiHelper.js b/e2e/helpers/mintiHelper.js index ee1c2edc5b..d1341ecba6 100644 --- a/e2e/helpers/mintiHelper.js +++ b/e2e/helpers/mintiHelper.js @@ -49,7 +49,6 @@ function getCaseAllocatedTrack(case_data, isSpecCase) { module.exports = { addSubmittedDateInCaseData: (caseData) => { - //=== caseData.valid.References.submittedDate = '2025-02-20T15:59:50'; return caseData; }, From 6e04ed4e0e63e3dd68929d2a88ae226ff5b5aeaf Mon Sep 17 00:00:00 2001 From: Sherlyn Khaw Date: Tue, 9 Jul 2024 12:09:17 +0100 Subject: [PATCH 5/6] fix api tests --- e2e/api/steps.js | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e/api/steps.js b/e2e/api/steps.js index 1528fb0103..62200931eb 100644 --- a/e2e/api/steps.js +++ b/e2e/api/steps.js @@ -1856,6 +1856,7 @@ const clearDataForDefendantResponse = (responseBody, solicitor) => { delete responseBody.data['respondent1DQDisclosureOfElectronicDocuments']; delete responseBody.data['respondent1DQDisclosureOfNonElectronicDocuments']; delete responseBody.data['respondent1DQDisclosureReport']; + delete responseBody.data['respondent1DQFixedRecoverableCosts']; delete responseBody.data['respondent1DQFixedRecoverableCostsIntermediate']; delete responseBody.data['respondent1DQExperts']; delete responseBody.data['respondent1DQWitnesses']; From f7eaa8a31d39a519941c7474c4655de0675e3d69 Mon Sep 17 00:00:00 2001 From: sankaviv1 Date: Mon, 15 Jul 2024 14:02:35 +0100 Subject: [PATCH 6/6] CIV-14393 CIV-14394 Show minti fields in claim details --- .../CaseField/CaseField-MINTI-nonprod.json | 4 ++-- .../ClaimDetailsLRSpec-MINTI-nonprod.json | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ccd-definition/CaseField/CaseField-MINTI-nonprod.json b/ccd-definition/CaseField/CaseField-MINTI-nonprod.json index 322bad820b..62a7005451 100644 --- a/ccd-definition/CaseField/CaseField-MINTI-nonprod.json +++ b/ccd-definition/CaseField/CaseField-MINTI-nonprod.json @@ -58,7 +58,7 @@ { "CaseTypeID": "CIVIL", "ID": "respondent1DQClaimantDocumentsToBeConsidered", - "Label": "Claimant documents to be considered", + "Label": "Defendant 1 claimant documents to be considered", "FieldType": "DocumentsToBeConsidered", "SecurityClassification": "Public", "Searchable": "N" @@ -66,7 +66,7 @@ { "CaseTypeID": "CIVIL", "ID": "applicant1DQDefendantDocumentsToBeConsidered", - "Label": "Defendant documents to be considered", + "Label": "Claimant 1 defendant documents to be considered", "FieldType": "DocumentsToBeConsidered", "SecurityClassification": "Public", "Searchable": "N" diff --git a/ccd-definition/CaseTypeTab/ClaimDetailsLRSpec-MINTI-nonprod.json b/ccd-definition/CaseTypeTab/ClaimDetailsLRSpec-MINTI-nonprod.json index 99a076adfb..46263df25c 100644 --- a/ccd-definition/CaseTypeTab/ClaimDetailsLRSpec-MINTI-nonprod.json +++ b/ccd-definition/CaseTypeTab/ClaimDetailsLRSpec-MINTI-nonprod.json @@ -27,6 +27,13 @@ "TabFieldDisplayOrder": 42, "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\"" }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "respondent1DQClaimantDocumentsToBeConsidered", + "TabFieldDisplayOrder": 45, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\" OR responseClaimTrack = \"MULTI_CLAIM\" OR allocatedTrack = \"MULTI_CLAIM\"" + }, { "CaseTypeID": "CIVIL", "TabID": "ClaimDetails", @@ -40,5 +47,12 @@ "CaseFieldID": "specApplicant1DQDisclosureOfNonElectronicDocuments", "TabFieldDisplayOrder": 78, "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\"" + }, + { + "CaseTypeID": "CIVIL", + "TabID": "ClaimDetails", + "CaseFieldID": "applicant1DQDefendantDocumentsToBeConsidered", + "TabFieldDisplayOrder": 82, + "FieldShowCondition": "responseClaimTrack = \"INTERMEDIATE_CLAIM\" OR allocatedTrack = \"INTERMEDIATE_CLAIM\" OR responseClaimTrack = \"MULTI_CLAIM\" OR allocatedTrack = \"MULTI_CLAIM\"" } ]