(fix) O3-2843: Ability to re-enroll in completed programs #1720

jwnasambu · 2024-03-07T00:27:27Z

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

I fixed the ability of complete programs being able to be re-enrolled again by adjusting the condition of disabling the Add button and setting a condition enrollment.dateCompleted !== null checks whether a program enrollment has a completion date. If it has a completion date (not null), it means the program has been completed.
Programs with completed enrollments will be included in eligiblePrograms, allowing them to be considered for re-enrollment.

Screenshots

Video before implementing proposed changes

screencast.2024-03-07.3.AM-36-34.mp4

Video with proposed changes

screencast.2024-07-02.2.PM-18-50.mp4

Related Issue

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

Other

jwnasambu · 2024-03-07T00:56:53Z

@denniskigen Kindly feel free to review my PR before I proceed with the e2e test. Am not certain if am on the right track since I don't have a design.

makombe · 2024-03-07T06:58:42Z

@jwnasambu Thanks for the work. From the gif, why are you editing enrollment date when you want to complete the program?

jwnasambu · 2024-03-07T07:52:30Z

@makombe I edited it because I wanted to a certain that the Add button is disabled when all the eligible/available programs are all enrolled and are in active state and confirm the 'Add' button is only activated when a program is marked as completed. Editing the enrolment date was the only way for me to confirm my questions. Thank you for pointing that out. Though that doesn't confirm that one is to edit the form to complete a program. Additionally, please feel free to guide me on the path I am supposed to take since I don't have a design to instruct me on the expected output.

jwnasambu · 2024-05-01T14:47:55Z

@makombe kindly what could be the way forward with this ticket please?

ojwanganto · 2024-05-02T07:19:16Z

@makombe please help with this

brandones · 2024-06-28T21:10:08Z

@makombe that's how you complete a program. @jwnasambu your demo in the gif was good. Could you please resolve the conflicts? programs-form.component was renamed to programs-form.workspace.

Regarding the UI, the only change that is definitely needed is that this banner should not appear if the add button is clickable. It's sending mixed signals to the user.

jwnasambu · 2024-07-01T08:47:40Z

Thanks @brandones for the review. Am going to push the fix before end of today. I have been seriously sick again but now am much better.

brandones · 2024-07-09T19:33:23Z

Ok, please tag me in a comment when this is ready for re-review. And please include an updated UI screenshot or video.

jwnasambu · 2024-07-09T20:21:52Z

@brandones Kindly I updated everything basing on the requests you made. Its ready for review!
Am so sorry I didn't inform you after making changes kindly forgive me.

N/B the second video above is the one with the updated changes.

denniskigen

Thanks for working on this, @jwnasambu. I've left some suggestions.

denniskigen · 2024-07-09T21:02:44Z

packages/esm-patient-programs-app/src/programs/programs-detailed-summary.component.tsx

+  const noCompletedPrograms = useMemo(() => {
+    return enrollments?.every((program) => !program.dateCompleted);
+  }, [enrollments]);


How about something like this instead for determining whether a patient is ineligible for new enrollments or re-enrollments to completed programs:

const isEnrolledInAllPrograms = useMemo(() => { if (!availablePrograms?.length || !enrollments?.length) { return false; } const activeEnrollments = enrollments.filter((enrollment) => !enrollment.dateCompleted); return activeEnrollments.length === availablePrograms.length; }, [availablePrograms, enrollments]);

denniskigen · 2024-07-09T21:05:25Z

packages/esm-patient-programs-app/src/programs/programs-detailed-summary.component.tsx

@@ -100,21 +106,21 @@ const ProgramsDetailedSummary: React.FC<ProgramsDetailedSummaryProps> = ({ patie
              renderIcon={(props) => <Add size={16} {...props} />}
              iconDescription="Add programs"
              onClick={launchProgramsForm}
-              disabled={availablePrograms?.length && eligiblePrograms?.length === 0}
+              disabled={availablePrograms?.length && eligiblePrograms?.length === 0 && noCompletedPrograms}


Suggested change

disabled={availablePrograms?.length && eligiblePrograms?.length === 0 && noCompletedPrograms}

I don't think we should worry about disabling the button because you shouldn't be able to see it if the isEnrolledInAllPrograms condition is truthy anyway:

denniskigen · 2024-07-09T21:05:39Z

packages/esm-patient-programs-app/src/programs/programs-detailed-summary.component.tsx

            >
              {t('add', 'Add')}
            </Button>
          )}
        </CardHeader>
