(refactor) Add workflows to pmtct summary in patient chart #1868

CynthiaKamau · 2024-06-13T12:38:44Z

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 the ticket number in the format OHRI-123 My PR title.
My work includes tests or is validated by existing tests.

Summary

-This pr refactors the code in the pmtct patient summary to use the new workflows approach

Screenshots

Related Issue

Other

hadijahkyampeire

@CynthiaKamau we should also convert the Summary cards, @lucyjemutai already made a function that you can reuse for summary cards, that way, we shall get rid of all that columns code and move it to schema configs.

hadijahkyampeire · 2024-06-13T20:19:28Z

Also I don't know if it is just on on my end but I see double navigations for pmtct and I can't open the summary

hadijahkyampeire · 2024-06-13T20:29:38Z

packages/esm-commons-lib/src/utils/encounter-list-utils.ts

+    return encounter.patient.age;
+  }
+
+  if (actionOptions?.formName === 'selectMchForm') {


I think this should be put in the builder file where we are constructing form actions because in this getObsFromEncounter function, only other columns other than actions use that function, so actions can be handled in their own function. Check something I did about conditional actions in the covid lab results table, you might need something like that.

@CynthiaKamau @hadijahkyampeire I realised the error is there in in cacx and Tb modues as well on dev..

CynthiaKamau · 2024-06-14T06:44:41Z

Also I don't know if it is just on on my end but I see double navigations for pmtct and I can't open the summary

Which hackend are you using?

hadijahkyampeire · 2024-06-14T13:40:20Z

Also I don't know if it is just on on my end but I see double navigations for pmtct and I can't open the summary

Which hackend are you using?

I just started the app so I think it was using the namibia backend.

CynthiaKamau · 2024-06-14T15:19:36Z

Also I don't know if it is just on on my end but I see double navigations for pmtct and I can't open the summary

Which hackend are you using?

I just started the app so I think it was using the namibia backend.

use the openmrs-dev backend, namibia doesnt have the new app name, if you use it you will see both the old and new app

hadijahkyampeire · 2024-06-15T14:44:58Z

@CynthiaKamau sorry about the conflicts, I think they are from the Eslint rule PR that just got merged.

hadijahkyampeire

This is getting closer but I just noticed some other visual issues, let's have a call about them.

hadijahkyampeire · 2024-06-18T13:22:33Z

packages/esm-commons-lib/src/utils/encounter-list-config-builder.ts

@@ -109,6 +109,20 @@ export const getTabColumns = (columnsDefinition: Array<ColumnDefinition>) => {
            }
          });
        }
