Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CIV-15612 Obligation journey screens #5106

Merged
merged 23 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3be9a40
add confirm order option
laarmada Nov 12, 2024
4a2c6cd
add confirm order option
laarmada Nov 13, 2024
69332ff
Merge branch 'master' into CIV-15505-ConfirmOrderReview
mounikahmcts Nov 19, 2024
59ea63a
Merge branch 'CIV-15505-ConfirmOrderReview' of github.com:hmcts/civil…
m-meulendijks-v1 Nov 20, 2024
e1ffcec
CIV-15611 - no obligation journey for confirm order review
m-meulendijks-v1 Nov 21, 2024
ba3ab3c
Merge branch 'master' into feat/CIV-15611
m-meulendijks-v1 Nov 21, 2024
735a8b3
CIV-15612 obligation screen
miguelMolina3691 Nov 26, 2024
6f2dd11
CIV-15612 update
miguelMolina3691 Nov 26, 2024
ec1d7e4
CIV-15612 update
miguelMolina3691 Nov 26, 2024
079efe4
CIV-15612 update
miguelMolina3691 Nov 26, 2024
418fb8a
Merge branch 'master' into feat/CIV-15612
miguelMolina3691 Dec 2, 2024
f016638
CIV-15612 update fields
miguelMolina3691 Dec 2, 2024
bc8250a
CIV-15612 update caseEvent
miguelMolina3691 Dec 2, 2024
2e25496
CIV-15612 add role
miguelMolina3691 Dec 2, 2024
954ea39
Merge branch 'master' into feat/CIV-15612
miguelMolina3691 Dec 2, 2024
64884a7
CIV-15612 add field to store obligationData
miguelMolina3691 Dec 2, 2024
16d91ea
Merge branch 'master' into feat/CIV-15612
miguelMolina3691 Dec 3, 2024
dac5e18
Merge branch 'master' into feat/CIV-15612
mounikahmcts Dec 10, 2024
715e49f
Merge branch 'master' into feat/CIV-15612
kannan-v-hmcts Dec 11, 2024
c24e463
CIV-15612 add mid callback
miguelMolina3691 Dec 12, 2024
e6e9d44
Merge remote-tracking branch 'origin/feat/CIV-15612' into feat/CIV-15612
miguelMolina3691 Dec 12, 2024
eb35686
Merge branch 'master' into feat/CIV-15612
mounikahmcts Dec 13, 2024
5e6c2ba
Merge branch 'master' into feat/CIV-15612
miguelMolina3691 Dec 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,29 @@
}
]
},
{
"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"
}
]
},
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseEventID": "MANAGE_STAY_WA",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,34 @@
}
]
},
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseFieldID": "obligationData",
"AccessControl": [
{
"UserRoles": [
"caseworker-civil-admin",
"cui-admin-profile",
"caseworker-civil-systemupdate"
],
"CRUD": "CRU"
}
]
},
{
"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": "isFinalOrder",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
[
{
"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",
"Publish": "Y"
},
{
"ID": "ObligationDataCollection",
"CaseEventID": "CONFIRM_ORDER_REVIEW",
"CaseFieldID": "obligationData",
"ListElementCode": "obligationAction",
"FieldDisplayOrder": 4,
"DisplayContext": "MANDATORY",
"Publish": "Y"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,18 @@
"PageID": "ObligationDate",
"ShowSummaryChangeOption": "Y"
},
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseEventID": "CONFIRM_ORDER_REVIEW",
"CaseFieldID": "obligationData",
"PageDisplayOrder": 2,
"PageFieldDisplayOrder": 1,
"DisplayContext": "MANDATORY",
"PageID": "EnterObligationData",
"ShowSummaryChangeOption": "Y",
"CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/validate-obligation-date",
"PageShowCondition": "obligationDatePresent = \"Yes\""
},
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"CaseEventID": "CONFIRM_ORDER_REVIEW",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,24 @@
"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": "storedObligationData",
"Label": "Obligation date",
"FieldType": "Collection",
"FieldTypeParameter": "ObligationDataCollection",
"SecurityClassification": "Public",
"Searchable": "N"
},
{
"CaseTypeID": "CIVIL${CCD_DEF_VERSION}",
"ID": "isFinalOrder",
Expand Down
36 changes: 36 additions & 0 deletions ccd-definition/ComplexTypes/ObligationDataCollection.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
[
{
"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",
"FieldShowCondition": "obligationReason = \"OTHER\"",
"Searchable": "N"
},
{
"ID": "ObligationDataCollection",
"ListElementCode": "obligationAction",
"FieldType": "TextArea",
"ElementLabel": "What action is required when the case is reviewed?",
"SecurityClassification": "Public",
"Searchable": "N"
}
]
50 changes: 50 additions & 0 deletions ccd-definition/FixedLists/ObligationReason.json
Original file line number Diff line number Diff line change
@@ -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
}
]
Loading