#6284 Prescriptions per program #6371

CarlosNZ · 2025-01-31T00:45:20Z

Fixes #6284

👩🏻‍💻 What does this PR do?

Bit of a biggie this one, but a lot of the changed files are just adding a field to Rust types.

Quick summary of changes:

Update "items" node to be filterable by "masterListId"
Add "master_list_id" field to "invoice" table
Prescriptions toolbar makes a query useListPrograms to get a list of programs, and if any exist, presents a "Program" selector on the Prescription page
Program selector is loaded with the value attached to the current prescription/invoice
Changing the program removes all items already added to prescription
The masterListId of the selected program is passed down into the StockItemSearchInput, and included in the filter (so will only show items belonging to selected program)

💌 Any notes for the reviewer?

There's two tiny off-road fixes I've included here too:

Pluralised the Breadcrumb heading to "Prescriptions" rather than "Prescription" to be consistent with everything else.
Removed the double-scroll bar from Detail View (it's still there on other things though -- have made an issue: My nemesis the double-scroll bar is back! #6370)

🧪 Testing

If you have no programs defined yet:

Confirm the "Program" selector does NOT appear on the Prescription, and that there is no restrictions on the Item search

Then create some programs, and associate some items with them (instructions elsewhere, sorry)

Prescription should now have "Program" selector
After selecting a program, the "Items" search should be restricted to only the items of that program
Clear the program (set it to nothing) -- it should work without any warnings or other changes to the prescription
Select another program -- you should be warned that it will remove all items already added
- "OK" clears the items and changes the program
- "Cancel" changes nothing

…list_id

github-actions · 2025-01-31T00:50:23Z

Bundle size difference

Comparing this PR to main

Old size	New size	Diff
5.27 MB	5.27 MB	2.28 KB (0.04%)

CarlosNZ · 2025-01-31T00:47:13Z

client/packages/common/src/intl/locales/en/common.json

@@ -1595,7 +1595,7 @@
  "placeholder.search-by-name-or-code": "Search by name or code",
  "placeholder.search-by-notes": "Search by notes",
  "preferences": "Preferences",
-  "prescription": "Prescription",
+  "prescription": "Prescriptions",


This is super annoying -- I tried for ages to figure out where the keys were defined in the breadcrumbs, and couldn't figure out how to change it to the plural version. But it turns out all the other areas (Outbound shipments, etc) have just put the plural version in the singular key! 🙄

Not a great pattern, but too hard to fix right now.

CarlosNZ · 2025-01-31T00:47:59Z

client/packages/common/src/utils/environment/EnvUtils.ts

@@ -71,7 +71,7 @@ const mapRoute = (route: string): RouteMapping => {
    case inRoute(AppRoute.Patients):
      return { title: 'patients', docs: '/dispensary/patients/' };
    case inRoute(AppRoute.Prescription):
-      return { title: 'prescription', docs: '/dispensary/prescriptions/' };
+      return { title: 'prescriptions', docs: '/dispensary/prescriptions/' };


Changed this too -- don't think it breaks anything (it's consistent with the other ones)

CarlosNZ · 2025-01-31T00:48:18Z

client/packages/invoices/src/Prescriptions/DetailView/ContentArea.tsx

@@ -48,24 +47,22 @@ export const ContentAreaComponent: FC<ContentAreaProps> = ({
  if (!rows) return null;

  return (
-    <Box flexDirection="column" display="flex" flex={1}>


Just removing the outer <div> to fix the double scrollbar problem

CarlosNZ · 2025-01-31T00:49:46Z

client/packages/invoices/src/Prescriptions/DetailView/Toolbar.tsx

+            flexDirection="column"
+            flex={1}
+            marginLeft={3}
+            gap={1}


Just added gap

CarlosNZ · 2025-01-31T00:50:42Z

client/packages/programs/src/api/hooks/useProgramList.ts

@@ -7,7 +7,7 @@ import { ProgramFragment } from '../operations.generated';
 import { useProgramsGraphQL } from '../useProgramsGraphQL';
 import { LIST, PROGRAM } from './keys';

-export const useProgramList = () => {
+export const useProgramList = (includeImmunisation?: boolean) => {


I just made an additional configuration rather than creating a whole new hook for this. I assume we want all programs, including immunisation ones?

CarlosNZ · 2025-01-31T00:51:58Z

client/packages/system/src/Program/ProgramSearchInput.tsx

+import React from 'react';
+import { FC } from 'react';
+
+interface ProgramSearchInputProps {


Pretty much a copy of "ClinicianSearchInput". The only difference is I did the query (to get the program list) in the Toolbar (parent) rather than in here, as I wanted to be able to not show the program selector if there are no programs.

roxy-dao · 2025-01-31T04:17:28Z

server/repository/src/migrations/v2_06_00/add_masterlist_id_to_invoice.rs

+        sql!(
+            connection,
+            r#"
+                ALTER TABLE invoice ADD COLUMN master_list_id TEXT


Since this is linking the invoice to program, should be renamed to program_id and reference the program table. Could you also do a migration to add and save the period_id as well? Might need mSupply implementation for period_id too for syncing. Then you don't need to serde rename in translation!

GeronimoJohn

Thanks for the hardwork on this @CarlosNZ. Looking good to me! The tests just need the programId field to be added. Approving with the note to include it

GeronimoJohn · 2025-02-03T01:40:34Z

client/packages/invoices/src/Prescriptions/DetailView/Toolbar.tsx

+        // For simplicity, we currently delete all items that have already been
+        // added when switching programs. We may wish to improve this in the
+        // future to only remove items that don't belong to the new program
+        await deleteAll();


Very Minor - Just a small behaviour question: If a user removes and then reselects the same program, it warns them about deleting all their current lines. Wondering if it would be nice if it didn't for that use case?

Yeah, I see what you mean. But once they've removed the program selection, we no longer have any record of what was previously selected. I could add a new previousSelection state value, but seems a bit overkill for a fairly edge case.

I actually think we should do the more sophisticated thing and only remove the items that are not part of the new program, and that would take care of this problem, but was told to just deleteAll for now. So any further changes seem like fixing the wrong problem if you know what I mean 😆

CarlosNZ · 2025-02-03T03:23:29Z

Thanks for the review @GeronimoJohn -- have fixed the tests now: b312ee3

CarlosNZ added 8 commits January 30, 2025 14:24

WIP

5d992c1

Add column to invoice table, update items filter to filter by master_…

1ccf441

…list_id

Filter Item search by masterListId

87306f8

Delete lines on change

3021625

Fix plural of "Prescriptions" list header

49f62db

Fix double-scroll for Prescription

2df0b23

Remove commented code

b92bfff

Fix empty program logic

05ea307

github-actions bot added this to the v2.6.0 milestone Jan 31, 2025

github-actions bot added Team Piwakawaka James, Carl, John, Zachariah feature: dispensing labels Jan 31, 2025

Fix imports

6f710ed

CarlosNZ commented Jan 31, 2025

View reviewed changes

GeronimoJohn self-assigned this Jan 31, 2025

roxy-dao reviewed Jan 31, 2025

View reviewed changes

roxy-dao mentioned this pull request Jan 31, 2025

Customised report: Prescription #6344

Open

GeronimoJohn assigned GeronimoJohn and unassigned GeronimoJohn Feb 2, 2025

CarlosNZ added 2 commits February 3, 2025 10:48

Merge branch 'develop' into 6284-prescriptions-per-program

8ffab7b

Rename invoice field to "program_id"

836bf17

GeronimoJohn approved these changes Feb 3, 2025

View reviewed changes

Update tests

b312ee3

CarlosNZ force-pushed the 6284-prescriptions-per-program branch from 69876ef to b312ee3 Compare February 3, 2025 03:23

CarlosNZ merged commit ccde2b2 into develop Feb 3, 2025
3 of 6 checks passed

CarlosNZ deleted the 6284-prescriptions-per-program branch February 3, 2025 03:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#6284 Prescriptions per program #6371

#6284 Prescriptions per program #6371

CarlosNZ commented Jan 31, 2025 •

edited by GeronimoJohn

Loading

github-actions bot commented Jan 31, 2025 •

edited

Loading

CarlosNZ Jan 31, 2025

CarlosNZ Jan 31, 2025

CarlosNZ Jan 31, 2025

CarlosNZ Jan 31, 2025

CarlosNZ Jan 31, 2025

CarlosNZ Jan 31, 2025

roxy-dao Jan 31, 2025 •

edited

Loading

GeronimoJohn left a comment

GeronimoJohn Feb 3, 2025

CarlosNZ Feb 3, 2025

CarlosNZ commented Feb 3, 2025

#6284 Prescriptions per program #6371

#6284 Prescriptions per program #6371

Conversation

CarlosNZ commented Jan 31, 2025 • edited by GeronimoJohn Loading

👩🏻‍💻 What does this PR do?

💌 Any notes for the reviewer?

🧪 Testing

github-actions bot commented Jan 31, 2025 • edited Loading

Bundle size difference

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

roxy-dao Jan 31, 2025 • edited Loading

Choose a reason for hiding this comment

GeronimoJohn left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CarlosNZ commented Feb 3, 2025

CarlosNZ commented Jan 31, 2025 •

edited by GeronimoJohn

Loading

github-actions bot commented Jan 31, 2025 •

edited

Loading

roxy-dao Jan 31, 2025 •

edited

Loading