(feat) O3-3773 Support for Patient Program Summary in Patient Chart #1969

kajambiya · 2024-08-22T05:13:47Z

Requirements

This PR has a title that briefly describes the work done including the ticket number. If there is a ticket, make sure your PR title includes a conventional commit label. See existing PR titles for inspiration.
My work conforms to the OpenMRS 3.0 Styleguide and design documentation.
My work includes tests or is validated by existing tests.

Summary

This PR introduces summary program summary to patient chart.

Screenshots

Related Issue

Other

hadijahkyampeire

Mostly looks good, thanks @kajambiya , just a few comments

packages/esm-patient-chart-app/src/encounter-tile/utils/helpers.ts

packages/esm-patient-chart-app/src/index.ts

...ges/esm-patient-chart-app/src/clinical-views/components/clinical-views-summary.component.tsx

packages/esm-patient-chart-app/src/encounter-tile/components/encounter-tile.component.tsx

packages/esm-patient-chart-app/src/encounter-tile/hooks/useLastEncounter.ts

packages/esm-patient-chart-app/src/encounter-tile/components/tile.scss

ibacher

Thank you! This widget is getting much closer. A few more nit-picking comments on the code.

Now looking at the visual of this widget, we should bring it in line with the existing RefApp chart tiles specifically:

The h4 header font rendering is inconsistent with other tiles in the chart. Both the font-size (20px vs 16px) is off and the font-weight (400 vs 600).
The header ::after element is not correctly sized (border-bottom-width is 2px too large and padding-top is off by 1px — 2px in this component vs 3px in others)

Oddly, when located in the top-of-all-patient-dashboards-slot, as shown above the box appears too wide, but when located in the same slot as the other elements, the width is too small:

...ges/esm-patient-chart-app/src/clinical-views/components/clinical-views-summary.component.tsx

packages/esm-patient-chart-app/src/clinical-views/utils/encounter-tile-config-builder.ts

...ges/esm-patient-chart-app/src/clinical-views/components/clinical-views-summary.component.tsx

brandones · 2024-11-11T16:37:35Z

Ping @ibacher

ibacher

Not sure I've covered everything, but here are some things that need to be cleaned-up before this is mergeable. Goal here is to make sure that the code is in a format that the community can support over the long term. Thanks!

...-patient-chart-app/src/clinical-views/components/encounter-tile/encounter-tile.component.tsx

packages/esm-patient-chart-app/src/clinical-views/utils/helpers.ts

packages/esm-patient-common-lib/src/types/index.ts

gracepotma · 2024-12-13T20:40:29Z

I'm confused, is this ready for rull re-review?

eudson · 2024-12-16T10:22:01Z

I'm confused, is this ready for rull re-review?

@gracepotma what does ready for full re-review means?

eudson · 2025-01-08T07:24:29Z

I have restructured a few files that cut across this pr and the encounter list PR

@ibacher @gracepotma kindly re-review the PR

ibacher

Thanks @CynthiaKamau! A few more nitpicky things that need to addressed before this is mergeable. Thanks!

packages/esm-patient-chart-app/src/clinical-views/encounter-list/encounter-list.component.tsx

...esm-patient-chart-app/src/clinical-views/encounter-tile/clinical-views-summary.component.tsx

packages/esm-patient-chart-app/src/clinical-views/encounter-tile/encounter-tile.component.tsx

packages/esm-patient-chart-app/src/clinical-views/utils/index.ts

packages/esm-patient-chart-app/src/clinical-views/hooks/useLastEncounter.ts

NethmiRodrigo

Thank you @CynthiaKamau! Haven't gone through it in its entirety but left some minor nit picks and suggestions:

NethmiRodrigo · 2025-01-16T16:32:02Z

packages/esm-patient-chart-app/src/clinical-views/encounter-list/encounter-list.component.tsx

 import { useEncounterRows, useFormsJson } from '../hooks';

 import styles from './encounter-list.scss';
-import { type TableRow, type Encounter, type Mode, type ColumnValue } from '../types';
-import { type FormattedColumn } from '../utils/encounter-list-config-builder';
+import { type TableRow, type Encounter, type Mode, type ColumnValue, type FormattedColumn } from '../types';


Minor nitpick, but we could do:

Suggested change

import { type TableRow, type Encounter, type Mode, type ColumnValue, type FormattedColumn } from '../types';

import type { TableRow, Encounter, Mode, ColumnValue, FormattedColumn } from '../types';

NethmiRodrigo · 2025-01-16T16:32:43Z

packages/esm-patient-chart-app/src/clinical-views/encounter-tile/encounter-tile.component.tsx

+import styles from './tile.scss';
+import { groupColumnsByEncounterType } from '../utils/helpers';
+import { useTranslation } from 'react-i18next';
+import { type EncounterTileColumn, type EncounterTileProps } from '../types';


NethmiRodrigo · 2025-01-16T16:35:34Z

packages/esm-patient-chart-app/src/clinical-views/encounter-tile/encounter-tile.component.tsx

