(feat) O3-4043: Dispensing: Allow back dating dispense events for ret… #122
Conversation
…rospective entry (update to latest Core libraries and fix usage of OpenMRS datepicker accordingly)
| @@ -506,13 +501,14 @@ const MedicationDispenseReview: React.FC<MedicationDispenseReviewProps> = ({ | |||
| labelText={t('dispenseDate', 'Date of Dispense')} | |||
| minDate={prescriptionDate ? dayjs(prescriptionDate).startOf('day').toDate() : null} | |||
| maxDate={dayjs().toDate()} | |||
| onChange={(selectedDate) => { | |||
| const currentDate = dayjs(medicationDispense.whenHandedOver); | |||
| onChange={(input) => { | |||
There was a problem hiding this comment.
the OpenMRS datepicker now returns a Date, not a CalenderDate, which makes things simpler
| }; | ||
| }); | ||
|
|
||
| jest.mocked(openmrsFetch); |
There was a problem hiding this comment.
Updating to the cleaner method of mocking
| @@ -1248,7 +1240,7 @@ describe('Medication Request Resource Test', () => { | |||
|
|
|||
| // @ts-ignore | |||
| useSWR.mockImplementation(() => ({ data: { data: queryRequestBundle } })); | |||
| const { allergies, totalAllergies } = usePatientAllergies('558494fe-5850-4b34-a3bf-06550334ba4a', 10000); | |||
| const { totalAllergies } = usePatientAllergies('558494fe-5850-4b34-a3bf-06550334ba4a', 10000); | |||
There was a problem hiding this comment.
unused variable caught by the linter
| @@ -1,26 +1,30 @@ | |||
| { | |||
There was a problem hiding this comment.
I just copied this from the Patient Management
tsconfig.json
Outdated
| "es2021", | ||
| "es2022", | ||
| "es5", | ||
| "scripthost", |
There was a problem hiding this comment.
Probably harmless, but we don't need "scripthost" (it's a Microsoft Windows API thing), or anything before "es2022" (since es2022 includes those things already).
We should probably clean up the tsconfig in patient-management / patient-chart / esm-core at some point....
There was a problem hiding this comment.
Cool, I removed those (and confirmed things still worked), thanks!
…rospective entry (remove unused libs from tsconfig)
|
Thanks @chibongho @ibacher , merging! |
…rospective entry
(update to latest Core libraries and fix usage of OpenMRS datepicker accordingly)
Requirements
Summary
This is a follow-up commit for the original, merged commit for https://openmrs.atlassian.net/browse/O3-4043
Unfortunately, I built against an old version of the core ESM libraries, and the OpenmrsDatepicker had been updated since then so things failed when deployed to our staging servers.
This updates Dispense to run against the latest ESM Core, and then fixed the code to work with the OpenmrsDatepicker and currently defined.
Updating the datepicker also fixed some of the issues I was seeing with it... :)
Screenshots
No new UI changes beyond the initial, merged PR
Related Issue
https://openmrs.atlassian.net/browse/O3-4043
Other