placeOfEvent configuration added for birth and death event

package.json

@@ -64,7 +64,7 @@
     "@hapi/boom": "^9.1.1",
     "@hapi/hapi": "^20.0.1",
     "@hapi/inert": "^6.0.3",
-    "@opencrvs/toolkit": "1.9.2-rc.5ad83cd",
+    "@opencrvs/toolkit": "1.9.2-rc.d14799e",
     "@types/chalk": "^2.2.0",
     "@types/csv2json": "^1.4.0",
     "@types/fhir": "^0.0.30",

src/form/v2/birth/forms/pages/child.ts

@@ -391,6 +391,27 @@ export const child = defineFormPage({
         streetAddressForm: defaultStreetAddressConfiguration
       }
     },
+    {
+      id: 'child.birthLocationId',
+      type: FieldType.ALPHA_HIDDEN,
+      required: false,
+      label: {
+        defaultMessage: 'Health Institution',
+        description: 'This is the label for the field',
+        id: 'event.birth.action.declare.form.section.child.field.birthLocation.label'
+      },
+      parent: [
+        field('child.placeOfBirth'),
+        field('child.birthLocation'),
+        field('child.birthLocation.privateHome'),
+        field('child.birthLocation.other')
+      ],
+      value: [
+        field('child.birthLocation'),
+        field('child.birthLocation.privateHome').get('administrativeArea'),
+        field('child.birthLocation.other').get('administrativeArea')
+      ]
+    },
     {
       id: 'child.divider2',
       type: FieldType.DIVIDER,

src/form/v2/birth/index.ts

@@ -41,6 +41,7 @@ export const birthEvent = defineConfig({
     id: 'event.birth.label'
   },
   dateOfEvent: field('child.dob'),
+  placeOfEvent: field('child.birthLocationId'),
   title: {
     defaultMessage: '{child.name.firstname} {child.name.surname}',
     description: 'This is the title of the summary',

src/form/v2/death/forms/pages/eventDetails.ts

@@ -364,6 +364,27 @@ export const eventDetails = defineFormPage({
       configuration: {
         streetAddressForm: defaultStreetAddressConfiguration
       }
+    },
+    {
+      id: 'eventDetails.deathLocationId',
+      type: FieldType.ALPHA_HIDDEN,
+      required: false,
+      label: {
+        defaultMessage: 'Health Institution',
+        description: 'This is the label for the field',
+        id: 'event.birth.action.declare.form.section.child.field.birthLocation.label'
+      },
+      parent: [
+        field('eventDetails.placeOfDeath'),
+        field('eventDetails.deathLocation'),
+        field('eventDetails.deathLocationOther'),
+        field('deceased.address')
+      ],
+      value: [
+        field('eventDetails.deathLocation'),
+        field('eventDetails.deathLocationOther').get('administrativeArea'),
+        field('deceased.address').get('administrativeArea')
+      ]
     }
   ]
 })

src/form/v2/death/index.ts

@@ -36,6 +36,7 @@ export const deathEvent = defineConfig({
     id: 'event.death.label'
   },
   dateOfEvent: field('eventDetails.date'),
+  placeOfEvent: field('eventDetails.deathLocationId'),
   title: {
     defaultMessage: '{deceased.name.firstname} {deceased.name.surname}',
     description: 'This is the title of the summary',