techmatters · sinehome · Apr 23, 2026 · Apr 1, 2026 · Apr 1, 2026 · Apr 1, 2026
diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/CallTypeButtons.json b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/CallTypeButtons.json
@@ -18,32 +18,26 @@
     "category": "non-data"
   },
   {
-    "name": "blank",
-    "label": "Blank",
-    "type": "button",
-    "category": "non-data"
-  },
-  {
-    "name": "joke",
-    "label": "Joke",
+    "name": "hangup",
+    "label": "Hang up",
     "type": "button",
     "category": "non-data"
   },
   {
-    "name": "hangup",
-    "label": "Hang up",
+    "name": "soft",
+    "label": "Soft",
     "type": "button",
     "category": "non-data"
   },
   {
-    "name": "wrongnumber",
-    "label": "Wrong Number",
+    "name": "hard",
+    "label": "Hard",
     "type": "button",
     "category": "non-data"
   },
   {
-    "name": "abusive",
-    "label": "Abusive",
+    "name": "connecting",
+    "label": "Connecting",
     "type": "button",
     "category": "non-data"
   }

diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/CaseSections.json b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/CaseSections.json
@@ -7,14 +7,14 @@
         "label": "Referral",
         "formPath": "caseForms/ReferralForm.json"
       },
-      "cpm": {
-        "label": "Case Management Plan",
-        "formPath": "caseForms/CaseManagementPlanForm.json"
-      },
       "agency": {
-        "label": "Agencies",
+        "label": "Agency",
         "formPath": "caseForms/AgencyForm.json"
       },
+      "caseManagementPlan": {
+        "label": "Case Management Plan",
+        "formPath": "caseForms/CaseManagementPlanForm.json"
+      },
       "dutyOfCare": {
         "label": "Duty of Care",
         "formPath": "caseForms/DutyOfCareForm.json"

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
@@ -1,16 +1,14 @@
 {
   "contact": {
-    "callerInformation": {
-    },
-    "childInformation": {
-    },
+    "callerInformation": {},
+    "childInformation": {},
     "caseInformation": {
-      "splitFormAt": 8
+      "splitFormAt": 10
     }
   },
   "case": {
     "sectionTypes": {
-      "cpm": {
+      "caseManagementPlan": {
         "splitFormAt": 10,
         "caseHomeOrder": 1,
         "printOrder": 1,
@@ -28,19 +26,41 @@
           "personsName",
           "position",
           "agency"
-        ]
+        ],
+        "layout": {
+          "personsName": {
+            "includeLabel": true
+          },
+          "position": {
+            "includeLabel": true
+          },
+          "agency": {
+            "includeLabel": true
+          }
+        }
       },
-     "referral": {
+      "referral": {
         "previewFields": [
           "referredTo"
         ],
         "layout": {
-          "referredTo": {}
+          "referredTo": {
+            "includeLabel": true
+          }
         },
         "splitFormAt": 2,
         "printOrder": 4,
         "caseHomeLocation": "timeline"
       },
+      "dutyOfCare": {
+        "previewFields": [
+          "date",
+          "location"
+        ],
+        "splitFormAt": 2,
+        "printOrder": 3,
+        "caseHomeLocation": "timeline"
+      },
       "dutyOfCare": {
          "previewFields": [
            "date",
@@ -79,11 +99,13 @@
         "printOrder": 5,
         "caseHomeLocation": "timeline",
         "printFormat": "list",
-        "previewFields": ["note"],
+        "previewFields": [
+          "note"
+        ],
         "layout": {
           "note": {}
         }
       }
     }
   }
-}
+}
diff --git a/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/PrepopulateMappings.json b/lambdas/packages/hrm-form-definitions/form-definitions/nzba/v1/PrepopulateMappings.json
@@ -0,0 +1,9 @@
+{
+  "preEngagement":{
+    "age": "ChildInformationTab.age",
+    "firstName": "ChildInformationTab.firstName",
+    "ethnicity1": "ChildInformationTab.ethnicity1",
+    "personalEmail": "ChildInformationTab.personalEmail"
+  },
+  "survey":{}
+}
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
@@ -1,101 +1,180 @@
 [
   {
-    "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": 5,
+    "width": 250
   },
   {
-    "name": "duration",
-    "label": "Duration",
+    "name": "clientPresentation",
+    "label": "Client presentation",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 5,
+    "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": 5,
+    "width": 250
+  },
+  {
+    "name": "planOfAction",
+    "label": "Plan of Action",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 5,
+    "width": 250
   },
   {
-    "name": "location",
-    "label": "Location",
+    "name": "immediateOutcome",
+    "label": "Immediate outcome (from Duty of Care process)",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 5,
+    "width": 250
+  },
+  {
+    "name": "consultationDetails",
+    "label": "Barnardos Consultation - Date, Time and who consulted",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 5,
+    "width": 250
+  },
+  {
+    "name": "agenciesInvolved",
+    "label": "Agencies Involved",
+    "type": "textarea",
+    "isPII": false,
+    "rows": 5,
+    "width": 250
+  },
+  {
+    "name": "informedUnitManager",
+    "label": "Informed unit manager?",
     "type": "select",
+    "isPII": false,
     "options": [
-      {
-        "value": "",
-        "label": ""
-      },
       {
         "value": "Unknown",
-        "label": "Unknown"
+        "label": ""
       },
       {
-        "value": "School",
-        "label": "School"
+        "value": "Yes",
+        "label": "Yes"
       },
       {
-        "value": "Home",
-        "label": "Home"
-      },
+        "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": "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": 5,
+    "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": 5,
+    "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": 5,
+    "width": 250
   }
 ]