Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(fix) Program enrollment && regimen history not loading #493

Merged
merged 2 commits into from
Nov 28, 2024
Merged

(fix) Program enrollment && regimen history not loading #493

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92488fa
(fix) Program enrollment && regimen history not loading
makombe Nov 27, 2024
cab4e1d
Add tests for program enrollment component
makombe Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/esm-care-panel-app/src/program-enrollment/program-enrollment.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const ProgramEnrollment: React.FC<ProgramEnrollmentProps> = ({ enrollments = [],
id: `${enrollment.enrollmentUuid}`,
...enrollment,
...firstEncounter,
changeReasons: enrollment?.firstEncounter?.changeReasons?.join(', '),
changeReasons: Array.isArray(firstEncounter?.changeReasons) ? firstEncounter.changeReasons.join(', ') : '',
Copy link
Contributor

@ojwanganto ojwanganto Nov 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does the endpoint provide? We may also want to fix the backend if that can help

enrollmentEncounterUuid: enrollmentEncounterUuid,
};
}),
Expand Down
32 changes: 20 additions & 12 deletions packages/esm-care-panel-app/src/regimen/regimen-history.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,26 @@ const RegimenHistory: React.FC<RegimenHistoryProps> = ({ patientUuid, category }

if (regimen?.length) {
const structuredListBodyRowGenerator = () => {
return regimen.map((regimen, i) => (
<StructuredListRow key={`row-${i}`} className={styles.structuredList}>
<StructuredListCell>{formatDate(parseDate(regimen.startDate), { mode: 'wide' })}</StructuredListCell>
<StructuredListCell>
{regimen.endDate ? formatDate(parseDate(regimen.endDate), { mode: 'wide' }) : ''}
</StructuredListCell>
<StructuredListCell>{regimen.regimenShortDisplay ? regimen.regimenShortDisplay : '——'}</StructuredListCell>
<StructuredListCell>{regimen.regimenLine ? regimen.regimenLine : '——'}</StructuredListCell>
<StructuredListCell>{regimen.changeReasons ? regimen.changeReasons.slice(1, -1) : '——'}</StructuredListCell>
<StructuredListCell></StructuredListCell>
</StructuredListRow>
));
return regimen
.filter((regimen) => regimen?.startDate)
.map((regimen, i) => (
<StructuredListRow key={`row-${i}`} className={styles.structuredList}>
<StructuredListCell>
{regimen?.startDate ? formatDate(parseDate(regimen?.startDate), { mode: 'wide' }) : ''}
</StructuredListCell>
<StructuredListCell>
{regimen?.endDate ? formatDate(parseDate(regimen?.endDate), { mode: 'wide' }) : ''}
</StructuredListCell>
<StructuredListCell>
{regimen?.regimenShortDisplay ? regimen?.regimenShortDisplay : '——'}
</StructuredListCell>
<StructuredListCell>{regimen?.regimenLine ? regimen?.regimenLine : '——'}</StructuredListCell>
<StructuredListCell>
{regimen?.changeReasons ? regimen?.changeReasons.slice(1, -1) : '——'}
</StructuredListCell>
<StructuredListCell></StructuredListCell>
</StructuredListRow>
));
};

return (
Expand Down