-        {availablePrograms?.length && eligiblePrograms?.length === 0 ? (
+        {showInlineNotification && (


Suggested change

{showInlineNotification && (

{isEnrolledInAllPrograms && (

denniskigen · 2024-07-09T21:09:08Z

packages/esm-patient-programs-app/src/programs/programs-form.workspace.tsx

+    : filter(
+        availablePrograms,
+        (program) =>
+          !includes(map(enrollments, 'program.uuid'), program.uuid) ||
+          enrollments.some(
+            (enrollment) => enrollment.program.uuid === program.uuid && enrollment.dateCompleted !== null,
+          ),
+      );


And how about doing this here instead:

const eligiblePrograms = currentProgram ? [currentProgram] : filter(availablePrograms, (program) => { const existingEnrollment = enrollments.find((enrollment) => enrollment.program.uuid === program.uuid); return !existingEnrollment || existingEnrollment.dateCompleted !== null; });

Which cleans up the logic a fair bit and makes it easier to add in custom implementation specific logic in the future for determining eligibility for enrollment.

jwnasambu · 2024-07-10T00:13:48Z

@brandones, @denniskigen kindly feel free to review my PR please!

…and the Add button is active

denniskigen · 2024-07-10T11:53:46Z

__mocks__/programs.mock.ts

@@ -61,6 +61,54 @@ export const mockEnrolledProgramsResponse = [
  },
 ];

+export const mockEnrolledInAllProgramsResponse = [


This is to test the appearance of an error if there are no more programs left to enroll the patient in.

denniskigen · 2024-07-10T11:59:27Z

packages/esm-patient-programs-app/src/programs/programs-form.workspace.tsx

@@ -187,7 +166,7 @@ const ProgramsForm: React.FC<ProgramsFormProps> = ({
            aria-label="program name"
            id="program"
            invalidText={t('required', 'Required')}
-            labelText=""
+            labelText={t('programName', 'Program name')}


These labels were not previously associated with their inputs correctly.

denniskigen · 2024-07-10T12:03:34Z

packages/esm-patient-programs-app/src/programs/programs-form.workspace.tsx

-  const onSubmit = React.useCallback(
-    (data: ProgramsFormData) => {
+  const onSubmit = useCallback(
+    async (data: ProgramsFormData) => {


This just cleans up the submit logic using async/await syntax.

denniskigen · 2024-07-10T13:35:43Z

packages/esm-patient-programs-app/src/programs/programs.resource.tsx

-export function getPatientProgramByUuid(programUuid: string) {
-  return openmrsObservableFetch<PatientProgram>(`${restBaseUrl}/programenrollment/${programUuid}`).pipe(
-    rxjsMap(({ data }) => data),
-  );
-}


It looks like this isn't being used anywhere.

denniskigen · 2024-07-10T13:36:14Z

packages/esm-patient-programs-app/src/programs/programs.resource.tsx

 export function createProgramEnrollment(payload, abortController) {
  if (!payload) {
    return null;
  }
  const { program, patient, dateEnrolled, dateCompleted, location } = payload;
-  return openmrsObservableFetch(`${restBaseUrl}/programenrollment`, {
+  return openmrsFetch(`${restBaseUrl}/programenrollment`, {


Necessitated by refactoring the submit logic to use async/await syntax.

denniskigen · 2024-07-10T13:52:41Z

Thanks for working on this, @jwnasambu.

brandones changed the title ~~(fix)O3-2843: Ability to re-enroll in completed programs.~~ (fix) O3-2843: Ability to re-enroll in completed programs. Jun 28, 2024

brandones changed the title ~~(fix) O3-2843: Ability to re-enroll in completed programs.~~ (fix) O3-2843: Ability to re-enroll in completed programs Jun 28, 2024

brandones self-requested a review June 28, 2024 21:11

jwnasambu force-pushed the (fix)O3-2843 branch from 0066af5 to 694109c Compare July 1, 2024 21:44

jwnasambu marked this pull request as draft July 1, 2024 21:44

jwnasambu force-pushed the (fix)O3-2843 branch from 4ddb8ce to ed49ec1 Compare July 2, 2024 11:45

jwnasambu marked this pull request as ready for review July 2, 2024 11:49

jwnasambu force-pushed the (fix)O3-2843 branch from 8165368 to 11c3f46 Compare July 3, 2024 17:51

denniskigen reviewed Jul 9, 2024

View reviewed changes

jwnasambu added 4 commits July 10, 2024 14:23

'(fix)O3-2843': Ability to re-enroll in completed programs.

3f10db6

InlineNotification not to be displayed once the program is completed …

08931d4

…and the Add button is active

Code refactor

3add8d7

Hide add button when there is no program to enroll in

c3a7b3d

denniskigen force-pushed the (fix)O3-2843 branch 2 times, most recently from 447ffdb to 8fa3fdb Compare July 10, 2024 11:56

Fixup

3a8cc42

denniskigen force-pushed the (fix)O3-2843 branch from 8fa3fdb to 3a8cc42 Compare July 10, 2024 12:01

denniskigen reviewed Jul 10, 2024

View reviewed changes

The E2E tests prove their worth yet again

2b4fe55

denniskigen reviewed Jul 10, 2024

View reviewed changes

denniskigen requested a review from ibacher July 10, 2024 13:46

ibacher approved these changes Jul 10, 2024

View reviewed changes

denniskigen merged commit 49ac387 into openmrs:main Jul 10, 2024
6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(fix) O3-2843: Ability to re-enroll in completed programs #1720

(fix) O3-2843: Ability to re-enroll in completed programs #1720

jwnasambu commented Mar 7, 2024 •

edited

Loading

jwnasambu commented Mar 7, 2024

makombe commented Mar 7, 2024 •

edited

Loading

jwnasambu commented Mar 7, 2024 •

edited

Loading

jwnasambu commented May 1, 2024

ojwanganto commented May 2, 2024

brandones commented Jun 28, 2024

jwnasambu commented Jul 1, 2024

brandones commented Jul 9, 2024

jwnasambu commented Jul 9, 2024 •

edited

Loading

denniskigen left a comment

denniskigen Jul 9, 2024

denniskigen Jul 9, 2024

denniskigen Jul 9, 2024

denniskigen Jul 9, 2024

jwnasambu commented Jul 10, 2024

denniskigen Jul 10, 2024

denniskigen Jul 10, 2024

denniskigen Jul 10, 2024

denniskigen Jul 10, 2024

denniskigen Jul 10, 2024

denniskigen commented Jul 10, 2024

(fix) O3-2843: Ability to re-enroll in completed programs #1720

(fix) O3-2843: Ability to re-enroll in completed programs #1720

Conversation

jwnasambu commented Mar 7, 2024 • edited Loading

Requirements

Summary

Screenshots

Related Issue

Other

jwnasambu commented Mar 7, 2024

makombe commented Mar 7, 2024 • edited Loading

jwnasambu commented Mar 7, 2024 • edited Loading

jwnasambu commented May 1, 2024

ojwanganto commented May 2, 2024

brandones commented Jun 28, 2024

jwnasambu commented Jul 1, 2024

brandones commented Jul 9, 2024

jwnasambu commented Jul 9, 2024 • edited Loading

denniskigen 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

jwnasambu commented Jul 10, 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

denniskigen commented Jul 10, 2024

jwnasambu commented Mar 7, 2024 •

edited

Loading

makombe commented Mar 7, 2024 •

edited

Loading

jwnasambu commented Mar 7, 2024 •

edited

Loading

jwnasambu commented Jul 9, 2024 •

edited

Loading