Merge pull request #9 from NunopRolo/Fix-generic-field

Fixed the generic field in the frontend
NunopRolo · Jul 31, 2024 · 25b7af5 · 25b7af5
2 parents 556cbf7 + ab02654
commit 25b7af5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/...ines-frontend/src/app/components/medicines/medicines-table/medicines-table.component.html b/...ines-frontend/src/app/components/medicines/medicines-table/medicines-table.component.html
@@ -45,7 +45,7 @@
                 <ngb-highlight [result]="medicine.dosage" [term]="filter.value" />
             </td>
             <td>
-                <ngb-highlight [result]="medicine.generic" [term]="filter.value" />
+                <ngb-highlight [result]="translateGenericValue(medicine.generic)" [term]="filter.value" />
             </td>
             <td>
                 <ngb-highlight [result]="medicine.internationalCommonName" [term]="filter.value" />

diff --git a/medicines-frontend/src/app/components/medicines/medicines-table/medicines-table.component.ts b/medicines-frontend/src/app/components/medicines/medicines-table/medicines-table.component.ts
@@ -99,4 +99,8 @@ export class MedicinesTableComponent implements OnInit{
             )
         }
     }
+
+    translateGenericValue(generic: string){
+        return this.translateService.instant("medicine."+generic);
+    }
 }
diff --git a/medicines-frontend/src/assets/i18n/en.json b/medicines-frontend/src/assets/i18n/en.json
@@ -20,7 +20,9 @@
         "notification": {
             "title": "Medicine",
             "medicine-not-found": "Medicine Not Found"
-        }
+        },
+        "false": "No",
+        "true": "Yes"
     },
     "medication": {
         "add-modal": {

diff --git a/medicines-frontend/src/assets/i18n/pt.json b/medicines-frontend/src/assets/i18n/pt.json
@@ -20,7 +20,9 @@
         "notification": {
             "title": "Medicamentos",
             "medicine-not-found": "Medicamento não encontrado"
-        }
+        },
+        "false": "Não",
+        "true": "Sim"
     },
     "medication": {
         "add-modal": {