From bc351ce9a3578ef87d6cf9b78fdc317cbc1d32bc Mon Sep 17 00:00:00 2001 From: Zach Robin Date: Tue, 5 Dec 2023 11:37:55 -0800 Subject: [PATCH 1/5] Added in progress button --- .../InProgressFormButton.js | 32 +++++++++++++++++ .../InProgressFormButtonStyle.css | 10 ++++++ src/components/RequestBox/RequestBox.js | 36 +++---------------- 3 files changed, 47 insertions(+), 31 deletions(-) create mode 100644 src/components/RequestBox/InProgressFormButton/InProgressFormButton.js create mode 100644 src/components/RequestBox/InProgressFormButton/InProgressFormButtonStyle.css diff --git a/src/components/RequestBox/InProgressFormButton/InProgressFormButton.js b/src/components/RequestBox/InProgressFormButton/InProgressFormButton.js new file mode 100644 index 00000000..e93dff8e --- /dev/null +++ b/src/components/RequestBox/InProgressFormButton/InProgressFormButton.js @@ -0,0 +1,32 @@ +import { Box, Button, Paper, Typography, ButtonGroup } from '@mui/material'; +import React from 'react'; +import './InProgressFormButtonStyle.css'; + +export default function InProgressFormButton(props) { + return ( + + {props.qrResponse.questionnaire ? ( + + + In Progress Form + + + Author: {props.qrResponse.author ? props.qrResponse.author.reference : 'empty'} + + + Last Edited: {props.qrResponse.authored ? props.qrResponse.authored : 'empty'} + + + Form Link: {props.qrResponse.questionnaire ? props.qrResponse.questionnaire : 'empty'} + + + + + + ) :

Error: No in progress forn found

+ } + + ); +} \ No newline at end of file diff --git a/src/components/RequestBox/InProgressFormButton/InProgressFormButtonStyle.css b/src/components/RequestBox/InProgressFormButton/InProgressFormButtonStyle.css new file mode 100644 index 00000000..461290f3 --- /dev/null +++ b/src/components/RequestBox/InProgressFormButton/InProgressFormButtonStyle.css @@ -0,0 +1,10 @@ +.inprogress-container { + background-color:#F3F6F9; + border: 1px solid #E5EAF2; + border-radius: 10px; + padding:25px; + margin:20px 0 20px 0; + + /* This should be inherited, need to change */ + width:48vw; +} \ No newline at end of file diff --git a/src/components/RequestBox/RequestBox.js b/src/components/RequestBox/RequestBox.js index ea995e28..0b0b7d2d 100644 --- a/src/components/RequestBox/RequestBox.js +++ b/src/components/RequestBox/RequestBox.js @@ -7,6 +7,7 @@ import { defaultValues, shortNameMap, types } from '../../util/data'; import { getAge } from '../../util/fhir'; import { retrieveLaunchContext } from '../../util/util'; import './request.css'; +import InProgressFormButton from './InProgressFormButton/InProgressFormButton.js'; import PatientSearchBar from './PatientSearchBar/PatientSearchBar.js'; @@ -201,7 +202,6 @@ export default class RequestBox extends Component { State: {this.state.patientState ? this.state.patientState : this.emptyField} {this.renderOtherInfo()} - {this.renderQRInfo()} ); } @@ -225,32 +225,6 @@ export default class RequestBox extends Component { ); } - renderQRInfo() { - const qrResponse = this.state.response; - return ( -
- {qrResponse.questionnaire ? ( - <> -
- In Progress Form -
-
- Form: {qrResponse.questionnaire ? qrResponse.questionnaire : this.emptyField} -
-
- Author: {qrResponse.author ? qrResponse.author.reference : this.emptyField} -
-
- Date: {qrResponse.authored ? qrResponse.authored : this.emptyField} -
- - ) : ( -
- )} -
- ); - } - renderPrefetchedResources() { const prefetchMap = new Map(Object.entries(this.state.prefetchedResources)); if (prefetchMap.size > 0) { @@ -460,7 +434,6 @@ export default class RequestBox extends Component { render() { const disableSendToCRD = this.isOrderNotSelected() || this.props.loading; - const disableLaunchDTR = !this.state.response.questionnaire; const disableSendRx = this.isOrderNotSelected() || this.props.loading; const disableLaunchSmartOnFhir = this.isPatientNotSelected(); return ( @@ -512,10 +485,11 @@ export default class RequestBox extends Component {
{this.state.patient.id ? (
+ - From 4dd6fb568f963651b68bb3d282c7a32a10f42a26 Mon Sep 17 00:00:00 2001 From: Zach Robin Date: Fri, 8 Dec 2023 07:29:47 -0800 Subject: [PATCH 2/5] addressed comments, bug fixes --- .../InProgressFormButton.js | 27 +++++++++---------- .../InProgressFormButtonStyle.css | 8 +++--- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/components/RequestBox/InProgressFormButton/InProgressFormButton.js b/src/components/RequestBox/InProgressFormButton/InProgressFormButton.js index e93dff8e..66a58833 100644 --- a/src/components/RequestBox/InProgressFormButton/InProgressFormButton.js +++ b/src/components/RequestBox/InProgressFormButton/InProgressFormButton.js @@ -4,29 +4,26 @@ import './InProgressFormButtonStyle.css'; export default function InProgressFormButton(props) { return ( - - {props.qrResponse.questionnaire ? ( - - + props.qrResponse.questionnaire ? ( + + In Progress Form - - Author: {props.qrResponse.author ? props.qrResponse.author.reference : 'empty'} + + Practitioner: {props.qrResponse.author ? props.qrResponse.author.reference : 'empty'} - - Last Edited: {props.qrResponse.authored ? props.qrResponse.authored : 'empty'} + + Last Edited: {props.qrResponse.authored ? props.qrResponse.authored : 'empty'} - - Form Link: {props.qrResponse.questionnaire ? props.qrResponse.questionnaire : 'empty'} + + Form Link: {props.qrResponse.questionnaire ? props.qrResponse.questionnaire : 'empty'} - - - ) :

Error: No in progress forn found

- } - + ) : '' ); } \ No newline at end of file diff --git a/src/components/RequestBox/InProgressFormButton/InProgressFormButtonStyle.css b/src/components/RequestBox/InProgressFormButton/InProgressFormButtonStyle.css index 461290f3..ae197b52 100644 --- a/src/components/RequestBox/InProgressFormButton/InProgressFormButtonStyle.css +++ b/src/components/RequestBox/InProgressFormButton/InProgressFormButtonStyle.css @@ -1,10 +1,10 @@ .inprogress-container { background-color:#F3F6F9; - border: 1px solid #E5EAF2; - border-radius: 10px; - padding:25px; + border: 1px solid black; + border-radius: 5px; + padding:20px; margin:20px 0 20px 0; /* This should be inherited, need to change */ - width:48vw; + width:48.5vw; } \ No newline at end of file From ed3104623c15d5bbac43c6d8ee508fab71af2fd0 Mon Sep 17 00:00:00 2001 From: Zach Robin Date: Fri, 8 Dec 2023 07:32:34 -0800 Subject: [PATCH 3/5] improved component name --- .../InProgressFormBox.js} | 4 ++-- .../InProgressFormBoxStyle.css} | 0 src/components/RequestBox/RequestBox.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename src/components/RequestBox/{InProgressFormButton/InProgressFormButton.js => InProgressFormBox/InProgressFormBox.js} (93%) rename src/components/RequestBox/{InProgressFormButton/InProgressFormButtonStyle.css => InProgressFormBox/InProgressFormBoxStyle.css} (100%) diff --git a/src/components/RequestBox/InProgressFormButton/InProgressFormButton.js b/src/components/RequestBox/InProgressFormBox/InProgressFormBox.js similarity index 93% rename from src/components/RequestBox/InProgressFormButton/InProgressFormButton.js rename to src/components/RequestBox/InProgressFormBox/InProgressFormBox.js index 66a58833..7cfe2573 100644 --- a/src/components/RequestBox/InProgressFormButton/InProgressFormButton.js +++ b/src/components/RequestBox/InProgressFormBox/InProgressFormBox.js @@ -1,8 +1,8 @@ import { Box, Button, Paper, Typography, ButtonGroup } from '@mui/material'; import React from 'react'; -import './InProgressFormButtonStyle.css'; +import './InProgressFormBoxStyle.css'; -export default function InProgressFormButton(props) { +export default function InProgressFormBox(props) { return ( props.qrResponse.questionnaire ? ( diff --git a/src/components/RequestBox/InProgressFormButton/InProgressFormButtonStyle.css b/src/components/RequestBox/InProgressFormBox/InProgressFormBoxStyle.css similarity index 100% rename from src/components/RequestBox/InProgressFormButton/InProgressFormButtonStyle.css rename to src/components/RequestBox/InProgressFormBox/InProgressFormBoxStyle.css diff --git a/src/components/RequestBox/RequestBox.js b/src/components/RequestBox/RequestBox.js index 0b0b7d2d..35deb168 100644 --- a/src/components/RequestBox/RequestBox.js +++ b/src/components/RequestBox/RequestBox.js @@ -7,7 +7,7 @@ import { defaultValues, shortNameMap, types } from '../../util/data'; import { getAge } from '../../util/fhir'; import { retrieveLaunchContext } from '../../util/util'; import './request.css'; -import InProgressFormButton from './InProgressFormButton/InProgressFormButton.js'; +import InProgressFormBox from './InProgressFormBox/InProgressFormBox.js'; import PatientSearchBar from './PatientSearchBar/PatientSearchBar.js'; @@ -485,7 +485,7 @@ export default class RequestBox extends Component {
{this.state.patient.id ? (
- From 627f431a56fda352c4d4258aee57e08800385a4b Mon Sep 17 00:00:00 2001 From: Zach Robin Date: Fri, 8 Dec 2023 10:26:17 -0800 Subject: [PATCH 4/5] updated background color --- .../RequestBox/InProgressFormBox/InProgressFormBoxStyle.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/RequestBox/InProgressFormBox/InProgressFormBoxStyle.css b/src/components/RequestBox/InProgressFormBox/InProgressFormBoxStyle.css index ae197b52..4e8b3eea 100644 --- a/src/components/RequestBox/InProgressFormBox/InProgressFormBoxStyle.css +++ b/src/components/RequestBox/InProgressFormBox/InProgressFormBoxStyle.css @@ -1,5 +1,5 @@ .inprogress-container { - background-color:#F3F6F9; + background-color:#f8f8f8; border: 1px solid black; border-radius: 5px; padding:20px; From 75b0226ced9b7e21c80d4a2680848b66057968fd Mon Sep 17 00:00:00 2001 From: Zach Robin Date: Fri, 8 Dec 2023 11:33:31 -0800 Subject: [PATCH 5/5] shortened main box --- src/components/RequestBox/request.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/RequestBox/request.css b/src/components/RequestBox/request.css index 4bac5323..2da628c9 100644 --- a/src/components/RequestBox/request.css +++ b/src/components/RequestBox/request.css @@ -12,7 +12,7 @@ .request { border: 1px solid black; - height:530px; + height:375px; padding: 10px; border-radius: 5px; background-color: rgb(248, 248, 248)