+import React, { memo, useMemo } from 'react';
+import { useLayoutType } from '@openmrs/esm-framework';
+import { CodeSnippetSkeleton, Tile, Column, Layer } from '@carbon/react';
+import styles from './tile.scss';
+import { groupColumnsByEncounterType } from '../utils/helpers';
+import { useTranslation } from 'react-i18next';
+import { type EncounterTileColumn, type EncounterTileProps } from '../types';
+import { useLastEncounter } from '../hooks';


Minor correction for the imports reorder:

Suggested change

import React, { memo, useMemo } from 'react';

import { useLayoutType } from '@openmrs/esm-framework';

import { CodeSnippetSkeleton, Tile, Column, Layer } from '@carbon/react';

import styles from './tile.scss';

import { groupColumnsByEncounterType } from '../utils/helpers';

import { useTranslation } from 'react-i18next';

import { type EncounterTileColumn, type EncounterTileProps } from '../types';

import { useLastEncounter } from '../hooks';

import React, { memo, useMemo } from 'react';

import { useLayoutType } from '@openmrs/esm-framework';

import { useTranslation } from 'react-i18next';

import { CodeSnippetSkeleton, Tile, Column, Layer } from '@carbon/react';

import { groupColumnsByEncounterType } from '../utils/helpers';

import { useLastEncounter } from '../hooks';

import type { EncounterTileColumn, EncounterTileProps } from '../types';

import styles from './tile.scss';

Suggested change

import React, { memo, useMemo } from 'react';

import { useLayoutType } from '@openmrs/esm-framework';

import { CodeSnippetSkeleton, Tile, Column, Layer } from '@carbon/react';

import styles from './tile.scss';

import { groupColumnsByEncounterType } from '../utils/helpers';

import { useTranslation } from 'react-i18next';

import { type EncounterTileColumn, type EncounterTileProps } from '../types';

import { useLastEncounter } from '../hooks';

import React, { memo, useMemo } from 'react';

import { useLayoutType } from '@openmrs/esm-framework';

import { CodeSnippetSkeleton, Tile, Column, Layer } from '@carbon/react';

import styles from './tile.scss';

import { groupColumnsByEncounterType } from '../utils/helpers';

import { useTranslation } from 'react-i18next';

import { type EncounterTileColumn, type EncounterTileProps } from '../types';

import { useLastEncounter } from '../hooks';

NethmiRodrigo · 2025-01-16T16:38:22Z

packages/esm-patient-chart-app/src/clinical-views/utils/helpers.ts

-import { formatDate, parseDate, formatDatetime, type Concept, age, type Visit } from '@openmrs/esm-framework';
-import { type Observation, type Encounter, type Form, type ConfigConcepts } from '../types';
+import { age, formatDate, parseDate, type Visit } from '@openmrs/esm-framework';
+import {


Ditto on types

packages/esm-patient-chart-app/src/clinical-views/utils/helpers.ts

packages/esm-patient-chart-app/src/clinical-views/utils/index.ts

packages/esm-patient-chart-app/src/clinical-views/utils/helpers.ts

ibacher

Thanks for all the work on this!

ibacher · 2025-01-18T14:30:42Z

Hi @CynthiaKamau! I intentionally left this unmerged because we're in a release cycle right now. I'm going to need to back this out and we're going to need to revive this PR.

…1969) * Introduce summary card * add logic * clean up * code review * code review * Introduce summary card * add logic * clean up * code review * code review * Restructure directories and fix conflicts * code review * code review * code review * Update encounter-list.component.tsx --------- Co-authored-by: CynthiaKamau <[email protected]> Co-authored-by: Ian <[email protected]>

…penmrs#1969) * Introduce summary card * add logic * clean up * code review * code review * Introduce summary card * add logic * clean up * code review * code review * Restructure directories and fix conflicts * code review * code review * code review * Update encounter-list.component.tsx --------- Co-authored-by: CynthiaKamau <[email protected]> Co-authored-by: Ian <[email protected]>

kajambiya force-pushed the O3-3773 branch from 1320c6f to 4946dbd Compare August 22, 2024 05:33

kajambiya force-pushed the O3-3773 branch 2 times, most recently from eaf5653 to 6b763ca Compare September 4, 2024 05:28

kajambiya changed the title ~~(feat) O3-3773 Support Summary Tiles in Patient Chart~~ (feat) O3-3773 Support for Patient Program Summary in Patient Chart Sep 4, 2024

kajambiya requested review from hadijahkyampeire, ibacher and ebambo September 4, 2024 06:13

kajambiya marked this pull request as ready for review September 4, 2024 06:36

kajambiya requested a review from samuelmale September 4, 2024 06:37

kajambiya force-pushed the O3-3773 branch from 6b763ca to 64b77fd Compare September 6, 2024 06:19

hadijahkyampeire reviewed Sep 16, 2024

View reviewed changes

packages/esm-patient-chart-app/src/encounter-tile/utils/helpers.ts Outdated Show resolved Hide resolved

