Merge pull request #1059 from opencrvs/ocrvs-10613

cibelius · web-flow · commit ab68cf5fbc29 · 2025-10-02T15:50:49.000+03:00
Fix bugs on death certificates
diff --git a/src/api/certificates/source/v2.death-certificate-certified-copy.svg b/src/api/certificates/source/v2.death-certificate-certified-copy.svg
@@ -22,7 +22,7 @@
   </text> -->
   <path d="M316.793 740L512.999 740.925" stroke="#CCCCCC" stroke-width="0.782258" stroke-dasharray="3.13 1.56" />
   <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="8" letter-spacing="0px">
-    <tspan x="373.248" y="753.656">Registrar {{ $lookup $metadata "updatedBy.name.fullname"}}</tspan>
+    <tspan x="373.248" y="753.656">Registrar: {{ $lookup $metadata "updatedBy.name"}}</tspan>
   </text>
   <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="8" letter-spacing="0px">
     <tspan x="69" y="623.604">I certify that this certificate is a true copy of the civil registry and is issued by the mandated authority in</tspan>
@@ -56,11 +56,11 @@
     <tspan x="70" y="168.104">2.</tspan>
   </text>
   <text fill="black" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="8" font-weight="600" letter-spacing="0px">
-    <tspan x="90" y="167.604">Date of birth / Date de naissance</tspan>
+    <tspan x="90" y="167.604">{{#ifCond ($lookup $declaration "deceased.dobUnknown") '!==' "true" }}Date of birth / Date de naissance{{else}}Age / L'âge{{/ifCond}}</tspan>
   </text>
   <g clip-path="url(#clip1_948_2918)">
     <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="8" letter-spacing="0px">
-      <tspan x="312" y="168.104">{{$lookup $declaration "deceased.dob"}}</tspan>
+      <tspan x="312" y="168.104">{{#ifCond ($lookup $declaration "deceased.dobUnknown") '!==' "true" }}{{$lookup $declaration "deceased.dob"}}{{else}}{{$lookup $declaration "deceased.age"}}{{/ifCond}}</tspan>
     </text>
   </g>
   <line x1="70" y1="174.5" x2="514" y2="174.5" stroke="#ECECEC" />
@@ -72,7 +72,11 @@
   </text>
   <g clip-path="url(#clip2_948_2918)">
     <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="8" letter-spacing="0px">
-      <tspan x="312" y="188.104">{{$lookup $declaration 'deceased.address.district'}}, {{$lookup $declaration 'deceased.address.province'}}, {{$lookup $declaration 'deceased.address.country'}}</tspan>
+      {{#ifCond ($lookup $declaration "deceased.address.addressType") '===' "INTERNATIONAL" }}
+        <tspan x="312" y="188.104">{{$lookup $declaration 'deceased.address.streetLevelDetails.district2'}}, {{$lookup $declaration 'deceased.address.streetLevelDetails.state'}}, {{$lookup $declaration 'deceased.address.country'}}</tspan>
+      {{else}}
+        <tspan x="312" y="188.104">{{$lookup $declaration 'deceased.address.district'}}, {{$lookup $declaration 'deceased.address.province'}}, {{$lookup $declaration 'deceased.address.country'}}</tspan>
+      {{/ifCond}}
     </text>
   </g>
   <line x1="70" y1="194.5" x2="514" y2="194.5" stroke="#ECECEC" />
@@ -162,11 +166,16 @@
     <tspan x="70" y="372.104">9.</tspan>
   </text>
   <text fill="black" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="8" font-weight="600" letter-spacing="0px">
-    <tspan x="90" y="371.604">Informant full name / Nom complet de l&#x2019;informateur</tspan>
+    <tspan x="90" y="371.604">Informant full name /</tspan>
+    <tspan x="90" y="383.604">Nom complet de l&#x2019;informateur</tspan>
   </text>
   <g clip-path="url(#clip8_948_2918)">
     <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="8" letter-spacing="0px">
+      {{#ifCond ($lookup $declaration "informant.relation") '!==' "Spouse" }}
       <tspan x="312" y="372.104">{{$lookup $declaration "informant.name.fullname"}}</tspan>
+      {{else}}
+      <tspan x="312" y="372.104">{{$lookup $declaration "spouse.name.fullname"}}</tspan>
+      {{/ifCond}}
       <tspan x="312" y="384.104">{{$lookup $declaration "informant.relation"}}</tspan>
     </text>
   </g>
@@ -301,7 +310,5 @@
     </clipPath>
   </defs>
   <image id="image2_948_2918" x="498.287" y="784" width="34.7131" height="35" xlink:href="{{qrCode}}" />
-  {{#ifCond printInAdvance '!==' true}}
-  <image id="image0_948_2918" x="323.826" y="669" width="182.139" height="68" xlink:href="{{$lookup $metadata 'assignedTo.signature'}}" />
-  {{/ifCond}}
+  <image id="image0_948_2918" x="323.826" y="669" width="182.139" height="68" xlink:href="{{$lookup $metadata 'legalStatuses.REGISTERED.createdBySignature'}}" />
 </svg>
diff --git a/src/api/certificates/source/v2.death-certificate.svg b/src/api/certificates/source/v2.death-certificate.svg
@@ -28,7 +28,7 @@
     <tspan x="357.752" y="687.343">Registrar / L&#39;Officier de l&#39;&#xc9;tat Civil</tspan>
   </text>
   <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="7.76" letter-spacing="0px">
-    <tspan x="398.064" y="699.954">{{ $lookup $metadata "updatedBy.name.fullname"}}</tspan>
+    <tspan x="398.064" y="699.954">{{ $lookup $metadata "updatedBy.name"}}</tspan>
   </text>
   <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="8" letter-spacing="0px">
     <tspan x="81.3999" y="563.615">I certify that this certificate is a true copy of the civil registry and is issued by the mandated authority in pursuance </tspan>
@@ -68,18 +68,28 @@
     <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="9.7" font-weight="bold" letter-spacing="0px">
       <tspan x="88.6029" y="305.363">3.</tspan>
     </text>
+    {{#ifCond ($lookup $declaration "deceased.dobUnknown") '!==' "true" }}
     <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="9.7" font-weight="bold" letter-spacing="0px">
       <tspan x="166.527" y="305.363"> /&#x2028;</tspan>
     </text>
     <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="9.7" font-weight="bold" letter-spacing="0px">
       <tspan x="104.68" y="305.363">Date of birth</tspan>
       <tspan x="104.68" y="320.363">Date de naissance</tspan>
     </text>
+    {{else}}
+    <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="9.7" font-weight="bold" letter-spacing="0px">
+      <tspan x="123.172" y="305.363"> /&#x2028;</tspan>
+    </text>
+    <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="9.7" font-weight="bold" letter-spacing="0px">
+      <tspan x="104.68" y="305.363">Age</tspan>
+      <tspan x="104.68" y="320.363">L'âge</tspan>
+    </text>
+    {{/ifCond}}
     <g clip-path="url(#clip5_1157_5058)">
-        <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="9.7" letter-spacing="0px">
-          <tspan x="289.95" y="312.863">{{$lookup $declaration "deceased.dob"}}</tspan>
-          <tspan x="425.276" y="312.863"></tspan>
-        </text>
+      <text fill="#222222" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="9.7" letter-spacing="0px">
+        <tspan x="289.95" y="312.863">{{#ifCond ($lookup $declaration "deceased.dobUnknown") '!==' "true" }}{{$lookup $declaration "deceased.dob"}}{{else}}{{$lookup $declaration "deceased.age"}}{{/ifCond}}</tspan>
+        <tspan x="425.276" y="312.863"></tspan>
+      </text>
       <text fill="#999999" xml:space="preserve" style="white-space: pre" font-family="Noto Sans" font-size="9.7" letter-spacing="0px">
         <tspan x="362.046" y="312.863"></tspan>
       </text>
@@ -274,8 +284,6 @@
       <rect width="469.48" height="62.08" fill="white" transform="translate(62.97 45.7305)" />
     </clipPath>
   </defs>
-    <image width="36" height="36" xlink:href="{{qrCode}}" x="500" y="770"></image>
-  {{#ifCond printInAdvance '!==' true}}
-    <image width="140" height="70" xlink:href="{{$lookup $metadata 'legalStatuses.REGISTERED.createdBy.signature'}}" x="347" y="605"></image>
-  {{/ifCond}}
+  <image width="36" height="36" xlink:href="{{qrCode}}" x="500" y="770"></image>
+  <image width="140" height="70" xlink:href="{{$lookup $metadata 'legalStatuses.REGISTERED.createdBySignature'}}" x="347" y="605"></image>
 </svg>
diff --git a/src/index.ts b/src/index.ts
@@ -711,10 +711,10 @@ export async function createServer() {
     await server.start()
     await syncLocationLevels()
     await syncLocationStatistics()
-    server.log(
-      'info',
-      `server started on ${COUNTRY_CONFIG_HOST}:${COUNTRY_CONFIG_PORT}`
-    )
+
+    const logMsg = `Server successfully started on ${COUNTRY_CONFIG_HOST}:${COUNTRY_CONFIG_PORT}`
+    logger.info(logMsg)
+    server.log('info', logMsg)
   }
 
   return { server, start, stop }
diff --git a/yarn.lock b/yarn.lock
@@ -834,10 +834,10 @@
   dependencies:
     "@octokit/openapi-types" "^18.0.0"
 
-"@opencrvs/toolkit@1.8.1-rc.fa0e315":
-  version "1.8.1-rc.fa0e315"
-  resolved "https://registry.yarnpkg.com/@opencrvs/toolkit/-/toolkit-1.8.1-rc.fa0e315.tgz#8192e0d68f5abfe94917871ecf7b2da2f4ea2718"
-  integrity sha512-ajRySayWMTOHCXg0vwoCbeWEKrK6yQjjE0CfsECHhC2QOPy184gdHOxcRWap15e/K0RGic1Zl37tq6ySKLc2FQ==
+"@opencrvs/toolkit@1.8.1-rc.4cfe084":
+  version "1.8.1-rc.4cfe084"
+  resolved "https://registry.yarnpkg.com/@opencrvs/toolkit/-/toolkit-1.8.1-rc.4cfe084.tgz#ef7c09bd167d995e87ce4be649fcd2be55b305ea"
+  integrity sha512-BUCJECF7YFD0m0XfeVC5JzNl60eNZVkJJxx1Ytnz9neEr2JfIQaYSUsAwCnjCswjDLpEMJXJG1VE+VnL7lRPVQ==
   dependencies:
     "@trpc/client" "11.4.3"
     "@trpc/server" "11.4.3"
