@@ -300,115 +307,115 @@ const SettingsSection = props => {
}}
>
{!state['useIntermediary'] && (
-
-
-
- Medication Display
- Medication RxNorm Code
- Hook / Endpoint
- REMS Admin URL
- {/* This empty TableCell corresponds to the add and delete
+
+
+
+ Medication Display
+ Medication RxNorm Code
+ Hook / Endpoint
+ REMS Admin URL
+ {/* This empty TableCell corresponds to the add and delete
buttons. It is used to fill up the sticky header which
will appear over the gray/white table rows. */}
-
-
-
-
- {Object.entries(state.medicationRequestToRemsAdmins).map(([key, row]) => {
- return (
-
-
-
- dispatch({
- type: actionTypes.updateCdsHookSetting,
- settingId: key,
- value: { display: event.target.value }
- })
- }
- sx={{ width: '100%' }}
- />
-
-
-
- dispatch({
- type: actionTypes.updateCdsHookSetting,
- settingId: key,
- value: { rxnorm: event.target.value }
- })
- }
- sx={{ width: '100%' }}
- />
-
-
-
-
-
-
- dispatch({
- type: actionTypes.updateCdsHookSetting,
- settingId: key,
- value: { remsAdmin: event.target.value }
- })
- }
- sx={{ width: '100%' }}
- />
-
-
-
-
- dispatch({ type: actionTypes.addCdsHookSetting, settingId: key })
+
+
+
+
+ {Object.entries(state.medicationRequestToRemsAdmins).map(([key, row]) => {
+ return (
+
+
+
+ dispatch({
+ type: actionTypes.updateCdsHookSetting,
+ settingId: key,
+ value: { display: event.target.value }
+ })
}
- size="large"
- >
-
-
-
-
-
- dispatch({ type: actionTypes.deleteCdsHookSetting, settingId: key })
+ sx={{ width: '100%' }}
+ />
+
+
+
+ dispatch({
+ type: actionTypes.updateCdsHookSetting,
+ settingId: key,
+ value: { rxnorm: event.target.value }
+ })
}
- size="large"
+ sx={{ width: '100%' }}
+ />
+
+
+
-
- );
- })}
-
-
+ {ENDPOINT.map(endpointType => (
+
+ ))}
+
+
+
+
+ dispatch({
+ type: actionTypes.updateCdsHookSetting,
+ settingId: key,
+ value: { remsAdmin: event.target.value }
+ })
+ }
+ sx={{ width: '100%' }}
+ />
+
+
+
+
+ dispatch({ type: actionTypes.addCdsHookSetting, settingId: key })
+ }
+ size="large"
+ >
+
+
+
+
+
+ dispatch({ type: actionTypes.deleteCdsHookSetting, settingId: key })
+ }
+ size="large"
+ >
+
+
+
+
+
+ );
+ })}
+
+
)}
diff --git a/src/components/RequestDashboard/TasksSection.jsx b/src/components/RequestDashboard/TasksSection.jsx
index 317a437..b712b87 100644
--- a/src/components/RequestDashboard/TasksSection.jsx
+++ b/src/components/RequestDashboard/TasksSection.jsx
@@ -1,18 +1,5 @@
import React, { memo, useState, useEffect, Fragment } from 'react';
-import {
- Button,
- Box,
- Modal,
- Grid,
- Tabs,
- Tab,
- Stack,
- Select,
- FormControl,
- InputLabel,
- MenuItem,
- Menu
-} from '@mui/material';
+import { Button, Box, Modal, Grid, Tabs, Tab, Stack, MenuItem, Menu } from '@mui/material';
import AssignmentIcon from '@mui/icons-material/Assignment';
import PersonIcon from '@mui/icons-material/Person';
import DeleteIcon from '@mui/icons-material/Delete';
@@ -20,15 +7,18 @@ import EditNoteIcon from '@mui/icons-material/EditNote';
import AssignmentLateIcon from '@mui/icons-material/AssignmentLate';
import AssignmentIndIcon from '@mui/icons-material/AssignmentInd';
import AssignmentTurnedInIcon from '@mui/icons-material/AssignmentTurnedIn';
-import PersonAddIcon from '@mui/icons-material/PersonAdd';
import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
-import CheckIcon from '@mui/icons-material/Check';
import ArrowForwardIcon from '@mui/icons-material/ArrowForward';
import useStyles from './styles';
import { SettingsContext } from '../../containers/ContextProvider/SettingsProvider';
import { MemoizedTabPanel } from './TabPanel';
-import { Info, Refresh } from '@mui/icons-material';
-import { retrieveLaunchContext } from '../../util/util';
+import { Refresh } from '@mui/icons-material';
+import {
+ getPatientFirstAndLastName,
+ getPatientFullName,
+ getPractitionerFirstAndLastName,
+ retrieveLaunchContext
+} from '../../util/util';
const taskStatus = Object.freeze({
inProgress: 'in-progress',
@@ -45,7 +35,8 @@ const TasksSection = props => {
const [open, setOpen] = useState(false);
const [taskToDelete, setTaskToDelete] = useState('');
const [anchorStatus, setAnchorStatus] = useState(null);
- const [anchorAssign, setAnchorAssign] = useState(null);
+ const [anchorAssign, setAnchorAssign] = useState(null); // R4 Task
+ const [practitioner, setPractitioner] = useState(null); // R4 Practitioner
const menuOpen = Boolean(anchorStatus);
const assignMenuOpen = Boolean(anchorAssign);
@@ -116,7 +107,7 @@ const TasksSection = props => {
reference: user
};
- props.client.update(task).then(e => {
+ props.client.update(task).then(() => {
fetchTasks();
});
}
@@ -127,14 +118,14 @@ const TasksSection = props => {
task.owner = {
reference: task.for.reference
};
- props.client.update(task).then(e => {
+ props.client.update(task).then(() => {
fetchTasks();
});
}
};
const deleteTask = () => {
if (taskToDelete) {
- props.client.delete(`${taskToDelete.resourceType}/${taskToDelete.id}`).then(e => {
+ props.client.delete(`${taskToDelete.resourceType}/${taskToDelete.id}`).then(() => {
console.log('Deleted Task');
fetchTasks();
});
@@ -160,6 +151,14 @@ const TasksSection = props => {
fetchTasks();
}, []);
+ useEffect(() => {
+ props.client.request(`Practitioner/${state.defaultUser}`).then(practitioner => {
+ if (practitioner) {
+ setPractitioner(practitioner);
+ }
+ });
+ }, [state.defaultUser]);
+
useEffect(() => {
fetchTasks();
}, [state.patient]);
@@ -167,7 +166,7 @@ const TasksSection = props => {
const updateTaskStatus = (task, status) => {
task.status = status;
const updatedTask = structuredClone(task); // structured clone may not work on older browsers
- props.client.update(washTask(updatedTask)).then(e => {
+ props.client.update(washTask(updatedTask)).then(() => {
fetchTasks();
});
};
@@ -191,7 +190,7 @@ const TasksSection = props => {
retrieveLaunchContext(smartLink, patient, props.client.state).then(result => {
updateTaskStatus(lTask, 'in-progress');
lTask.status = 'in-progress';
- props.client.update(washTask(lTask)).then(_e => {
+ props.client.update(washTask(lTask)).then(() => {
fetchTasks();
});
window.open(result.url, '_blank');
@@ -216,22 +215,33 @@ const TasksSection = props => {
);
};
const renderAssignMenu = () => {
- const assignOptions = ['me', 'patient'];
+ const patient = anchorAssign?.task?.for;
+ const assignOptions = [
+ {
+ id: 'me',
+ display: `provider${practitioner ? ' (' + getPractitionerFirstAndLastName(practitioner) + ')' : ''}`
+ },
+ {
+ id: 'patient',
+ display: `patient${patient ? ' (' + getPatientFullName(patient) + ')' : ''}`
+ }
+ ];
return (
);
};
+
const renderTasks = taskSubset => {
if (taskSubset.length > 0) {
return (
@@ -259,13 +269,13 @@ const TasksSection = props => {
if (task.for?.resourceType?.toLowerCase() === 'patient') {
const patient = task.for;
if (patient.name) {
- taskForName = `${patient.name[0].given[0]} ${patient.name[0].family}`;
+ taskForName = getPatientFirstAndLastName(patient);
}
}
if (task.owner && task.owner?.resourceType?.toLowerCase() === 'practitioner') {
const practitioner = task.owner;
if (practitioner.name) {
- taskOwnerName = `${practitioner.name[0].given[0]} ${practitioner.name[0].family}`;
+ taskOwnerName = getPractitionerFirstAndLastName(practitioner);
} else {
taskOwnerName = task.owner.id;
}
@@ -273,7 +283,7 @@ const TasksSection = props => {
if (task.owner && task.owner?.resourceType?.toLowerCase() === 'patient') {
const patient = task.owner;
if (patient.name) {
- taskOwnerName = `${patient.name[0].given[0]} ${patient.name[0].family}`;
+ taskOwnerName = getPatientFirstAndLastName(patient);
} else {
taskOwnerName = task.owner.id;
}
@@ -454,6 +464,7 @@ const TasksSection = props => {
{renderStatusMenu()}
+ {/* edit this function so it is like renderPortalView or renderMainView where it refers to each and every task */}
{renderAssignMenu()}
{props.portalView ? renderPortalView() : renderMainView()}
diff --git a/src/components/SMARTBox/PatientBox.jsx b/src/components/SMARTBox/PatientBox.jsx
index 885252c..01ff274 100644
--- a/src/components/SMARTBox/PatientBox.jsx
+++ b/src/components/SMARTBox/PatientBox.jsx
@@ -11,7 +11,11 @@ import TableCell from '@mui/material/TableCell';
import TableContainer from '@mui/material/TableContainer';
import TableHead from '@mui/material/TableHead';
import TableRow from '@mui/material/TableRow';
-import { retrieveLaunchContext } from '../../util/util';
+import {
+ getPatientFirstAndLastName,
+ getPatientFullName,
+ retrieveLaunchContext
+} from '../../util/util';
const PatientBox = props => {
const [state, setState] = useState({
@@ -539,11 +543,11 @@ const PatientBox = props => {
if (patient.name) {
setState(prevState => ({
...prevState,
- name: `${patient.name[0].given[0]} ${patient.name[0].family}`
+ name: getPatientFirstAndLastName(patient)
}));
setState(prevState => ({
...prevState,
- fullName: `${patient.name[0].given.join(' ')} ${patient.name[0].family}`
+ fullName: getPatientFullName(patient)
}));
}
if (patient.birthDate) {
diff --git a/src/containers/PatientPortal.jsx b/src/containers/PatientPortal.jsx
index e940d56..cc25378 100644
--- a/src/containers/PatientPortal.jsx
+++ b/src/containers/PatientPortal.jsx
@@ -10,6 +10,7 @@ import Typography from '@mui/material/Typography';
import env from 'env-var';
import { actionTypes } from './ContextProvider/reducer';
import { SettingsContext } from './ContextProvider/SettingsProvider';
+import { getPatientFirstAndLastName } from '../util/util';
const PatientPortal = () => {
const classes = useStyles();
@@ -30,7 +31,7 @@ const PatientPortal = () => {
}
});
client.request(`Patient/${client.patient.id}`).then(patient => {
- setPatientName(getName(patient));
+ setPatientName(getPatientFirstAndLastName(patient));
dispatch({
type: actionTypes.updatePatient,
value: patient
@@ -46,18 +47,6 @@ const PatientPortal = () => {
setPatientName(null);
};
- const getName = patient => {
- const name = [];
- if (patient.name) {
- if (patient.name[0].given) {
- name.push(patient.name[0].given[0]);
- }
- if (patient.name[0].family) {
- name.push(patient.name[0].family);
- }
- }
- return name.join(' ');
- };
return (
diff --git a/src/util/buildRequest.js b/src/util/buildRequest.js
index 7cabe93..c0397a0 100644
--- a/src/util/buildRequest.js
+++ b/src/util/buildRequest.js
@@ -1,4 +1,4 @@
-import { ORDER_SIGN, ORDER_SELECT } from "./data";
+import { ORDER_SIGN, ORDER_SELECT } from './data';
export default function buildRequest(
request,
diff --git a/src/util/util.js b/src/util/util.js
index 1e5a5d1..821d2f2 100644
--- a/src/util/util.js
+++ b/src/util/util.js
@@ -182,6 +182,21 @@ const prepPrefetch = prefetchedResources => {
return preppedResources;
};
+// FHIR R4 Patient
+export const getPatientFirstAndLastName = patient => {
+ return patient ? `${patient.name[0].given[0]} ${patient.name[0].family}` : '';
+};
+
+// FHIR R4 Patient
+export const getPatientFullName = patient => {
+ return patient ? `${patient.name[0].given.join(' ')} ${patient.name[0].family}` : '';
+};
+
+// FHIR R4 Practitioner
+export const getPractitionerFirstAndLastName = practitioner => {
+ return practitioner ? `${practitioner.name[0].given[0]} ${practitioner.name[0].family}` : '';
+};
+
export {
retrieveLaunchContext,
standardsBasedGetEtasu,