diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField.json index efd76c8b38..a19b832668 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField.json @@ -1842,6 +1842,60 @@ } ] }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "applicant2", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-solicitor" + ], + "CRUD": "CRU" + }, + { + "UserRoles": [ + "caseworker-civil-admin" + ], + "CRUD": "R" + } + ] + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "applicant2LitigationFriendRequired", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-solicitor" + ], + "CRUD": "CRU" + }, + { + "UserRoles": [ + "caseworker-civil-admin" + ], + "CRUD": "R" + } + ] + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "applicant2LitigationFriend", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-solicitor" + ], + "CRUD": "CRU" + }, + { + "UserRoles": [ + "caseworker-civil-admin" + ], + "CRUD": "R" + } + ] + }, { "CaseTypeID": "CIVIL", "CaseFieldID": "addRespondent2", @@ -1949,5 +2003,68 @@ "CRUD": "R" } ] + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2EmailAddress", + "UserRoles": [ + "caseworker-civil-solicitor", + "caseworker-civil-admin" + ], + "CRUD": "CRU" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2OrgLabel", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-solicitor" + ], + "CRUD": "CRU" + }, + { + "UserRoles": [ + "caseworker-civil-admin" + ], + "CRUD": "R" + } + ] + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-solicitor" + ], + "CRUD": "CRU" + }, + { + "UserRoles": [ + "caseworker-civil-admin" + ], + "CRUD": "R" + } + ] + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2Reference", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-solicitor" + ], + "CRUD": "CRU" + }, + { + "UserRoles": [ + "caseworker-civil-admin" + ], + "CRUD": "R" + } + ] } ] diff --git a/ccd-definition/AuthorisationCaseField/caseAccessAssignment.json b/ccd-definition/AuthorisationCaseField/caseAccessAssignment.json index 595c8b9cb0..e30fb38d64 100644 --- a/ccd-definition/AuthorisationCaseField/caseAccessAssignment.json +++ b/ccd-definition/AuthorisationCaseField/caseAccessAssignment.json @@ -11,12 +11,24 @@ "UserRole": "caseworker-caa", "CRUD": "CRU" }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "applicant2", + "UserRole": "caseworker-caa", + "CRUD": "CRU" + }, { "CaseTypeID": "CIVIL", "CaseFieldID": "respondent1", "UserRole": "caseworker-caa", "CRUD": "CRU" }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondent2", + "UserRole": "caseworker-caa", + "CRUD": "CRU" + }, { "CaseTypeID": "CIVIL", "CaseFieldID": "claimType", diff --git a/ccd-definition/AuthorisationCaseField/staff.json b/ccd-definition/AuthorisationCaseField/staff.json index 6da9b0fedb..96fadfd9fe 100644 --- a/ccd-definition/AuthorisationCaseField/staff.json +++ b/ccd-definition/AuthorisationCaseField/staff.json @@ -582,59 +582,93 @@ "CRUD": "R" }, { - "LiveFrom": "01/01/2017", "CaseTypeID": "CIVIL", "CaseFieldID": "addApplicant2Label", "UserRole": "caseworker-civil-staff", "CRUD": "R" }, { - "LiveFrom": "01/01/2017", "CaseTypeID": "CIVIL", "CaseFieldID": "addApplicant2", "UserRole": "caseworker-civil-staff", "CRUD": "R" }, { - "LiveFrom": "01/01/2017", + "CaseTypeID": "CIVIL", + "CaseFieldID": "applicant2", + "UserRole": "caseworker-civil-staff", + "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "applicant2LitigationFriendRequired", + "UserRole": "caseworker-civil-staff", + "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "applicant2LitigationFriend", + "UserRole": "caseworker-civil-staff", + "CRUD": "R" + }, + { "CaseTypeID": "CIVIL", "CaseFieldID": "addRespondent2", "UserRole": "caseworker-civil-staff", "CRUD": "R" }, { - "LiveFrom": "01/01/2017", "CaseTypeID": "CIVIL", "CaseFieldID": "respondent2", "UserRole": "caseworker-civil-staff", "CRUD": "R" }, { - "LiveFrom": "01/01/2017", "CaseTypeID": "CIVIL", "CaseFieldID": "respondent2Represented", "UserRole": "caseworker-civil-staff", "CRUD": "R" }, { - "LiveFrom": "01/01/2017", "CaseTypeID": "CIVIL", "CaseFieldID": "respondent2SameLegalRepresentative", "UserRole": "caseworker-civil-staff", "CRUD": "R" }, { - "LiveFrom": "01/01/2017", "CaseTypeID": "CIVIL", "CaseFieldID": "respondent2OrgRegistered", "UserRole": "caseworker-civil-staff", "CRUD": "R" }, { - "LiveFrom": "01/01/2017", "CaseTypeID": "CIVIL", "CaseFieldID": "respondent2OrganisationPolicy", "UserRole": "caseworker-civil-staff", "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2EmailAddress", + "CRUD": "R", + "UserRole": "caseworker-civil-staff" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2OrgLabel", + "UserRole": "caseworker-civil-staff", + "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "UserRole": "caseworker-civil-staff", + "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2Reference", + "UserRole": "caseworker-civil-staff", + "CRUD": "R" } ] diff --git a/ccd-definition/AuthorisationCaseField/systemUpdate.json b/ccd-definition/AuthorisationCaseField/systemUpdate.json index 95c309f16c..cd26f58e7a 100644 --- a/ccd-definition/AuthorisationCaseField/systemUpdate.json +++ b/ccd-definition/AuthorisationCaseField/systemUpdate.json @@ -239,6 +239,24 @@ "UserRole": "caseworker-civil-systemupdate", "CRUD": "R" }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "applicant2", + "UserRole": "caseworker-civil-systemupdate", + "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "applicant2LitigationFriendRequired", + "UserRole": "caseworker-civil-systemupdate", + "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "applicant2LitigationFriend", + "UserRole": "caseworker-civil-systemupdate", + "CRUD": "R" + }, { "CaseTypeID": "CIVIL", "CaseFieldID": "addRespondent2", @@ -274,5 +292,29 @@ "CaseFieldID": "respondent2OrganisationPolicy", "UserRole": "caseworker-civil-systemupdate", "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2EmailAddress", + "UserRole": "caseworker-civil-systemupdate", + "CRUD": "CRUD" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2OrgLabel", + "UserRole": "caseworker-civil-systemupdate", + "CRUD": "CRUD" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "UserRole": "caseworker-civil-systemupdate", + "CRUD": "CRUD" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2Reference", + "UserRole": "caseworker-civil-systemupdate", + "CRUD": "CRUD" } ] diff --git a/ccd-definition/AuthorisationComplexType/caseAccessAssignment.json b/ccd-definition/AuthorisationComplexType/caseAccessAssignment.json index d86f55f6a8..3450d9bfc0 100644 --- a/ccd-definition/AuthorisationComplexType/caseAccessAssignment.json +++ b/ccd-definition/AuthorisationComplexType/caseAccessAssignment.json @@ -68,5 +68,40 @@ "ListElementCode": "Organisation.OrganisationName", "UserRole": "caseworker-caa", "CRUD": "CRU" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondent2OrganisationPolicy", + "ListElementCode": "OrgPolicyCaseAssignedRole", + "UserRole": "caseworker-caa", + "CRUD": "CRU" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondent2OrganisationPolicy", + "ListElementCode": "OrgPolicyReference", + "UserRole": "caseworker-caa", + "CRUD": "CRU" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondent2OrganisationPolicy", + "ListElementCode": "Organisation", + "UserRole": "caseworker-caa", + "CRUD": "CRU" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondent2OrganisationPolicy", + "ListElementCode": "Organisation.OrganisationID", + "UserRole": "caseworker-caa", + "CRUD": "CRU" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondent2OrganisationPolicy", + "ListElementCode": "Organisation.OrganisationName", + "UserRole": "caseworker-caa", + "CRUD": "CRU" } ] diff --git a/ccd-definition/AuthorisationComplexType/solicitor.json b/ccd-definition/AuthorisationComplexType/solicitor.json index e69781b985..e99efb030f 100644 --- a/ccd-definition/AuthorisationComplexType/solicitor.json +++ b/ccd-definition/AuthorisationComplexType/solicitor.json @@ -110,5 +110,82 @@ "ListElementCode": "address", "UserRole": "caseworker-civil-solicitor", "CRUD": "CRU" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondent2OrganisationPolicy", + "ListElementCode": "OrgPolicyCaseAssignedRole", + "UserRole": "caseworker-civil-solicitor", + "CRUD": "CRU" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondent2OrganisationPolicy", + "ListElementCode": "OrgPolicyReference", + "UserRole": "caseworker-civil-solicitor", + "CRUD": "CRU" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondent2OrganisationPolicy", + "ListElementCode": "Organisation", + "UserRole": "caseworker-civil-solicitor", + "CRUD": "CRU" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondent2OrganisationPolicy", + "ListElementCode": "Organisation.OrganisationID", + "UserRole": "caseworker-civil-solicitor", + "CRUD": "CRU" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondent2OrganisationPolicy", + "ListElementCode": "Organisation.OrganisationName", + "UserRole": "caseworker-civil-solicitor", + "CRUD": "CRU" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "organisationName", + "UserRole": "caseworker-civil-solicitor", + "CRUD": "CRU" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "phoneNumber", + "UserRole": "caseworker-civil-solicitor", + "CRUD": "CRU" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "email", + "UserRole": "caseworker-civil-solicitor", + "CRUD": "CRU" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "dx", + "UserRole": "caseworker-civil-solicitor", + "CRUD": "CRU" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "fax", + "UserRole": "caseworker-civil-solicitor", + "CRUD": "CRU" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "address", + "UserRole": "caseworker-civil-solicitor", + "CRUD": "CRU" } ] diff --git a/ccd-definition/AuthorisationComplexType/staff.json b/ccd-definition/AuthorisationComplexType/staff.json index 07f1420b3d..dbb1cbfa41 100644 --- a/ccd-definition/AuthorisationComplexType/staff.json +++ b/ccd-definition/AuthorisationComplexType/staff.json @@ -110,5 +110,82 @@ "ListElementCode": "address", "UserRole": "caseworker-civil-staff", "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondent2OrganisationPolicy", + "ListElementCode": "OrgPolicyCaseAssignedRole", + "UserRole": "caseworker-civil-staff", + "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondent2OrganisationPolicy", + "ListElementCode": "OrgPolicyReference", + "UserRole": "caseworker-civil-staff", + "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondent2OrganisationPolicy", + "ListElementCode": "Organisation", + "UserRole": "caseworker-civil-staff", + "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondent2OrganisationPolicy", + "ListElementCode": "Organisation.OrganisationID", + "UserRole": "caseworker-civil-staff", + "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondent2OrganisationPolicy", + "ListElementCode": "Organisation.OrganisationName", + "UserRole": "caseworker-civil-staff", + "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "organisationName", + "UserRole": "caseworker-civil-staff", + "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "phoneNumber", + "UserRole": "caseworker-civil-staff", + "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "email", + "UserRole": "caseworker-civil-staff", + "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "dx", + "UserRole": "caseworker-civil-staff", + "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "fax", + "UserRole": "caseworker-civil-staff", + "CRUD": "R" + }, + { + "CaseTypeID": "CIVIL", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "address", + "UserRole": "caseworker-civil-staff", + "CRUD": "R" } ] diff --git a/ccd-definition/CaseEventToComplexTypes/AddOrAmendClaimDocuments.json b/ccd-definition/CaseEventToComplexTypes/AddOrAmendClaimDocuments.json index aa306254db..686b3aa833 100644 --- a/ccd-definition/CaseEventToComplexTypes/AddOrAmendClaimDocuments.json +++ b/ccd-definition/CaseEventToComplexTypes/AddOrAmendClaimDocuments.json @@ -7,28 +7,12 @@ "FieldDisplayOrder": 1, "DisplayContext": "READONLY" }, - { - "ID": "Upload", - "CaseEventID": "ADD_OR_AMEND_CLAIM_DOCUMENTS", - "CaseFieldID": "servedDocumentFiles", - "ListElementCode": "spreadsheetsLabel", - "FieldDisplayOrder": 2, - "DisplayContext": "READONLY" - }, - { - "ID": "Upload", - "CaseEventID": "ADD_OR_AMEND_CLAIM_DOCUMENTS", - "CaseFieldID": "servedDocumentFiles", - "ListElementCode": "medicalReportsLabel", - "FieldDisplayOrder": 3, - "DisplayContext": "READONLY" - }, { "ID": "Upload", "CaseEventID": "ADD_OR_AMEND_CLAIM_DOCUMENTS", "CaseFieldID": "servedDocumentFiles", "ListElementCode": "particularsOfClaimDocument", - "FieldDisplayOrder": 4, + "FieldDisplayOrder": 2, "DisplayContext": "OPTIONAL" }, { @@ -37,7 +21,7 @@ "CaseFieldID": "servedDocumentFiles", "ListElementCode": "particularsOfClaimText", "EventElementLabel": "If you prefer you can copy and paste the details of claim here.", - "FieldDisplayOrder": 5, + "FieldDisplayOrder": 3, "DisplayContext": "OPTIONAL" }, { @@ -45,7 +29,7 @@ "CaseEventID": "ADD_OR_AMEND_CLAIM_DOCUMENTS", "CaseFieldID": "servedDocumentFiles", "ListElementCode": "medicalReport.document", - "FieldDisplayOrder": 6, + "FieldDisplayOrder": 4, "DisplayContext": "OPTIONAL" }, { @@ -54,7 +38,7 @@ "CaseFieldID": "servedDocumentFiles", "ListElementCode": "medicalReport", "DisplayContext": "OPTIONAL", - "FieldDisplayOrder": 6, + "FieldDisplayOrder": 4, "FieldShowCondition": "claimType=\"CLINICAL_NEGLIGENCE\" OR claimType=\"PERSONAL_INJURY\"", "Comment": "medicalreports.document is just the document input,so this must be defined to hide the whole element" }, @@ -63,7 +47,7 @@ "CaseEventID": "ADD_OR_AMEND_CLAIM_DOCUMENTS", "CaseFieldID": "servedDocumentFiles", "ListElementCode": "scheduleOfLoss.document", - "FieldDisplayOrder": 7, + "FieldDisplayOrder": 5, "DisplayContext": "OPTIONAL" }, { @@ -71,7 +55,7 @@ "CaseEventID": "ADD_OR_AMEND_CLAIM_DOCUMENTS", "CaseFieldID": "servedDocumentFiles", "ListElementCode": "certificateOfSuitability.document", - "FieldDisplayOrder": 8, + "FieldDisplayOrder": 6, "DisplayContext": "OPTIONAL" }, { @@ -79,7 +63,7 @@ "CaseEventID": "ADD_OR_AMEND_CLAIM_DOCUMENTS", "CaseFieldID": "servedDocumentFiles", "ListElementCode": "other.document", - "FieldDisplayOrder": 9, + "FieldDisplayOrder": 7, "DisplayContext": "OPTIONAL" } ] diff --git a/ccd-definition/CaseEventToComplexTypes/CreateClaim-nonprod.json b/ccd-definition/CaseEventToComplexTypes/CreateClaim-nonprod.json index ab0d9c8b43..3895d8c1ae 100644 --- a/ccd-definition/CaseEventToComplexTypes/CreateClaim-nonprod.json +++ b/ccd-definition/CaseEventToComplexTypes/CreateClaim-nonprod.json @@ -1,6 +1,159 @@ [ { - "ID": "Defendant", + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "type", + "FieldDisplayOrder": 1, + "DisplayContext": "MANDATORY", + "EventElementLabel": "Claimant type" + }, + { + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "individualTitle", + "FieldDisplayOrder": 2, + "DisplayContext": "OPTIONAL" + }, + { + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "individualFirstName", + "FieldDisplayOrder": 3, + "DisplayContext": "MANDATORY" + }, + { + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "individualLastName", + "FieldDisplayOrder": 4, + "DisplayContext": "MANDATORY" + }, + { + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "individualDateOfBirth", + "FieldDisplayOrder": 5, + "DisplayContext": "MANDATORY" + }, + { + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "companyName", + "FieldDisplayOrder": 6, + "DisplayContext": "MANDATORY" + }, + { + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "organisationName", + "FieldDisplayOrder": 7, + "DisplayContext": "MANDATORY" + }, + { + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "soleTraderTitle", + "FieldDisplayOrder": 8, + "DisplayContext": "OPTIONAL" + }, + { + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "soleTraderFirstName", + "FieldDisplayOrder": 9, + "DisplayContext": "MANDATORY" + }, + { + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "soleTraderLastName", + "FieldDisplayOrder": 10, + "DisplayContext": "MANDATORY" + }, + { + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "soleTraderTradingAs", + "FieldDisplayOrder": 11, + "DisplayContext": "MANDATORY" + }, + { + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "soleTraderDateOfBirth", + "FieldDisplayOrder": 12, + "DisplayContext": "MANDATORY" + }, + { + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "primaryAddress.AddressLine1", + "FieldDisplayOrder": 13, + "DisplayContext": "MANDATORY" + }, + { + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "primaryAddress.AddressLine2", + "FieldDisplayOrder": 14, + "DisplayContext": "OPTIONAL" + }, + { + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "primaryAddress.AddressLine3", + "FieldDisplayOrder": 15, + "DisplayContext": "OPTIONAL" + }, + { + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "primaryAddress.PostTown", + "FieldDisplayOrder": 16, + "DisplayContext": "OPTIONAL" + }, + { + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "primaryAddress.County", + "FieldDisplayOrder": 17, + "DisplayContext": "OPTIONAL" + }, + { + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "primaryAddress.Country", + "FieldDisplayOrder": 18, + "DisplayContext": "OPTIONAL" + }, + { + "ID": "SecondClaimant", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "ListElementCode": "primaryAddress.PostCode", + "FieldDisplayOrder": 19, + "DisplayContext": "MANDATORY" + }, + { + "ID": "SecondDefendant", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2", "ListElementCode": "type", @@ -9,7 +162,7 @@ "EventElementLabel": "Defendant type" }, { - "ID": "Defendant", + "ID": "SecondDefendant", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2", "ListElementCode": "individualTitle", @@ -17,7 +170,7 @@ "DisplayContext": "OPTIONAL" }, { - "ID": "Defendant", + "ID": "SecondDefendant", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2", "ListElementCode": "individualFirstName", @@ -25,7 +178,7 @@ "DisplayContext": "MANDATORY" }, { - "ID": "Defendant", + "ID": "SecondDefendant", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2", "ListElementCode": "individualLastName", @@ -33,7 +186,7 @@ "DisplayContext": "MANDATORY" }, { - "ID": "Defendant", + "ID": "SecondDefendant", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2", "ListElementCode": "companyName", @@ -41,7 +194,7 @@ "DisplayContext": "MANDATORY" }, { - "ID": "Defendant", + "ID": "SecondDefendant", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2", "ListElementCode": "organisationName", @@ -49,7 +202,7 @@ "DisplayContext": "MANDATORY" }, { - "ID": "Defendant", + "ID": "SecondDefendant", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2", "ListElementCode": "soleTraderTitle", @@ -57,7 +210,7 @@ "DisplayContext": "OPTIONAL" }, { - "ID": "Defendant", + "ID": "SecondDefendant", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2", "ListElementCode": "soleTraderFirstName", @@ -65,7 +218,7 @@ "DisplayContext": "MANDATORY" }, { - "ID": "Defendant", + "ID": "SecondDefendant", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2", "ListElementCode": "soleTraderLastName", @@ -73,7 +226,7 @@ "DisplayContext": "MANDATORY" }, { - "ID": "Defendant", + "ID": "SecondDefendant", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2", "ListElementCode": "soleTraderTradingAs", @@ -81,7 +234,7 @@ "DisplayContext": "OPTIONAL" }, { - "ID": "Defendant", + "ID": "SecondDefendant", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2", "ListElementCode": "primaryAddress.AddressLine1", @@ -89,7 +242,7 @@ "DisplayContext": "MANDATORY" }, { - "ID": "Defendant", + "ID": "SecondDefendant", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2", "ListElementCode": "primaryAddress.AddressLine2", @@ -97,7 +250,7 @@ "DisplayContext": "OPTIONAL" }, { - "ID": "Defendant", + "ID": "SecondDefendant", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2", "ListElementCode": "primaryAddress.AddressLine3", @@ -105,7 +258,7 @@ "DisplayContext": "OPTIONAL" }, { - "ID": "Defendant", + "ID": "SecondDefendant", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2", "ListElementCode": "primaryAddress.PostTown", @@ -113,7 +266,7 @@ "DisplayContext": "OPTIONAL" }, { - "ID": "Defendant", + "ID": "SecondDefendant", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2", "ListElementCode": "primaryAddress.County", @@ -121,7 +274,7 @@ "DisplayContext": "OPTIONAL" }, { - "ID": "Defendant", + "ID": "SecondDefendant", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2", "ListElementCode": "primaryAddress.Country", @@ -129,7 +282,7 @@ "DisplayContext": "OPTIONAL" }, { - "ID": "Defendant", + "ID": "SecondDefendant", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2", "ListElementCode": "primaryAddress.PostCode", @@ -137,7 +290,7 @@ "DisplayContext": "MANDATORY" }, { - "ID": "SolicitorCreate", + "ID": "SecondSolicitorCreate", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2OrganisationPolicy", "ListElementCode": "Organisation.OrganisationID", @@ -145,7 +298,7 @@ "DisplayContext": "MANDATORY" }, { - "ID": "SolicitorCreate", + "ID": "SecondSolicitorCreate", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2OrganisationPolicy", "ListElementCode": "Organisation.OrganisationName", @@ -153,7 +306,7 @@ "DisplayContext": "OPTIONAL" }, { - "ID": "SolicitorCreate", + "ID": "SecondSolicitorCreate", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2OrganisationPolicy", "ListElementCode": "OrgPolicyCaseAssignedRole", @@ -164,7 +317,7 @@ "RetainHiddenValue": "TRUE" }, { - "ID": "SolicitorCreate", + "ID": "SecondSolicitorCreate", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "respondent2OrganisationPolicy", "ListElementCode": "OrgPolicyReference", @@ -226,5 +379,101 @@ "ListElementCode": "PostCode", "FieldDisplayOrder": 8, "DisplayContext": "MANDATORY" + }, + { + "ID": "RespondentSolicitor2Organisation", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "organisationName", + "FieldDisplayOrder": 1, + "DisplayContext": "MANDATORY" + }, + { + "ID": "RespondentSolicitor2Organisation", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "phoneNumber", + "FieldDisplayOrder": 2, + "DisplayContext": "OPTIONAL" + }, + { + "ID": "RespondentSolicitor2Organisation", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "email", + "FieldDisplayOrder": 3, + "DisplayContext": "OPTIONAL" + }, + { + "ID": "RespondentSolicitor2Organisation", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "dx", + "FieldDisplayOrder": 4, + "DisplayContext": "OPTIONAL" + }, + { + "ID": "RespondentSolicitor2Organisation", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "fax", + "FieldDisplayOrder": 5, + "DisplayContext": "OPTIONAL" + }, + { + "ID": "RespondentSolicitor2Organisation", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "address.AddressLine1", + "FieldDisplayOrder": 13, + "DisplayContext": "MANDATORY" + }, + { + "ID": "RespondentSolicitor2Organisation", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "address.AddressLine2", + "FieldDisplayOrder": 14, + "DisplayContext": "OPTIONAL" + }, + { + "ID": "RespondentSolicitor2Organisation", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "address.AddressLine3", + "FieldDisplayOrder": 15, + "DisplayContext": "OPTIONAL" + }, + { + "ID": "RespondentSolicitor2Organisation", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "address.PostTown", + "FieldDisplayOrder": 16, + "DisplayContext": "OPTIONAL" + }, + { + "ID": "RespondentSolicitor2Organisation", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "address.County", + "FieldDisplayOrder": 17, + "DisplayContext": "OPTIONAL" + }, + { + "ID": "RespondentSolicitor2Organisation", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "address.Country", + "FieldDisplayOrder": 18, + "DisplayContext": "OPTIONAL" + }, + { + "ID": "RespondentSolicitor2Organisation", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "ListElementCode": "address.PostCode", + "FieldDisplayOrder": 19, + "DisplayContext": "MANDATORY" } ] diff --git a/ccd-definition/CaseEventToComplexTypes/CreateClaim.json b/ccd-definition/CaseEventToComplexTypes/CreateClaim.json index 07d236c0a7..7c6493ef04 100644 --- a/ccd-definition/CaseEventToComplexTypes/CreateClaim.json +++ b/ccd-definition/CaseEventToComplexTypes/CreateClaim.json @@ -449,28 +449,12 @@ "FieldDisplayOrder": 1, "DisplayContext": "READONLY" }, - { - "ID": "Upload", - "CaseEventID": "CREATE_CLAIM", - "CaseFieldID": "servedDocumentFiles", - "ListElementCode": "spreadsheetsLabel", - "FieldDisplayOrder": 2, - "DisplayContext": "READONLY" - }, - { - "ID": "Upload", - "CaseEventID": "CREATE_CLAIM", - "CaseFieldID": "servedDocumentFiles", - "ListElementCode": "medicalReportsLabel", - "FieldDisplayOrder": 3, - "DisplayContext": "READONLY" - }, { "ID": "Upload", "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "servedDocumentFiles", "ListElementCode": "particularsOfClaimDocument", - "FieldDisplayOrder": 4, + "FieldDisplayOrder": 2, "DisplayContext": "OPTIONAL" }, { @@ -479,7 +463,7 @@ "CaseFieldID": "servedDocumentFiles", "ListElementCode": "particularsOfClaimText", "EventElementLabel": "If you prefer you can copy and paste the details of claim here.", - "FieldDisplayOrder": 5, + "FieldDisplayOrder": 3, "DisplayContext": "OPTIONAL" }, { @@ -487,7 +471,7 @@ "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "servedDocumentFiles", "ListElementCode": "medicalReport.document", - "FieldDisplayOrder": 6, + "FieldDisplayOrder": 4, "DisplayContext": "OPTIONAL" }, { @@ -496,7 +480,7 @@ "CaseFieldID": "servedDocumentFiles", "ListElementCode": "medicalReport", "DisplayContext": "OPTIONAL", - "FieldDisplayOrder": 6, + "FieldDisplayOrder": 4, "FieldShowCondition": "claimType=\"CLINICAL_NEGLIGENCE\" OR claimType=\"PERSONAL_INJURY\"", "Comment": "medicalreports.document is just the document input,so this must be defined to hide the whole element" }, @@ -505,7 +489,7 @@ "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "servedDocumentFiles", "ListElementCode": "scheduleOfLoss.document", - "FieldDisplayOrder": 7, + "FieldDisplayOrder": 5, "DisplayContext": "OPTIONAL" }, { @@ -513,7 +497,7 @@ "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "servedDocumentFiles", "ListElementCode": "certificateOfSuitability.document", - "FieldDisplayOrder": 8, + "FieldDisplayOrder": 6, "DisplayContext": "OPTIONAL" }, { @@ -521,7 +505,7 @@ "CaseEventID": "CREATE_CLAIM", "CaseFieldID": "servedDocumentFiles", "ListElementCode": "other.document", - "FieldDisplayOrder": 9, + "FieldDisplayOrder": 7, "DisplayContext": "OPTIONAL" }, { diff --git a/ccd-definition/CaseEventToComplexTypes/NotifyDefendantOfClaimDetails.json b/ccd-definition/CaseEventToComplexTypes/NotifyDefendantOfClaimDetails.json index e7985c9232..bb182251c3 100644 --- a/ccd-definition/CaseEventToComplexTypes/NotifyDefendantOfClaimDetails.json +++ b/ccd-definition/CaseEventToComplexTypes/NotifyDefendantOfClaimDetails.json @@ -7,28 +7,12 @@ "FieldDisplayOrder": 1, "DisplayContext": "READONLY" }, - { - "ID": "Upload", - "CaseEventID": "NOTIFY_DEFENDANT_OF_CLAIM_DETAILS", - "CaseFieldID": "servedDocumentFiles", - "ListElementCode": "spreadsheetsLabel", - "FieldDisplayOrder": 2, - "DisplayContext": "READONLY" - }, - { - "ID": "Upload", - "CaseEventID": "NOTIFY_DEFENDANT_OF_CLAIM_DETAILS", - "CaseFieldID": "servedDocumentFiles", - "ListElementCode": "medicalReportsLabel", - "FieldDisplayOrder": 3, - "DisplayContext": "READONLY" - }, { "ID": "Upload", "CaseEventID": "NOTIFY_DEFENDANT_OF_CLAIM_DETAILS", "CaseFieldID": "servedDocumentFiles", "ListElementCode": "particularsOfClaimDocument", - "FieldDisplayOrder": 4, + "FieldDisplayOrder": 2, "DisplayContext": "OPTIONAL" }, { @@ -37,7 +21,7 @@ "CaseFieldID": "servedDocumentFiles", "ListElementCode": "particularsOfClaimText", "EventElementLabel": "If you prefer you can copy and paste the details of claim here.", - "FieldDisplayOrder": 5, + "FieldDisplayOrder": 3, "DisplayContext": "OPTIONAL" }, { @@ -45,7 +29,7 @@ "CaseEventID": "NOTIFY_DEFENDANT_OF_CLAIM_DETAILS", "CaseFieldID": "servedDocumentFiles", "ListElementCode": "medicalReport.document", - "FieldDisplayOrder": 6, + "FieldDisplayOrder": 4, "DisplayContext": "OPTIONAL" }, { @@ -54,7 +38,7 @@ "CaseFieldID": "servedDocumentFiles", "ListElementCode": "medicalReport", "DisplayContext": "OPTIONAL", - "FieldDisplayOrder": 6, + "FieldDisplayOrder": 4, "FieldShowCondition": "claimType=\"CLINICAL_NEGLIGENCE\" OR claimType=\"PERSONAL_INJURY\"", "Comment": "medicalreports.document is just the document input,so this must be defined to hide the whole element" }, @@ -63,7 +47,7 @@ "CaseEventID": "NOTIFY_DEFENDANT_OF_CLAIM_DETAILS", "CaseFieldID": "servedDocumentFiles", "ListElementCode": "scheduleOfLoss.document", - "FieldDisplayOrder": 7, + "FieldDisplayOrder": 5, "DisplayContext": "OPTIONAL" }, { @@ -71,7 +55,7 @@ "CaseEventID": "NOTIFY_DEFENDANT_OF_CLAIM_DETAILS", "CaseFieldID": "servedDocumentFiles", "ListElementCode": "certificateOfSuitability.document", - "FieldDisplayOrder": 8, + "FieldDisplayOrder": 6, "DisplayContext": "OPTIONAL" }, { @@ -79,7 +63,7 @@ "CaseEventID": "NOTIFY_DEFENDANT_OF_CLAIM_DETAILS", "CaseFieldID": "servedDocumentFiles.document", "ListElementCode": "other", - "FieldDisplayOrder": 9, + "FieldDisplayOrder": 7, "DisplayContext": "OPTIONAL" } ] diff --git a/ccd-definition/CaseEventToFields/CreateClaim-nonprod.json b/ccd-definition/CaseEventToFields/CreateClaim-nonprod.json index ff10519782..e406f1de3f 100644 --- a/ccd-definition/CaseEventToFields/CreateClaim-nonprod.json +++ b/ccd-definition/CaseEventToFields/CreateClaim-nonprod.json @@ -20,6 +20,45 @@ "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y" }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2", + "PageFieldDisplayOrder": 1, + "DisplayContext": "COMPLEX", + "PageID": "SecondClaimant", + "PageDisplayOrder": 10, + "PageColumnNumber": 1, + "ShowSummaryChangeOption": "Y", + "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/applicant2", + "RetriesTimeoutURLMidEvent": 0, + "PageShowCondition": "addApplicant2=\"Yes\"" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2LitigationFriendRequired", + "PageFieldDisplayOrder": 1, + "DisplayContext": "MANDATORY", + "PageID": "SecondClaimantLitigationFriend", + "PageDisplayOrder": 11, + "PageColumnNumber": 1, + "ShowSummaryChangeOption": "Y", + "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/idam-email", + "PageShowCondition": "addApplicant2=\"Yes\"" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "applicant2LitigationFriend", + "PageFieldDisplayOrder": 2, + "DisplayContext": "MANDATORY", + "PageID": "SecondClaimantLitigationFriend", + "PageDisplayOrder": 11, + "PageColumnNumber": 1, + "ShowSummaryChangeOption": "Y", + "FieldShowCondition": "applicant2LitigationFriendRequired = \"Yes\"" + }, { "CaseTypeID": "CIVIL", "CaseEventID": "CREATE_CLAIM", @@ -27,9 +66,10 @@ "PageFieldDisplayOrder": 1, "DisplayContext": "MANDATORY", "PageID": "AddAnotherDefendant", - "PageDisplayOrder": 15, + "PageDisplayOrder": 17, "PageColumnNumber": 1, - "ShowSummaryChangeOption": "Y" + "ShowSummaryChangeOption": "Y", + "PageShowCondition": "addApplicant2=\"No\"" }, { "CaseTypeID": "CIVIL", @@ -38,7 +78,7 @@ "PageFieldDisplayOrder": 1, "DisplayContext": "COMPLEX", "PageID": "SecondDefendant", - "PageDisplayOrder": 16, + "PageDisplayOrder": 18, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "PageShowCondition": "addRespondent2=\"Yes\"" @@ -50,7 +90,7 @@ "PageFieldDisplayOrder": 1, "DisplayContext": "MANDATORY", "PageID": "SecondDefendantLegalRepresentation", - "PageDisplayOrder": 17, + "PageDisplayOrder": 19, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "PageShowCondition": "addRespondent2=\"Yes\"" @@ -62,7 +102,7 @@ "PageFieldDisplayOrder": 1, "DisplayContext": "MANDATORY", "PageID": "SameLegalRepresentative", - "PageDisplayOrder": 18, + "PageDisplayOrder": 20, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "PageShowCondition": "respondent2Represented=\"Yes\"" @@ -75,7 +115,7 @@ "DisplayContext": "MANDATORY", "PageID": "SecondDefendantSolicitorOrganisation", "PageLabel": "Search for the second defendant's legal representative", - "PageDisplayOrder": 19, + "PageDisplayOrder": 21, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/rep2OrgPolicy", @@ -88,7 +128,7 @@ "PageFieldDisplayOrder": 2, "DisplayContext": "COMPLEX", "PageID": "SecondDefendantSolicitorOrganisation", - "PageDisplayOrder": 19, + "PageDisplayOrder": 21, "PageColumnNumber": 1, "FieldShowCondition": "respondent2OrgRegistered=\"Yes\"", "ShowSummaryChangeOption": "Y" @@ -101,7 +141,7 @@ "DisplayContext": "MANDATORY", "PageID": "SecondDefendantSolicitorServiceAddress", "PageLabel": "Second respondent representative’s service address", - "PageDisplayOrder": 20, + "PageDisplayOrder": 22, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "PageShowCondition": "respondent2OrgRegistered=\"Yes\"" @@ -114,9 +154,58 @@ "DisplayContext": "COMPLEX", "PageID": "SecondDefendantSolicitorServiceAddress", "PageLabel": "Second respondent representative’s service address", - "PageDisplayOrder": 20, + "PageDisplayOrder": 22, "PageColumnNumber": 1, "FieldShowCondition": "respondentSolicitor2ServiceAddressRequired=\"Yes\"", "ShowSummaryChangeOption": "Y" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "respondentSolicitor2Reference", + "PageFieldDisplayOrder": 1, + "DisplayContext": "OPTIONAL", + "PageID": "SecondDefendantSolicitorReference", + "PageDisplayOrder": 23, + "PageColumnNumber": 1, + "ShowSummaryChangeOption": "Y", + "PageShowCondition": "respondent2OrgRegistered=\"Yes\"" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "respondentSolicitor2EmailAddress", + "PageFieldDisplayOrder": 1, + "DisplayContext": "MANDATORY", + "PageID": "SecondDefendantSolicitorEmail", + "PageLabel": "Second Defendant's legal representative's email", + "PageDisplayOrder": 24, + "PageColumnNumber": 1, + "ShowSummaryChangeOption": "Y", + "PageShowCondition": "respondent2OrgRegistered=\"Yes\"" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "respondentSolicitor2OrgLabel", + "PageFieldDisplayOrder": 1, + "DisplayContext": "READONLY", + "PageID": "UnRegisteredSecondDefendantSolicitorOrganisation", + "PageLabel": "Defendant's legal representative’s details", + "PageDisplayOrder": 24, + "PageColumnNumber": 1, + "ShowSummaryChangeOption": "N", + "PageShowCondition": "respondent2OrgRegistered=\"No\"" + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "CREATE_CLAIM", + "CaseFieldID": "respondentSolicitor2OrganisationDetails", + "PageFieldDisplayOrder": 2, + "DisplayContext": "COMPLEX", + "PageID": "UnRegisteredSecondDefendantSolicitorOrganisation", + "PageDisplayOrder": 24, + "PageColumnNumber": 1, + "ShowSummaryChangeOption": "Y" } ] diff --git a/ccd-definition/CaseEventToFields/CreateClaim.json b/ccd-definition/CaseEventToFields/CreateClaim.json index 1c7806ccc0..4a2e514cb6 100644 --- a/ccd-definition/CaseEventToFields/CreateClaim.json +++ b/ccd-definition/CaseEventToFields/CreateClaim.json @@ -138,7 +138,7 @@ "PageFieldDisplayOrder": 1, "DisplayContext": "COMPLEX", "PageID": "Defendant", - "PageDisplayOrder": 10, + "PageDisplayOrder": 12, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y" }, @@ -149,7 +149,7 @@ "PageFieldDisplayOrder": 1, "DisplayContext": "MANDATORY", "PageID": "LegalRepresentation", - "PageDisplayOrder": 11, + "PageDisplayOrder": 13, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y" }, @@ -161,7 +161,7 @@ "DisplayContext": "MANDATORY", "PageID": "DefendantSolicitorOrganisation", "PageLabel": "Search for the defendant's legal representative", - "PageDisplayOrder": 12, + "PageDisplayOrder": 14, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/repOrgPolicy", @@ -174,7 +174,7 @@ "PageFieldDisplayOrder": 2, "DisplayContext": "COMPLEX", "PageID": "DefendantSolicitorOrganisation", - "PageDisplayOrder": 12, + "PageDisplayOrder": 14, "PageColumnNumber": 1, "FieldShowCondition": "respondent1OrgRegistered=\"Yes\"", "ShowSummaryChangeOption": "Y" @@ -187,7 +187,7 @@ "DisplayContext": "MANDATORY", "PageID": "DefendantSolicitorServiceAddress", "PageLabel": "Respondent representative’s service address", - "PageDisplayOrder": 13, + "PageDisplayOrder": 15, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "PageShowCondition": "respondent1OrgRegistered=\"Yes\"" @@ -200,7 +200,7 @@ "DisplayContext": "COMPLEX", "PageID": "DefendantSolicitorServiceAddress", "PageLabel": "Respondent representative’s service address", - "PageDisplayOrder": 13, + "PageDisplayOrder": 15, "PageColumnNumber": 1, "FieldShowCondition": "respondentSolicitor1ServiceAddressRequired=\"Yes\"", "ShowSummaryChangeOption": "Y" @@ -212,7 +212,7 @@ "PageFieldDisplayOrder": 1, "DisplayContext": "MANDATORY", "PageID": "DefendantSolicitorEmail", - "PageDisplayOrder": 14, + "PageDisplayOrder": 16, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "PageShowCondition": "respondent1OrgRegistered=\"Yes\"" @@ -225,7 +225,7 @@ "DisplayContext": "READONLY", "PageID": "UnRegisteredDefendantSolicitorOrganisation", "PageLabel": "Defendant's legal representative’s details", - "PageDisplayOrder": 14, + "PageDisplayOrder": 16, "PageColumnNumber": 1, "ShowSummaryChangeOption": "N", "PageShowCondition": "respondent1OrgRegistered=\"No\"" @@ -237,7 +237,7 @@ "PageFieldDisplayOrder": 2, "DisplayContext": "COMPLEX", "PageID": "UnRegisteredDefendantSolicitorOrganisation", - "PageDisplayOrder": 14, + "PageDisplayOrder": 16, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y" }, @@ -248,7 +248,7 @@ "PageFieldDisplayOrder": 1, "DisplayContext": "MANDATORY", "PageID": "ClaimType", - "PageDisplayOrder": 21, + "PageDisplayOrder": 25, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "CaseEventFieldLabel": "What type of claim is this?" @@ -260,7 +260,7 @@ "PageFieldDisplayOrder": 2, "DisplayContext": "MANDATORY", "PageID": "ClaimType", - "PageDisplayOrder": 21, + "PageDisplayOrder": 25, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "FieldShowCondition": "claimType = \"OTHER\"" @@ -272,7 +272,7 @@ "PageFieldDisplayOrder": 1, "DisplayContext": "MANDATORY", "PageID": "PersonalInjuryType", - "PageDisplayOrder": 22, + "PageDisplayOrder": 26, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "PageShowCondition": "claimType = \"PERSONAL_INJURY\"" @@ -284,7 +284,7 @@ "PageFieldDisplayOrder": 2, "DisplayContext": "MANDATORY", "PageID": "PersonalInjuryType", - "PageDisplayOrder": 22, + "PageDisplayOrder": 26, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "FieldShowCondition": "personalInjuryType = \"PERSONAL_INJURY_OTHER\"" @@ -296,7 +296,7 @@ "PageFieldDisplayOrder": 1, "DisplayContext": "READONLY", "PageID": "Details", - "PageDisplayOrder": 23, + "PageDisplayOrder": 27, "PageColumnNumber": 1, "ShowSummaryChangeOption": "N" }, @@ -307,7 +307,7 @@ "PageFieldDisplayOrder": 2, "DisplayContext": "MANDATORY", "PageID": "Details", - "PageDisplayOrder": 23, + "PageDisplayOrder": 27, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y" }, @@ -318,7 +318,7 @@ "PageFieldDisplayOrder": 1, "DisplayContext": "MANDATORY", "PageID": "uploadParticularsOfClaim", - "PageDisplayOrder": 24, + "PageDisplayOrder": 28, "PageColumnNumber": 1, "ShowSummaryChangeOption": "N" }, @@ -329,7 +329,7 @@ "PageFieldDisplayOrder": 1, "DisplayContext": "COMPLEX", "PageID": "Upload", - "PageDisplayOrder": 25, + "PageDisplayOrder": 29, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/particulars-of-claim", @@ -342,7 +342,7 @@ "PageFieldDisplayOrder": 1, "DisplayContext": "MANDATORY", "PageID": "ClaimValue", - "PageDisplayOrder": 26, + "PageDisplayOrder": 30, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "CaseEventFieldLabel": "Enter expected claim value", @@ -355,7 +355,7 @@ "PageFieldDisplayOrder": 1, "DisplayContext": "OPTIONAL", "PageID": "PbaNumber", - "PageDisplayOrder": 27, + "PageDisplayOrder": 31, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "CaseEventFieldLabel": "Pay fee using Payment by Account (PBA)", @@ -369,7 +369,7 @@ "PageFieldDisplayOrder": 2, "DisplayContext": "COMPLEX", "PageID": "PbaNumber", - "PageDisplayOrder": 27, + "PageDisplayOrder": 31, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y" }, @@ -380,7 +380,7 @@ "PageFieldDisplayOrder": 3, "DisplayContext": "MANDATORY", "PageID": "PbaNumber", - "PageDisplayOrder": 27, + "PageDisplayOrder": 31, "PageColumnNumber": 1, "CaseEventFieldLabel": "Select a PBA", "ShowSummaryChangeOption": "Y" @@ -392,7 +392,7 @@ "PageFieldDisplayOrder": 4, "DisplayContext": "READONLY", "PageID": "PbaNumber", - "PageDisplayOrder": 27, + "PageDisplayOrder": 31, "PageColumnNumber": 1, "ShowSummaryChangeOption": "N", "FieldShowCondition": "applicantSolicitor1PbaAccountsIsEmpty = \"No\" OR applicantSolicitor1PbaAccountsIsEmpty = \"\"" @@ -404,7 +404,7 @@ "PageFieldDisplayOrder": 5, "DisplayContext": "READONLY", "PageID": "PbaNumber", - "PageDisplayOrder": 27, + "PageDisplayOrder": 31, "PageColumnNumber": 1, "ShowSummaryChangeOption": "N", "FieldShowCondition": "applicantSolicitor1PbaAccountsIsEmpty = \"Yes\"" @@ -416,7 +416,7 @@ "PageFieldDisplayOrder": 1, "DisplayContext": "COMPLEX", "PageID": "PaymentReference", - "PageDisplayOrder": 28, + "PageDisplayOrder": 32, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y" }, @@ -428,7 +428,7 @@ "DisplayContext": "READONLY", "PageID": "StatementOfTruth", "PageLabel": "Statement of truth", - "PageDisplayOrder": 29, + "PageDisplayOrder": 33, "PageColumnNumber": 1, "ShowSummaryChangeOption": "N", "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/statement-of-truth" @@ -440,7 +440,7 @@ "PageFieldDisplayOrder": 2, "DisplayContext": "COMPLEX", "PageID": "StatementOfTruth", - "PageDisplayOrder": 29, + "PageDisplayOrder": 33, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y" }, @@ -451,7 +451,7 @@ "PageFieldDisplayOrder": 3, "DisplayContext": "READONLY", "PageID": "StatementOfTruth", - "PageDisplayOrder": 29, + "PageDisplayOrder": 33, "PageColumnNumber": 1 } ] diff --git a/ccd-definition/CaseField.json b/ccd-definition/CaseField.json index 5a4b4ddea5..a9320ee739 100644 --- a/ccd-definition/CaseField.json +++ b/ccd-definition/CaseField.json @@ -9,7 +9,7 @@ { "CaseTypeID": "CIVIL", "ID": "eligibilityQuestions", - "Label": "## Issue civil court proceedings\n### Who can use this service\nUse this service if you are representing a Claimant and:\n* bringing a claim for damages\n* able to pay the full issue fee using Payment by Account\n\n### About the Claimant\n The Claimant must: \n* have an address in England or Wales \n* have a litigation friend who can provide a certificate of suitability if they are under 18 \n* not be a protected party as defined in CPR 21.1(2)(d)\n* not have an all proceedings order, civil proceedings order, or civil restraint order in force against them\n\n### About the Defendant \nThe Defendant must (as far as the Claimant is aware):\n* have a postal address for service in England or Wales\n* be aged 18 years or older\n* not be a protected party\n\n### About the claim\nA County Court damages claim is only suitable for the pilot if it:\n* would not ordinarily follow the Part 8 procedure\n* is not made under one of the provisions of the Consumer Credit Act 1974 specified in Civil Procedure Rules PD 7B paragraph 3.1\n* is conducted in English \n", + "Label": "## Issue civil court proceedings\n### Who can use this service\nYou must be: \n* representing 1 Claimant against up to 2 Defendants, or 2 Claimants against 1 Defendant\n* able to pay the full issue fee using Payment by Account (PBA)\n\n### About the Claimants\n Claimants must: \n* have an address in England or Wales \n* have a litigation friend who can provide a certificate of suitability if they are under 18 \n* not be a protected party as defined in CPR 21.1(2)(d)\n* not have an all proceedings order, civil proceedings order, or civil restraint order in force against them\n\n### About the Defendants \nDefendants must (as far as the Claimant is aware):\n* have a postal address for service in England or Wales\n* be aged 18 years or older\n* not be a protected party\n\n### About the claim\nA County Court damages claim is only suitable for the pilot if it:\n* would not ordinarily follow the Part 8 procedure\n* is not made under one of the provisions of the Consumer Credit Act 1974 specified in Civil Procedure Rules PD 7B paragraph 3.1\n* is conducted in English \n", "FieldType": "Label", "SecurityClassification": "Public" }, @@ -30,7 +30,7 @@ { "CaseTypeID": "CIVIL", "ID": "applicant1", - "Label": "Claimant details", + "Label": "Claimant's details", "FieldType": "Party", "SecurityClassification": "Public", "_Definition": "The details of the first applicant on the case", @@ -158,7 +158,7 @@ { "CaseTypeID": "CIVIL", "ID": "claimStatementOfTruthLabel", - "Label": "The claimant believes that the facts stated in the brief details of claim are true. \n\nI am duly authorised by the claimant to sign this statement.\n\nThe claimant understands that proceedings for contempt of court may be brought against anyone who makes, or causes to be made, a false statement in a document verified by a statement of truth without an honest belief in its truth.", + "Label": "The Claimant(s) believes that the facts stated in the brief details of claim are true. \n\nI am duly authorised by the Claimant(s) to sign this statement.\n\nThe Claimant(s) understands that proceedings for contempt of court may be brought against anyone who makes, or causes to be made, a false statement in a document verified by a statement of truth without an honest belief in its truth.", "FieldType": "Label", "SecurityClassification": "Public" }, @@ -190,7 +190,7 @@ { "CaseTypeID": "CIVIL", "ID": "servedDocumentFiles", - "Label": "Documents which are uploaded must be in one of the following machine readable formats:", + "Label": "Upload documents", "FieldType": "ServedDocumentFiles", "SecurityClassification": "Public" }, @@ -803,10 +803,31 @@ { "CaseTypeID": "CIVIL", "ID": "addApplicant2", - "Label": "Do you want to add another Claimant at this time?", + "Label": "Do you want to add another Claimant now?", "FieldType": "YesOrNo", "SecurityClassification": "Public" }, + { + "CaseTypeID": "CIVIL", + "ID": "applicant2", + "Label": "Second Claimant's details", + "FieldType": "Party", + "SecurityClassification": "Public" + }, + { + "CaseTypeID": "CIVIL", + "ID": "applicant2LitigationFriendRequired", + "Label": "Is the second Claimant a child i.e. under the age of 18?", + "FieldType": "YesOrNo", + "SecurityClassification": "Public" + }, + { + "CaseTypeID": "CIVIL", + "ID": "applicant2LitigationFriend", + "Label": "Second Claimant litigation friend details", + "FieldType": "LitigationFriend", + "SecurityClassification": "Public" + }, { "CaseTypeID": "CIVIL", "ID": "addRespondent2", @@ -850,5 +871,34 @@ "Label": "Respondent 2 organisation policy", "FieldType": "OrganisationPolicy", "SecurityClassification": "Public" + }, + { + "CaseTypeID": "CIVIL", + "ID": "respondentSolicitor2EmailAddress", + "Label": "Enter the second Defendant legal representatives email address to be used for notifications", + "HintText": "This should be the email address that the Defendant's legal representative provided. You can still issue the claim without their email address but the claim will then continue on paper (offline).", + "FieldType": "Email", + "SecurityClassification": "Public" + }, + { + "CaseTypeID": "CIVIL", + "ID": "respondentSolicitor2OrgLabel", + "Label": "Enter organisation details manually. The claim will then continue offline.", + "FieldType": "Label", + "SecurityClassification": "Public" + }, + { + "CaseTypeID": "CIVIL", + "ID": "respondentSolicitor2OrganisationDetails", + "Label": " ", + "FieldType": "SolicitorOrganisationDetails", + "SecurityClassification": "Public" + }, + { + "CaseTypeID": "CIVIL", + "ID": "respondentSolicitor2Reference", + "Label": "Defendant's legal representative's reference", + "FieldType": "Text", + "SecurityClassification": "Public" } ] diff --git a/ccd-definition/ComplexTypes/ServedDocumentFiles.json b/ccd-definition/ComplexTypes/ServedDocumentFiles.json index 58aeeb2034..da4b669dbe 100644 --- a/ccd-definition/ComplexTypes/ServedDocumentFiles.json +++ b/ccd-definition/ComplexTypes/ServedDocumentFiles.json @@ -3,21 +3,7 @@ "ID": "ServedDocumentFiles", "ListElementCode": "documentsLabel", "FieldType": "Label", - "ElementLabel": "Text documents: .pdf, .txt, .doc, .dot, .docx, .rtf", - "SecurityClassification": "Public" - }, - { - "ID": "ServedDocumentFiles", - "ListElementCode": "spreadsheetsLabel", - "FieldType": "Label", - "ElementLabel": "Spreadsheets: .xlt, .xlsx", - "SecurityClassification": "Public" - }, - { - "ID": "ServedDocumentFiles", - "ListElementCode": "medicalReportsLabel", - "FieldType": "Label", - "ElementLabel": "Aside from the medical report (which may be scanned), any pdf must be text-based and machine readable (rather than a scanned document)", + "ElementLabel": "Aside from medical reports, any documents you upload must be in the following machine readable format: doc, docx, dot, pdf, rtf, txt, xlt or xlsx. Pdf’s must be text based, not a scanned document.", "SecurityClassification": "Public" }, { diff --git a/e2e/fixtures/events/createClaim.js b/e2e/fixtures/events/createClaim.js index 7c55bf0dc0..b9c0d669bc 100644 --- a/e2e/fixtures/events/createClaim.js +++ b/e2e/fixtures/events/createClaim.js @@ -8,11 +8,23 @@ const respondent1 = { individualTitle: 'Sir', primaryAddress: buildAddress('respondent') }; +const respondent2 = { + type: 'INDIVIDUAL', + individualFirstName: 'Foo', + individualLastName: 'Bar', + individualTitle: 'Dr', + primaryAddress: buildAddress('second respondent') +}; const respondent1WithPartyName = { ...respondent1, partyName: 'Sir John Doe', partyTypeDisplayValue: 'Individual', }; +const respondent2WithPartyName = { + ...respondent2, + partyName: 'Dr Foo Bar', + partyTypeDisplayValue: 'Individual', +}; const applicant1 = { type: 'COMPANY', companyName: 'Test Inc', @@ -102,6 +114,9 @@ const createClaimData = (legalRepresentation, useValidPba) => { respondentSolicitor1EmailAddress: 'civilunspecified@gmail.com' }, AddAnotherDefendant: {}, + SecondDefendant: {}, + SecondDefendantLegalRepresentation: {}, + SameLegalRepresentative: {}, ClaimType: { claimType: 'PERSONAL_INJURY' }, @@ -151,7 +166,16 @@ const createClaimData = (legalRepresentation, useValidPba) => { addApplicant2: 'No' }, AddAnotherDefendant: { - addRespondent2: 'No' + addRespondent2: 'Yes' + }, + SecondDefendant: { + respondent2: respondent2 + }, + SecondDefendantLegalRepresentation: { + respondent2Represented: 'Yes' + }, + SameLegalRepresentative: { + respondent2SameLegalRepresentative: 'Yes' }, }; } @@ -179,6 +203,9 @@ module.exports = { }, applicant1: applicant1WithPartyName, respondent1: respondent1WithPartyName, + ...config.multipartyTestsEnabled ? { + respondent2: respondent2WithPartyName + } : {} }, ClaimantLitigationFriend: { applicant1: applicant1WithPartyName, diff --git a/e2e/pages/createClaim/defendantSolicitorEmail.page.js b/e2e/pages/createClaim/defendantSolicitorEmail.page.js index 78051ee860..0b35e820de 100644 --- a/e2e/pages/createClaim/defendantSolicitorEmail.page.js +++ b/e2e/pages/createClaim/defendantSolicitorEmail.page.js @@ -1,16 +1,17 @@ -const { I } = inject(); +const {I} = inject(); module.exports = { - fields: { - - emailAddress: '#respondentSolicitor1EmailAddress' + fields: respondentSolicitorNumber => { + return { + emailAddress: `#respondentSolicitor${respondentSolicitorNumber}EmailAddress` + }; }, - async enterSolicitorEmail() { - I.waitForElement(this.fields.emailAddress); + async enterSolicitorEmail(respondentSolicitorNumber) { + I.waitForElement(this.fields(respondentSolicitorNumber).emailAddress); await I.runAccessibilityTest(); - I.fillField(this.fields.emailAddress, 'civilunspecified@gmail.com'); + I.fillField(this.fields(respondentSolicitorNumber).emailAddress, 'civilunspecified@gmail.com'); await I.clickContinue(); }, }; diff --git a/e2e/pages/createClaim/secondDefendantSolicitorReference.page.js b/e2e/pages/createClaim/secondDefendantSolicitorReference.page.js new file mode 100644 index 0000000000..49798c8b7d --- /dev/null +++ b/e2e/pages/createClaim/secondDefendantSolicitorReference.page.js @@ -0,0 +1,16 @@ +const { I } = inject(); + +module.exports = { + + fields: { + reference: '#respondentSolicitor2Reference' + }, + + async enterReference() { + I.waitForElement(this.fields.reference); + await I.runAccessibilityTest(); + I.fillField(this.fields.reference, 'some reference'); + await I.clickContinue(); + }, +}; + diff --git a/e2e/steps_file.js b/e2e/steps_file.js index 8371c6102b..23a2091b8e 100644 --- a/e2e/steps_file.js +++ b/e2e/steps_file.js @@ -21,6 +21,7 @@ const chooseCourtPage = require('./pages/createClaim/chooseCourt.page'); const claimantLitigationDetails = require('./pages/createClaim/claimantLitigationDetails.page'); const addAnotherDefendant = require('./pages/createClaim/addAnotherDefendant.page'); const respondent2SameLegalRepresentative = require('./pages/createClaim/respondent2SameLegalRepresentative.page'); +const secondDefendantSolicitorReference = require('./pages/createClaim/secondDefendantSolicitorReference.page'); const claimTypePage = require('./pages/createClaim/claimType.page'); const respondentRepresentedPage = require('./pages/createClaim/isRespondentRepresented.page'); const personalInjuryTypePage = require('./pages/createClaim/personalInjuryType.page'); @@ -155,7 +156,7 @@ module.exports = function () { () => respondentRepresentedPage.enterRespondentRepresented('respondent1', 'yes'), () => defendantSolicitorOrganisation.enterOrganisationDetails('respondent1'), () => defendantSolicitorServiceAddress.enterOrganisationServiceAddress(), - () => defendantSolicitorEmail.enterSolicitorEmail() + () => defendantSolicitorEmail.enterSolicitorEmail('1') ]), ... conditionalSteps(config.multipartyTestsEnabled, [ () => addAnotherDefendant.enterAddAnotherDefendant(), @@ -163,7 +164,9 @@ module.exports = function () { () => respondentRepresentedPage.enterRespondentRepresented('respondent2', 'yes'), () => respondent2SameLegalRepresentative.enterRespondent2SameLegalRepresentative(), () => defendantSolicitorOrganisation.enterOrganisationDetails('respondent2'), - () => secondDefendantSolicitorServiceAddress.enterOrganisationServiceAddress() + () => secondDefendantSolicitorServiceAddress.enterOrganisationServiceAddress(), + () => secondDefendantSolicitorReference.enterReference(), + () => defendantSolicitorEmail.enterSolicitorEmail('2') ]), () => claimTypePage.selectClaimType(), () => personalInjuryTypePage.selectPersonalInjuryType(),