packages/esm-patient-chart-app/src/encounter-tile/utils/helpers.ts Outdated Show resolved Hide resolved

ibacher requested changes Sep 17, 2024

View reviewed changes

CynthiaKamau force-pushed the O3-3773 branch from 64b77fd to 36a0e2a Compare October 4, 2024 17:50

CynthiaKamau requested a review from ibacher October 4, 2024 17:52

CynthiaKamau force-pushed the O3-3773 branch 3 times, most recently from cb49d63 to cab9b91 Compare October 8, 2024 13:30

ibacher requested changes Oct 9, 2024

View reviewed changes

CynthiaKamau force-pushed the O3-3773 branch 2 times, most recently from d5c1461 to b9b0d00 Compare October 12, 2024 07:25

ibacher requested changes Oct 21, 2024

View reviewed changes

CynthiaKamau force-pushed the O3-3773 branch from b9b0d00 to 72c35b9 Compare October 22, 2024 18:43

CynthiaKamau requested a review from ibacher October 29, 2024 15:59

ibacher requested changes Nov 22, 2024

View reviewed changes

CynthiaKamau force-pushed the O3-3773 branch 2 times, most recently from 8dcedbb to bd4e5dc Compare November 26, 2024 13:32

CynthiaKamau force-pushed the O3-3773 branch from 12d5ba0 to 797618b Compare December 16, 2024 11:02

CynthiaKamau requested review from ibacher and CynthiaKamau December 18, 2024 11:02

ibacher requested changes Jan 13, 2025

View reviewed changes

CynthiaKamau force-pushed the O3-3773 branch 2 times, most recently from 4df2838 to 5312489 Compare January 14, 2025 10:05

CynthiaKamau requested a review from ibacher January 15, 2025 06:52

kajambiya and others added 13 commits January 16, 2025 15:27

Introduce summary card

64d6834

add logic

75cd6ff

clean up

9015c95

code review

280482b

code review

c79903f

Introduce summary card

96c2d0f

add logic

22ae83c

clean up

58fb901

code review

15157ab

code review

a633135

Restructure directories and fix conflicts

b65aded

code review

e046e15

code review

f29f807

CynthiaKamau force-pushed the O3-3773 branch from 5312489 to f29f807 Compare January 16, 2025 12:28

NethmiRodrigo reviewed Jan 16, 2025

View reviewed changes

code review

869b457

CynthiaKamau requested a review from NethmiRodrigo January 17, 2025 08:08

Update encounter-list.component.tsx

8a1a6b9

ibacher approved these changes Jan 17, 2025

View reviewed changes

CynthiaKamau merged commit 55b4ad5 into openmrs:main Jan 17, 2025
6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(feat) O3-3773 Support for Patient Program Summary in Patient Chart #1969

(feat) O3-3773 Support for Patient Program Summary in Patient Chart #1969

kajambiya commented Aug 22, 2024 •

edited by denniskigen

Loading

hadijahkyampeire left a comment

ibacher left a comment

brandones commented Nov 11, 2024

ibacher left a comment

gracepotma commented Dec 13, 2024

eudson commented Dec 16, 2024

eudson commented Jan 8, 2025

ibacher left a comment

NethmiRodrigo left a comment

NethmiRodrigo Jan 16, 2025

NethmiRodrigo Jan 16, 2025

NethmiRodrigo Jan 16, 2025

NethmiRodrigo Jan 16, 2025

ibacher left a comment

ibacher commented Jan 18, 2025

	import { type TableRow, type Encounter, type Mode, type ColumnValue, type FormattedColumn } from '../types';
	import type { TableRow, Encounter, Mode, ColumnValue, FormattedColumn } from '../types';

(feat) O3-3773 Support for Patient Program Summary in Patient Chart #1969

(feat) O3-3773 Support for Patient Program Summary in Patient Chart #1969

Conversation

kajambiya commented Aug 22, 2024 • edited by denniskigen Loading

Requirements

Summary

Screenshots

Related Issue

Other

hadijahkyampeire left a comment

Choose a reason for hiding this comment

ibacher left a comment

Choose a reason for hiding this comment

brandones commented Nov 11, 2024

ibacher left a comment

Choose a reason for hiding this comment

gracepotma commented Dec 13, 2024

eudson commented Dec 16, 2024

eudson commented Jan 8, 2025

ibacher left a comment

Choose a reason for hiding this comment

NethmiRodrigo left a comment

Choose a reason for hiding this comment

NethmiRodrigo Jan 16, 2025

Choose a reason for hiding this comment

NethmiRodrigo Jan 16, 2025

Choose a reason for hiding this comment

NethmiRodrigo Jan 16, 2025

Choose a reason for hiding this comment

NethmiRodrigo Jan 16, 2025

Choose a reason for hiding this comment

ibacher left a comment

Choose a reason for hiding this comment

ibacher commented Jan 18, 2025

kajambiya commented Aug 22, 2024 •

edited by denniskigen

Loading