diff --git a/frontend/src/components/Reports/Routine.js b/frontend/src/components/Reports/Routine.js
index e89adadba9..e71ce4a8a5 100644
--- a/frontend/src/components/Reports/Routine.js
+++ b/frontend/src/components/Reports/Routine.js
@@ -1,5 +1,6 @@
import React from "react";
import GlobalSideBar from "../common/GlobalSideBar";
+import { FormattedMessage, injectIntl } from "react-intl";
import {
IbmWatsonDiscovery,
IbmWatsonNaturalLanguageUnderstanding,
@@ -10,137 +11,138 @@ export const RoutineReportsMenu = {
className: "resultSideNav",
sideNavMenuItems: [
{
- title: "Patient Status Report",
+ title: ,
icon: IbmWatsonDiscovery,
SideNavMenuItem: [
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=patientCILNSP_vreduit",
- label: "Patient Status Report",
+ label: ,
},
],
},
{
- title: "Aggregate Reports",
+ title: ,
icon: Microscope,
SideNavMenuItem: [
{
link:
config.serverBaseUrl +
"/Report?type=indicator&report=statisticsReport",
- label: "Statistics Report",
+ label: ,
},
{
link:
config.serverBaseUrl +
"/Report?type=indicator&report=indicatorHaitiLNSPAllTests",
- label: "Summary of All Tests",
+ label:
},
{
link:
config.serverBaseUrl +
"/Report?type=indicator&report=indicatorCDILNSPHIV",
- label: "HIV Test Summary",
+ label: ,
},
],
},
{
- title: "Rejection Report",
+ title: ,
icon: IbmWatsonNaturalLanguageUnderstanding,
SideNavMenuItem: [
{
link:
config.serverBaseUrl +
"/Report?type=indicator&report=sampleRejectionReport",
- label: "Rejection Report",
+ label: ,
},
],
},
{
- title: "Activity Report",
+ title: ,
icon: IbmWatsonNaturalLanguageUnderstanding,
SideNavMenuItem: [
{
link:
config.serverBaseUrl +
"/Report?type=indicator&report=activityReportByTest",
- label: "By Test Type",
+ label: ,
},
{
link:
config.serverBaseUrl +
"/Report?type=indicator&report=activityReportByPanel",
- label: "By Panel Type",
+ label: ,
},
{
link:
config.serverBaseUrl +
"/Report?type=indicator&report=activityReportByTestSection",
- label: "By Unit",
+ label: ,
},
],
},
{
- title: "Referred Tests Report",
+ title: ,
icon: IbmWatsonNaturalLanguageUnderstanding,
SideNavMenuItem: [
{
link:
config.serverBaseUrl + "/Report?type=patient&report=referredOut",
- label: "Referred Tests Report",
+ label: ,
},
],
},
{
- title: "Non conformity Reports",
+ title: ,
icon: IbmWatsonNaturalLanguageUnderstanding,
SideNavMenuItem: [
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=haitiNonConformityByDate",
- label: "By Date",
+ label: ,
},
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=haitiNonConformityBySectionReason",
- label: "By unit and Reason",
+ label: ,
},
],
},
{
- title: "Delayed Validation",
+ title: ,
icon: IbmWatsonNaturalLanguageUnderstanding,
SideNavMenuItem: [
{
link:
config.serverBaseUrl +
"/ReportPrint?type=indicator&report=validationBacklog",
- label: "Delayed Validation",
+ label: ,
+ icon: IbmWatsonNaturalLanguageUnderstanding,
},
],
},
{
- title: "Audit Trail",
+ title: ,
icon: IbmWatsonNaturalLanguageUnderstanding,
SideNavMenuItem: [
{
link: config.serverBaseUrl + "/AuditTrailReport",
- label: "Audit Trail",
+ label: ,
},
],
},
{
- title: "Export Routine CSV file",
+ title: ,
icon: IbmWatsonNaturalLanguageUnderstanding,
SideNavMenuItem: [
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=CISampleRoutineExport",
- label: "Export Routine CSV file",
+ label: ,
},
],
},
@@ -155,4 +157,4 @@ const Routine = () => {
);
};
-export default Routine;
+export default injectIntl(Routine);
diff --git a/frontend/src/components/Reports/Study.js b/frontend/src/components/Reports/Study.js
index 4a4d3bc861..f994694c79 100644
--- a/frontend/src/components/Reports/Study.js
+++ b/frontend/src/components/Reports/Study.js
@@ -1,5 +1,6 @@
import React from "react";
import GlobalSideBar from "../common/GlobalSideBar";
+import { FormattedMessage, injectIntl} from "react-intl";
import {
IbmWatsonDiscovery,
IbmWatsonNaturalLanguageUnderstanding,
@@ -10,202 +11,202 @@ export const RoutineReportsMenu = {
className: "resultSideNav",
sideNavMenuItems: [
{
- title: "ARV Reports",
+ title:,
icon: IbmWatsonDiscovery,
SideNavMenuItem: [
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=patientARVInitial1",
- label: "ARV Initial Version 1",
+ label: ,
},
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=patientARVInitial2",
- label: "ARV Initial Version 2",
+ label:,
},
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=patientARVFollowup1",
- label: "ARV Follow-up Version 1",
+ label: ,
},
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=patientARVFollowup2",
- label: "ARV Follow-up Version 2",
+ label: ,
},
{
link:
config.serverBaseUrl + "/Report?type=patient&report=patientARV1",
- label: "ARV-Version 1",
+ label: ,
},
],
},
{
- title: "EID Reports",
+ title: ,
icon: Microscope,
SideNavMenuItem: [
{
link:
config.serverBaseUrl + "/Report?type=patient&report=patientEID1",
- label: "EID Version 1",
+ label: ,
},
{
link:
config.serverBaseUrl + "/Report?type=patient&report=patientEID2",
- label: "EID Version 2",
+ label: ,
},
],
},
{
- title: "VL Report",
+ title: ,
icon: IbmWatsonNaturalLanguageUnderstanding,
SideNavMenuItem: [
{
link: config.serverBaseUrl + "/Report?type=patient&report=patientVL1",
- label: "VL version Nationale",
+ label: ,
},
],
},
{
- title: "Intermediate Report",
+ title: ,
icon: IbmWatsonNaturalLanguageUnderstanding,
SideNavMenuItem: [
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=patientIndeterminate1",
- label: "Intermediate version 1",
+ label: ,
},
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=patientIndeterminate2",
- label: "Intermediate version 2",
+ label: ,
},
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=patientIndeterminateByLocation",
- label: "Intermediate By Service",
+ label: ,
},
],
},
{
- title: "Special Request ",
+ title: ,
icon: IbmWatsonNaturalLanguageUnderstanding,
SideNavMenuItem: [
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=patientSpecialReport",
- label: "Special Request",
+ label: ,
},
],
},
{
- title: "Collected ARV patient Report",
+ title: ,
icon: IbmWatsonNaturalLanguageUnderstanding,
SideNavMenuItem: [
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=patientCollection",
- label: "Collected ARV patient Report",
+ label: ,
},
],
},
{
- title: "Associated Patient Report",
+ title: ,
icon: IbmWatsonNaturalLanguageUnderstanding,
SideNavMenuItem: [
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=patientAssociated",
- label: "Associated Patient Report",
+ label: ,
},
],
},
{
- title: "Indicator",
+ title: ,
icon: IbmWatsonNaturalLanguageUnderstanding,
SideNavMenuItem: [
{
link:
config.serverBaseUrl +
"/ReportPrint?type=indicator&report=indicatorSectionPerformance",
- label: "Section Performance",
+ label: ,
},
{
link:
config.serverBaseUrl +
"/ReportPrint?type=indicator&report=validationBacklog",
- label: "Delayed Validation",
+ label: ,
},
],
},
{
- title: "Non conformity Reports",
+ title: ,
icon: IbmWatsonNaturalLanguageUnderstanding,
SideNavMenuItem: [
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=retroCINonConformityByDate",
- label: "By date",
+ label: ,
},
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=retroCInonConformityBySectionReason",
- label: config.serverBaseUrl + "By Unit and Reason",
+ label: config.serverBaseUrl + ,
},
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=retroCINonConformityByLabno",
- label: "By LabNo",
+ label: ,
},
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=retroCInonConformityNotification",
- label: "Non-conformity notification",
+ label: ,
},
{
link:
config.serverBaseUrl +
"/Report?type=patient&report=retroCIFollowupRequiredByLocation",
- label: "Follow-up required",
+ label:,
},
],
},
{
- title: "Export By Date",
+ title: ,
icon: IbmWatsonNaturalLanguageUnderstanding,
SideNavMenuItem: [
{
link:
config.serverBaseUrl + "/Report?type=patient&report=CIStudyExport",
- label: "General Report",
+ label: ,
},
{
link: config.serverBaseUrl + "/Report?type=patient&report=Trends",
- label: "Viral Load Data Export",
+ label: ,
},
],
},
{
- title: "Audit Trail",
+ title: ,
icon: IbmWatsonNaturalLanguageUnderstanding,
SideNavMenuItem: [
{
link: config.serverBaseUrl + "/AuditTrailReport",
- label: "Audit Trail",
+ label:,
},
],
},
@@ -220,4 +221,4 @@ const Study = () => {
);
};
-export default Study;
+export default injectIntl(Study);
diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json
index a670e44820..0a58941088 100644
--- a/frontend/src/languages/en.json
+++ b/frontend/src/languages/en.json
@@ -179,6 +179,58 @@
"sidenav.label.admin.organizationmgt" : "Organization Management" ,
"sidenav.label.admin.usermgt" : "User Management",
"sidenav.label.admin.labNumber" : "Lab Number Management",
+ "sidenav.title.statusreport":"Patient Status Report",
+ "sidenav.label.statusreport": "Patient Status Report",
+ "sidenav.title.aggregatereport":"Aggregate Reports",
+ "sidenav.label.statisticsreport" :"Statistics Report",
+ "sideNav.title.rejectionreport":"Rejection Report",
+ "sideNav.label.rejectionreport":"Rejection Report",
+ "sidenav.label.testsummary" :"Summary of All Tests",
+ "sideNav.label.hivtestsummary":"HIV Test Summary",
+ "sideNav.title.activityreport" :"Activity Report",
+ "sideNav.title.referredtestreport":"Referred Tests Report",
+ "sideNav.title.noncomformityreports":"Non conformity Reports",
+ "sideNav.label.bytesttype":"By Test Type",
+ "sideNav.label.bypaneltype":"By Panel Type",
+ "sideNav.label.byunit" :"By Unit",
+ "sideNav.label.referredtestreport" : "Referred Tests Report",
+ "sideNav.label.noncomformityreportsbydate": "By Date",
+ "sideNav.label.noncomformityreportsbyunit" :"By Unit and Reason",
+ "sideNav.title.delayedvalidation":"Delayed Validation",
+ "sideNav.label.delayedvalidation" : "Delayed Validation",
+ "sideNav.title.audittrail" :"Audit Trail",
+ "sideNav.label.audittrail" :"Audit Trail",
+ "sideNav.title.exportcsvfile" :"Export Routine CSV file",
+ "sideNav.label.exportcsvfile" :"Export Routine CSV file",
+ "sideNav.label.noncomformityreportsbylabno": "By Lab No",
+ "sideNav.label.noncomformitynotification" :"Non-conformity Notification",
+ "sideNav.label.followuprequired":"Follow-up Required",
+ "sideNav.title.exportbydate":"Export By Date",
+ "sideNav.label.generalreport": "General Report",
+ "sideNav.label.viralloaddataexport" :"Viral Load Data Export",
+ "sideNav.title.arvreports":"ARV Reports",
+ "sideNav.label.arvreports1":"ARV Initial Version 1",
+ "sideNav.label.arvreports2":"ARV Initial Version 2",
+ "sideNav.label.arvfollowup1":"ARV Follow-up Version 1",
+ "sideNav.label.arvfollowup2":"ARV Follow-up Version 2",
+ "sideNav.label.arvversion1": "ARV-Version 1",
+ "sideNav.title.eidreports" :"EID Reports",
+ "sideNav.label.eidreports1" :"EID Version 1",
+ "sideNav.label.eidreports2" :"EID Version 2",
+ "sideNav.title.vlreport":"VL Report",
+ "sideNav.label.vlversionnational":"VL version Nationale",
+ "sideNav.title.intermediatereport" : "Intermediate Report",
+ "sideNav.label.intermediatereport1":"Intermediate Version 1",
+ "sideNav.label.intermediatereport2":"Intermediate Version 2",
+ "sideNav.label.intermediatebyservice":"Intermediate By Service",
+ "sideNav.title.specialrequest":"Special Request ",
+ "sideNav.label.specialrequest":"Special Request ",
+ "sideNav.title.collectedarvpatientreports":"Collected ARV patient Report",
+ "sideNav.label.collectedarvpatientreports":"Collected ARV patient Report",
+ "sideNav.title.associatedpatientreport" :"Associated Patient Report",
+ "sideNav.label.associatedpatientreport" :"Associated Patient Report",
+ "sideNav.title.indicator":"Indicator",
+ "sideNav.label.sectionperformance":"Section Performance",
"patient.label.name" : "Name" ,
"patient.label.sex" : "Sex" ,
"patient.label.age" : "Age" ,
@@ -226,11 +278,14 @@
"yes.option": "Yes",
"no.option": "No",
"label.program": "Program",
+ "referral.label.testmethod":"Methods",
+ "referral.label.reason": "Referral Reason",
+ "referral.label.institute" :"Institute",
+ "referral.label.testtoperform":"Test to Perform",
+ "referral.label.sentdate" :"Sent Date",
"patient.label": "Patient",
"requester.label": "Requester",
"search.patient.label": "Search for Patient",
- "referral.label.institute":"Institute",
- "referral.label.testmethod":"Method",
"referral.testresult.pastnote":"Past Notes",
"referral.label.sentdate":"Sent Date",
"referral.label.reason":"Referral Reason",
diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json
index a99811cd3b..8c417242b5 100644
--- a/frontend/src/languages/fr.json
+++ b/frontend/src/languages/fr.json
@@ -7,6 +7,11 @@
"label.button.range" : "Range" ,
"label.button.clear" : "Dégager",
"label.button.confirm": "Confirmer",
+ "referral.label.testmethod":"Méthodes",
+ "referral.label.reason":"Raison de référence",
+ "referral.label.institute" :"Institut",
+ "referral.label.testtoperform":"Tester pour effectuer",
+ "referral.label.sentdate" : "Date envoyée",
"label.button.cancel": "Annuler",
"label.button.confirmDelete": "Confirmation de la suppression",
"login.title": "Identifiant",
@@ -46,11 +51,7 @@
"result.noTestsFound": "Aucun test approprié trouvé",
"quick.entry.accession.number":"N° Labo",
"patient.subject.number":"Sujet No.",
- "referral.label.institute":"Institut",
- "referral.label.testmethod":"Méthode",
"referral.testresult.pastnote":"Notes passées",
- "referral.label.sentdate":"Date envoyée",
- "referral.label.reason":"Raison de la référence",
"sample.entry.nextVisit.date":"Date de rendez vous",
"sample.entry.project.testName":"Nom du Test",
"sample.receivedDate":"Date de réception",
@@ -138,8 +139,8 @@
"cytology.label.review": "En attente de révision cytopathologique",
"header.label.version" :"Version:",
"header.label.logout" :"Déconnexion",
- "header.label.selectlocale" : "Sélectionner la Langue",
- "sidenav.label.order" : "Commande",
+ "header.label.selectlocale": "Sélectionner la Langue",
+ "sidenav.label.order" : "Commande",
"sidenav.label.addorder" : "Ajouter une commande",
"sidenav.label.editorder" : "Modifier la commande",
"sidenav.label.incomingorder" : "Commandes Entrantes",
@@ -184,6 +185,58 @@
"sidenav.label.admin.organizationmgt" : "Gestion de l'Organisation",
"sidenav.label.admin.usermgt" : "Gestion des Utilisateurs",
"sidenav.label.admin.labNumber" : "Gestion des Numéro de Laboratoire",
+ "sidenav.title.statusreport":"Rapport sur l'état du patient",
+ "sidenav.label.statusreport":"Rapport sur l'état du patient",
+ "sidenav.title.aggregatereport":"Rapports globaux",
+ "sidenav.label.statisticsreport":"Rapport Statistiques",
+ "sidenav.label.testsummary" :"Résumé de tous les tests",
+ "sideNav.label.hivtestsummary":"Résumé du test VIH",
+ "sideNav.title.rejectionreport": "Rapport de rejet",
+ "sideNav.label.rejectionreport": "Rapport de rejet",
+ "sideNav.title.activityreport" :"Rapport d'activité",
+ "sideNav.title.referredtestreport":"Rapport de tests référencés",
+ "sideNav.title.noncomformityreports": "Rapports de non-conformité",
+ "sideNav.label.bytesttype":"Par type de test",
+ "sideNav.label.bypaneltype":"Par type de panneau",
+ "sideNav.label.byunit" : "Par unité",
+ "sideNav.label.referredtestreport" :"Rapport de tests référencés",
+ "sideNav.label.noncomformityreportsbydate": "Par date",
+ "sideNav.label.noncomformityreportsbyunit" :"Par unité et raison",
+ "sideNav.title.delayedvalidation":"Validation retardée",
+ "sideNav.label.delayedvalidation":"Validation retardée",
+ "sideNav.title.audittrail" :"Piste d'audit",
+ "sideNav.title.exportcsvfile" :"Exporter le fichier CSV de routine",
+ "sideNav.label.noncomformityreportsbylabno": "Par numéro de laboratoire",
+ "sideNav.label.noncomformitynotification" :"Notification de non-conformité",
+ "sideNav.label.followuprequired":"Suivi requis",
+ "sideNav.title.exportbydate":"Exporter par date",
+ "sideNav.label.generalreport" : "Rapport général",
+ "sideNav.label.viralloaddataexport" :"Exportation des données de charge virale",
+ "sideNav.title.arvreports":"Rapports ARV",
+ "sideNav.label.arvreports1":"ARV version initiale 1",
+ "sideNav.label.arvreports2":"ARV version initiale 2",
+ "sideNav.label.exportcsvfile":"Exporter le fichier CSV de routine",
+ "sideNav.label.arvfollowup1":"Suivi ARV version 1",
+ "sideNav.label.arvfollowup2":"Suivi ARV version 2",
+ "sideNav.label.arvversion1": "ARV-Version 1",
+ "sideNav.title.eidreports" :"Rapports EID",
+ "sideNav.label.eidreports1":"EID version 1",
+ "sideNav.label.eidreports2":"EID version 2",
+ "sideNav.title.vlreport":"Rapport VL",
+ "sideNav.title.intermediatereport" :"Rapport intermédiaire",
+ "sideNav.label.intermediatereport1" :"Version intermédiaire 1",
+ "sideNav.label.intermediatereport2" :"Version intermédiaire 2",
+ "sideNav.label.intermediatebyservice" :"Intermédiaire par service",
+ "sideNav.title.specialrequest":"Demande spéciale ",
+ "sideNav.label.specialrequest":"Demande spéciale ",
+ "sideNav.title.collectedarvpatientreports":"Rapport de patient ARV collecté",
+ "sideNav.label.collectedarvpatientreports":"Rapport de patient ARV collecté",
+ "sideNav.title.associatedpatientreport":"Rapport de patient associé",
+ "sideNav.label.associatedpatientreport":"Rapport de patient associé",
+ "sideNav.title.indicator":"Indicateur",
+ "sideNav.label.sectionperformance":"Performances de la section",
+ "sideNav.label.vlversionnational":"VL version Nationale",
+ "sideNav.label.audittrail" :"Piste d'audit",
"patient.label.name" : "Nom",
"patient.label.sex" : "Sexe",
"patient.label.age" : "Âge",