(feat) O3-4219: Add ability to print patient prescriptions #125

Omoshlawi · 2024-11-25T14:27:49Z

Requirements

This PR has a title that briefly describes the work done, including the ticket number if there is a ticket.
My work conforms to the OpenMRS 3.0 Styleguide and design documentation.
My work includes tests or is validated by existing tests.

Summary

Screenshots

prescriptionprint.mp4

Related Issue

https://openmrs.atlassian.net/browse/O3-4219

Other

ojwanganto · 2024-11-25T22:11:38Z

Thanks, @Omoshlawi. Was there guidance to introduce the action column considering that other actions are shown when the row is expanded? We need additional guidance by the UI/UX team. Please reach out to Paul.
Kindly update the related ticket in the PR description.

Omoshlawi · 2024-11-26T04:07:13Z

Thanks, @Omoshlawi. Was there guidance to introduce the action column considering that other actions are shown when the row is expanded? We need additional guidance by the UI/UX team. Please reach out to Paul. Kindly update the related ticket in the PR description.

Ok, sure, thankz

mogoodrich · 2024-11-26T15:25:07Z

Thanks, @Omoshlawi. Was there guidance to introduce the action column considering that other actions are shown when the row is expanded? We need additional guidance by the UI/UX team. Please reach out to Paul. Kindly update the related ticket in the PR description.

also adding @fiona855 for her thoughts on the design...

mogoodrich

One small comment, but defer to others for a deeper code review. Also, I agree we should have a design discussion about where to add this print action (it probably is better as a button under "Prescription Details" where the Dispense-Pause-Close buttons are.

But thanks so much for working on this @Omoshlawi , this is definitely a much-requested feature.

mogoodrich · 2024-11-26T17:33:19Z

src/print-prescription/prescription-printout.component.tsx

+          <StructuredListCell head>Patient Name Here</StructuredListCell>
+          <StructuredListCell head>Facility name here</StructuredListCell>
+        </StructuredListRow>
+      </StructuredListHead> */}


Remove this commented out text.

fiona855 · 2024-11-26T17:47:59Z

Agreed @mogoodrich. In the original designs (which have changed), the print button was a link under the prescription details which makes sense to me.

ojwanganto · 2024-11-26T19:37:46Z

Thanks, @fiona855 and @mogoodrich for the additions. We'll probably need to wait for Paul's guidance on the best positioning but @fiona855 can guide further.

Omoshlawi · 2024-11-27T17:57:07Z

selectable-printable-prescriptions.mp4

Added ability to select prescriptions to include in the print out

mogoodrich

@Omoshlawi I added a few comments but overall looks good to me, though again I defer to others with more O3 experience.

I think the layout and functionality look great... what are your thoughts @fiona855 ?

mogoodrich · 2024-11-27T18:43:39Z

src/print-prescription/prescription-printout.component.tsx

+            <StructuredListCell head>
+              <br />
+              <br />
+              <p className={styles.printoutTitle}>Prescription Instructions</p>


This should use t() to localize.

yeah, sure.thanks

mogoodrich · 2024-11-27T18:45:08Z

src/print-prescription/prescription-printout.component.tsx

+                  {patient.display
+                    .match(/^([A-Za-z\s]+)\s\(/)
+                    ?.at(1)
+                    ?.toUpperCase()}


I don't think we should manipulate the patient display here... I hope we have some sort of existing utility formatting method we can use... @denniskigen @ibacher ?

extracted it into a utility function

mogoodrich · 2024-11-27T18:46:31Z

src/print-prescription/prescription-printout.component.tsx

+                          <p>{dosageInstruction?.additionalInstruction[0].text}</p>
+                        )}
+                      </StructuredListCell>
+                    </StructuredListRow>


I just scanned this quickly, but during testing we should make sure that this properly displays all the fields we want it to display.

fiona855 · 2024-11-27T19:00:09Z

Agreed, looks really good @Omoshlawi !

ojwanganto · 2024-11-27T21:32:43Z

Thanks @Omoshlawi. It looks nice!
@mogoodrich @fiona855 - should we indicate the date of printing somewhere on the page?

ojwanganto · 2024-11-28T19:34:19Z

@Omoshlawi are we good on this one? @mogoodrich anything else that needs to be addressed?

mogoodrich · 2024-12-02T15:58:49Z

