Merge pull request #623 from jona42-ui/tj/resultcomponent

(feat)add translations to the search result form component
I-TECH-UW · Dec 4, 2023 · ec48f57 · ec48f57
2 parents a4cf106 + 4b35a41
commit ec48f57
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/frontend/src/components/resultPage/SearchResultForm.js b/frontend/src/components/resultPage/SearchResultForm.js
@@ -7,9 +7,7 @@ import {
   convertAlphaNumLabNumForDisplay,
 } from "../utils/Utils";
 import {
-  Heading,
   Form,
-  FormLabel,
   TextInput,
   TextArea,
   Checkbox,
@@ -19,7 +17,6 @@ import {
   DatePicker,
   DatePickerInput,
   Stack,
-  Section,
   Pagination,
   Select,
   SelectItem,
@@ -101,7 +98,6 @@ export function SearchResultForm(props) {
     }
   };
 
-  const handleAdvancedSearch = () => {};
 
   const loadNextResultsPage = () => {
     setLoading(true);
@@ -877,15 +873,15 @@ export function SearchResults(props) {
             value={data.pastNotes}
             disabled={true}
             type="text"
-            labelText="Past Notes"
+            labelText={<FormattedMessage id="referral.testresult.pastnote"/>}
             rows={2}
           ></TextArea>
         </Column>
         <Column lg={2}>
           <Select
             id={"testMethod" + data.id}
             name={"testResult[" + data.id + "].testMethod"}
-            labelText={"Methods"}
+            labelText={<FormattedMessage id= "referral.label.testmethod"/>}
             onChange={(e) => handleChange(e, data.id)}
             value={data.method}
           >
@@ -904,7 +900,7 @@ export function SearchResults(props) {
             id={"referralReason" + data.id}
             name={"testResult[" + data.id + "].referralReason"}
             // noLabel={true}
-            labelText={"Referral Reason"}
+            labelText={<FormattedMessage id= "referral.label.reason"/>}
             onChange={(e) => handleChange(e, data.id)}
           >
             {/* {...updateShadowResult(e, this, param.rowId)} */}
@@ -923,7 +919,7 @@ export function SearchResults(props) {
             id={"institute" + data.id}
             name={"testResult[" + data.id + "].institute"}
             // noLabel={true}
-            labelText={"Institute"}
+            labelText={<FormattedMessage id ="referral.label.institute"/>}
             onChange={(e) => handleChange(e, data.id)}
           >
             {/* {...updateShadowResult(e, this, param.rowId)} */}
@@ -939,7 +935,7 @@ export function SearchResults(props) {
             id={"testToPerform" + data.id}
             name={"testResult[" + data.id + "].testToPerform"}
             // noLabel={true}
-            labelText={"Test to Perform"}
+            labelText={<FormattedMessage id="referral.label.testtoperform"/>}
             onChange={(e) => handleChange(e, data.id)}
           >
             {/* {...updateShadowResult(e, this, param.rowId)} */}
@@ -956,7 +952,7 @@ export function SearchResults(props) {
           >
             <DatePickerInput
               placeholder="mm/dd/yyyy"
-              labelText="Sent Date"
+              labelText={<FormattedMessage id="referral.label.sentdate"/>}
               id="date-picker-single"
             />
           </DatePicker>

diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json
@@ -222,6 +222,11 @@
     "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",
     "new.patient.label": "New Patient",
     "sample.select.type": "Select sample type",
     "sample.reject.label": "Reject Sample",

diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json
@@ -46,6 +46,11 @@
     "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",