From 3be9a40ef7291df1668c5999b7f4d412b3df2d1a Mon Sep 17 00:00:00 2001 From: laarmada Date: Tue, 12 Nov 2024 14:35:42 +0000 Subject: [PATCH 01/12] add confirm order option --- ...ionCaseEvent-caseworkerEvents-nonprod.json | 21 +++++++++++++++++++ .../UserEvents-caseworkerEvents-nonprod.json | 18 ++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-caseworkerEvents-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-caseworkerEvents-nonprod.json index bf647911c2..05ea676533 100644 --- a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-caseworkerEvents-nonprod.json +++ b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-caseworkerEvents-nonprod.json @@ -58,5 +58,26 @@ "CRUD": "R" } ] + }, + { + "CaseTypeID": "CIVIL", + "CaseEventID": "CONFIRM_ORDER_REVIEW", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-admin", + "cui-admin-profile", + "ctsc-team-leader","ctsc" + ], + "CRUD": "CRU" + }, + { + "UserRoles": [ + "caseworker-civil-solicitor", + "judge-profile" + ], + "CRUD": "R" + } + ] } ] diff --git a/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json index 782bf38e83..c544b5a82f 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json @@ -137,5 +137,23 @@ "RetriesTimeoutAboutToStartEvent": 0, "RetriesTimeoutURLAboutToSubmitEvent": 0, "EventEnablingCondition": "preStayState != \"IN_MEDIATION\"" + }, + { + "CaseTypeID": "CIVIL", + "ID": "CONFIRM_ORDER_REVIEW", + "Name": "Confirm order review", + "Description": "Confirm order review", + "DisplayOrder": 17, + "PreConditionState(s)": "AWAITING_APPLICANT_INTENTION;AWAITING_DEFENDANT_RESPONSE;DECISION_OUTCOME;IN_MEDIATION;All_FINAL_ORDERS_ISSUED;JUDICIAL_REFERRAL;CASE_PROGRESSION;HEARING_READINESS;PREPARE_FOR_HEARING_CONDUCT_HEARING", + "PostConditionState": "*", + "SecurityClassification": "Public", + "ShowSummary": "N", + "ShowEventNotes": "N", + "EndButtonLabel": "Submit", + "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start", + "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit", + "CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/submitted", + "RetriesTimeoutAboutToStartEvent": 0, + "RetriesTimeoutURLAboutToSubmitEvent": 0 } ] From 4a2c6cda8d26e5eb866d510d28b1add7e9182408 Mon Sep 17 00:00:00 2001 From: laarmada Date: Wed, 13 Nov 2024 11:41:34 +0000 Subject: [PATCH 02/12] add confirm order option --- .../CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json index c544b5a82f..dd96fcfde3 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json @@ -144,7 +144,7 @@ "Name": "Confirm order review", "Description": "Confirm order review", "DisplayOrder": 17, - "PreConditionState(s)": "AWAITING_APPLICANT_INTENTION;AWAITING_DEFENDANT_RESPONSE;DECISION_OUTCOME;IN_MEDIATION;All_FINAL_ORDERS_ISSUED;JUDICIAL_REFERRAL;CASE_PROGRESSION;HEARING_READINESS;PREPARE_FOR_HEARING_CONDUCT_HEARING", + "PreConditionState(s)": "AWAITING_APPLICANT_INTENTION;AWAITING_RESPONDENT_ACKNOWLEDGEMENT;DECISION_OUTCOME;IN_MEDIATION;All_FINAL_ORDERS_ISSUED;JUDICIAL_REFERRAL;CASE_PROGRESSION;HEARING_READINESS;PREPARE_FOR_HEARING_CONDUCT_HEARING", "PostConditionState": "*", "SecurityClassification": "Public", "ShowSummary": "N", From e1ffcec2e436dbb54605e7d2204bf4cf3347a115 Mon Sep 17 00:00:00 2001 From: meulendijksm Date: Thu, 21 Nov 2024 14:46:13 +0000 Subject: [PATCH 03/12] CIV-15611 - no obligation journey for confirm order review --- ...ionCaseEvent-caseworkerEvents-nonprod.json | 5 +-- ...ionCaseField-caseworkerEvents-nonprod.json | 39 +++++++++++++++++++ .../UserEvents-caseworkerEvents-nonprod.json | 5 +-- .../FlagCase-caseworkerEvents-nonprod.json | 37 ++++++++++++++++++ .../CaseField-caseworkerEvents-nonprod.json | 25 ++++++++++++ ...affNextSteps-caseworkerEvents-nonprod.json | 14 +++++++ ...s-ManageStay-caseworkerEvents-nonprod.json | 0 7 files changed, 119 insertions(+), 6 deletions(-) create mode 100644 ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json create mode 100644 ccd-definition/FixedLists/CaseworkerEvents/CourtStaffNextSteps-caseworkerEvents-nonprod.json rename ccd-definition/FixedLists/{ => CaseworkerEvents}/ManageStayOptions-ManageStay-caseworkerEvents-nonprod.json (100%) diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-caseworkerEvents-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-caseworkerEvents-nonprod.json index 6b11daa1dd..9107ba7dba 100644 --- a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-caseworkerEvents-nonprod.json +++ b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-caseworkerEvents-nonprod.json @@ -60,14 +60,13 @@ ] }, { - "CaseTypeID": "CIVIL", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "CONFIRM_ORDER_REVIEW", "AccessControl": [ { "UserRoles": [ "caseworker-civil-admin", - "cui-admin-profile", - "ctsc-team-leader","ctsc" + "cui-admin-profile" ], "CRUD": "CRU" }, diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json index d82d26db20..4a856dd836 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json @@ -145,5 +145,44 @@ "CRUD": "CRU" } ] + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "obligationDatePresent", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-admin", + "cui-admin-profile" + ], + "CRUD": "CRU" + } + ] + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "courtStaffNextSteps", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-admin", + "cui-admin-profile" + ], + "CRUD": "CRU" + } + ] + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "stillTasksText", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-admin", + "cui-admin-profile" + ], + "CRUD": "R" + } + ] } ] diff --git a/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json index f54ec0de73..565fa35ab2 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-caseworkerEvents-nonprod.json @@ -139,15 +139,14 @@ "EventEnablingCondition": "preStayState != \"IN_MEDIATION\"" }, { - "CaseTypeID": "CIVIL", + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "ID": "CONFIRM_ORDER_REVIEW", "Name": "Confirm order review", "Description": "Confirm order review", - "DisplayOrder": 17, "PreConditionState(s)": "AWAITING_APPLICANT_INTENTION;AWAITING_RESPONDENT_ACKNOWLEDGEMENT;DECISION_OUTCOME;IN_MEDIATION;All_FINAL_ORDERS_ISSUED;JUDICIAL_REFERRAL;CASE_PROGRESSION;HEARING_READINESS;PREPARE_FOR_HEARING_CONDUCT_HEARING", "PostConditionState": "*", "SecurityClassification": "Public", - "ShowSummary": "N", + "ShowSummary": "Y", "ShowEventNotes": "N", "EndButtonLabel": "Submit", "CallBackURLAboutToStartEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-start", diff --git a/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json b/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json new file mode 100644 index 0000000000..808b6cad24 --- /dev/null +++ b/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json @@ -0,0 +1,37 @@ +[ + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "CONFIRM_ORDER_REVIEW", + "CaseFieldID": "obligationDatePresent", + "PageLabel": "Confirm order review", + "PageDisplayOrder": 1, + "PageFieldDisplayOrder": 1, + "DisplayContext": "MANDATORY", + "PageID": "ObligationDate", + "ShowSummaryChangeOption": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "CONFIRM_ORDER_REVIEW", + "CaseFieldID": "courtStaffNextSteps", + "PageLabel": "Confirm order review", + "PageDisplayOrder": 3, + "PageFieldDisplayOrder": 1, + "DisplayContext": "MANDATORY", + "PageID": "NextSteps", + "ShowSummaryChangeOption": "Y", + "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/validate-tasks-left" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "CONFIRM_ORDER_REVIEW", + "CaseFieldID": "stillTasksText", + "PageLabel": "Confirm order review", + "PageDisplayOrder": 3, + "PageFieldDisplayOrder": 2, + "DisplayContext": "READONLY", + "PageID": "NextSteps", + "ShowSummaryChangeOption": "N", + "FieldShowCondition": "courtStaffNextSteps = \"STILL_TASKS\"" + } +] diff --git a/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json b/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json index 9de5d427d5..9d9ef69945 100644 --- a/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json @@ -87,5 +87,30 @@ "FieldType": "YesOrNo", "SecurityClassification": "Public", "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "obligationDatePresent", + "Label": "Is there an obligation date?", + "FieldType": "YesOrNo", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "courtStaffNextSteps", + "Label": "Have all the next steps for court staff been completed?", + "FieldType": "FixedRadioList", + "FieldTypeParameter": "courtStaffNextSteps", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "stillTasksText", + "Label": "You must complete all of your tasks before you can submit your order review.", + "FieldType": "Label", + "SecurityClassification": "Public", + "Searchable": "N" } ] diff --git a/ccd-definition/FixedLists/CaseworkerEvents/CourtStaffNextSteps-caseworkerEvents-nonprod.json b/ccd-definition/FixedLists/CaseworkerEvents/CourtStaffNextSteps-caseworkerEvents-nonprod.json new file mode 100644 index 0000000000..629943b8e5 --- /dev/null +++ b/ccd-definition/FixedLists/CaseworkerEvents/CourtStaffNextSteps-caseworkerEvents-nonprod.json @@ -0,0 +1,14 @@ +[ + { + "ID": "courtStaffNextSteps", + "ListElementCode": "NO_TASKS", + "ListElement": "There are no other tasks to complete", + "DisplayOrder": 1 + }, + { + "ID": "courtStaffNextSteps", + "ListElementCode": "STILL_TASKS", + "ListElement": "There are still tasks to do", + "DisplayOrder": 2 + } +] diff --git a/ccd-definition/FixedLists/ManageStayOptions-ManageStay-caseworkerEvents-nonprod.json b/ccd-definition/FixedLists/CaseworkerEvents/ManageStayOptions-ManageStay-caseworkerEvents-nonprod.json similarity index 100% rename from ccd-definition/FixedLists/ManageStayOptions-ManageStay-caseworkerEvents-nonprod.json rename to ccd-definition/FixedLists/CaseworkerEvents/ManageStayOptions-ManageStay-caseworkerEvents-nonprod.json From 735a8b361eb301eb7f98fdc511088774d886622d Mon Sep 17 00:00:00 2001 From: miguelMolina3691 Date: Tue, 26 Nov 2024 09:51:18 +0000 Subject: [PATCH 04/12] CIV-15612 obligation screen --- ...ionCaseField-caseworkerEvents-nonprod.json | 13 +++++ ...ligationData-caseworkerEvents-nonprod.json | 39 +++++++++++++++ .../FlagCase-caseworkerEvents-nonprod.json | 13 +++++ .../CaseField-caseworkerEvents-nonprod.json | 9 ++++ .../ObligationDataCollection.json | 35 +++++++++++++ .../FixedLists/ObligationReason.json | 50 +++++++++++++++++++ 6 files changed, 159 insertions(+) create mode 100644 ccd-definition/CaseEventToComplexTypes/ObligationData-caseworkerEvents-nonprod.json create mode 100644 ccd-definition/ComplexTypes/ObligationDataCollection.json create mode 100644 ccd-definition/FixedLists/ObligationReason.json diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json index 4a856dd836..ee8f8f8ef5 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json @@ -159,6 +159,19 @@ } ] }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "obligationData", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-admin", + "cui-admin-profile" + ], + "CRUD": "CRU" + } + ] + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseFieldID": "courtStaffNextSteps", diff --git a/ccd-definition/CaseEventToComplexTypes/ObligationData-caseworkerEvents-nonprod.json b/ccd-definition/CaseEventToComplexTypes/ObligationData-caseworkerEvents-nonprod.json new file mode 100644 index 0000000000..45363cc159 --- /dev/null +++ b/ccd-definition/CaseEventToComplexTypes/ObligationData-caseworkerEvents-nonprod.json @@ -0,0 +1,39 @@ +[ + { + "ID": "ObligationDataCollection", + "CaseEventID": "CONFIRM_ORDER_REVIEW", + "CaseFieldID": "obligationData", + "ListElementCode": "obligationDate", + "FieldDisplayOrder": 1, + "DisplayContext": "MANDATORY", + "Publish": "Y" + }, + { + "ID": "ObligationDataCollection", + "CaseEventID": "CONFIRM_ORDER_REVIEW", + "CaseFieldID": "obligationData", + "ListElementCode": "obligationReason", + "FieldDisplayOrder": 2, + "DisplayContext": "MANDATORY", + "Publish": "Y" + }, + { + "ID": "ObligationDataCollection", + "CaseEventID": "CONFIRM_ORDER_REVIEW", + "CaseFieldID": "obligationData", + "ListElementCode": "otherObligationReason", + "FieldDisplayOrder": 3, + "DisplayContext": "MANDATORY", + "FieldShowCondition": "obligationReason = \"OTHER\"", + "Publish": "Y" + }, + { + "ID": "ObligationDataCollection", + "CaseEventID": "CONFIRM_ORDER_REVIEW", + "CaseFieldID": "obligationData", + "ListElementCode": "obligationAction", + "FieldDisplayOrder": 4, + "DisplayContext": "MANDATORY", + "Publish": "Y" + } +] diff --git a/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json b/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json index 808b6cad24..1d98517c41 100644 --- a/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json @@ -10,6 +10,19 @@ "PageID": "ObligationDate", "ShowSummaryChangeOption": "Y" }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "CONFIRM_ORDER_REVIEW", + "CaseFieldID": "obligationData", + "PageFieldDisplayOrder": 1, + "DisplayContext": "MANDATORY", + "PageID": "EnterObligationData", + "PageDisplayOrder": 2, + "PageColumnNumber": 1, + "ShowSummaryChangeOption": "Y", + "PageLabel": "Confirm order review", + "PageShowCondition": "obligationDatePresent = \"YES\"" + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "CONFIRM_ORDER_REVIEW", diff --git a/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json b/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json index 9d9ef69945..73fa932ad7 100644 --- a/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json @@ -96,6 +96,15 @@ "SecurityClassification": "Public", "Searchable": "N" }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "obligationData", + "Label": "Obligation date", + "FieldType": "Collection", + "FieldTypeParameter": "ObligationDataCollection", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "ID": "courtStaffNextSteps", diff --git a/ccd-definition/ComplexTypes/ObligationDataCollection.json b/ccd-definition/ComplexTypes/ObligationDataCollection.json new file mode 100644 index 0000000000..e937835687 --- /dev/null +++ b/ccd-definition/ComplexTypes/ObligationDataCollection.json @@ -0,0 +1,35 @@ +[ + { + "ID": "ObligationDataCollection", + "ListElementCode": "obligationDate", + "FieldType": "Date", + "ElementLabel": "Enter the date that this case should be reviewed", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "ID": "ObligationDataCollection", + "ListElementCode": "obligationReason", + "ElementLabel": "Why does this case need to be reviewed?", + "FieldType": "FixedRadioList", + "FieldTypeParameter": "ObligationReason", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "ID": "ObligationDataCollection", + "ListElementCode": "otherObligationReason", + "FieldType": "Text", + "ElementLabel": " ", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "ID": "ObligationDataCollection", + "ListElementCode": "obligationAction", + "FieldType": "TextArea", + "ElementLabel": "What action is required when the case is reviewed?", + "SecurityClassification": "Public", + "Searchable": "N" + } +] diff --git a/ccd-definition/FixedLists/ObligationReason.json b/ccd-definition/FixedLists/ObligationReason.json new file mode 100644 index 0000000000..417c999514 --- /dev/null +++ b/ccd-definition/FixedLists/ObligationReason.json @@ -0,0 +1,50 @@ +[ + { + "ID": "ObligationReason", + "ListElementCode": "UNLESS_ORDER", + "ListElement": "Unless order", + "DisplayOrder": 1 + }, + { + "ID": "ObligationReason", + "ListElementCode": "STAY_A_CASE", + "ListElement": "Stay a case", + "DisplayOrder": 2 + }, + { + "ID": "ObligationReason", + "ListElementCode": "LIFT_A_STAY", + "ListElement": "Lift a stay", + "DisplayOrder": 3 + }, + { + "ID": "ObligationReason", + "ListElementCode": "DISMISS_CASE", + "ListElement": "Dismiss case", + "DisplayOrder": 4 + }, + { + "ID": "ObligationReason", + "ListElementCode": "PRE_TRIAL_CHECKLIST", + "ListElement": "Pre-trial checklist", + "DisplayOrder": 5 + }, + { + "ID": "ObligationReason", + "ListElementCode": "GENERAL_ORDER", + "ListElement": "General order", + "DisplayOrder": 6 + }, + { + "ID": "ObligationReason", + "ListElementCode": "RESERVE_JUDGMENT", + "ListElement": "Reserve judgment", + "DisplayOrder": 7 + }, + { + "ID": "ObligationReason", + "ListElementCode": "OTHER", + "ListElement": "Other", + "DisplayOrder": 8 + } +] From 6f2dd11d617244da15961668c9c3a04ec05db3ad Mon Sep 17 00:00:00 2001 From: miguelMolina3691 Date: Tue, 26 Nov 2024 13:10:17 +0000 Subject: [PATCH 05/12] CIV-15612 update --- .../CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json b/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json index 1d98517c41..89bc997a6e 100644 --- a/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json @@ -21,7 +21,7 @@ "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "PageLabel": "Confirm order review", - "PageShowCondition": "obligationDatePresent = \"YES\"" + "PageShowCondition": "obligationDatePresent = \"Yes\"" }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", From ec1d7e4a8f1cb3e8b02febf17f3619c25a80ac56 Mon Sep 17 00:00:00 2001 From: miguelMolina3691 Date: Tue, 26 Nov 2024 15:12:03 +0000 Subject: [PATCH 06/12] CIV-15612 update --- ...sationCaseField-caseworkerEvents-nonprod.json | 13 +++++++++++++ .../ObligationData-caseworkerEvents-nonprod.json | 1 - .../FlagCase-caseworkerEvents-nonprod.json | 16 +++++++++++++--- .../CaseField-caseworkerEvents-nonprod.json | 10 +++++++++- .../ComplexTypes/ObligationDataCollection.json | 1 + 5 files changed, 36 insertions(+), 5 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json index ee8f8f8ef5..1bc090c878 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json @@ -172,6 +172,19 @@ } ] }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "obligationDataMandatory", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-admin", + "cui-admin-profile" + ], + "CRUD": "CRU" + } + ] + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseFieldID": "courtStaffNextSteps", diff --git a/ccd-definition/CaseEventToComplexTypes/ObligationData-caseworkerEvents-nonprod.json b/ccd-definition/CaseEventToComplexTypes/ObligationData-caseworkerEvents-nonprod.json index 45363cc159..01408709f1 100644 --- a/ccd-definition/CaseEventToComplexTypes/ObligationData-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseEventToComplexTypes/ObligationData-caseworkerEvents-nonprod.json @@ -24,7 +24,6 @@ "ListElementCode": "otherObligationReason", "FieldDisplayOrder": 3, "DisplayContext": "MANDATORY", - "FieldShowCondition": "obligationReason = \"OTHER\"", "Publish": "Y" }, { diff --git a/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json b/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json index 89bc997a6e..678a92baba 100644 --- a/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json @@ -13,16 +13,26 @@ { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "CONFIRM_ORDER_REVIEW", - "CaseFieldID": "obligationData", + "CaseFieldID": "obligationDataMandatory", "PageFieldDisplayOrder": 1, - "DisplayContext": "MANDATORY", + "DisplayContext": "COMPLEX", "PageID": "EnterObligationData", "PageDisplayOrder": 2, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", - "PageLabel": "Confirm order review", "PageShowCondition": "obligationDatePresent = \"Yes\"" }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "CONFIRM_ORDER_REVIEW", + "CaseFieldID": "obligationData", + "PageFieldDisplayOrder": 2, + "DisplayContext": "OPTIONAL", + "PageID": "EnterObligationData", + "PageDisplayOrder": 2, + "PageColumnNumber": 1, + "ShowSummaryChangeOption": "Y" + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "CONFIRM_ORDER_REVIEW", diff --git a/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json b/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json index 73fa932ad7..64a7ce6a52 100644 --- a/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json @@ -98,8 +98,16 @@ }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "ID": "obligationData", + "ID": "obligationDataMandatory", "Label": "Obligation date", + "FieldType": "ObligationDataCollection", + "SecurityClassification": "Public", + "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "obligationData", + "Label": " ", "FieldType": "Collection", "FieldTypeParameter": "ObligationDataCollection", "SecurityClassification": "Public", diff --git a/ccd-definition/ComplexTypes/ObligationDataCollection.json b/ccd-definition/ComplexTypes/ObligationDataCollection.json index e937835687..4cd783fc46 100644 --- a/ccd-definition/ComplexTypes/ObligationDataCollection.json +++ b/ccd-definition/ComplexTypes/ObligationDataCollection.json @@ -22,6 +22,7 @@ "FieldType": "Text", "ElementLabel": " ", "SecurityClassification": "Public", + "FieldShowCondition": "obligationReason = \"OTHER\"", "Searchable": "N" }, { From 079efe4c4ad451a6101715d94da0b1f421abe0ea Mon Sep 17 00:00:00 2001 From: miguelMolina3691 Date: Tue, 26 Nov 2024 15:34:09 +0000 Subject: [PATCH 07/12] CIV-15612 update --- ...sationCaseField-caseworkerEvents-nonprod.json | 13 ------------- .../FlagCase-caseworkerEvents-nonprod.json | 16 +++------------- .../CaseField-caseworkerEvents-nonprod.json | 8 -------- 3 files changed, 3 insertions(+), 34 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json index 1bc090c878..ee8f8f8ef5 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json @@ -172,19 +172,6 @@ } ] }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseFieldID": "obligationDataMandatory", - "AccessControl": [ - { - "UserRoles": [ - "caseworker-civil-admin", - "cui-admin-profile" - ], - "CRUD": "CRU" - } - ] - }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseFieldID": "courtStaffNextSteps", diff --git a/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json b/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json index 678a92baba..3680fd9bc5 100644 --- a/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json @@ -13,26 +13,16 @@ { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "CONFIRM_ORDER_REVIEW", - "CaseFieldID": "obligationDataMandatory", + "CaseFieldID": "obligationData", + "PageLabel": " ", "PageFieldDisplayOrder": 1, - "DisplayContext": "COMPLEX", + "DisplayContext": "MANDATORY", "PageID": "EnterObligationData", "PageDisplayOrder": 2, "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "PageShowCondition": "obligationDatePresent = \"Yes\"" }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "CaseEventID": "CONFIRM_ORDER_REVIEW", - "CaseFieldID": "obligationData", - "PageFieldDisplayOrder": 2, - "DisplayContext": "OPTIONAL", - "PageID": "EnterObligationData", - "PageDisplayOrder": 2, - "PageColumnNumber": 1, - "ShowSummaryChangeOption": "Y" - }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "CONFIRM_ORDER_REVIEW", diff --git a/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json b/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json index 64a7ce6a52..6dc78991d2 100644 --- a/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json @@ -96,14 +96,6 @@ "SecurityClassification": "Public", "Searchable": "N" }, - { - "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", - "ID": "obligationDataMandatory", - "Label": "Obligation date", - "FieldType": "ObligationDataCollection", - "SecurityClassification": "Public", - "Searchable": "N" - }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "ID": "obligationData", From f0166387f5586337041f6a6e255c72144a53f7dc Mon Sep 17 00:00:00 2001 From: miguelMolina3691 Date: Mon, 2 Dec 2024 12:49:21 +0000 Subject: [PATCH 08/12] CIV-15612 update fields --- ...ionCaseEvent-caseworkerEvents-nonprod.json | 29 +++++++++++++++++-- ...cationEvents-caseworkerEvents-nonprod.json | 13 +++++++++ .../CaseField-caseworkerEvents-nonprod.json | 2 +- 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-caseworkerEvents-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-caseworkerEvents-nonprod.json index d58c46c99e..dc03a521c8 100644 --- a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-caseworkerEvents-nonprod.json +++ b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-caseworkerEvents-nonprod.json @@ -66,14 +66,37 @@ { "UserRoles": [ "caseworker-civil-admin", - "cui-admin-profile" + "cui-admin-profile", + "judge-profile" ], "CRUD": "CRU" }, { "UserRoles": [ - "caseworker-civil-solicitor", - "judge-profile" + "caseworker-civil-solicitor" + ], + "CRUD": "R" + } + ] + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "UPDATE_CONFIRM_REVIEW_ORDER_EVENT", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-systemupdate" + ], + "CRUD": "CRU" + }, + { + "UserRoles": [ + "cui-admin-profile", + "caseworker-civil-admin", + "judge-profile", + "legal-adviser", + "GS_profile", + "caseworker-civil-solicitor" ], "CRUD": "R" } diff --git a/ccd-definition/CaseEvent/Camunda/NotificationEvents-caseworkerEvents-nonprod.json b/ccd-definition/CaseEvent/Camunda/NotificationEvents-caseworkerEvents-nonprod.json index 1a95b40b76..47811a8e49 100644 --- a/ccd-definition/CaseEvent/Camunda/NotificationEvents-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseEvent/Camunda/NotificationEvents-caseworkerEvents-nonprod.json @@ -232,5 +232,18 @@ "ShowSummary": "N", "ShowEventNotes": "N", "RetriesTimeoutURLAboutToSubmitEvent": 0 + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "UPDATE_CONFIRM_REVIEW_ORDER_EVENT", + "Name": "Obligation added", + "Description": "Obligation added", + "PreConditionState(s)": "*", + "PostConditionState": "*", + "SecurityClassification": "Public", + "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit", + "ShowSummary": "N", + "ShowEventNotes": "N", + "RetriesTimeoutURLAboutToSubmitEvent": 0 } ] diff --git a/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json b/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json index b46eafc1f0..4252bcc6a9 100644 --- a/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json @@ -107,7 +107,7 @@ { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "ID": "obligationData", - "Label": " ", + "Label": "Obligation date", "FieldType": "Collection", "FieldTypeParameter": "ObligationDataCollection", "SecurityClassification": "Public", From bc8250acc8d743f9937b14afa7f175a63b9b61d9 Mon Sep 17 00:00:00 2001 From: miguelMolina3691 Date: Mon, 2 Dec 2024 13:10:30 +0000 Subject: [PATCH 09/12] CIV-15612 update caseEvent --- .../AuthorisationCaseEvent-caseworkerEvents-nonprod.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-caseworkerEvents-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-caseworkerEvents-nonprod.json index dc03a521c8..39752c7425 100644 --- a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-caseworkerEvents-nonprod.json +++ b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-caseworkerEvents-nonprod.json @@ -66,14 +66,14 @@ { "UserRoles": [ "caseworker-civil-admin", - "cui-admin-profile", - "judge-profile" + "cui-admin-profile" ], "CRUD": "CRU" }, { "UserRoles": [ - "caseworker-civil-solicitor" + "caseworker-civil-solicitor", + "judge-profile" ], "CRUD": "R" } From 2e2549629657421116129e9a5d31719a63918cc5 Mon Sep 17 00:00:00 2001 From: miguelMolina3691 Date: Mon, 2 Dec 2024 14:48:54 +0000 Subject: [PATCH 10/12] CIV-15612 add role --- .../AuthorisationCaseField-caseworkerEvents-nonprod.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json index 2795c97471..f90d0b91da 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json @@ -180,7 +180,8 @@ { "UserRoles": [ "caseworker-civil-admin", - "cui-admin-profile" + "cui-admin-profile", + "caseworker-civil-systemupdate" ], "CRUD": "CRU" } From 64884a7b484e27b2d1875a86e68562c48aa0fada Mon Sep 17 00:00:00 2001 From: miguelMolina3691 Date: Mon, 2 Dec 2024 15:56:12 +0000 Subject: [PATCH 11/12] CIV-15612 add field to store obligationData --- ...risationCaseField-caseworkerEvents-nonprod.json | 14 ++++++++++++++ .../CaseField-caseworkerEvents-nonprod.json | 9 +++++++++ 2 files changed, 23 insertions(+) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json index f90d0b91da..3cba4f482d 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-caseworkerEvents-nonprod.json @@ -187,6 +187,20 @@ } ] }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "storedObligationData", + "AccessControl": [ + { + "UserRoles": [ + "caseworker-civil-admin", + "cui-admin-profile", + "caseworker-civil-systemupdate" + ], + "CRUD": "CRU" + } + ] + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseFieldID": "courtStaffNextSteps", diff --git a/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json b/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json index 4252bcc6a9..539936b243 100644 --- a/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseField/CaseField-caseworkerEvents-nonprod.json @@ -113,6 +113,15 @@ "SecurityClassification": "Public", "Searchable": "N" }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "storedObligationData", + "Label": "Obligation date", + "FieldType": "Collection", + "FieldTypeParameter": "ObligationDataCollection", + "SecurityClassification": "Public", + "Searchable": "N" + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "ID": "courtStaffNextSteps", From c24e463af0260c8c66249275aaffbb85b0466c3f Mon Sep 17 00:00:00 2001 From: miguelMolina3691 Date: Thu, 12 Dec 2024 13:42:46 +0000 Subject: [PATCH 12/12] CIV-15612 add mid callback --- .../CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json b/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json index 1d5c0bb643..91ddd246ff 100644 --- a/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json +++ b/ccd-definition/CaseEventToFields/FlagCase-caseworkerEvents-nonprod.json @@ -18,6 +18,7 @@ "DisplayContext": "MANDATORY", "PageID": "EnterObligationData", "ShowSummaryChangeOption": "Y", + "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/validate-obligation-date", "PageShowCondition": "obligationDatePresent = \"Yes\"" }, {