Merge pull request #1116 from opencrvs/ocrvs-10834

cibelius · web-flow · commit 7e1913d3cdcf · 2025-10-23T13:04:22.000+03:00
Fix age testdata, fix age lookup selectors in birth certificate certified copy
diff --git a/src/api/certificates/source/v2.birth-certificate-certified-copy.svg b/src/api/certificates/source/v2.birth-certificate-certified-copy.svg
@@ -220,7 +220,7 @@
       {{#ifCond (lookup $declaration 'mother.dob') '!==' undefined }}
       <tspan x="307" y="286.104">{{$lookup $declaration 'mother.dob'}}</tspan>
       {{else}}
-      <tspan x="307" y="286.104">{{$lookup $declaration 'mother.age.age'}} {{#ifCond (lookup $declaration 'mother.age') '!==' undefined }}years old{{/ifCond}}</tspan>
+      <tspan x="307" y="286.104">{{$lookup $declaration 'mother.age'}} {{#ifCond (lookup $declaration 'mother.age') '!==' undefined }}years old{{/ifCond}}</tspan>
       {{/ifCond}}
     </text>
   </g>
@@ -305,7 +305,7 @@
       {{#ifCond (lookup $declaration 'father.dob') '!==' undefined }}
       <tspan x="307" y="412.104">{{$lookup $declaration 'father.dob'}}</tspan>
       {{else}}
-      <tspan x="307" y="412.104">{{$lookup $declaration 'father.age.age'}} {{#ifCond (lookup $declaration 'father.age') '!==' undefined }}years old{{/ifCond}}</tspan>
+      <tspan x="307" y="412.104">{{$lookup $declaration 'father.age'}} {{#ifCond (lookup $declaration 'father.age') '!==' undefined }}years old{{/ifCond}}</tspan>
       {{/ifCond}}
     </text>
   </g>
diff --git a/src/api/notification/testData.ts b/src/api/notification/testData.ts
@@ -311,13 +311,13 @@ const RequestDeathDeclarationAction = {
   createdByRole: 'LOCAL_REGISTRAR',
   createdAtLocation: '9e069dda-0d83-4f67-a4f2-9adbf5658e2e' as unknown as UUID,
   declaration: {
-    'spouse.age': { age: '41', asOfDate: '2025-08-19' },
+    'spouse.age': { age: '41', asOfDateRef: 'eventDetails.date' },
     'spouse.name': {
       firstname: 'Toki',
       surname: 'Kozuki',
       middlename: ''
     },
-    'deceased.age': { age: '31', asOfDate: '2025-08-19' },
+    'deceased.age': { age: '31', asOfDateRef: 'eventDetails.date' },
     'deceased.name': {
       firstname: 'Oden',
       surname: 'Kozuki',
@@ -367,13 +367,13 @@ const DeathDeclarationAction = {
   createdByRole: 'LOCAL_REGISTRAR',
   createdAtLocation: '9e069dda-0d83-4f67-a4f2-9adbf5658e2e' as unknown as UUID,
   declaration: {
-    'spouse.age': { age: '41', asOfDate: '2025-08-19' },
+    'spouse.age': { age: '41', asOfDateRef: 'eventDetails.date' },
     'spouse.name': {
       firstname: 'Toki',
       surname: 'Kozuki',
       middlename: ''
     },
-    'deceased.age': { age: '31', asOfDate: '2025-08-19' },
+    'deceased.age': { age: '31', asOfDateRef: 'eventDetails.date' },
     'deceased.name': {
       firstname: 'Oden',
       surname: 'Kozuki',
