@ampath/esm-patient-registration-app 6.0.1-pre.84 → 6.0.1-pre.89

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.24.0"},"pages":[{"component":"root","route":"patient-registration","online":true,"offline":true},{"component":"editPatient","routeRegex":"patient\\/([a-zA-Z0-9\\-]+)\\/edit","online":true,"offline":true}],"extensions":[{"component":"addPatientLink","name":"add-patient-action","slot":"top-nav-actions-slot","online":true,"offline":true},{"component":"cancelPatientEditModal","name":"cancel-patient-edit-modal","online":true,"offline":true},{"component":"patientPhotoExtension","name":"patient-photo-widget","slot":"patient-photo-slot","online":true,"offline":true},{"component":"editPatientDetailsButton","name":"edit-patient-details-button","slot":"patient-actions-slot","online":true,"offline":true},{"component":"editPatientDetailsButton","name":"edit-patient-details-button","slot":"patient-search-actions-slot","online":true,"offline":true},{"component":"deleteIdentifierConfirmationModal","name":"delete-identifier-confirmation-modal","online":true,"offline":true},{"component":"emptyClientRegistryModal","name":"empty-client-registry-modal","online":true,"offline":true},{"component":"confirmClientRegistryModal","name":"confirm-client-registry-modal","online":true,"offline":true}],"version":"6.0.1-pre.84"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.24.0"},"pages":[{"component":"root","route":"patient-registration","online":true,"offline":true},{"component":"editPatient","routeRegex":"patient\\/([a-zA-Z0-9\\-]+)\\/edit","online":true,"offline":true}],"extensions":[{"component":"addPatientLink","name":"add-patient-action","slot":"top-nav-actions-slot","online":true,"offline":true},{"component":"cancelPatientEditModal","name":"cancel-patient-edit-modal","online":true,"offline":true},{"component":"patientPhotoExtension","name":"patient-photo-widget","slot":"patient-photo-slot","online":true,"offline":true},{"component":"editPatientDetailsButton","name":"edit-patient-details-button","slot":"patient-actions-slot","online":true,"offline":true},{"component":"editPatientDetailsButton","name":"edit-patient-details-button","slot":"patient-search-actions-slot","online":true,"offline":true},{"component":"deleteIdentifierConfirmationModal","name":"delete-identifier-confirmation-modal","online":true,"offline":true},{"component":"emptyClientRegistryModal","name":"empty-client-registry-modal","online":true,"offline":true},{"component":"confirmClientRegistryModal","name":"confirm-client-registry-modal","online":true,"offline":true}],"version":"6.0.1-pre.89"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampath/esm-patient-registration-app",
-  "version": "6.0.1-pre.84",
+  "version": "6.0.1-pre.89",
   "description": "Patient registration microfrontend for the OpenMRS SPA",
   "browser": "dist/ampath-esm-patient-registration-app.js",
   "main": "src/index.ts",

package/src/patient-registration/patient-registration-hooks.ts

