@palladium-ethiopia/esm-clinical-workflow-app 5.4.2-pre.34 → 5.4.2-pre.37

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"pages":[],"extensions":[{"name":"clinical-workflow-triage-dashboard-link","component":"triageDashboardLink","slot":"homepage-dashboard-slot","order":0,"meta":{"name":"clinical-workflow-triage","slot":"clinical-workflow-triage-dashboard-slot","title":"clinical-workflow-triage"}},{"name":"clinical-workflow-triage-dashboard","component":"triageDashboard","slot":"clinical-workflow-triage-dashboard-slot"},{"name":"ewf-mru-dashboard-link","component":"mruLeftPanelLink","slot":"homepage-dashboard-slot","order":1,"meta":{"name":"mru","title":"MRU","path":"mru","slot":"mru-dashboard-slot"}},{"name":"ewf-mru-dashboard","component":"mruDashboard","slot":"mru-dashboard-slot","online":true,"offline":false},{"name":"patient-scoreboard-link","component":"patientScoreboardLink","slot":"homepage-dashboard-slot","order":1,"meta":{"name":"patient-scoreboard","title":"Patient Scoreboard","path":"patient-scoreboard","slot":"patient-scoreboard-slot"}},{"name":"patient-scoreboard","component":"patientScoreboard","slot":"patient-scoreboard-slot","online":true,"offline":false},{"name":"past-visits-detail-overview-shadow","slot":"patient-chart-encounters-dashboard-slot","component":"pastVisitsDetailOverviewShadow","order":0,"meta":{"title":"Visits","view":"visits"},"online":true,"offline":true},{"name":"queue-table-transfer-column","component":"queueTableTransferColumn","slot":"queue-table-transfer-status-slot"},{"name":"transfer-notes-overview-widget","component":"transferNotesOverview","slot":"patient-chart-summary-dashboard-slot","meta":{"fullWidth":false},"order":6}],"workspaces":[{"name":"triage-workspace","component":"triageWorkspace","title":"Triage Form","canMaximize":true,"type":"clinical-form"},{"name":"patient-registration-workspace","component":"patientRegistrationWorkspace","title":"Patient Registration","canMaximize":true,"type":"registration-form"},{"name":"billing-information-workspace","component":"billingInformationWorkspace","title":"Billing Information Workspace","type":"clinical-form"}],"workspaces2":[{"name":"clinical-workflow-patient-form-entry-workspace","component":"@openmrs/esm-patient-forms-app#exportedPatientFormEntryWorkspace","window":"clinical-workflow-window"},{"name":"patient-transfer-form-entry-workspace","component":"@openmrs/esm-patient-forms-app#exportedPatientFormEntryWorkspace","window":"patient-transfer"},{"name":"visit-notes-form-shadow-workspace","component":"visitNotesFormWorkspace","window":"visit-note-shadow"}],"workspaceWindows2":[{"name":"clinical-workflow-window","group":"clinical-workflow-group","width":"wider","canMaximize":true},{"name":"visit-note-shadow","group":"patient-chart","icon":"visitNoteActionButton","order":3},{"name":"patient-transfer","group":"patient-chart","icon":"patientTransferActionButton","order":4,"width":"wider","canMaximize":true}],"workspaceGroups2":[{"name":"clinical-workflow-group","overlay":true,"persistence":"closable"}],"modals":[{"name":"confirm-transfer-dialog","component":"confirmTransferDialog"},{"name":"patient-transfer-details-modal","component":"patientTransferDetailsModal"}],"version":"5.4.2-pre.34"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"pages":[],"extensions":[{"name":"clinical-workflow-triage-dashboard-link","component":"triageDashboardLink","slot":"homepage-dashboard-slot","order":0,"meta":{"name":"clinical-workflow-triage","slot":"clinical-workflow-triage-dashboard-slot","title":"clinical-workflow-triage"}},{"name":"clinical-workflow-triage-dashboard","component":"triageDashboard","slot":"clinical-workflow-triage-dashboard-slot"},{"name":"ewf-mru-dashboard-link","component":"mruLeftPanelLink","slot":"homepage-dashboard-slot","order":1,"meta":{"name":"mru","title":"MRU","path":"mru","slot":"mru-dashboard-slot"}},{"name":"ewf-mru-dashboard","component":"mruDashboard","slot":"mru-dashboard-slot","online":true,"offline":false},{"name":"patient-scoreboard-link","component":"patientScoreboardLink","slot":"homepage-dashboard-slot","order":1,"meta":{"name":"patient-scoreboard","title":"Patient Scoreboard","path":"patient-scoreboard","slot":"patient-scoreboard-slot"}},{"name":"patient-scoreboard","component":"patientScoreboard","slot":"patient-scoreboard-slot","online":true,"offline":false},{"name":"past-visits-detail-overview-shadow","slot":"patient-chart-encounters-dashboard-slot","component":"pastVisitsDetailOverviewShadow","order":0,"meta":{"title":"Visits","view":"visits"},"online":true,"offline":true},{"name":"queue-table-transfer-column","component":"queueTableTransferColumn","slot":"queue-table-transfer-status-slot"},{"name":"transfer-notes-overview-widget","component":"transferNotesOverview","slot":"patient-chart-summary-dashboard-slot","meta":{"fullWidth":false},"order":6}],"workspaces":[{"name":"triage-workspace","component":"triageWorkspace","title":"Triage Form","canMaximize":true,"type":"clinical-form"},{"name":"patient-registration-workspace","component":"patientRegistrationWorkspace","title":"Patient Registration","canMaximize":true,"type":"registration-form"},{"name":"billing-information-workspace","component":"billingInformationWorkspace","title":"Billing Information Workspace","type":"clinical-form"}],"workspaces2":[{"name":"clinical-workflow-patient-form-entry-workspace","component":"@openmrs/esm-patient-forms-app#exportedPatientFormEntryWorkspace","window":"clinical-workflow-window"},{"name":"patient-transfer-form-entry-workspace","component":"@openmrs/esm-patient-forms-app#exportedPatientFormEntryWorkspace","window":"patient-transfer"},{"name":"visit-notes-form-shadow-workspace","component":"visitNotesFormWorkspace","window":"visit-note-shadow"}],"workspaceWindows2":[{"name":"clinical-workflow-window","group":"clinical-workflow-group","width":"wider","canMaximize":true},{"name":"visit-note-shadow","group":"patient-chart","icon":"visitNoteActionButton","order":3},{"name":"patient-transfer","group":"patient-chart","icon":"patientTransferActionButton","order":4,"width":"wider","canMaximize":true}],"workspaceGroups2":[{"name":"clinical-workflow-group","overlay":true,"persistence":"closable"}],"modals":[{"name":"confirm-transfer-dialog","component":"confirmTransferDialog"},{"name":"patient-transfer-details-modal","component":"patientTransferDetailsModal"}],"version":"5.4.2-pre.37"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@palladium-ethiopia/esm-clinical-workflow-app",
-  "version": "5.4.2-pre.34",
+  "version": "5.4.2-pre.37",
   "description": "Express workflow app for OpenMRS 3",
   "keywords": [
     "openmrs",

package/src/config-schema.ts

@@ -25,6 +25,7 @@ export const configSchema = {
       creditType: '5cd1eb62-e006-4146-bd22-80bc4d5bd2f7',
       creditTypeDetails: 'd824aa96-d2c7-4a52-aa8d-03f60a516083',
       freeType: '7523ecfe-b8f1-4e7f-80a7-1a495b15ace4',
+      paymentAttributesSummary: '3cc0102e-6c1f-41db-af72-4be6aa9eb27a',
     },
   },
   visitTypeUuid: {
@@ -125,6 +126,7 @@ export type ClinicalWorkflowConfig = {
     creditType: string;
     creditTypeDetails: string;
     freeType: string;
+    paymentAttributesSummary: string;
   };
   visitTypeUuid: string;
   identifierSourceUuid: string;

package/src/index.ts

@@ -10,7 +10,7 @@ import visitNotesActionButtonExtension from './patient-notes/visit-note-action-b
 import patientTransferActionButtonExtension from './patient-transfer/patient-transfer-action-button.extension';
 import pastVisitsOverviewComponent from './patient-chart/visit/visits-widget/visit-detail-overview.component';
 
-const moduleName = '@ethiopia/esm-clinical-workflow-app';
+const moduleName = '@palladium-ethiopia/esm-clinical-workflow-app';
 
 const options = {
   featureName: 'clinical-workflow',

package/src/mru/billing-information/billing-information.resource.ts

@@ -3,59 +3,45 @@ import { z } from 'zod';
 // Create the billing form schema factory with conditional validation based on skip logic
 import type { TFunction } from 'i18next';
 
-export const createBillingFormSchema = (t: TFunction) => {
+export const createBillingFormSchema = (
+  t: TFunction,
+  billingTypes?: Array<{ uuid: string; name?: string; attributeTypes?: Array<{ uuid: string; required?: boolean }> }>,
+) => {
   return z
     .object({
-      billingType: z.enum(['credit', 'free', 'cash']).optional(),
-      creditType: z.string().optional(),
-      name: z.string().optional(),
-      code: z.string().optional(),
-      id: z.string().optional(),
-      expiryDate: z.string().optional(),
-      zone: z.string().optional(),
-      freeType: z.string().optional(),
+      billingTypeUuid: z.string().optional(),
+      creditSubType: z.string().optional(),
+      freeSubType: z.string().optional(),
+      attributes: z.record(z.string(), z.any()).optional(),
     })
     .superRefine((data, ctx) => {
       // Billing type is required on submit
-      if (!data.billingType) {
+      if (!data.billingTypeUuid) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,
           message: t('billingTypeRequired', 'Billing type is required'),
-          path: ['billingType'],
+          path: ['billingTypeUuid'],
         });
         return;
       }
 
-      // Credit billing type validation
-      if (data.billingType === 'credit') {
-        // Credit type is required
-        if (!data.creditType || data.creditType.trim() === '') {
-          ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: t('creditTypeRequired', 'Credit type is required'),
-            path: ['creditType'],
-          });
-        }
-
-        // If creditType is insurance, require additional fields
-        if (data.creditType === 'insurance') {
-          if (!data.id || data.id.trim() === '') {
-            ctx.addIssue({
-              code: z.ZodIssueCode.custom,
-              message: t('idRequired', 'ID is required'),
-              path: ['id'],
-            });
-          }
-        }
-      }
-
-      // Free billing type validation
-      if (data.billingType === 'free') {
-        if (!data.freeType || data.freeType.trim() === '') {
-          ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: t('freeTypeRequired', 'Free type is required'),
-            path: ['freeType'],
+      // Validate required attributes for the selected billing type
+      if (billingTypes && data.billingTypeUuid) {
+        const selectedBillingType = billingTypes.find((bt) => bt.uuid === data.billingTypeUuid);
+        if (selectedBillingType?.attributeTypes) {
+          selectedBillingType.attributeTypes.forEach((attrType) => {
+            if (attrType.required) {
+              const attrValue = data.attributes?.[attrType.uuid];
+              if (!attrValue || (typeof attrValue === 'string' && attrValue.trim() === '')) {
+                ctx.addIssue({
+                  code: z.ZodIssueCode.custom,
+                  message: t('attributeRequired', '{{attributeName}} is required', {
+                    attributeName: attrType.uuid,
+                  }),
+                  path: ['attributes', attrType.uuid],
+                });
+              }
+            }
           });
         }
       }
@@ -98,33 +84,48 @@ export const createBillingInformationVisitAttribute = (
   billingFormData: BillingFormData,
   visitAttributeTypeUuidsMap: {
     paymentMethod: string;
-    creditType: string;
-    creditTypeDetails: string;
-    freeType: string;
+    paymentAttributesSummary?: string;
   },
 ) => {
-  const { billingType, creditType, name, code, id, expiryDate, zone, freeType } = billingFormData;
+  const { billingTypeUuid, attributes } = billingFormData;
 
-  const formObject = {
-    paymentMethod: billingType,
-    creditType: creditType,
-    creditTypeDetails: {
-      name: name,
-      code: code,
-      id: id,
-      expiryDate: expiryDate,
-      zone: zone,
-    },
-    freeType: freeType,
-  };
+  const visitAttributePayload: Array<{ attributeType: { uuid: string } | string; value: string }> = [];
+
+  // Add billing method
+  if (billingTypeUuid && visitAttributeTypeUuidsMap.paymentMethod) {
+    visitAttributePayload.push({
+      attributeType: visitAttributeTypeUuidsMap.paymentMethod,
+      value: billingTypeUuid,
+    });
+  }
+
+  // Save sub attributes (from attributes object) as a stringified object under the paymentAttributesSummary key
+  // Format: {attributeUuid: value}
+  // Only includes sub attributes, not the main paymentMethod attribute
+  if (visitAttributeTypeUuidsMap.paymentAttributesSummary && attributes) {
+    const paymentAttributesObject: Record<string, any> = {};
+
+    // Add sub attributes from the attributes object using their UUIDs as keys
+    Object.entries(attributes).forEach(([attrTypeUuid, value]) => {
+      if (value !== undefined && value !== null && value !== '') {
+        paymentAttributesObject[attrTypeUuid] = value;
+      }
+    });
 
-  const visitAttributePayload = transformFormObjectToVisitAttributes(formObject, visitAttributeTypeUuidsMap);
+    // Only add the summary if there are sub attributes to save
+    if (Object.keys(paymentAttributesObject).length > 0) {
+      visitAttributePayload.push({
+        attributeType: visitAttributeTypeUuidsMap.paymentAttributesSummary,
+        value: JSON.stringify(paymentAttributesObject),
+      });
+    }
+  }
 
   return visitAttributePayload;
 };
 
 export const updateVisitWithBillingInformation = (
-  visitAttributePayload: Array<{ attributeType: string; value: string }>,
+  visitAttributePayload: Array<{ attributeType: { uuid: string } | string; value: string }>,
   visitUuid: string,
 ) => {
   return openmrsFetch(`${restBaseUrl}/visit/${visitUuid}`, {

package/src/mru/billing-information/billing-information.scss

@@ -24,18 +24,35 @@
 
 .billingInformationContainer {
   margin: spacing.$spacing-05;
+  overflow-y: visible;
   height: 100%;
-  overflow-y: auto;
+  border: solid red 1px;
 }
 
+.paymentTypeSwitcher {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-evenly;
+  // flex-wrap: wrap;
+  border: none;
+  outline: none;
+  padding: 2px;
+}
+
+// .paymentTypeSwitch {
+//   margin-bottom: spacing.$spacing-03;
+//   border: solid #a6c8ff;
+// }
+
 .creditDetailsContainer {
   display: flex;
   flex-direction: column;
   gap: spacing.$spacing-05;
   margin-top: spacing.$spacing-03;
-  min-height: 45rem;
+  height: auto;
   border: 1px solid colors.$gray-20;
   padding: spacing.$spacing-03;
+  overflow: visible;
 }
 
 .freeDetailsContainer {
@@ -43,9 +60,10 @@
   flex-direction: column;
   gap: spacing.$spacing-05;
   margin-top: spacing.$spacing-03;
-  min-height: 20rem;
+  height: auto;
   border: 1px solid colors.$gray-20;
   padding: spacing.$spacing-03;
+  overflow: visible;
 }
 
 .creditTypeDetailsContainer {