diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP index de25b53b6e..5faf965e1b 100644 --- a/Jenkinsfile_CNP +++ b/Jenkinsfile_CNP @@ -7,7 +7,7 @@ def type = "nodejs" def product = "civil" def component = "ccd" def camundaBranch = "master" -def dmnBranch = "master" +def dmnBranch = "CIV-15725-minti-hearing-notice" def waStandaloneBranch = "master" def yarnBuilder = new uk.gov.hmcts.contino.YarnBuilder(this) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json index 2df8466f41..3c1a678c03 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json @@ -173,6 +173,19 @@ } ] }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "isFinalOrder", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-admin", + "cui-admin-profile" + ], + "CRUD": "CRU" + } + ] + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseFieldID": "courtStaffNextSteps", diff --git a/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json index c55baad3c5..c87511b52a 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json @@ -26,7 +26,8 @@ "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/submitted", "ShowSummary": "N", "ShowEventNotes": "N", - "RetriesTimeoutURLAboutToSubmitEvent": 0 + "RetriesTimeoutURLAboutToSubmitEvent": 0, + "Publish": "Y" }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", diff --git a/ccd-definition/CaseEvent/User/UserEventsCaseProg-MINTI-nonprod.json b/ccd-definition/CaseEvent/User/UserEventsCaseProg-MINTI-nonprod.json index 1b394b2201..ddcd2ae551 100644 --- a/ccd-definition/CaseEvent/User/UserEventsCaseProg-MINTI-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEventsCaseProg-MINTI-nonprod.json @@ -114,7 +114,8 @@ "ShowEventNotes": "N", "EndButtonLabel": "Submit", "RetriesTimeoutAboutToStartEvent": 0, - "RetriesTimeoutURLAboutToSubmitEvent": 0 + "RetriesTimeoutURLAboutToSubmitEvent": 0, + "Publish": "Y" }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", diff --git a/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json b/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json index 534158dcf8..4338764a7c 100644 --- a/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json @@ -9,6 +9,17 @@ "PageID": "ObligationDate", "ShowSummaryChangeOption": "Y" }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "CONFIRM_ORDER_REVIEW", + "CaseFieldID": "isFinalOrder", + "PageDisplayOrder": 2, + "PageFieldDisplayOrder": 1, + "DisplayContext": "MANDATORY", + "PageID": "IsFinalOrder", + "ShowSummaryChangeOption": "Y", + "PageShowCondition": "obligationDatePresent = \"No\"" + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "CONFIRM_ORDER_REVIEW", diff --git a/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-MINTI-nonprod.json b/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-MINTI-nonprod.json new file mode 100644 index 0000000000..74f8ade54f --- /dev/null +++ b/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-MINTI-nonprod.json @@ -0,0 +1,23 @@ +[ + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "CONFIRM_LISTING_COMPLETED", + "CaseFieldID": "allocatedTrack", + "PageFieldDisplayOrder": 10, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "PageShowCondition": "confirmListingTickBox=\"DONOTSHOW\"", + "Publish": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "CONFIRM_LISTING_COMPLETED", + "CaseFieldID": "responseClaimTrack", + "PageFieldDisplayOrder": 10, + "DisplayContext": "READONLY", + "PageID": "WorkAllocationIntegrationFields", + "PageDisplayOrder": 99, + "Publish": "Y" + } +] diff --git a/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json b/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json index 6db1f68b60..623a47a8fd 100644 --- a/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json @@ -104,6 +104,14 @@ "SecurityClassification": "Public", "Searchable": "N" }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "isFinalOrder", + "Label": "Is this a final order?", + "FieldType": "YesOrNo", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "ID": "courtStaffNextSteps",