Merge branch 'bidirectional' of https://github.com/rahul6603/OpenELIS…

…-Global-2 into bidirectional
I-TECH-UW · Jun 25, 2024 · 3ab8d93 · 3ab8d93
2 parents 695b682 + 8bb178a
commit 3ab8d93
Show file tree

Hide file tree

Showing 20 changed files with 3,066 additions and 200 deletions.
diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -40,6 +40,7 @@ import PrintBarcode from "./components/printBarcode/Index";
 import NonConformIndex from "./components/nonconform/index";
 import SampleBatchEntrySetup from "./components/batchOrderEntry/SampleBatchEntrySetup.js";
 import AuditTrailReportIndex from "./components/reports/auditTrailReport/Index.js";
+import ReferredOutTests from "./components/resultPage/resultsReferredOut/ReferredOutTests.js";
 
 export default function App() {
   let i18nConfig = {
@@ -409,6 +410,12 @@ export default function App() {
                   component={() => <ResultSearch />}
                   role="Results"
                 />
+                <SecureRoute
+                  path="/ReferredOutTests"
+                  exact
+                  component={() => <ReferredOutTests />}
+                  role="Results"
+                />
                 <SecureRoute
                   path="/RoutineReports"
                   exact

diff --git a/frontend/src/components/formModel/innitialValues/ReferredOutTestsFormValues.js b/frontend/src/components/formModel/innitialValues/ReferredOutTestsFormValues.js
@@ -0,0 +1,11 @@
+const ReferredOutTestsFormValues = {
+  labNumberInput: "",
+  selectedPatientId: "",
+  startDate: "",
+  endDate: "",
+  dateType: "",
+  dateOfBirth: "",
+  searchTypeValues: ["TEST_AND_DATES", "LAB_NUMBER", "PATIENT"],
+};
+
+export default ReferredOutTestsFormValues;
diff --git a/frontend/src/components/resultPage/SearchResultForm.js b/frontend/src/components/resultPage/SearchResultForm.js
@@ -28,6 +28,7 @@ import SearchResultFormValues from "../formModel/innitialValues/SearchResultForm
 import { AlertDialog, NotificationKinds } from "../common/CustomNotification";
 import { NotificationContext } from "../layout/Layout";
 import SearchPatientForm from "../patient/SearchPatientForm";
+import ReferredOutTests from "./resultsReferredOut/ReferredOutTests";
 import { ConfigurationContext } from "../layout/Layout";
 import config from "../../config.json";
 import CustomDatePicker from "../common/CustomDatePicker";
@@ -695,6 +696,8 @@ export function SearchResultForm(props) {
           </Grid>
         </>
       )}
+
+      {searchBy.type === "ReferredOutTests" && (<ReferredOutTests/>)}
 
       <>
         {pagination && (