Resolved Order Entry conflicts

I-TECH-UW · Jul 2, 2023 · 4874d07 · 4874d07
1 parent c4405c0
commit 4874d07
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 50 deletions.
diff --git a/react-ui/src/components/addOrder/AddOrder.js b/react-ui/src/components/addOrder/AddOrder.js
@@ -298,7 +298,7 @@ const AddOrder = (props) => {
     useEffect(() => {
         getFromOpenElisServer("/rest/SamplePatientEntry", getSampleEntryPreform);
         getFromOpenElisServer("/rest/configuration-properties", fetchConfigurationProperties)
-
+        window.scrollTo(0, 0)
         return () => {
             componentMounted.current = false
         }
@@ -338,11 +338,11 @@ const AddOrder = (props) => {
 
                 </div>
                 <div className="inlineDiv">
-                    <CustomDatePicker id={"requestDate"} labelText={"Request Date"}
+                    <CustomDatePicker id={"requestDate"} labelText={"Request Date"} autofillDate={true}
                                       value={orderFormValues.sampleOrderItems.requestDate} className="inputText"
                                       onChange={(date) => handleDatePickerChange("requestDate", date)}/>
 
-                    <CustomDatePicker id={"receivedDate"} labelText={"Received Date"} className="inputText"
+                    <CustomDatePicker id={"receivedDate"} labelText={"Received Date"} className="inputText" autofillDate={true}
                                       value={orderFormValues.sampleOrderItems.receivedDateForDisplay}
                                       onChange={(date) => handleDatePickerChange("receivedDate", date)}/>
                 </div>
@@ -353,7 +353,7 @@ const AddOrder = (props) => {
                     />
 
                     <CustomDatePicker id={"nextVisitDate"} className="inputText" labelText={"Next Visit Date"}
-                                      value={orderFormValues.sampleOrderItems.nextVisitDate}
+                                      value={orderFormValues.sampleOrderItems.nextVisitDate} autofillDate={false}
                                       onChange={(date) => handleDatePickerChange("nextVisitDate", date)}/>
                 </div>
                 <div className="inlineDiv">

diff --git a/react-ui/src/components/addOrder/AddSample.js b/react-ui/src/components/addOrder/AddSample.js
@@ -84,6 +84,7 @@ const AddSample = (props) => {
 
     useEffect(() => {
         getFromOpenElisServer("/rest/test-rejection-reasons", fetchRejectSampleReasons);
+        window.scrollTo(0, 0)
         return () => {
             componentMounted.current = false
         }

diff --git a/react-ui/src/components/addOrder/Index.js b/react-ui/src/components/addOrder/Index.js
@@ -9,6 +9,7 @@ import {NotificationContext} from "../layout/Layout";
 import {AlertDialog, NotificationKinds} from "../common/CustomNotification";
 import {postToOpenElisServer} from "../utils/Utils";
 import OrderEntryAdditionalQuestions from './OrderEntryAdditionalQuestions';
+import OrderSuccessMessage from "./OrderSuccessMessage";
 
 export let sampleObject = {
     index: 0,
@@ -24,11 +25,12 @@ export let sampleObject = {
 const Index = () => {
 
     const firstPageNumber = 0;
-    const lastPageNumber = 3
+    const lastPageNumber = 4
     const patientInfoPageNumber = firstPageNumber;
     const programPageNumber = firstPageNumber + 1;
     const samplePageNumber = firstPageNumber + 2;
-    const orderPageNumber = lastPageNumber;
+    const orderPageNumber = firstPageNumber + 3;
+    const successMsgPageNumber = lastPageNumber;
 
     const {notificationVisible} = useContext(NotificationContext);
     const [page, setPage] = useState(firstPageNumber);
@@ -53,6 +55,7 @@ const Index = () => {
     }
     const handleSubmitOrderForm = (e) => {
         e.preventDefault();
+        setPage(page + 1);
         postToOpenElisServer("/rest/SamplePatientEntry", JSON.stringify(orderFormValues
         ), handlePost)
     }
@@ -135,9 +138,9 @@ const Index = () => {
             <Stack gap={10}>
                 <div className='pageContent'>
                     {notificationVisible === true ? <AlertDialog/> : ""}
-                    <div className="orderLegendBody">
+                    <div className="orderWorkFlowDiv">
                         <h2>Test Request</h2>
-                        <ProgressIndicator currentIndex={page} className="ProgressIndicator" spaceEqually={true}
+                        {page <= orderPageNumber && <ProgressIndicator currentIndex={page} className="ProgressIndicator" spaceEqually={true}
                                            onChange={(e) => handleTabClickHandler(e)}>
                             <ProgressStep
                                 complete
@@ -152,7 +155,7 @@ const Index = () => {
                             <ProgressStep
                                 label="Add Order"
                             />
-                        </ProgressIndicator>
+                        </ProgressIndicator> }
 
                         {page === patientInfoPageNumber &&
                             <PatientInfo orderFormValues={orderFormValues} setOrderFormValues={setOrderFormValues}/>
@@ -167,14 +170,20 @@ const Index = () => {
                             <AddOrder orderFormValues={orderFormValues} setOrderFormValues={setOrderFormValues}
                                       samples={samples}/>
                         }
+
+                        {page === successMsgPageNumber &&
+                            <OrderSuccessMessage orderFormValues={orderFormValues}
+                                                 setOrderFormValues={setOrderFormValues}
+                                                 samples={samples}/>}
                         <div className="navigationButtonsLayout">
-                            {page !== firstPageNumber && <Button kind="tertiary" onClick={() => navigateBackWards()}>Back</Button>}
+                            {(page !== firstPageNumber && page <= orderPageNumber) &&
+                                <Button kind="tertiary" onClick={() => navigateBackWards()}>Back</Button>}
 
-                            {page !== orderPageNumber ? <Button kind="primary" className="forwardButton"
-                                                  onClick={() => navigateForward()}>Next</Button> :
+                            {page <  orderPageNumber && <Button kind="primary" className="forwardButton"
+                                                  onClick={() => navigateForward()}>Next</Button> }
 
-                                <Button kind="primary" className="forwardButton"
-                                        onClick={handleSubmitOrderForm}>Submit</Button>}
+                            {page === orderPageNumber && <Button kind="primary" className="forwardButton"
+                                                   onClick={handleSubmitOrderForm}>Submit</Button>}
 
                         </div>
                     </div>

diff --git a/react-ui/src/components/addOrder/OrderReferralRequest.js b/react-ui/src/components/addOrder/OrderReferralRequest.js
@@ -88,7 +88,7 @@ const OrderReferralRequest = ({
                                          value={referralRequests[i].institute ? referralRequests[i].institute : null}
                                          onChange={(e) => handleInstituteSelect(e, i)}
                                          defaultSelect={defaultSelect}/>,
-                sentDate: <CustomDatePicker id={"sendDate_" + id}
+                sentDate: <CustomDatePicker id={"sendDate_" + id} autofillDate={true}
                                             value={referralRequests[i].sentDate ? referralRequests[i].sentDate : null}
                                             onChange={(date) => handleSentDatePicker(date, i)} labelText={""}/>,
                 testName: <CustomSelect id={"shadowReferredTest_" + id} defaultSelect={testValue}/>,

diff --git a/react-ui/src/components/addOrder/PatientInfo.js b/react-ui/src/components/addOrder/PatientInfo.js
@@ -1,6 +1,5 @@
-import React, {useEffect, useRef, useState} from 'react'
-import {getFromOpenElisServer} from "../utils/Utils";
-import {Button, Select, SelectItem, Stack} from "@carbon/react";
+import React, {useEffect, useRef, useState} from 'react';
+import {Button, Stack} from "@carbon/react";
 import "./../admin/reflexTests/ReflexRule"
 import SearchPatientForm from "../common/SearchPatientForm";
 import CreatePatientForm from "../common/CreatePatientForm";
@@ -32,6 +31,7 @@ const PatientInfo = (props) => {
         if (orderFormValues.patientProperties.firstName !== "" || orderFormValues.patientProperties.guid !== "") {
             handleNewPatientTab();
         }
+        window.scrollTo(0, 0)
         return () => {
             componentMounted.current = false
         }

diff --git a/react-ui/src/components/addOrder/SampleType.js b/react-ui/src/components/addOrder/SampleType.js
@@ -192,8 +192,6 @@ const SampleType = (props) => {
         props.sampleTypeObject({sampleXML: sampleXML, sampleObjectIndex: index});
     }
 
-    // const rows = TableSampleTableRows(index, selectedSampleType, rejectSampleReasons, selectedTests, updateSampleXml, handleRemoveSampleTest);
-
     const fetchSamplesTypes = (res) => {
         if (componentMounted.current) {
             setSampleTypes(res);
@@ -320,7 +318,7 @@ const SampleType = (props) => {
 
     useEffect(() => {
         componentMounted.current = true;
-        if (selectedSampleType.id) {
+        if (selectedSampleType.id !== "" && selectedSampleType.id != null) {
             getFromOpenElisServer(`/rest/sample-type-tests?sampleType=${selectedSampleType.id}`, fetchSampleTypeTests);
         }
         return () => {
@@ -337,16 +335,6 @@ const SampleType = (props) => {
         props.sampleTypeObject({selectedPanels: selectedPanels, sampleObjectIndex: index});
     }, [selectedPanels]);
 
-    useEffect(() => {
-        componentMounted.current = true;
-        if (selectedSampleType.id) {
-            getFromOpenElisServer(`/rest/sample-type-tests?sampleType=${selectedSampleType.id}`, fetchSampleTypeTests);
-        }
-        return () => {
-            componentMounted.current = false;
-        }
-    }, [selectedSampleType.id]);
-
     const repopulateUI = () => {
         if (props.sample !== null) {
             setSelectedTests(props.sample.tests);
@@ -383,7 +371,7 @@ const SampleType = (props) => {
                     required
                 >
                     <SelectItem
-                        text=""
+                        text="Select sample type"
                         value=""
                     />
                     {sampleTypes.map((sampleType, i) => (<SelectItem
@@ -394,15 +382,15 @@ const SampleType = (props) => {
                 </Select>
 
                 <CustomCheckBox id={"reject_" + index} onChange={(value) => handleRejection(value)}
-                                label="Reject"/>
+                                label="Reject Sample"/>
                 <CustomSelect id={"rejectedReasonId_" + index} options={rejectSampleReasons}
                               disabled={rejectionReasonsDisabled}
                               defaultSelect={defaultSelect}
                               onChange={(e) => handleReasons(e)}/>
 
                 <div className="inlineDiv">
 
-                    <CustomDatePicker id={"collectionDate_" + index}
+                    <CustomDatePicker id={"collectionDate_" + index} autofillDate={true}
                                       onChange={(date) => handleCollectionDate(date)}
                                       labelText={"Collection Date"} className="inputText"/>
 
@@ -415,7 +403,7 @@ const SampleType = (props) => {
                 </div>
                 <div className="testPanels">
                     <div className="cds--col">
-                        <h4>Panels</h4>
+                        <h4>Order Panels</h4>
                         <div className={"searchTestText"} style={{marginBottom: '1.188rem'}}>
                             {selectedPanels && selectedPanels.length ? (
                                 <>
@@ -490,7 +478,7 @@ const SampleType = (props) => {
                 </div>
 
                 <div className="cds--col">
-                    {selectedTests && !selectedTests.length ? "" : <h3>Ordered Tests</h3>}
+                    {selectedTests && !selectedTests.length ? "" : <h4>Order Tests</h4>}
                     <div className={"searchTestText"} style={{marginBottom: '1.188rem'}}>
                         {selectedTests && selectedTests.length ? (
                             <>

diff --git a/react-ui/src/components/addOrder/add-order.scss b/react-ui/src/components/addOrder/add-order.scss
@@ -32,8 +32,15 @@
 .emptyFilterTests span{
   color: #d4373a;
 }
+.orderWorkFlowDiv{
+  //border: 0.5px solid #295785;
+  border-radius: 5px;
+  margin: 2%;
+  padding: 4%;
+}
+
 .orderLegendBody {
-  border: 0.5px solid #295785;
+  background-color: #FFFFFF;
   border-radius: 5px;
   margin: 2%;
   padding: 4%;
@@ -108,4 +115,20 @@
 .requestTestReferral .cds--checkbox-label-text {
   color: red !important;
 }
-
+.orderEntrySuccessMsg{
+  width: 100px;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  margin: auto;
+}
+.printBarCodeBtn{
+  width: 220px;
+  text-align: center;
+}
+.placeAnotherOrderBtn{
+  width: 220px;
+  text-align: center;
+  margin-top: 10px;
+}
diff --git a/react-ui/src/components/common/CustomDatePicker.js b/react-ui/src/components/common/CustomDatePicker.js
@@ -31,7 +31,9 @@ const CustomDatePicker = (props) => {
     }
     useEffect(() => {
         const date = findConfigurationProperty("currentDateAsText");
-        setCurrentDate(date);
+        if(props.autofillDate){
+            setCurrentDate(date);
+        }
     }, [configurationProperties]);
 
     useEffect(() => {

diff --git a/react-ui/src/components/common/SearchPatientForm.js b/react-ui/src/components/common/SearchPatientForm.js
@@ -106,16 +106,14 @@ class SearchPatientForm extends React.Component {
                                     onChange={handleChange}
                                     onBlur={handleBlur}>
                                   <div className="inlineDiv">
-                                        <Field name="labNumber"
-                                        >
-                                            {({ field }) =>
-                                                <TextInput name={field.name} labelText="Lab Number" id={field.name} className="inputText" />
-                                            }
-                                        </Field>
-                                        <Field name="patientId"
-                                        >
+                                     <Field name="patientId">
+                                      {({ field }) =>
+                                          <TextInput name={field.name} labelText="Patient Id" id={field.name} className="inputText" />
+                                      }
+                                    </Field>
+                                        <Field name="labNumber">
                                             {({ field }) =>
-                                                <TextInput name={field.name} labelText="Patient Id" id={field.name} className="inputText" />
+                                                <TextInput name={field.name} labelText="Previous Lab Number" id={field.name} className="inputText" />
                                             }
                                         </Field>
                                   </div>

diff --git a/react-ui/src/index.scss b/react-ui/src/index.scss
@@ -19,10 +19,10 @@
 .cds--content {
   margin-top: 3rem;
   padding: 0;
-  background: var(--cds-background);
+  background-color: #F5F6F8;
 }
 
 .loginPageContent {
   padding-top: 3rem;
   background: var(--cds-background);
-}
+}