Skip to content

Commit

Permalink
Reduced ratio of panes on md+ screens, added spacing on CDS Hooks car…
Browse files Browse the repository at this point in the history
…ds buttons, moved Grid component out of dropdown component
  • Loading branch information
jtquach1 committed Sep 5, 2023
1 parent 0d0e5db commit f1749c9
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 18 deletions.
4 changes: 2 additions & 2 deletions src/views/Patient/MedReqDropDown/MedReqDropDown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ function MedReqDropDown(props: MedReqDropDownProps) {

const label = 'Select Medication Request';
return (
<Grid item xs={12} md={6}>
<>
<Card sx={{ bgcolor: 'white' }}>
<CardContent>
<Grid item container spacing={2}>
Expand Down Expand Up @@ -350,7 +350,7 @@ function MedReqDropDown(props: MedReqDropDownProps) {
/>
</Box>
</Modal>
</Grid>
</>
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ const CdsHooksCard = (props: CdsHooksCardProps) => {
</Typography>
</CardContent>
<CardActions>
<Grid container>
<Grid container spacing={1}>
{links.map((link: Link) => {
if (link.type === 'smart') {
return (
Expand Down
25 changes: 10 additions & 15 deletions src/views/Patient/PatientView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,12 @@ function PatientView(props: PatientViewProps) {
return (
<Box flexGrow={1}>
<Grid container spacing={2}>
<Grid item xs={12}>
<Typography variant="h4" component="h1" textAlign="center">
Launched with patient context:
</Typography>
</Grid>
<Grid item xs={12} md={6}>
<Grid item xs={12} md={4}>
{patient ? (
<Card sx={{ bgcolor: 'white' }}>
<CardContent>
<Typography component="h2" variant="h5" gutterBottom>
Patient Info
<Typography component="h1" variant="h5">
Patient information loaded from patient context
</Typography>
<TableContainer>
<Table>
Expand All @@ -78,18 +73,18 @@ function PatientView(props: PatientViewProps) {
</CardContent>
</Card>
) : (
<Typography component="h2" variant="h5">
<Typography component="h1" variant="h5">
Loading patient info...
</Typography>
)}
</Grid>
{client ? (
<MedReqDropDown client={client} tabCallback={props.tabCallback} />
) : (
<Grid item xs={12} md={6}>
<Grid item xs={12} md={8}>
{client ? (
<MedReqDropDown client={client} tabCallback={props.tabCallback} />
) : (
<p>Loading medication request...</p>
</Grid>
)}
)}
</Grid>
</Grid>
</Box>
);
Expand Down

0 comments on commit f1749c9

Please sign in to comment.