From 17bb2791bda601276839412d9ce56df5765c8024 Mon Sep 17 00:00:00 2001 From: Sinekhaya Date: Sat, 21 Mar 2026 20:55:59 +0200 Subject: [PATCH 1/2] duty of care --- .../nzba/v1/caseForms/DutyOfCareForm.json | 195 +++++++++++++----- .../v1/tabbedForms/CaseInformationTab.json | 187 +++++++++++++++++ 2 files changed, 326 insertions(+), 56 deletions(-) diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/caseForms/DutyOfCareForm.json b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/caseForms/DutyOfCareForm.json index 7a12c6df72..82facbfbd1 100644 --- a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/caseForms/DutyOfCareForm.json +++ b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/caseForms/DutyOfCareForm.json @@ -1,101 +1,184 @@ [ { - "name": "date", - "label": "Date", - "type": "date-input", - "required": { - "value": true, - "message": "RequiredFieldError" - } + "name": "otherInformationAboutTheClient", + "label": "Other Information about the Client", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 }, { - "name": "duration", - "label": "Duration", + "name": "clientPresentation", + "label": "Client presentation", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 + }, + { + "name": "assessmentOfRisk", + "label": "Assessment of Risk", "type": "select", + "isPII": false, "options": [ { - "value": "", + "value": "Unknown", "label": "" }, { - "value": "Ongoing", - "label": "Ongoing" + "value": "Urgent", + "label": "Urgent" + }, + { + "value": "High", + "label": "High" }, { - "value": "Once Off", - "label": "Once Off" + "value": "Medium", + "label": "Medium" }, { - "value": "Other", - "label": "Other" + "value": "Low", + "label": "Low" } - ], - "required": { - "value": true, - "message": "RequiredFieldError" - } + ] + }, + { + "name": "supervisorsAnalysis", + "label": "Supervisor's Analysis", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 + }, + { + "name": "planOfAction", + "label": "Plan of Action", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 }, { - "name": "location", - "label": "Location", + "name": "immediateOutcome", + "label": "Immediate outcome (from Duty of Care process)", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 + }, + { + "name": "consultationDetails", + "label": "Barnardos Consultation - Date, Time and who consulted", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 + }, + { + "name": "agenciesInvolved", + "label": "Agencies Involved", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 + }, + { + "name": "informedUnitManager", + "label": "Informed unit manager?", "type": "select", + "isPII": false, "options": [ { - "value": "", + "value": "Unknown", "label": "" }, { - "value": "Unknown", - "label": "Unknown" + "value": "Yes", + "label": "Yes" }, { - "value": "School", - "label": "School" - }, + "value": "No", + "label": "No" + } + ] + }, + { + "name": "whyNot", + "label": "Why not?", + "type": "input", + "isPII": false + }, + { + "name": "methodOfInforming", + "label": "Method of informing", + "type": "listbox-multiselect", + "isPII": false, + "options": [ { - "value": "Home", - "label": "Home" + "value": "Unknown", + "label": "" }, { - "value": "Institution", - "label": "Institution" + "value": "Conversation", + "label": "Conversation" }, { - "value": "Online", - "label": "Online" + "value": "Email", + "label": "Email" }, { - "value": "Public Place", - "label": "Public Place" + "value": "Instant Message", + "label": "Instant Message" }, { - "value": "Other", - "label": "Other" + "value": "Phone Call", + "label": "Phone Call" } - ], - "required": { - "value": true, - "message": "RequiredFieldError" - } + ] }, { - "name": "isCaregiverAware", - "label": "Is caregiver aware?", - "type": "mixed-checkbox" + "name": "furtherActionNeeded", + "label": "Further action needed", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 }, { - "name": "incidentWitnessed", - "label": "Was the incident witnessed by anyone?", - "type": "mixed-checkbox" + "name": "followUpRequired", + "label": "This D.o.C requires further follow up", + "type": "select", + "isPII": false, + "options": [ + { + "value": "Unknown", + "label": "" + }, + { + "value": "Yes", + "label": "Yes" + }, + { + "value": "No", + "label": "No" + } + ] }, { - "name": "abuseReportedElsewhere", - "label": "Has abuse been reported elsewhere?", - "type": "mixed-checkbox" + "name": "notesFromFollowupAction", + "label": "Notes from follow-up action", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 }, { - "name": "whereElseBeenReported", - "label": "Where else the incident has been reported?", - "type": "mixed-checkbox" + "name": "furtherContactWithClientOrAgency", + "label": "Further contact with client or agency", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 } ] \ No newline at end of file diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/CaseInformationTab.json b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/CaseInformationTab.json index e70df9dfa6..9b05641eb0 100644 --- a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/CaseInformationTab.json +++ b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/CaseInformationTab.json @@ -275,6 +275,193 @@ "type": "textarea", "isPII": false, "rows": 8, + "width": 250, + "description": { + "title": "Duty of Care", + "content": "The below fields need to be capture if there is a Duty of Care case" + } + }, + { + "name": "otherInformationAboutTheClient", + "label": "DOC - Other Information about the Client", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 + }, + { + "name": "clientPresentation", + "label": "Client presentation", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 + }, + { + "name": "assessmentOfRisk", + "label": "Assessment of Risk", + "type": "select", + "isPII": false, + "options": [ + { + "value": "Unknown", + "label": "" + }, + { + "value": "Urgent", + "label": "Urgent" + }, + { + "value": "High", + "label": "High" + }, + { + "value": "Medium", + "label": "Medium" + }, + { + "value": "Low", + "label": "Low" + } + ] + }, + { + "name": "supervisorsAnalysis", + "label": "Supervisor's Analysis", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 + }, + { + "name": "planOfAction", + "label": "Plan of Action", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 + }, + { + "name": "immediateOutcome", + "label": "Immediate outcome (from Duty of Care process)", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 + }, + { + "name": "consultationDetails", + "label": "Barnardos Consultation - Date, Time and who consulted", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 + }, + { + "name": "agenciesInvolved", + "label": "Agencies Involved", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 + }, + { + "name": "informedUnitManager", + "label": "Informed unit manager?", + "type": "select", + "isPII": false, + "options": [ + { + "value": "Unknown", + "label": "" + }, + { + "value": "Yes", + "label": "Yes" + }, + { + "value": "No", + "label": "No" + } + ] + }, + { + "name": "whyNot", + "label": "Why not?", + "type": "input", + "isPII": false + }, + { + "name": "methodOfInforming", + "label": "Method of informing", + "type": "listbox-multiselect", + "isPII": false, + "options": [ + { + "value": "Unknown", + "label": "" + }, + { + "value": "Conversation", + "label": "Conversation" + }, + { + "value": "Email", + "label": "Email" + }, + { + "value": "Instant Message", + "label": "Instant Message" + }, + { + "value": "Phone Call", + "label": "Phone Call" + } + ] + }, + { + "name": "furtherActionNeeded", + "label": "Further action needed", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 + }, + { + "name": "followUpRequired", + "label": "This D.o.C requires further follow up", + "type": "select", + "isPII": false, + "options": [ + { + "value": "Unknown", + "label": "" + }, + { + "value": "Yes", + "label": "Yes" + }, + { + "value": "No", + "label": "No" + } + ] + }, + { + "name": "notesFromFollowupAction", + "label": "Notes from follow-up action", + "type": "textarea", + "isPII": false, + "rows": 7, + "width": 250 + }, + { + "name": "furtherContactWithClientOrAgency", + "label": "Further contact with client or agency", + "type": "textarea", + "isPII": false, + "rows": 7, "width": 250 } + ] \ No newline at end of file From 6ebc3ff4a9e98af656bb37adf116dd6e3390f2c1 Mon Sep 17 00:00:00 2001 From: Sinekhaya Date: Sat, 21 Mar 2026 22:11:56 +0200 Subject: [PATCH 2/2] layout --- .../form-definitions/nzba/v1/LayoutDefinitions.json | 8 ++++---- .../nzba/v1/caseForms/DutyOfCareForm.json | 8 ++------ .../nzba/v1/tabbedForms/CaseInformationTab.json | 8 ++------ 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/LayoutDefinitions.json b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/LayoutDefinitions.json index b2fa532e6c..3be3eede14 100644 --- a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/LayoutDefinitions.json +++ b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/LayoutDefinitions.json @@ -5,7 +5,7 @@ "childInformation": { }, "caseInformation": { - "splitFormAt": 8 + "splitFormAt": 12 } }, "case": { @@ -43,10 +43,10 @@ }, "dutyOfCare": { "previewFields": [ - "date", - "location" + "assessmentOfRisk", + "followUpRequired" ], - "splitFormAt": 2, + "splitFormAt": 8, "printOrder": 3, "caseHomeLocation": "timeline" }, diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/caseForms/DutyOfCareForm.json b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/caseForms/DutyOfCareForm.json index 82facbfbd1..f45680925c 100644 --- a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/caseForms/DutyOfCareForm.json +++ b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/caseForms/DutyOfCareForm.json @@ -105,7 +105,7 @@ }, { "name": "whyNot", - "label": "Why not?", + "label": "If no, why not?", "type": "input", "isPII": false }, @@ -115,10 +115,6 @@ "type": "listbox-multiselect", "isPII": false, "options": [ - { - "value": "Unknown", - "label": "" - }, { "value": "Conversation", "label": "Conversation" @@ -147,7 +143,7 @@ }, { "name": "followUpRequired", - "label": "This D.o.C requires further follow up", + "label": "This D.O.C requires further follow up", "type": "select", "isPII": false, "options": [ diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/CaseInformationTab.json b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/CaseInformationTab.json index 9b05641eb0..42861a6088 100644 --- a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/CaseInformationTab.json +++ b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/tabbedForms/CaseInformationTab.json @@ -283,7 +283,7 @@ }, { "name": "otherInformationAboutTheClient", - "label": "DOC - Other Information about the Client", + "label": "Other Information about the Client", "type": "textarea", "isPII": false, "rows": 7, @@ -397,10 +397,6 @@ "type": "listbox-multiselect", "isPII": false, "options": [ - { - "value": "Unknown", - "label": "" - }, { "value": "Conversation", "label": "Conversation" @@ -429,7 +425,7 @@ }, { "name": "followUpRequired", - "label": "This D.o.C requires further follow up", + "label": "This D.O.C requires further follow up", "type": "select", "isPII": false, "options": [