+        if (column?.conditionalActionOptions?.length) {


This condition is similar to the one up, why can't you move that logic up or if anything is different you might wanna add it to the condition.

hadijahkyampeire · 2024-06-18T13:23:19Z

packages/esm-commons-lib/src/utils/encounter-list-utils.ts

@@ -85,6 +85,7 @@ export function getObsFromEncounter(
  type?: string,
  fallbackConcepts?: Array<string>,
  secondaryConcept?: string,
+  actionOptions?: any,


you forgot to remove this.

hadijahkyampeire · 2024-06-18T13:24:29Z

packages/esm-commons-lib/src/utils/summary-card-config-builder.ts

      if (column.isConditionalConcept) {
-        return getConditionalConceptValue(encounter, column.conditionalConceptMappings, column.isDate);
+        return getConditionalConceptValue(encounter, column.conditionalconditionalConceptMappings, column.isDate);


This naming seems wrong, why change it to this?

hadijahkyampeire · 2024-06-18T13:26:08Z

packages/esm-commons-lib/src/utils/summary-card-config-builder.ts

      }
+
+      if (column.id == 'artInitiation' && column.encounterTypes?.length > 0) {


We agreed not to use name specific conditions like art, because we want some of these functions to be reused, you might wanna do something like what I did for ART date and Reason.

Also instead of using column.id, we can use the type field because ids might be different but types can be similar.

hadijahkyampeire · 2024-06-18T13:28:07Z

packages/esm-commons-lib/src/utils/summary-card-config-builder.ts

@@ -24,15 +53,45 @@ export const getSummaryCardProps = (schemaConfig, config = null) => {
    },
    getObsSummary: async (encounters) => {
      const summaryValues = encounters.map((encounter) => {
-        if (encounter && encounter.observation && encounter.observation.value) {
+        if (column.encounterType === 'antenatal' && column.id === 'nextAppointmentDate') {


Same here, prefer using type to column id.

hadijahkyampeire · 2024-06-18T13:31:20Z

packages/esm-ohri-pmtct-app/src/views/mch-summary/tabs/arv-therapy-config.json

+      "isDate": true,
+      "title": "Enrollment Date",
+      "encounterTypes": ["motherPostnatal", "labourAndDelivery", "antenatal"],
+      "concept": "161552AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"


hadijahkyampeire · 2024-06-18T13:32:05Z

packages/esm-ohri-pmtct-app/src/views/mch-summary/tabs/infant-summary-config.json

+      "encounterTypes": [
+        "af1f1b24-d2e8-4282-b308-0bf79b365584"
+      ],
+      "concept": "1148AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"


Same here, let's not hardcode the concept uuids

hadijahkyampeire · 2024-06-18T13:32:18Z

packages/esm-ohri-pmtct-app/src/views/mch-summary/tabs/infant-summary-config.json

+      "encounterTypes": [
+        "af1f1b24-d2e8-4282-b308-0bf79b365584"
+      ],
+      "concept": "1151AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"


hadijahkyampeire · 2024-06-18T13:32:28Z

packages/esm-ohri-pmtct-app/src/views/mch-summary/tabs/infant-summary-config.json

+      "encounterTypes": [
+        "af1f1b24-d2e8-4282-b308-0bf79b365584"
+      ],
+      "concept": "164460AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"


hadijahkyampeire · 2024-06-18T13:32:34Z

packages/esm-ohri-pmtct-app/src/views/mch-summary/tabs/infant-summary-config.json

+      "encounterTypes": [
+        "af1f1b24-d2e8-4282-b308-0bf79b365584"
+      ],
+      "concept": "160433AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"


hadijahkyampeire

This looks good thanks @CynthiaKamau

CynthiaKamau requested review from lucyjemutai and hadijahkyampeire June 13, 2024 12:39

hadijahkyampeire reviewed Jun 13, 2024

View reviewed changes

CynthiaKamau force-pushed the tb-summary-conversion branch from e16bd75 to 2fc6d94 Compare June 14, 2024 15:18

CynthiaKamau requested a review from hadijahkyampeire June 14, 2024 15:20

CynthiaKamau force-pushed the tb-summary-conversion branch from 2fc6d94 to 1502c5b Compare June 18, 2024 06:53

hadijahkyampeire reviewed Jun 18, 2024

View reviewed changes

CynthiaKamau force-pushed the tb-summary-conversion branch 2 times, most recently from d784f0a to acdb03b Compare June 19, 2024 13:12

(refactor) Add workflows to pmtct summary in patient chart

8fc877b

CynthiaKamau force-pushed the tb-summary-conversion branch from acdb03b to 8fc877b Compare June 19, 2024 13:17

CynthiaKamau requested a review from hadijahkyampeire June 19, 2024 16:20

hadijahkyampeire approved these changes Jun 20, 2024

View reviewed changes

hadijahkyampeire merged commit 42759cd into dev Jun 20, 2024
5 checks passed

hadijahkyampeire deleted the tb-summary-conversion branch June 20, 2024 14:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(refactor) Add workflows to pmtct summary in patient chart #1868

(refactor) Add workflows to pmtct summary in patient chart #1868

CynthiaKamau commented Jun 13, 2024 •

edited

Loading

hadijahkyampeire left a comment

hadijahkyampeire commented Jun 13, 2024

hadijahkyampeire Jun 13, 2024

lucyjemutai Jun 14, 2024 •

edited

Loading

CynthiaKamau commented Jun 14, 2024

hadijahkyampeire commented Jun 14, 2024

CynthiaKamau commented Jun 14, 2024

hadijahkyampeire commented Jun 15, 2024

hadijahkyampeire left a comment

hadijahkyampeire Jun 18, 2024

hadijahkyampeire Jun 18, 2024

hadijahkyampeire Jun 18, 2024

hadijahkyampeire Jun 18, 2024

hadijahkyampeire Jun 18, 2024

hadijahkyampeire Jun 18, 2024

hadijahkyampeire Jun 18, 2024

hadijahkyampeire Jun 18, 2024

hadijahkyampeire Jun 18, 2024

hadijahkyampeire Jun 18, 2024

hadijahkyampeire Jun 18, 2024

hadijahkyampeire left a comment

		}

		if (column.id == 'artInitiation' && column.encounterTypes?.length > 0) {

(refactor) Add workflows to pmtct summary in patient chart #1868

(refactor) Add workflows to pmtct summary in patient chart #1868

Conversation

CynthiaKamau commented Jun 13, 2024 • edited Loading

Requirements

Summary

Screenshots

Related Issue

Other

hadijahkyampeire left a comment

Choose a reason for hiding this comment

hadijahkyampeire commented Jun 13, 2024

Choose a reason for hiding this comment

lucyjemutai Jun 14, 2024 • edited Loading

Choose a reason for hiding this comment

CynthiaKamau commented Jun 14, 2024

hadijahkyampeire commented Jun 14, 2024

CynthiaKamau commented Jun 14, 2024

hadijahkyampeire commented Jun 15, 2024

hadijahkyampeire 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

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

hadijahkyampeire left a comment

Choose a reason for hiding this comment

CynthiaKamau commented Jun 13, 2024 •

edited

Loading

lucyjemutai Jun 14, 2024 •

edited

Loading