diff --git a/src/components/Dashboard/Dashboard.jsx b/src/components/Dashboard/Dashboard.jsx
index 05f626a..e6b3dda 100644
--- a/src/components/Dashboard/Dashboard.jsx
+++ b/src/components/Dashboard/Dashboard.jsx
@@ -81,7 +81,7 @@ const Dashboard = props => {
case Section.MEDICATIONS:
return ;
case Section.NOTIFICATIONS:
- return
+ return ;
default:
return ;
}
diff --git a/src/components/Dashboard/ListSelections/NotificationsSection.jsx b/src/components/Dashboard/ListSelections/NotificationsSection.jsx
index b36bdcc..306982d 100644
--- a/src/components/Dashboard/ListSelections/NotificationsSection.jsx
+++ b/src/components/Dashboard/ListSelections/NotificationsSection.jsx
@@ -7,76 +7,85 @@ import { createMedicationFromMedicationRequest } from '../../../util/fhir';
import { standardsBasedGetEtasu } from '../../../util/util';
const NotificationsSection = () => {
- const [globalState, _] = useContext(SettingsContext);
- const classes = useStyles();
- const [etasu, setEtasu] = useState([]);
- const [medications, setMedications] = useState([]);
- useEffect(() => {
- setEtasu([]);
- getMedicationRequest();
- }, []);
+ const [globalState, _] = useContext(SettingsContext);
+ const classes = useStyles();
+ const [etasu, setEtasu] = useState([]);
+ const [medications, setMedications] = useState([]);
+ useEffect(() => {
+ setEtasu([]);
+ getMedicationRequest();
+ }, []);
- useEffect(() => {
- getAllEtasu();
- }, [medications]);
+ useEffect(() => {
+ getAllEtasu();
+ }, [medications]);
- const getMedicationRequest = () => {
- const patientsMedications = [];
- axios({
- method: 'get',
- url: `${globalState.baseUrl}/MedicationRequest?subject=Patient/${globalState.patient.id}`
- }).then((result) => {
- result?.data.entry.forEach((m) => {
- const medication = createMedicationFromMedicationRequest(m.resource);
- patientsMedications.push(medication);
- })
- setMedications(patientsMedications);
- }, (error) =>{
- console.error(error);
+ const getMedicationRequest = () => {
+ const patientsMedications = [];
+ axios({
+ method: 'get',
+ url: `${globalState.baseUrl}/MedicationRequest?subject=Patient/${globalState.patient.id}`
+ }).then(
+ result => {
+ result?.data.entry.forEach(m => {
+ const medication = createMedicationFromMedicationRequest(m.resource);
+ patientsMedications.push(medication);
});
- };
+ setMedications(patientsMedications);
+ },
+ error => {
+ console.error(error);
+ }
+ );
+ };
- const compileResponses = (newRequest, body) => {
- if (newRequest.contained) {
- newRequest.body = body;
- setEtasu(prevState => [ ...prevState, newRequest]);
- }
+ const compileResponses = (newRequest, body) => {
+ if (newRequest.contained) {
+ newRequest.body = body;
+ setEtasu(prevState => [...prevState, newRequest]);
}
+ };
- const getAllEtasu = () => {
- medications.forEach((medication) => {
- const body = makeBody(medication);
- const standardEtasuUrl = `${globalState.remsAdminServer}/4_0_0/GuidanceResponse/$rems-etasu`;
- standardsBasedGetEtasu(standardEtasuUrl, body, compileResponses);
- });
-
- }
+ const getAllEtasu = () => {
+ medications.forEach(medication => {
+ const body = makeBody(medication);
+ const standardEtasuUrl = `${globalState.remsAdminServer}/4_0_0/GuidanceResponse/$rems-etasu`;
+ standardsBasedGetEtasu(standardEtasuUrl, body, compileResponses);
+ });
+ };
- const makeBody = (medication) => {
- return {
- resourceType: "Parameters",
- parameter: [
- {
- name: 'patient',
- resource: globalState.patient
- },
- {
- name: 'medication',
- resource: medication
- }
- ]
+ const makeBody = medication => {
+ return {
+ resourceType: 'Parameters',
+ parameter: [
+ {
+ name: 'patient',
+ resource: globalState.patient
+ },
+ {
+ name: 'medication',
+ resource: medication
}
- }
+ ]
+ };
+ };
- return (
-
-
Notifications
- {etasu.map((remsCase) => {
- const display = remsCase.body.parameter[1]?.resource.code.coding[0].display;
- return
- })}
-
- );
+ return (
+
+
Notifications
+ {etasu.map(remsCase => {
+ const display = remsCase.body.parameter[1]?.resource.code.coding[0].display;
+ return (
+
+ );
+ })}
+
+ );
};
export default memo(NotificationsSection);
diff --git a/src/components/EtasuStatus/EtasuStatus.jsx b/src/components/EtasuStatus/EtasuStatus.jsx
index 97417ab..a7837dd 100644
--- a/src/components/EtasuStatus/EtasuStatus.jsx
+++ b/src/components/EtasuStatus/EtasuStatus.jsx
@@ -14,26 +14,24 @@ export const EtasuStatus = props => {
const [etasuData, setEtasuData] = useState({});
const [display, setDisplay] = useState('');
- useEffect(() => {
+ useEffect(() => {
const medication = createMedicationFromMedicationRequest(request);
getEtasuStatus(medication);
}, [code]);
- const getEtasuStatus = (medication) => {
+ const getEtasuStatus = medication => {
const body = makeBody(medication);
setEtasuData(body);
const display = body.parameter[1]?.resource.code.coding[0].display;
setDisplay(display);
const standardEtasuUrl = `${globalState.remsAdminServer}/4_0_0/GuidanceResponse/$rems-etasu`;
standardsBasedGetEtasu(standardEtasuUrl, body, setRemsAdminResponse);
-
};
-
- const makeBody = (medication) => {
+ const makeBody = medication => {
console.log('patient -- > ', globalState.patient);
return {
- resourceType: "Parameters",
+ resourceType: 'Parameters',
parameter: [
{
name: 'patient',
@@ -44,13 +42,20 @@ export const EtasuStatus = props => {
resource: medication
}
]
- }
- }
+ };
+ };
return (
<>
- {remsAdminResponse.contained ? : ""}
+ {remsAdminResponse.contained ? (
+
+ ) : (
+ ''
+ )}
>
);
};
-
diff --git a/src/components/EtasuStatus/EtasuStatusButton.jsx b/src/components/EtasuStatus/EtasuStatusButton.jsx
index ed87d7c..cff24ef 100644
--- a/src/components/EtasuStatus/EtasuStatusButton.jsx
+++ b/src/components/EtasuStatus/EtasuStatusButton.jsx
@@ -3,8 +3,7 @@ import ListIcon from '@mui/icons-material/List';
import './EtasuStatusButton.css';
export const EtasuStatusButton = props => {
- const { baseColor, remsAdminResponse, handleOpenEtasuStatus, lastCheckedEtasuTime } =
- props;
+ const { baseColor, remsAdminResponse, handleOpenEtasuStatus, lastCheckedEtasuTime } = props;
return (