diff --git a/frontend/cypress/fixtures/Order.json b/frontend/cypress/fixtures/Order.json index 1e90b4db7..05213a9d4 100644 --- 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 index 20aeb4a99..7a86bf897 100644 --- 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 index d83401f36..2b87f86c0 100644 --- 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 index ab47a2163..5b91aa4ce 100755 --- 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 index 3330c6724..69aec0de5 100644 --- 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 {cell.value.toString()}; + } else if (cell.info.header === "notes") { + return ( + +
+ + ); } else { return {cell.value}; }