Merge pull request #324 from digital-gov-mg/fix/revert-toamasina-conditions

Fix/revert toamasina conditions

Author: tokinrandr

public/helpers.js

@@ -255,18 +255,12 @@ function eventStatement() {
                   ? 'fokontany ' + this.birthChildFokontanyCustomAddress + ','
                   : '',
 
-                this.birthChildFokontanyCustomAddress
-                  .toLowerCase()
-                  .includes('toamasina')
-                  ? ''
-                  : 'kaominina' +
-                      ' ' +
+                      'kaominina',
                       (definitionOffice(
                         replaceByUppercase(placeOfBirthDistrict)
                       ) || '-') +
                       ',' +
-                      'district' +
-                      ' ' +
+                      'district ' +
                       definitionDistrict(placeOfBirthState) || '-'
               ]
             : [
@@ -416,10 +410,7 @@ function fatherDetails(fatherPrimaryDistrict) {
                   (this.birthFatherFokontanyCustomAddress ||
                     this.birthMotherFokontanyCustomAddress ||
                     '-') + ',',
-                  fatherPrimaryDistrict?.toLowerCase().includes('cu toamasina')
-                    ? // && (this.birthFatherFokontanyCustomAddress?.toLowerCase().includes('toamasina') || this.birthMotherFokontanyCustomAddress?.toLowerCase().includes('toamasina'))
-                      ''
-                    : 'kaominina' +
+                    'kaominina' +
                       ' ' +
                       (definitionOffice(
                         replaceByUppercase(fatherPrimaryDistrict)
@@ -671,16 +662,12 @@ function motherDetails(motherPrimaryDistrict) {
           ? [
               'amin’ny fokontany',
               (this.birthMotherFokontanyCustomAddress || '-') + ',',
-
-              motherPrimaryDistrict?.toLowerCase().includes('cu toamasina')
-                ? // && this.birthMotherFokontanyCustomAddress.toLowerCase().includes('toamasina')
-                  ''
-                : 'kaominina' +
-                  ' ' +
-                  (definitionOffice(
-                    replaceByUppercase(motherPrimaryDistrict)
-                  ) || '-') +
-                  ','
+              'kaominina' +
+                ' ' +
+                (definitionOffice(
+                  replaceByUppercase(motherPrimaryDistrict)
+                ) || '-') +
+                ','
             ]
           : [
               ([

src/form/common/certificate/handlebars/helpers.ts

@@ -216,7 +216,7 @@ export function eventStatement(): Handlebars.HelperDelegate {
     motherPrimaryDistrict: string
   ) {
     return joinValuesWith([
-      "--Tamin'ny",
+      '--Tamin’ny',
       customizeDateInCertificateContent(this.eventDate) + ',',
       'tamin’ny',
       convertTimeToMdgCustomWords(this.birthChildBirthTime),
@@ -233,19 +233,12 @@ export function eventStatement(): Handlebars.HelperDelegate {
               ? 'fokontany ' + this.birthChildFokontanyCustomAddress + ','
               : '',
 
-            this.birthChildFokontanyCustomAddress
-              ?.toLowerCase()
-              .includes('toamasina') ||
-            this.placeOfBirthFacility?.toLowerCase().includes('toamasina')
-              ? ''
-              : 'kaominina' +
-                  ' ' +
-                  (definitionOffice(replaceByUppercase(placeOfBirthDistrict)) ||
-                    '-') +
-                  ', ' +
-                  'district' +
-                  ' ' +
-                  definitionDistrict(placeOfBirthState) || '-'
+            'kaominina',
+            (definitionOffice(replaceByUppercase(placeOfBirthDistrict)) ||
+              '-') +
+              ', ' +
+              'district ' +
+              (definitionDistrict(placeOfBirthState) || '-')
           ]
         : [
             'no teraka tao',
@@ -315,15 +308,10 @@ function fatherDetails(
               (this.birthFatherFokontanyCustomAddress ||
                 this.birthMotherFokontanyCustomAddress ||
                 '-') + ',',
-              fatherPrimaryDistrict?.toLowerCase().includes('cu toamasina')
-                ? // && (this.birthFatherFokontanyCustomAddress?.toLowerCase().includes('toamasina') || this.birthMotherFokontanyCustomAddress?.toLowerCase().includes('toamasina'))
-                  ''
-                : 'kaominina' +
-                  ' ' +
-                  (definitionOffice(
-                    replaceByUppercase(fatherPrimaryDistrict)
-                  ) || '- ') +
-                  ','
+              'kaominina ' +
+                (definitionOffice(replaceByUppercase(fatherPrimaryDistrict)) ||
+                  '- ') +
+                ','
             ]
           : [
               ([
@@ -373,14 +361,10 @@ function motherDetails(
           'amin’ny fokontany',
           (this.birthMotherFokontanyCustomAddress || '-') + ',',
 
-          motherPrimaryDistrict?.toLowerCase().includes('cu toamasina')
-            ? // && this.birthMotherFokontanyCustomAddress?.toLowerCase().includes('toamasina')
-              ''
-            : 'kaominina' +
-              ' ' +
-              (definitionOffice(replaceByUppercase(motherPrimaryDistrict)) ||
-                '-') +
-              ','
+          'kaominina ' +
+            (definitionOffice(replaceByUppercase(motherPrimaryDistrict)) ||
+              '-') +
+            ','
         ]
       : [
           ([
@@ -499,9 +483,11 @@ export function registrationStatement(): Handlebars.HelperDelegate {
             'monina ao',
             ...(this.countryPrimaryInformant == 'Madagascar'
               ? [
-                  `amin'ny`,
+                  `amin’ny`,
                   this.birthInformantFokontanyCustomAddress
-                    ? `fokontany ${this.birthInformantFokontanyCustomAddress},`
+                    ? `fokontany ${
+                        this.birthInformantFokontanyCustomAddress || '-'
+                      },`
                     : '',
                   'kaominina',
                   (definitionOffice(
@@ -1163,12 +1149,12 @@ function getRecognitionMentionValues(this: Record<string, string>, i: number) {
   return [
     `Nozanahan'i ${this['birthMentionChildFamilyName__' + i] || '-'} ${
       this['birthMentionChildFirstName__' + i] || '-'
-    } tamin'ny ${
+    } tamin’ny ${
       this['birthMentionRecognitionDate__' + i]
         ?.split('-')
         ?.reverse()
         ?.join('/') || '-'
-    } tao amin'ny kaominina ${
+    } tao amin’ny kaominina ${
       this['birthMentionRecognitionPlace__' + i] || '-'
     } soratra faha ${this['birthMentionRecognitionActNumber__' + i] || '-'}.`
   ]