Merge branch '2.8' into 2.8

I-TECH-UW · Sep 21, 2023 · 9a39721 · 9a39721
2 parents c1ed16a + 47329f6
commit 9a39721
Show file tree

Hide file tree

Showing 18 changed files with 2,358 additions and 26 deletions.
diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -18,7 +18,8 @@ import PatientManagement from "./components/patient/PatientManagement";
 import PatientHistory from "./components/patient/PatientHistory";
 import Workplan from "./components/workplan/Workplan";
 import AddOrder from "./components/addOrder/Index";
-import ModifyOrder from "./components/modifyOrder/Index";
+import FindOrder from "./components/modifyOrder/Index";
+import ModifyOrder from "./components/modifyOrder/ModifyOrder";
 import RoutineReports from "./components/Reports/Routine";
 import StudyReports from "./components/Reports/Study";
 import StudyValidation from "./components/validation/Index";
@@ -227,6 +228,12 @@ export default function App() {
                   exact
                   component={() => <ModifyOrder />}
                   role="Reception"
+                />
+                 <SecureRoute
+                  path="/FindOrder"
+                  exact
+                  component={() => <FindOrder />}
+                  role="Reception"
                 />
                 <SecureRoute
                   path="/PatientManagement"

diff --git a/frontend/src/components/addOrder/SampleType.js b/frontend/src/components/addOrder/SampleType.js
@@ -486,7 +486,9 @@ const SampleType = (props) => {
         </div>
         <div className="testPanels">
           <div className="cds--col">
-            <h4>Order Panels</h4>
+            <h4>
+              <FormattedMessage id="sample.label.orderpanel" />
+            </h4>
             <div
               className={"searchTestText"}
               style={{ marginBottom: "1.188rem" }}

diff --git a/frontend/src/components/formModel/innitialValues/OrderEntryFormValues.js b/frontend/src/components/formModel/innitialValues/OrderEntryFormValues.js
@@ -150,3 +150,126 @@ export const ReferralItem = {
   multiSelectResultValues: null,
   qualifiedResultValue: null,
 };
+
+export const ModifyOrderFormValues = {
+  patientName: "",
+  dob: "",
+  gender: "",
+  nationalId: "",
+  accessionNumber: "",
+  newAccessionNumber: "",
+  existingTests: [
+    {
+      accessionNumber: null,
+      analysisId: null,
+      sampleType: null,
+      testName: null,
+      sampleItemId: null,
+      testId: null,
+      canCancel: false,
+      canceled: false,
+      add: false,
+      status: null,
+      sortOrder: null,
+      canRemoveSample: false,
+      removeSample: false,
+      collectionDate: null,
+      collectionTime: null,
+      sampleItemChanged: false,
+      hasResults: false,
+    },
+  ],
+  possibleTests: [
+    {
+      accessionNumber: null,
+      analysisId: null,
+      sampleType: null,
+      testName: null,
+      sampleItemId: null,
+      testId: null,
+      canCancel: false,
+      canceled: false,
+      add: false,
+      status: null,
+      sortOrder: null,
+      canRemoveSample: false,
+      removeSample: false,
+      collectionDate: null,
+      collectionTime: null,
+      sampleItemChanged: false,
+      hasResults: false,
+    },
+  ],
+  rememberSiteAndRequester: false,
+  currentDate: null,
+  projects: null,
+  customNotificationLogic: false,
+  patientEmailNotificationTestIds: [],
+  patientSMSNotificationTestIds: [],
+  providerEmailNotificationTestIds: [],
+  providerSMSNotificationTestIds: [],
+  patientUpdateStatus: "ADD",
+  referralItems: [],
+  referralOrganizations: null,
+  referralReasons: null,
+  sampleTypes: null,
+  sampleXML: "",
+  patientSearch: null,
+  patientEnhancedSearch: null,
+  patientClinicalProperties: null,
+  sampleOrderItems: {
+    newRequesterName: "",
+    orderTypes: null,
+    orderType: null,
+    externalOrderNumber: null,
+    labNo: "",
+    requestDate: "",
+    receivedDateForDisplay: "",
+    receivedTime: "",
+    nextVisitDate: "",
+    requesterSampleID: null,
+    referringPatientNumber: null,
+    referringSiteId: "",
+    referringSiteDepartmentId: "",
+    referringSiteCode: null,
+    referringSiteName: "",
+    referringSiteDepartmentName: null,
+    referringSiteList: null,
+    referringSiteDepartmentList: null,
+    providersList: null,
+    providerId: null,
+    providerPersonId: null,
+    providerFirstName: "",
+    providerLastName: "",
+    providerWorkPhone: "",
+    providerFax: "",
+    providerEmail: "",
+    facilityAddressStreet: null,
+    facilityAddressCommune: null,
+    facilityPhone: null,
+    facilityFax: null,
+    paymentOptionSelection: "",
+    paymentOptions: null,
+    modified: true,
+    sampleId: "",
+    readOnly: false,
+    billingReferenceNumber: "",
+    testLocationCode: "",
+    otherLocationCode: "",
+    testLocationCodeList: null,
+    program: "",
+    programList: null,
+    contactTracingIndexName: null,
+    contactTracingIndexRecordNumber: null,
+    priorityList: null,
+    priority: "ROUTINE",
+    programId: null,
+    additionalQuestions: null,
+  },
+  initialSampleConditionList: [],
+  sampleNatureList: null,
+  testSectionList: null,
+  warning: false,
+  useReferral: false,
+  rejectReasonList: null,
+};
diff --git a/frontend/src/components/layout/Header.js b/frontend/src/components/layout/Header.js
@@ -201,12 +201,7 @@ function OEHeader(props) {
                           <SideNavMenuItem href="/AddOrder">
                             <FormattedMessage id="sidenav.label.addorder" />
                           </SideNavMenuItem>
-                          <SideNavMenuItem
-                            href={
-                              config.serverBaseUrl +
-                              "/SampleEdit?type=readwrite"
-                            }
-                          >
+                          <SideNavMenuItem href="/FindOrder">
                             <FormattedMessage id="sidenav.label.editorder" />
                           </SideNavMenuItem>
                           <SideNavMenuItem