Skip to content

Commit

Permalink
Merge pull request #1177 from mozzy11/develop
Browse files Browse the repository at this point in the history
improve patient History page styling
  • Loading branch information
mozzy11 authored Jul 11, 2024
2 parents ca7085e + d58b072 commit 06618f6
Showing 1 changed file with 42 additions and 30 deletions.
72 changes: 42 additions & 30 deletions frontend/src/components/patient/resultsViewer/results-viewer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,43 +115,55 @@ const RoutedResultsViewer: React.FC<ResultsViewerProps> = () => {
</Breadcrumb>
</Column>
</Grid>
<PatientHeader
id={patient.patientPK}
lastName={patient.lastName}
firstName={patient.firstName}
gender={patient.gender}
dob={patient.birthDateForDisplay}
subjectNumber={patient.subjectNumber}
nationalId={patient.nationalId}
>
{" "}
</PatientHeader>
<Grid fullWidth={true}>
<Column lg={16}>
<Section>
<Section>
<Heading>
<FormattedMessage id="label.page.patientHistory" />
</Heading>
</Section>
</Section>
</Column>
</Grid>
<Grid fullWidth={true}>
<Column lg={16}>
<PatientHeader
id={patient.patientPK}
lastName={patient.lastName}
firstName={patient.firstName}
gender={patient.gender}
dob={patient.birthDateForDisplay}
subjectNumber={patient.subjectNumber}
nationalId={patient.nationalId}
className="patient-header2"
>
{" "}
</PatientHeader>
</Column>
</Grid>

{roots?.length ? (
<Grid fullWidth={true}>
<Grid fullWidth={true} className="orderLegendBody">
<Column lg={16}>
<div className="orderLegendBody">
<FilterProvider roots={loading ? roots : []}>
<ResultsViewer
patientId={patientId}
basePath={config.serverBaseUrl}
loading={loading}
/>
</FilterProvider>
</div>
<FilterProvider roots={loading ? roots : []}>
<ResultsViewer
patientId={patientId}
basePath={config.serverBaseUrl}
loading={loading}
/>
</FilterProvider>
</Column>
</Grid>
) : (
<Grid fullWidth={true}>
<Grid fullWidth={true} className="orderLegendBody">
<Column lg={16}>
<div className="orderLegendBody">
<EmptyState
headerTitle={intl.formatMessage({ id: "label.test.results" })}
displayText={intl.formatMessage({
id: "label.test.resultsData",
})}
/>
</div>
<EmptyState
headerTitle={intl.formatMessage({ id: "label.test.results" })}
displayText={intl.formatMessage({
id: "label.test.resultsData",
})}
/>
</Column>
</Grid>
)}
Expand Down

0 comments on commit 06618f6

Please sign in to comment.