Merge pull request #1138 from mozzy11/develop

fix Notes display on Refered tests
I-TECH-UW · Jun 25, 2024 · 4773c0c · 4773c0c
2 parents 72d522c + c215ecf
commit 4773c0c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/frontend/cypress/fixtures/Order.json b/frontend/cypress/fixtures/Order.json
@@ -10,5 +10,5 @@
     "lastName": "Prime"
   },
   "labNo": "",
-  "invalidLabNo":"DEV0124000000000000"
+  "invalidLabNo": "DEV0124000000000000"
 }
diff --git a/frontend/cypress/fixtures/Patient.json b/frontend/cypress/fixtures/Patient.json
@@ -6,5 +6,5 @@
   "nationalId": "UG-23SLHD7DBD",
   "DOB": "12/05/2001",
   "gender": "Male",
-  "labNo":"DEV01240000000000001"
+  "labNo": "DEV01240000000000001"
 }
diff --git a/frontend/cypress/pages/OrderEntityPage.js b/frontend/cypress/pages/OrderEntityPage.js
@@ -31,8 +31,7 @@ class OrderEntityPage {
     ).click();
   }
 
-
-  validateAcessionNumber(order){
+  validateAcessionNumber(order) {
     cy.intercept("GET", `**/rest/SampleEntryAccessionNumberValidation**`).as(
       "accessionNoValidation",
     );

diff --git a/frontend/cypress/pages/PatientEntryPage.js b/frontend/cypress/pages/PatientEntryPage.js
@@ -8,7 +8,7 @@ class PatientEntryPage {
   personContactPrimaryPhone = "input#patientContact\\.person\\.primaryPhone";
   personContactEmail = "input#patientContact\\.person\\.email";
   patientIdSelector = "input#patientId";
-  labNoSelector="#labNumber";
+  labNoSelector = "#labNumber";
   city = "input#city";
   primaryPhone = "input#primaryPhone";
   dateOfBirth = "input#date-picker-default-id";
@@ -93,9 +93,8 @@ class PatientEntryPage {
     cy.enterText(this.patientIdSelector, PID);
   }
 
-  searchPatientBylabNo(labNo){
-    cy.enterText(this. labNoSelector, labNo);
-
+  searchPatientBylabNo(labNo) {
+    cy.enterText(this.labNoSelector, labNo);
   }
 
   getPatientSearchResultsTable() {

diff --git a/frontend/src/components/resultPage/resultsReferredOut/ReferredOutTests.js b/frontend/src/components/resultPage/resultsReferredOut/ReferredOutTests.js
@@ -297,6 +297,12 @@ function ReferredOutTests(props) {
       );
     } else if (cell.info.header === "active") {
       return <TableCell key={cell.id}>{cell.value.toString()}</TableCell>;
+    } else if (cell.info.header === "notes") {
+      return (
+        <TableCell key={cell.id}>
+          <div dangerouslySetInnerHTML={{ __html: cell.value }} />
+        </TableCell>
+      );
     } else {
       return <TableCell key={cell.id}>{cell.value}</TableCell>;
     }