(feat) O3-3365: Add the ability to record non-coded cause-of-death #1876

jwnasambu · 2024-06-24T19:05:01Z

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 included a feature to allow users to enter a free-text cause of death. If someone selects 'Other', the text input field will be available for entering this free-text concept

Screenshots

screencast.2024-06-25.11.PM-55-08.mp4

Related Issue

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

Other

jwnasambu · 2024-06-24T19:28:28Z

Hey @ibacher and @denniskigen, I kindly request for your guidance please! I'm a bit stuck on how to properly utilize other cause of death concept fetched by the useCauseOfDeath hook. When I add the TextInput input, it creates another other concept that functions as expected but on submitting the entered value in the TextInput throws an error as reflected in the video above.

denniskigen · 2024-06-24T19:33:02Z

...ges/esm-patient-chart-app/src/mark-patient-deceased/mark-patient-deceased-form.workspace.tsx

+  const OTHER_CONCEPT_UUID = 'UUID of other';
+  const OTHER_CONCEPT_DISPLAY = t('other', 'Other');


Suggested change

const OTHER_CONCEPT_UUID = 'UUID of other';

const OTHER_CONCEPT_DISPLAY = t('other', 'Other');

```suggestion

const freetextCauseOfDeathUuid = 5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';

denniskigen · 2024-06-24T19:33:15Z

...ges/esm-patient-chart-app/src/mark-patient-deceased/mark-patient-deceased-form.workspace.tsx

@@ -34,25 +35,34 @@ const MarkPatientDeceasedForm: React.FC<DefaultPatientWorkspaceProps> = ({ close
  const { deathDate, isDead } = usePatientDeceasedStatus(patientUuid);
  const [isSubmitting, setIsSubmitting] = useState(false);
  const [searchTerm, setSearchTerm] = useState('');
+  const [showOtherInputField, setShowOtherInputField] = useState(false);


Suggested change

const [showOtherInputField, setShowOtherInputField] = useState(false);

denniskigen · 2024-06-24T19:34:19Z

...ges/esm-patient-chart-app/src/mark-patient-deceased/mark-patient-deceased-form.workspace.tsx

  const filteredCausesOfDeath = useMemo(() => {
-    if (!searchTerm) {
-      return causesOfDeath;
+    if (!causesOfDeath) return [];
+
+    let filtered = causesOfDeath.filter((concept) => concept.uuid !== OTHER_CONCEPT_UUID);
+
+    if (searchTerm) {
+      filtered = fuzzy
+        .filter(searchTerm, filtered, {
+          extract: (causeOfDeathConcept) => causeOfDeathConcept.display,
+        })
+        .sort((r1, r2) => r1.score - r2.score)
+        .map((result) => result.original);
    }

-    return searchTerm
-      ? fuzzy
-          .filter(searchTerm, causesOfDeath, {
-            extract: (causeOfDeathConcept) => causeOfDeathConcept.display,
-          })
-          .sort((r1, r2) => r1.score - r2.score)
-          .map((result) => result.original)
-      : causesOfDeath;
-  }, [searchTerm, causesOfDeath]);
+    filtered.push({ uuid: OTHER_CONCEPT_UUID, display: OTHER_CONCEPT_DISPLAY, name: OTHER_CONCEPT_DISPLAY });
+
+    return filtered;
+  }, [searchTerm, causesOfDeath, OTHER_CONCEPT_DISPLAY]);


You don't need any of these changes.

denniskigen · 2024-06-24T19:34:36Z

...ges/esm-patient-chart-app/src/mark-patient-deceased/mark-patient-deceased-form.workspace.tsx

+  useEffect(() => {
+    setShowOtherInputField(causeOfDeathValue === OTHER_CONCEPT_UUID);
+  }, [causeOfDeathValue]);
+
+  useEffect(() => {
+    if (causesOfDeath && causesOfDeath.length > 0) {
+      setShowOtherInputField(causeOfDeathValue === OTHER_CONCEPT_UUID);
+    }
+  }, [causesOfDeath, causeOfDeathValue]);


Remove this.

denniskigen · 2024-06-24T19:36:30Z

...ges/esm-patient-chart-app/src/mark-patient-deceased/mark-patient-deceased-form.workspace.tsx

+      const causeOfDeathToSubmit = causeOfDeath === OTHER_CONCEPT_UUID ? freeTextCauseOfDeath : causeOfDeath;
+
+      markPatientDeceased(deathDate, patientUuid, causeOfDeathToSubmit)


Suggested change

const causeOfDeathToSubmit = causeOfDeath === OTHER_CONCEPT_UUID ? freeTextCauseOfDeath : causeOfDeath;

markPatientDeceased(deathDate, patientUuid, causeOfDeathToSubmit)

markPatientDeceased(deathDate, patientUuid, causeOfDeath === freetextCauseOfDeathUuid ? freeTextCauseOfDeath : causeOfDeath)

denniskigen · 2024-06-24T19:37:18Z

...ges/esm-patient-chart-app/src/mark-patient-deceased/mark-patient-deceased-form.workspace.tsx

+                      {filteredCausesOfDeath.map(({ uuid, display, name }) => (
+                        <RadioButton
+                          key={uuid}
+                          className={styles.radioButton}
+                          id={name}
+                          labelText={display}
+                          value={uuid}
+                        />
+                      ))}


I think we can undo this change as well

denniskigen · 2024-06-24T19:37:47Z

...ges/esm-patient-chart-app/src/mark-patient-deceased/mark-patient-deceased-form.workspace.tsx

+                  )}
+                />
+              </div>
+            )}


Move this below the <section> tag.

denniskigen · 2024-06-24T19:38:37Z

...ges/esm-patient-chart-app/src/mark-patient-deceased/mark-patient-deceased-form.workspace.tsx

@@ -216,6 +240,24 @@ const MarkPatientDeceasedForm: React.FC<DefaultPatientWorkspaceProps> = ({ close
              ) : null}
            </div>
            {errors?.causeOfDeath && <p className={styles.errorMessage}>{errors?.causeOfDeath?.message}</p>}
+            {showOtherInputField && (


Suggested change

{showOtherInputField && (

{causeOfDeathValue === freetextCauseOfDeathUuid && (

jwnasambu · 2024-06-24T19:56:39Z

@denniskigen Thanks

denniskigen · 2024-06-24T19:57:41Z

@ibacher what property should be used to record the freetext value to the backend? https://rest.openmrs.org/#create-a-person

ibacher · 2024-06-24T20:40:49Z

causeOfDeathNonCoded

jwnasambu · 2024-06-25T09:29:08Z

@denniskigen this is funny. We walking on the same issue at ago. Thanks am looking at some of the changes you have pushed and I can consent I wasn't thinking in that direction and I will be glad learning something from the coffee break session.

jwnasambu · 2024-06-25T09:38:04Z

@denniskigen I was concentrating on validating this form since it can be submitted successfully with or without a date. Should I continue with the task or terminate it the task?

jwnasambu · 2024-06-25T21:03:28Z

@denniskigen am so sorry for the late response I had issues with internet. Kindly I have tested and attached the current snapshot everything seems to be working as expected.

denniskigen

LGTM

denniskigen · 2024-06-25T09:26:22Z

...ges/esm-patient-chart-app/src/mark-patient-deceased/mark-patient-deceased-form.workspace.tsx

@@ -34,12 +35,12 @@ const MarkPatientDeceasedForm: React.FC<DefaultPatientWorkspaceProps> = ({ close
  const { deathDate, isDead } = usePatientDeceasedStatus(patientUuid);
  const [isSubmitting, setIsSubmitting] = useState(false);
  const [searchTerm, setSearchTerm] = useState('');
+  const freetextCauseOfDeathUuid = '5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';


@ibacher should this value be configurable?

Yes. Just about anywhere we use a concept, the concept should be configurable. Technically, the platform only enforces that there is a True / False concept.

Let me work that in. Thanks

jwnasambu marked this pull request as draft June 24, 2024 19:05

denniskigen reviewed Jun 24, 2024

View reviewed changes

denniskigen changed the title ~~(fix)O3-3365: Cause-of-death concepts are not loading in O3~~ (feat) O3-3365: Add the ability to record non-coded cause-of-death Jun 24, 2024

jwnasambu marked this pull request as ready for review June 25, 2024 10:06

denniskigen force-pushed the (fix)O3-3365 branch from 06fdc0e to 1e189d8 Compare June 25, 2024 10:15

jwnasambu force-pushed the (fix)O3-3365 branch from 1e189d8 to c1f44c2 Compare June 25, 2024 10:25

denniskigen force-pushed the (fix)O3-3365 branch from c1f44c2 to 1e189d8 Compare June 25, 2024 11:52

jwnasambu and others added 3 commits June 26, 2024 13:32

fix linting errors

e50f90e

Remove an extra other concept

e219062

Fixup

838ef1f

denniskigen force-pushed the (fix)O3-3365 branch from 1e189d8 to 838ef1f Compare June 26, 2024 10:34

denniskigen approved these changes Jun 26, 2024

View reviewed changes

denniskigen merged commit 5ee3e64 into openmrs:main Jun 26, 2024
6 checks passed

denniskigen mentioned this pull request Jun 26, 2024

(feat) O3-3365: Make freeTextFieldConceptUuid configurable #1880

Merged

3 tasks

denniskigen mentioned this pull request Aug 23, 2024

(feat) O3-3840 : Improvements to the registration form Death info section openmrs/openmrs-esm-patient-management#1290

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(feat) O3-3365: Add the ability to record non-coded cause-of-death #1876

(feat) O3-3365: Add the ability to record non-coded cause-of-death #1876

jwnasambu commented Jun 24, 2024 •

edited

Loading

jwnasambu commented Jun 24, 2024

denniskigen Jun 24, 2024

denniskigen Jun 24, 2024

denniskigen Jun 24, 2024

denniskigen Jun 24, 2024

denniskigen Jun 24, 2024

denniskigen Jun 24, 2024

denniskigen Jun 24, 2024 •

edited

Loading

denniskigen Jun 24, 2024

jwnasambu commented Jun 24, 2024

denniskigen commented Jun 24, 2024

ibacher commented Jun 24, 2024

jwnasambu commented Jun 25, 2024

jwnasambu commented Jun 25, 2024

jwnasambu commented Jun 25, 2024

denniskigen left a comment

denniskigen Jun 25, 2024

ibacher Jun 26, 2024

denniskigen Jun 26, 2024

		const OTHER_CONCEPT_UUID = 'UUID of other';
		const OTHER_CONCEPT_DISPLAY = t('other', 'Other');

		const causeOfDeathToSubmit = causeOfDeath === OTHER_CONCEPT_UUID ? freeTextCauseOfDeath : causeOfDeath;

		markPatientDeceased(deathDate, patientUuid, causeOfDeathToSubmit)

	{showOtherInputField && (
	{causeOfDeathValue === freetextCauseOfDeathUuid && (

(feat) O3-3365: Add the ability to record non-coded cause-of-death #1876

(feat) O3-3365: Add the ability to record non-coded cause-of-death #1876

Conversation

jwnasambu commented Jun 24, 2024 • edited Loading

Requirements

Summary

Screenshots

Related Issue

Other

jwnasambu commented Jun 24, 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

denniskigen Jun 24, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jwnasambu commented Jun 24, 2024

denniskigen commented Jun 24, 2024

ibacher commented Jun 24, 2024

jwnasambu commented Jun 25, 2024

jwnasambu commented Jun 25, 2024

jwnasambu commented Jun 25, 2024

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

jwnasambu commented Jun 24, 2024 •

edited

Loading

denniskigen Jun 24, 2024 •

edited

Loading