@Omoshlawi are we good on this one? @mogoodrich anything else that needs to be addressed?

Sorry for the delay, a holiday last week in the US. No blockers on my end, though it would be good to have @ibacher @denniskigen or @chibongho take a look.

mogoodrich · 2024-12-02T16:00:23Z

src/print-prescription/prescription-printout.component.tsx

+              <p className={styles.printoutTitle}>{t('prescriptionInstructions', 'Prescription Instructions')}</p>
+              {patient && (
+                <p className={styles.faintText} style={{ textAlign: 'center' }}>
+                  {extractpatientName(patient.display)?.toUpperCase()}


@denniskigen @ibacher @chibongho do we have an existing utility method we could use here instead?

No, but this extractpatientName() method is definitely not it (this regex excludes any accent marks, any non-Latin scripts, which means it does not work in a language-agnostic way). A much better (and simpler) way of doing the exact same thing is this:

display.includes('(') ? display.split('(')[0] : display;

We should probably add something like this to the framework utilities, though.

I'm also not hugely a fan of having the call to toUpperCase() here. A CSS text-transform would be much cleaner here.

One last thing, the mixing of both className and style on a single tag should not be done. Just add a second class.

@Omoshlawi Did you see the above comments?

ibacher · 2024-12-02T17:16:40Z

src/print-prescription/prescription-printout.component.tsx

+                          </span>{' '}
+                          &mdash; {dosageInstruction?.route?.text} &mdash; {dosageInstruction?.timing?.code?.text}{' '}
+                          {dosageInstruction?.timing?.repeat?.duration
+                            ? 'for ' +


Any display text must be translatable.

fixed, thanks

ibacher · 2024-12-02T17:17:14Z

src/print-prescription/prescription-printout.component.tsx

+                          <span className={styles.faintText}>{t('datePrescribed', 'Date prescribed')}</span>
+                          {': '} <span>{formatDate(parseDate((request.request as any).authoredOn))}</span>
+                        </p>
+                        {(refillsAllowed || refillsAllowed === 0) && (


It seems like a drug order placed without refills needs to have that prominently noted on the printed prescription.

Displaying Not Refillable explicitly instead of conditional rendering

I would stick with the text "No Refills".

ok, renamed

ojwanganto · 2024-12-09T19:58:54Z

Ping @ibacher @mogoodrich

ibacher

See existing comments

ojwanganto · 2024-12-10T16:19:09Z

@Omoshlawi please address the comments and the conflicts.

Omoshlawi · 2024-12-10T17:59:25Z

@Omoshlawi please address the comments and the conflicts.

conflict resolved

Omoshlawi · 2024-12-10T18:16:51Z

See existing comments

Just saw the comments and addressed them, thanks

Capitalized patient name from styles
Introduces another class in styles removing inline styling
refactored patient name extractor method

donaldkibet · 2024-12-16T13:28:03Z

Thanks @Omoshlawi, merging this in since all comments have been addressed.

src/prescriptions/prescriptions-actions.scss

src/print-prescription/printable-prescriptions.component.tsx

src/print-prescription/print-prescription.scss

src/print-prescription/prescription-printout.component.tsx

src/prescriptions/prescription-actions.component.tsx

src/print-prescription/prescription-print-action.component.tsx

src/print-prescription/prescription-print-preview.modal.tsx

src/print-prescription/prescription-printout.component.tsx

src/print-prescription/printable-prescriptions.component.tsx

ojwanganto · 2024-12-16T18:13:58Z

Thanks, @denniskigen for the reviews. @Omoshlawi please address the comments and have this in.

Omoshlawi · 2024-12-16T21:04:19Z

Thanks, @denniskigen for the reviews. @Omoshlawi please address the comments and have this in.

Done, thanks

…ng logic into utility function

…escription that are not refillable

…or from display

…ndlers funtions and wrapping them in useCallback for persisting avoiding reconstructions

denniskigen

Thanks, @Omoshlawi! I've taken the liberty to tack on some useful miscellaneous tweaks. Hope that's fine with you. Also, could you please add a summary of your changes to the PR description for posterity?

mogoodrich reviewed Nov 26, 2024

View reviewed changes

mogoodrich reviewed Nov 27, 2024

View reviewed changes

mogoodrich requested review from ibacher and denniskigen November 27, 2024 18:48

mogoodrich requested a review from chibongho December 2, 2024 15:58

mogoodrich reviewed Dec 2, 2024

View reviewed changes

ibacher reviewed Dec 2, 2024

View reviewed changes

donaldkibet approved these changes Dec 9, 2024

View reviewed changes

ibacher requested changes Dec 9, 2024

View reviewed changes

ibacher changed the title ~~(feat)O3 4219 add ability to print patient prescriptions~~ (feat) O3-4219: Add ability to print patient prescriptions Dec 11, 2024

donaldkibet approved these changes Dec 16, 2024

View reviewed changes

donaldkibet requested a review from ibacher December 16, 2024 13:28

denniskigen reviewed Dec 16, 2024

View reviewed changes

src/prescriptions/prescriptions-actions.scss Outdated Show resolved Hide resolved

denniskigen reviewed Dec 16, 2024

View reviewed changes

src/print-prescription/printable-prescriptions.component.tsx Outdated Show resolved Hide resolved

src/print-prescription/print-prescription.scss Outdated Show resolved Hide resolved

src/print-prescription/prescription-printout.component.tsx Outdated Show resolved Hide resolved

denniskigen reviewed Dec 16, 2024

View reviewed changes

src/prescriptions/prescription-actions.component.tsx Outdated Show resolved Hide resolved

denniskigen reviewed Dec 16, 2024

View reviewed changes

src/print-prescription/prescription-print-action.component.tsx Outdated Show resolved Hide resolved

src/print-prescription/prescription-print-preview.modal.tsx Outdated Show resolved Hide resolved

denniskigen reviewed Dec 16, 2024

View reviewed changes

Omoshlawi and others added 10 commits December 17, 2024 01:59

Added preview model with printing capability

cd87874

Print preview and printing and printing done

96b2537

Added ability to select prescriptions to print

878ef44

wraped free text under translation.Extracted patient display processi…

fa1c6f7

…ng logic into utility function

Added all addtional instructions and indicating not refillable for pr…

9d6fb95

…escription that are not refillable

Updated display for none refillable prescriptions to no refills

393c60b

Captitalize patient name from styles, refactored patient name extract…

c995ff4

…or from display

Fixed class name spelling

7dba4da

fixed variable names casing and naming, stylings and extracting of ha…

3e4b478

…ndlers funtions and wrapping them in useCallback for persisting avoiding reconstructions

Misc tweaks

f6cf58c

denniskigen force-pushed the O3-4219-add-ability-to-print-patient-prescriptions branch from 7c8f337 to f6cf58c Compare December 16, 2024 23:21

denniskigen approved these changes Dec 16, 2024

View reviewed changes

donaldkibet merged commit dd031d5 into openmrs:main Dec 17, 2024
4 checks passed

(feat) O3-4219: Add ability to print patient prescriptions #125

(feat) O3-4219: Add ability to print patient prescriptions #125

Conversation

Omoshlawi commented Nov 25, 2024 • edited by denniskigen Loading

Requirements

Summary

Screenshots

Related Issue

Other

ojwanganto commented Nov 25, 2024

Omoshlawi commented Nov 26, 2024

mogoodrich commented Nov 26, 2024

mogoodrich left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fiona855 commented Nov 26, 2024

ojwanganto commented Nov 26, 2024

Omoshlawi commented Nov 27, 2024

mogoodrich left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fiona855 commented Nov 27, 2024

ojwanganto commented Nov 27, 2024

ojwanganto commented Nov 28, 2024

mogoodrich commented Dec 2, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ojwanganto commented Dec 9, 2024

ibacher left a comment

Choose a reason for hiding this comment

ojwanganto commented Dec 10, 2024

Omoshlawi commented Dec 10, 2024 • edited Loading

Omoshlawi commented Dec 10, 2024 • edited Loading

donaldkibet commented Dec 16, 2024

ojwanganto commented Dec 16, 2024

Omoshlawi commented Dec 16, 2024

denniskigen left a comment • edited Loading

Choose a reason for hiding this comment

Omoshlawi commented Nov 25, 2024 •

edited by denniskigen

Loading

Omoshlawi commented Dec 10, 2024 •

edited

Loading

Omoshlawi commented Dec 10, 2024 •

edited

Loading

denniskigen left a comment •

edited

Loading