-
NewOrders
+
+
New Orders
);
diff --git a/frontend/src/views/DoctorOrders/OrderCard/EtasuPopUp/EtasuPopUp.css b/frontend/src/views/DoctorOrders/OrderCard/EtasuPopUp/EtasuPopUp.css
deleted file mode 100644
index e69de29..0000000
diff --git a/frontend/src/views/DoctorOrders/OrderCard/EtasuPopUp/EtasuPopUp.tsx b/frontend/src/views/DoctorOrders/OrderCard/EtasuPopUp/EtasuPopUp.tsx
index 916e239..4dfb26a 100644
--- a/frontend/src/views/DoctorOrders/OrderCard/EtasuPopUp/EtasuPopUp.tsx
+++ b/frontend/src/views/DoctorOrders/OrderCard/EtasuPopUp/EtasuPopUp.tsx
@@ -12,15 +12,19 @@ import * as React from 'react';
import { useState } from 'react';
type MetRequirements = {
- stakeholderId: string;
- completed: boolean;
- metRequirementId: string;
- requirementName: string;
- requirementDescription: string;
- _id: string;
+ name: string;
+ resource: {
+ status: string;
+ moduleUri: string;
+ resourceType: string;
+ note: [{ text: string }];
+ subject: {
+ reference: string;
+ };
+ };
};
-interface DoctorOrder {
+export type DoctorOrder = {
caseNumber?: string;
patientName?: string;
patientDOB?: string;
@@ -30,12 +34,13 @@ interface DoctorOrder {
doctorEmail?: string;
drugNames?: string;
drugPrice?: number;
- quanitities?: string;
+ drugRxNormCode: number;
+ quantities?: string;
total?: number;
pickupDate?: string;
dispenseStatus?: string;
metRequirements: MetRequirements[];
-}
+};
const Transition = React.forwardRef(function Transition(
props: TransitionProps & {
@@ -54,12 +59,12 @@ const EtasuPopUp = (props: any) => {
const handleClickOpen = () => {
setOpen(true);
// call api endpoint to update
- const url = '/doctorOrders/api/updateRx/' + props.data._id + '?dontUpdateStatus=true';
+ const url = '/doctorOrders/api/updateRx/' + props.data._id + '?doNotUpdateStatus=true';
axios
.patch(url)
.then(function (response) {
const DoctorOrders = response.data;
- //Adding data to state
+ // Adding data to state
getDoctorOrders(DoctorOrders);
})
.catch(error => console.error('Error', error));
@@ -88,16 +93,18 @@ const EtasuPopUp = (props: any) => {
{doctorOrder?.metRequirements
.sort((first: MetRequirements, second: MetRequirements) => {
// Keep the other forms unsorted.
- if (second.requirementName.includes('Patient Status Update')) {
+ if (second.name.includes('Patient Status Update')) {
// Sort the Patient Status Update forms in descending order of timestamp.
- return second.requirementName.localeCompare(first.requirementName);
+ return second.name.localeCompare(first.name);
}
return 0;
})
.map(etasuElement => (
-
- {etasuElement.requirementName}
- {etasuElement.completed ? '✅' : '❌'}
+
+ {etasuElement.name}
+
+ {etasuElement.resource.status === 'success' ? '✅' : '❌'}
+
))}
diff --git a/frontend/src/views/DoctorOrders/OrderCard/OrderCard.css b/frontend/src/views/DoctorOrders/OrderCard/OrderCard.css
deleted file mode 100644
index e69de29..0000000
diff --git a/frontend/src/views/DoctorOrders/OrderCard/OrderCard.test.tsx b/frontend/src/views/DoctorOrders/OrderCard/OrderCard.test.tsx
index e67d0d9..6d82a33 100644
--- a/frontend/src/views/DoctorOrders/OrderCard/OrderCard.test.tsx
+++ b/frontend/src/views/DoctorOrders/OrderCard/OrderCard.test.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
import { render, screen, waitFor } from '@testing-library/react';
import OrderCard from './OrderCard';
import axios from 'axios';
@@ -52,14 +51,6 @@ describe('
', () => {
expect(screen.getByText(/1996/i)).toBeInTheDocument();
expect(screen.getByText(/Turalio/i)).toBeInTheDocument();
expect(screen.getByText(/Pending/i)).toBeInTheDocument();
- // expect(screen.getByTestId('quantities')).toBeInTheDocument();
- // expect(screen.getByTestId('drugPrice')).toBeInTheDocument();
- // expect(screen.getByTestId('total')).toBeInTheDocument();
- // expect(screen.getByTestId('doctorName')).toBeInTheDocument();
- // expect(screen.getByTestId('doctorID')).toBeInTheDocument();
- // expect(screen.getByTestId('doctorContact')).toBeInTheDocument();
- // expect(screen.getByTestId('doctorEmail')).toBeInTheDocument();
- // expect(screen.getByTestId('pickupDate')).toBeInTheDocument();
expect(screen.getByRole('button', { name: /remove all/i })).toBeInTheDocument();
});
});
diff --git a/frontend/src/views/DoctorOrders/OrderCard/OrderCard.tsx b/frontend/src/views/DoctorOrders/OrderCard/OrderCard.tsx
index 5984b44..4e71ae1 100644
--- a/frontend/src/views/DoctorOrders/OrderCard/OrderCard.tsx
+++ b/frontend/src/views/DoctorOrders/OrderCard/OrderCard.tsx
@@ -16,11 +16,10 @@ import {
import axios from 'axios';
import { useEffect, useState } from 'react';
import EtasuPopUp from './EtasuPopUp/EtasuPopUp';
-import './OrderCard.css';
import PickedUpButton from './PickedUpButton';
import VerifyButton from './VerifyButton';
-interface DoctorOrder {
+export type DoctorOrder = {
caseNumber?: string;
patientName?: string;
patientDOB?: string;
@@ -35,15 +34,21 @@ interface DoctorOrder {
pickupDate?: string;
dispenseStatus?: string;
metRequirements: {
- stakeholderId: string;
- completed: boolean;
- metRequirementId: string;
- requirementName: string;
- requirementDescription: string;
+ name: string;
+ resource: {
+ status: string;
+ moduleUri: string;
+ resourceType: string;
+ note: [{ text: string }];
+ subject: {
+ reference: string;
+ };
+ };
}[];
-}
+ _id: string;
+};
-const OrderCard = (props: any) => {
+const OrderCard = (props: { tabStatus: 'Pending' | 'Picked Up' | 'Approved' }) => {
const [doctorOrder, setDoctorOrders] = useState
([]);
const [isLoading, setIsLoading] = useState(true);
@@ -107,7 +112,7 @@ const OrderCard = (props: any) => {
Dispense Status
- Quanitities
+ Quantities
Drug Price
Total
Doctor Name
@@ -137,10 +142,10 @@ const OrderCard = (props: any) => {
{props.tabStatus === 'Pending' && (
-
+
)}
{props.tabStatus === 'Approved' && (
-
+
)}
diff --git a/frontend/src/views/DoctorOrders/OrderCard/PickedUpButton.tsx b/frontend/src/views/DoctorOrders/OrderCard/PickedUpButton.tsx
index 834ef65..0072359 100644
--- a/frontend/src/views/DoctorOrders/OrderCard/PickedUpButton.tsx
+++ b/frontend/src/views/DoctorOrders/OrderCard/PickedUpButton.tsx
@@ -1,21 +1,23 @@
import Button from '@mui/material/Button';
import axios from 'axios';
+import { DoctorOrder } from './OrderCard';
-const PickedUpButton = (props: any) => {
- //verify the order
- const verifyOrder = () => {
- const url = '/doctorOrders/api/updateRx/' + props.data.row._id + '/pickedUp';
+type PickedUpButtonProps = { row: DoctorOrder; getAllDoctorOrders: () => Promise };
+
+const PickedUpButton = (props: PickedUpButtonProps) => {
+ const markOrderAsPickedUp = () => {
+ const url = '/doctorOrders/api/updateRx/' + props.row._id + '/pickedUp';
axios
.patch(url)
.then(function (response) {
- props.data.getAllDoctorOrders();
+ props.getAllDoctorOrders();
console.log(response.data);
})
.catch(error => console.error('Error', error));
};
return (
-