Merge branch 'develop_3x' into PR_requirements.md

Agaba-derrick · Mar 21, 2024 · 20748d5 · 20748d5
2 parents bd34413 + 9fb9344
commit 20748d5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/frontend/src/components/patient/SearchPatientForm.js b/frontend/src/components/patient/SearchPatientForm.js
@@ -192,6 +192,7 @@ function SearchPatientForm(props) {
                   <TextInput
                     name={field.name}
                     value={values[field.name]}
+                    placeholder={intl.formatMessage({id:"input.placeholder.patientId"})}
                     labelText={intl.formatMessage({
                       id: "patient.id",
                       defaultMessage: "Patient Id",
@@ -205,6 +206,7 @@ function SearchPatientForm(props) {
                 {({ field }) => (
                   <CustomLabNumberInput
                     name={field.name}
+                    placeholder={intl.formatMessage({id:"input.placeholder.prevLabNumber"})}
                     labelText={intl.formatMessage({
                       id: "patient.prev.lab.no",
                       defaultMessage: "Previous Lab Number",
@@ -224,6 +226,7 @@ function SearchPatientForm(props) {
                 {({ field }) => (
                   <TextInput
                     name={field.name}
+                    placeholder={intl.formatMessage({id:"input.placeholder.patientLastName"})}
                     labelText={intl.formatMessage({
                       id: "patient.last.name",
                       defaultMessage: "Last Name",
@@ -237,6 +240,7 @@ function SearchPatientForm(props) {
                 {({ field }) => (
                   <TextInput
                     name={field.name}
+                    placeholder={intl.formatMessage({id:"input.placeholder.patientFirstName"})}
                     labelText={intl.formatMessage({
                       id: "patient.first.name",
                       defaultMessage: "First Name",

diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json
@@ -752,11 +752,14 @@
   "reports.export.whonet": "WHONET Report",
   "openreports.mgt.nonconformity.date": "Non ConformityReport by Date",
   "openreports.mgt.nonconformity.section": "Non Conformity Report by Unit and Reason",
+  "input.placeholder.patientId": "Enter Patient Id" ,
+  "input.placeholder.prevLabNumber": "Enter Previous Lab Number",
+  "input.placeholder.patientLastName": "Enter Patient's Last Name",
+  "input.placeholder.patientFirstName": "Enter Patient's First Name",
   "input.placeholder.labNo":"Enter Lab Number",
   "input.placeholder.requesterFirstName":"Enter Requester's First Name",
   "input.placeholder.requesterLastName":"Enter Requester's Last Name",
   "input.placeholder.providerWorkPhone":"Enter Requester's Phone Number",
   "input.placeholder.providerFax":"Enter Requester's Fax Number",
   "input.placeholder.providerEmail":"Enter Requester's Email"
-
 }
diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json
@@ -693,6 +693,11 @@
   "pagination.page-number": "Numéro de page",
   "pagination.page-range": "de {total} {total, plural, one {page} other {pages}}",
   "openreports.mgt.nonconformity.date": "Rapport de non-conformité par date",
+  "openreports.mgt.nonconformity.section": "Rapport de non-conformité par unité et raison",
+  "input.placeholder.patientId": "Entrez le numéro du patient",
+  "input.placeholder.prevLabNumber": "Entrez le numéro de laboratoire précédent",
+  "input.placeholder.patientLastName": "Entrez le nom de famille du patient",
+  "input.placeholder.patientFirstName": "Entrez le prénom du patient",
   "openreports.mgt.nonconformity.section": "Rapport de non-conformité par unité et raison", 
   "reports.export.whonet": "WHONET Report",
   "menu.accession.validation": "Recherche par Ordonnance",
@@ -704,5 +709,4 @@
   "input.placeholder.providerWorkPhone":"Saisir le numéro de téléphone du demandeur",
   "input.placeholder.providerFax":"Saisir le numéro de fax du demandeur",
   "input.placeholder.providerEmail":"Saisir l'adresse e-mail du demandeur"
-
 }