Update to account for unknown status

mcode · Feb 16, 2024 · 4419e68 · 4419e68
1 parent 23566df
commit 4419e68
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/src/views/Patient/MedReqDropDown/MedReqDropDown.tsx b/src/views/Patient/MedReqDropDown/MedReqDropDown.tsx
@@ -321,6 +321,15 @@ function MedReqDropDown({
   }
 
   const pStatus = testEhrResponse?.resource?.status;
+  const getMedicationStatus = (status: string | undefined) => {
+    if (status === 'completed') {
+      return 'Picked Up';
+    } else if (status === 'unknown') {
+      return 'Not Started';
+    } else {
+      return 'N/A';
+    }
+  };
   let pColor = '#0c0c0c'; // black
   if (pStatus === 'completed') {
     pColor = '#5cb85c'; // green
@@ -435,7 +444,7 @@ function MedReqDropDown({
                           <div>
                             <LocalPharmacyIcon fontSize="large" />
                             <p className="etasuButtonText">Medication: </p>
-                            <p>{pStatus === 'completed' ? 'Picked Up' : 'Unknown'}</p>
+                            <p>{getMedicationStatus(pStatus)}</p>
                           </div>
                         </Button>
                         {renderTimestamp(checkedPharmacyTime)}

diff --git a/src/views/Patient/MedReqDropDown/pharmacyStatus/PharmacyStatus.tsx b/src/views/Patient/MedReqDropDown/pharmacyStatus/PharmacyStatus.tsx
@@ -21,6 +21,16 @@ const PharmacyStatus = (props: PharmacyStatusProps) => {
     }
   }, [props.update]);
 
+  const getMedicationStatus = (status: string | undefined) => {
+    if (status === 'completed') {
+      return 'Picked Up';
+    } else if (status === 'unknown') {
+      return 'Not Started';
+    } else {
+      return 'N/A';
+    }
+  };
+
   const status = props.testEhrResponse?.resource?.status;
   let color = '#0c0c0c'; // black
   if (status === 'completed') {
@@ -34,7 +44,7 @@ const PharmacyStatus = (props: PharmacyStatusProps) => {
       <Grid container columns={12}>
         <Grid item xs={10}>
           <div className="bundle-entry">ID: {props.testEhrResponse?.resource?.id || 'N/A'}</div>
-          <div className="bundle-entry">Status: {status === 'completed' ? 'Picked Up' : 'N/A'}</div>
+          <div className="bundle-entry">Status: {getMedicationStatus(status)}</div>
         </Grid>
         <Grid item xs={2}>
           <div className="bundle-entry">

diff --git a/src/views/Questionnaire/components/RemsInterface/RemsInterface.tsx b/src/views/Questionnaire/components/RemsInterface/RemsInterface.tsx
@@ -196,6 +196,16 @@ export default function RemsInterface(props: RemsInterfaceProps) {
   // Checking if REMS Request (pt enrollment) || Met Requirments (prescriber Form)
   const hasRemsCase = remsAdminResponse?.data?.case_number ? true : false;
 
+  const getMedicationStatus = (status: string | undefined) => {
+    if (status === 'completed') {
+      return 'Picked Up';
+    } else if (status === 'unknown') {
+      return 'Not Started';
+    } else {
+      return 'N/A';
+    }
+  };
+
   return (
     <div>
       <div>
@@ -254,7 +264,7 @@ export default function RemsInterface(props: RemsInterfaceProps) {
                 <div className="status-icon" style={{ backgroundColor: colorPis }}></div>
                 <div className="bundle-entry">ID : {response?.resource?.id || 'N/A'}</div>
                 <div className="bundle-entry">
-                  Status: {statusPis === 'completed' ? 'Picked Up' : 'N/A'}
+                  Status: {getMedicationStatus(statusPis)}
                 </div>
                 <div className="bundle-entry">
                   <AutorenewIcon