@@ -36,7 +36,7 @@ import { useInitialPatientRelationships } from './section/patient-relationships/
 import dayjs from 'dayjs';
 
 export function useInitialFormValues(patientUuid: string): [FormValues, Dispatch<FormValues>] {
-  const { martialStatus, education, occupation, educationLoad, occupationLoad } = useConcepts();
+  const { martialStatus, education, occupation, educationLoad } = useConcepts();
   const { isLoading: isLoadingPatientToEdit, patient: patientToEdit } = usePatient(patientUuid);
   const { data: attributes, isLoading: isLoadingAttributes } = useInitialPersonAttributes(patientUuid);
   const { data: identifiers, isLoading: isLoadingIdentifiers } = useInitialPatientIdentifiers(patientUuid);
@@ -326,6 +326,10 @@ function useConcepts() {
   const config = useConfig<RegistrationConfig>();
   const { data: education, isLoading: educationLoad } = useConceptAnswers('a89e48ae-1350-11df-a1f1-0026b9348838');
   const { data: occupation, isLoading: occupationLoad } = useConceptAnswers('a8a0a00e-1350-11df-a1f1-0026b9348838');
+  const { data: martialStatus, isLoading: martialStatusLoad } = useConceptAnswers(
+    'a899a9f2-1350-11df-a1f1-0026b9348838',
+  );
+
   /* const occupation: Array<ConceptAnswers> = [
     {
       uuid: '1538AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
@@ -356,7 +360,7 @@ function useConcepts() {
       display: 'Other',
     },
   ]; */
-  const martialStatus: Array<ConceptAnswers> = [
+  /* const martialStatus: Array<ConceptAnswers> = [
     {
       uuid: 'a8b03712-1350-11df-a1f1-0026b9348838',
       display: 'Married polygamous',
@@ -398,6 +402,7 @@ function useConcepts() {
       display: 'Other Non-Coded',
     },
   ];
+  */
   //const martialStatus: Array<ConceptAnswers> = config.fieldDefinitions
   //  .find((fieldDefinition) => fieldDefinition.id === 'maritalStatus')
   //  .customConceptAnswers.map((concept) => ({ uuid: concept.uuid, display: concept.label }));

package/src/patient-verification/patient-verification-hook.tsx

@@ -148,8 +148,8 @@ async function postToRegistry(
         ...formValues,
         attributes: {
           ...formValues.attributes,
-          ['869f623a-f78e-4ace-9202-0bed481822f5']: 'Failed validation',
-          ['752a0331-5293-4aa5-bf46-4d51aaf2cdc5']: 'Failed',
+          ['5553d509-f03a-4982-8e16-0d6f3d70fb8b']: 'Failed validation',
+          ['d8f4d295-3f31-47ec-b377-825bd38820b2']: 'Failed',
         },
       });
       showNotification({

package/src/patient-verification/patient-verification-utils.ts

@@ -88,9 +88,9 @@ export function handleClientRegistryResponse(
           birthdate: new Date(dateOfBirth),
           isDead: !isAlive,
           attributes: {
-            'b2c38640-2603-4629-aebd-3b54f33f1e3a': contact?.primaryPhone,
-            '94614350-84c8-41e0-ac29-86bc107069be': contact?.secondaryPhone,
-            'b8d0b331-1d2d-4a9a-b741-1816f498bdb6': contact?.emailAddress ?? '',
+            '72a759a8-1359-11df-a1f1-0026b9348838': contact?.primaryPhone,
+            'b0a08406-09c0-4f8b-8cb5-b22b6d4a8e46': contact?.secondaryPhone,
+            '2f65dbcb-3e58-45a3-8be7-fd1dc9aa0faa': contact?.emailAddress ?? '',
           },
           address: {
             address1: residence?.address,
@@ -104,7 +104,7 @@ export function handleClientRegistryResponse(
           },
           identifiers: { ...props.values.identifiers, ...nupiIdentifiers },
           obs: {
-            '1054AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA':
+            'a899a9f2-1350-11df-a1f1-0026b9348838':
               props.values.concepts.find((concept) =>
                 concept.display?.toLowerCase()?.includes(clientResponse.client.maritalStatus?.toLowerCase()),
               )?.uuid ?? '',
@@ -112,12 +112,12 @@ export function handleClientRegistryResponse(
               props.values.concepts.find((concept) =>
                 concept.display?.toLowerCase()?.includes(clientResponse.client.educationLevel?.toLowerCase()),
               )?.uuid ?? '',
-            '1542AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA':
+            'a8a0a00e-1350-11df-a1f1-0026b9348838':
               clientResponse.client.occupation === undefined || clientResponse.client.occupation === null
-                ? '1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
+                ? 'a899e0ac-1350-11df-a1f1-0026b9348838'
                 : props.values.concepts.find(
                     (concept) => concept.display?.toLowerCase() === clientResponse.client.occupation?.toLowerCase(),
-                  )?.uuid ?? '5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+                  )?.uuid ?? 'a8aaf3e2-1350-11df-a1f1-0026b9348838',
           },
         });
         dispose();
@@ -133,7 +133,7 @@ export function generateNUPIPayload(formValues: FormValues): RegistryPatient {
     (concept) => concept.uuid === formValues.obs['a89e48ae-1350-11df-a1f1-0026b9348838'],
   );
   const occupation = formValues.concepts.find(
-    (concept) => concept.uuid === formValues.obs['1542AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'],
+    (concept) => concept.uuid === formValues.obs['a8a0a00e-1350-11df-a1f1-0026b9348838'],
   );
   const maritalStatus = formValues.concepts.find(
     (concept) => concept.uuid === formValues.obs['a899a9f2-1350-11df-a1f1-0026b9348838'],
@@ -156,9 +156,9 @@ export function generateNUPIPayload(formValues: FormValues): RegistryPatient {
     },
     nextOfKins: [],
     contact: {
-      primaryPhone: formValues.attributes['b2c38640-2603-4629-aebd-3b54f33f1e3a'],
-      secondaryPhone: formValues.attributes['94614350-84c8-41e0-ac29-86bc107069be'],
-      emailAddress: formValues.attributes['b8d0b331-1d2d-4a9a-b741-1816f498bdb6'],
+      primaryPhone: formValues.attributes['72a759a8-1359-11df-a1f1-0026b9348838'],
+      secondaryPhone: formValues.attributes['b0a08406-09c0-4f8b-8cb5-b22b6d4a8e46'],
+      emailAddress: formValues.attributes['2f65dbcb-3e58-45a3-8be7-fd1dc9aa0faa'],
     },
     country: 'KE',
     countyOfBirth: `0${counties.find((county) => county.name.includes(formValues.address['countyDistrict']))?.code}`,