Merge pull request #739 from PR4NJ41/develop_3x

Guiding text added to select element in TestSelectForm.js
I-TECH-UW · Mar 21, 2024 · 01d3a0a · 01d3a0a
2 parents 07fed38 + 96b0632
commit 01d3a0a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/frontend/src/components/workplan/TestSelectForm.js b/frontend/src/components/workplan/TestSelectForm.js
@@ -1,6 +1,6 @@
 import React, { useEffect, useRef, useState } from "react";
 import { Column, Grid, Select, SelectItem } from "@carbon/react";
-import { FormattedMessage, injectIntl } from "react-intl";
+import { FormattedMessage, injectIntl, useIntl } from "react-intl";
 import "../Style.css";
 import { getFromOpenElisServer } from "../utils/Utils";
 
@@ -20,13 +20,15 @@ function TestSelectForm(props) {
     }
   };
 
+  const intl = useIntl();
+
   useEffect(() => {
     mounted.current = true;
     let testId = new URLSearchParams(window.location.search).get("testId");
     testId = testId ? testId : "";
     getFromOpenElisServer("/rest/tests", (fetchedTests) => {
       let test = fetchedTests.find((test) => test.id === testId);
-      let testLabel = test ? test.value : "";
+      let testLabel = test ? test.value : intl.formatMessage({id:"input.placeholder.selectTest"});
       setDefaultTestId(testId);
       setDefaultTestLabel(testLabel);
       props.value(testId, testLabel);
@@ -66,4 +68,4 @@ function TestSelectForm(props) {
   );
 }
 
-export default injectIntl(TestSelectForm);
+export default injectIntl(TestSelectForm);
diff --git a/frontend/src/components/workplan/WorkplanSearchForm.js b/frontend/src/components/workplan/WorkplanSearchForm.js
@@ -152,7 +152,7 @@ export default function WorkplanSearchForm(props) {
         <Column lg={16} md={8} sm={4}>
           {selectedLabel && (
             <Section>
-              <h4 className="contentHeader1">&nbsp; {selectedLabel} </h4>
+              <h4 className="contentHeader1">&nbsp;</h4>
             </Section>
           )}
         </Column>

diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json
@@ -1,5 +1,4 @@
 {
-
   "language.select.label": "English",
   "label.button.submit": "Submit",
   "label.button.changepassword": "Change Password",
@@ -761,5 +760,6 @@
   "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"
+  "input.placeholder.providerEmail":"Enter Requester's Email",
+  "input.placeholder.selectTest":"Select Test Type"
 }
diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json
@@ -1,4 +1,3 @@
-
 {
   "language.select.label": "French",
   "label.button.submit": "Connecter",
@@ -708,5 +707,6 @@
   "input.placeholder.requesterLastName":"Saisir le nom de famille du demandeur",
   "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"
+  "input.placeholder.providerEmail":"Saisir l'adresse e-mail du demandeur",
+  "input.placeholder.selectTest":"Sélectionnez le type de test"
 }