From 8a47a4f38cc296b5c6fcb418af7c33e8ce0cf4aa Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Tue, 1 Aug 2023 13:28:34 -0400 Subject: [PATCH 1/5] cleaned up backend bug --- backend/src/routes/doctorOrders.js | 6 +----- .../src/views/DoctorOrders/OrderCard/PickedUpButton.tsx | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/backend/src/routes/doctorOrders.js b/backend/src/routes/doctorOrders.js index 5e703ea..2783540 100644 --- a/backend/src/routes/doctorOrders.js +++ b/backend/src/routes/doctorOrders.js @@ -61,10 +61,6 @@ router.patch('/api/updateRx/:id', async (req, res) => { console.log('found by id!'); console.log('order', order); - if (order.dispenseStatus === 'Picked Up') { - console.log('Do not update prescription if it is picked up, it was verified before'); - return; - } // Reaching out to REMS Admin finding by pt name and drug name // '/etasu/met/patient/:patientFirstName/:patientLastName/:patientDOB/drug/:drugName', @@ -87,7 +83,7 @@ router.patch('/api/updateRx/:id', async (req, res) => { // Saving and updating const newOrder = await doctorOrder.findOneAndUpdate( { _id: req.params.id }, - { dispenseStatus: response.data.status, metRequirements: response.data.metRequirements }, + { dispenseStatus: order.dispenseStatus === 'Picked Up' ? order.dispenseStatus : response.data.status, metRequirements: response.data.metRequirements }, { new: true } diff --git a/frontend/src/views/DoctorOrders/OrderCard/PickedUpButton.tsx b/frontend/src/views/DoctorOrders/OrderCard/PickedUpButton.tsx index 3293099..6b0203f 100644 --- a/frontend/src/views/DoctorOrders/OrderCard/PickedUpButton.tsx +++ b/frontend/src/views/DoctorOrders/OrderCard/PickedUpButton.tsx @@ -42,7 +42,7 @@ const PickedUpButton = (props: any) => { }; return ( - + ); }; From 6acbc71a3e17d13e7db1725404c2a8f695eab4c8 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Tue, 1 Aug 2023 13:34:42 -0400 Subject: [PATCH 2/5] remove whitespace --- frontend/env.json | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/env.json b/frontend/env.json index 3101dfa..172333d 100644 --- a/frontend/env.json +++ b/frontend/env.json @@ -36,7 +36,6 @@ "type" :"number", "default" : 5050 }, - "SSL_KEY_FILE": { "type": "string", "default": "server.key" From 43d62a83b0573317284e3d877adedaa03f7c78cb Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Tue, 1 Aug 2023 13:39:04 -0400 Subject: [PATCH 3/5] prettier formatting --- backend/src/routes/doctorOrders.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/backend/src/routes/doctorOrders.js b/backend/src/routes/doctorOrders.js index 2783540..4f46659 100644 --- a/backend/src/routes/doctorOrders.js +++ b/backend/src/routes/doctorOrders.js @@ -83,7 +83,11 @@ router.patch('/api/updateRx/:id', async (req, res) => { // Saving and updating const newOrder = await doctorOrder.findOneAndUpdate( { _id: req.params.id }, - { dispenseStatus: order.dispenseStatus === 'Picked Up' ? order.dispenseStatus : response.data.status, metRequirements: response.data.metRequirements }, + { + dispenseStatus: + order.dispenseStatus === 'Picked Up' ? order.dispenseStatus : response.data.status, + metRequirements: response.data.metRequirements + }, { new: true } From 478df2bf55522c2fa1b5df9592a759085a58c846 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Tue, 1 Aug 2023 14:34:36 -0400 Subject: [PATCH 4/5] dont update status on view etasu button --- backend/src/routes/doctorOrders.js | 3 ++- .../src/views/DoctorOrders/OrderCard/EtasuPopUp/EtasuPopUp.tsx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/routes/doctorOrders.js b/backend/src/routes/doctorOrders.js index 4f46659..adaf980 100644 --- a/backend/src/routes/doctorOrders.js +++ b/backend/src/routes/doctorOrders.js @@ -56,6 +56,7 @@ router.post('/api/addRx', async (req, res) => { */ router.patch('/api/updateRx/:id', async (req, res) => { try { + const dontUpdateStatusBool = req.query.dontUpdateStatus; // Finding by id const order = await doctorOrder.findById(req.params.id).exec(); console.log('found by id!'); @@ -85,7 +86,7 @@ router.patch('/api/updateRx/:id', async (req, res) => { { _id: req.params.id }, { dispenseStatus: - order.dispenseStatus === 'Picked Up' ? order.dispenseStatus : response.data.status, + dontUpdateStatusBool || order.dispenseStatus === 'Picked Up' ? order.dispenseStatus : response.data.status, metRequirements: response.data.metRequirements }, { diff --git a/frontend/src/views/DoctorOrders/OrderCard/EtasuPopUp/EtasuPopUp.tsx b/frontend/src/views/DoctorOrders/OrderCard/EtasuPopUp/EtasuPopUp.tsx index 2a2ce25..6153bee 100644 --- a/frontend/src/views/DoctorOrders/OrderCard/EtasuPopUp/EtasuPopUp.tsx +++ b/frontend/src/views/DoctorOrders/OrderCard/EtasuPopUp/EtasuPopUp.tsx @@ -54,7 +54,7 @@ const EtasuPopUp = (props: any) => { const handleClickOpen = () => { setOpen(true); // call api endpoint to update - const url = '/doctorOrders/api/updateRx/' + props.data._id; + const url = '/doctorOrders/api/updateRx/' + props.data._id + '?dontUpdateStatus=true'; axios.patch(url) .then(function (response) { const DoctorOrders = response.data; From a4158e0c47e39e713b9fbe9f726a01232c3522a6 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Tue, 1 Aug 2023 14:51:06 -0400 Subject: [PATCH 5/5] linting --- backend/src/routes/doctorOrders.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/src/routes/doctorOrders.js b/backend/src/routes/doctorOrders.js index adaf980..8cb6685 100644 --- a/backend/src/routes/doctorOrders.js +++ b/backend/src/routes/doctorOrders.js @@ -86,7 +86,9 @@ router.patch('/api/updateRx/:id', async (req, res) => { { _id: req.params.id }, { dispenseStatus: - dontUpdateStatusBool || order.dispenseStatus === 'Picked Up' ? order.dispenseStatus : response.data.status, + dontUpdateStatusBool || order.dispenseStatus === 'Picked Up' + ? order.dispenseStatus + : response.data.status, metRequirements: response.data.metRequirements }, {