From 416a636bdce93664d548f5a84026b54b38cc969b Mon Sep 17 00:00:00 2001
From: Mutesasira Moses <mozzymutesa@gmail.com>
Date: Tue, 26 Sep 2023 00:05:47 +0300
Subject: [PATCH] fix search order translation

---
 .../src/components/modifyOrder/ModifyOrder.js |  2 +-
 .../src/components/modifyOrder/SearchOrder.js | 26 +++++++++++++------
 .../pathology/PathologyDashboard.js           |  6 ++---
 frontend/src/languages/en.json                |  6 ++++-
 frontend/src/languages/fr.json                |  5 +++-
 5 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/modifyOrder/ModifyOrder.js b/frontend/src/components/modifyOrder/ModifyOrder.js
index ee0e69339d..dbf4acef6a 100644
--- a/frontend/src/components/modifyOrder/ModifyOrder.js
+++ b/frontend/src/components/modifyOrder/ModifyOrder.js
@@ -201,7 +201,7 @@ const ModifyOrder = () => {
           {intl.formatMessage({ id: "home.label" })}
         </BreadcrumbItem>
         <BreadcrumbItem href="/FindOrder">
-          {intl.formatMessage({ id: "label.search.patient" })}
+          {intl.formatMessage({ id: "sample.label.search.Order" })}
         </BreadcrumbItem>
       </Breadcrumb>
 
diff --git a/frontend/src/components/modifyOrder/SearchOrder.js b/frontend/src/components/modifyOrder/SearchOrder.js
index e37bfc1f17..51ea5c0bac 100644
--- a/frontend/src/components/modifyOrder/SearchOrder.js
+++ b/frontend/src/components/modifyOrder/SearchOrder.js
@@ -1,6 +1,7 @@
 import React, { useState, useEffect, useRef } from "react";
 import SearchPatientForm from "../patient/SearchPatientForm";
-import { Button, Column, TextInput ,Grid  ,Form} from "@carbon/react";
+import { Button, Column, TextInput, Grid, Form } from "@carbon/react";
+import { FormattedMessage } from "react-intl";
 
 function SearchOrder() {
   const [selectedPatient, setSelectedPatient] = useState({});
@@ -37,8 +38,8 @@ function SearchOrder() {
       <div className="orderLegendBody">
         <Form onSubmit={handleSearch}>
           <Grid>
-            <Column  lg={16}>
-            <h4>Search By Accesion</h4>
+            <Column lg={16}>
+              <h4> <FormattedMessage id="sample.label.search.labnumber" /></h4>
             </Column>
             <Column lg={4}>
               <TextInput
@@ -48,16 +49,25 @@ function SearchOrder() {
               />
             </Column>
             <Column lg={2}>
-              <Button type="submit">Search</Button>
+              <Button type="submit"> <FormattedMessage id="label.button.submit" /></Button>
             </Column>
           </Grid>
         </Form>
       </div>
       <div className="orderLegendBody">
-        <h4>Search By Patient</h4>
-        <SearchPatientForm
-          getSelectedPatient={getSelectedPatient}
-        ></SearchPatientForm>
+        <Grid>
+          <Column lg={16}>
+            <h4>
+              {" "}
+              <FormattedMessage id="sample.label.search.patient" />
+            </h4>
+          </Column>
+          <Column lg={16}>
+            <SearchPatientForm
+              getSelectedPatient={getSelectedPatient}
+            ></SearchPatientForm>
+          </Column>
+        </Grid>
       </div>
     </>
   );
diff --git a/frontend/src/components/pathology/PathologyDashboard.js b/frontend/src/components/pathology/PathologyDashboard.js
index dacf2a3b13..5f81f6121d 100644
--- a/frontend/src/components/pathology/PathologyDashboard.js
+++ b/frontend/src/components/pathology/PathologyDashboard.js
@@ -87,7 +87,7 @@ function PathologyDashboard() {
               assignCurrentUserAsTechnician(e, pathologySampleId);
             }}
           >
-             <FormattedMessage id="label.button.start"/>
+            <FormattedMessage id="label.button.start" />
           </Button>
         </TableCell>
       );
@@ -105,8 +105,8 @@ function PathologyDashboard() {
             onClick={(e) => {
               assignCurrentUserAsPathologist(e, pathologySampleId);
             }}
-          > 
-           <FormattedMessage id="label.button.start"/>
+          >
+            <FormattedMessage id="label.button.start" />
           </Button>
         </TableCell>
       );
diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json
index f37bdbeed0..a0dac69ab9 100644
--- a/frontend/src/languages/en.json
+++ b/frontend/src/languages/en.json
@@ -294,5 +294,9 @@
     "patient.natioanalid":"National ID",
     "sample.label.orderpanel":"Order Panels",
     "sample.label.noorder":"Order Doesnt Exist",
-    "sample.label.labnumber.new" : "New Lab Number" 
+    "sample.label.labnumber.new" : "New Lab Number" ,
+    "sample.label.search.labnumber" : "Search By Accesion Number"  ,
+    "sample.label.search.patient" : "Search By Patient" ,
+    "sample.label.search.Order" : "Search Order" 
+    
 }
diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json
index 4e42d79ccb..cb541dc92a 100644
--- a/frontend/src/languages/fr.json
+++ b/frontend/src/languages/fr.json
@@ -292,5 +292,8 @@
     "patient.nationalid": "Identifiant National",
     "sample.label.orderpanel": "Panels de commande",
     "sample.label.noorder": "La commande n'existe pas" ,
-    "sample.label.labnumber.new": "Nouveau numéro de laboratoire"
+    "sample.label.labnumber.new": "Nouveau numéro de laboratoire" ,
+    "sample.label.search.labnumber": "Rechercher par numéro d'accès",
+    "sample.label.search.patient": "Rechercher par patient",
+    "sample.label.search.Order": "Rechercher une commande"
 }