From b9cd626c53e01d3abc946a64997db21c58588178 Mon Sep 17 00:00:00 2001
From: kajambiya <jssebaggala@outlook.com>
Date: Thu, 25 Apr 2024 13:18:00 +0300
Subject: [PATCH] resolve conflicts

---
 .../encounter/encounter-form.component.tsx    | 23 ++++++++++++++++++-
 .../patientIdentifierHandler.ts               | 14 +++++------
 src/utils/patient-identifier-helper.ts        |  2 +-
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/components/encounter/encounter-form.component.tsx b/src/components/encounter/encounter-form.component.tsx
index 860b88974..da5af7a5d 100644
--- a/src/components/encounter/encounter-form.component.tsx
+++ b/src/components/encounter/encounter-form.component.tsx
@@ -561,6 +561,7 @@ export const EncounterForm: React.FC<EncounterFormProps> = ({
       };
     }
 
+    let formPatientIdentifiers = '';
     const patientIdentifierFields = fields.filter((field) => field.type === 'patientIdentifier');
     const patientIdentifierPromises = patientIdentifierFields.map((field) => {
       const identfier: PatientIdentifier = {
@@ -572,8 +573,28 @@ export const EncounterForm: React.FC<EncounterFormProps> = ({
     });
 
     return Promise.all(patientIdentifierPromises)
-      .then(() => saveEncounterWithAttachments(encounterForSubmission))
+      .then(() => {
+        for (let i = 0; i < patientIdentifierFields.length; i++) {
+          formPatientIdentifiers += patientIdentifierFields[i].value;
+          if (i < patientIdentifierFields.length - 1) {
+            formPatientIdentifiers += ', ';
+          }
+        }
+        if (patientIdentifierFields.length) {
+          showSnackbar({
+            title: t('identifierCreated', 'Identifier Created'),
+            subtitle: t(
+              'identifierCreatedDescription',
+              `Patient Identifier(s) ${formPatientIdentifiers} successfully created!`,
+            ),
+            kind: 'success',
+            isLowContrast: true,
+          });
+        }
+        saveEncounterWithAttachments(encounterForSubmission);
+      })
       .catch((error) => {
+        setIsSubmitting(false);
         showSnackbar({
           title: t('errorDescriptionTitle', 'Error on saving form'),
           subtitle: t('errorDescription', error.message),
diff --git a/src/submission-handlers/patientIdentifierHandler.ts b/src/submission-handlers/patientIdentifierHandler.ts
index 97353d07f..cd87e0536 100644
--- a/src/submission-handlers/patientIdentifierHandler.ts
+++ b/src/submission-handlers/patientIdentifierHandler.ts
@@ -1,26 +1,24 @@
-import { SubmissionHandler } from '..';
-import { OpenmrsEncounter, OHRIFormField } from '../api/types';
-import { EncounterContext } from '../ohri-form-context';
+import { EncounterContext, FormField, OpenmrsEncounter, SubmissionHandler } from '..';
 import { getPatientLatestIdentifier } from '../utils/patient-identifier-helper';
 
 export const PatientIdentifierHandler: SubmissionHandler = {
-  handleFieldSubmission: (field: OHRIFormField, value: any, context: EncounterContext) => {
+  handleFieldSubmission: (field: FormField, value: any, context: EncounterContext) => {
     return value;
   },
    getInitialValue: (
     encounter: OpenmrsEncounter,
-    field: OHRIFormField,    
-    allFormFields: Array<OHRIFormField>,
+    field: FormField,    
+    allFormFields: Array<FormField>,
     context: EncounterContext,
   ) => {
     const patientIdentifier = getPatientLatestIdentifier(context.patient, field.questionOptions.identifierType);
     return patientIdentifier?.value;
   },
 
-  getDisplayValue: (field: OHRIFormField, value: any) => {
+  getDisplayValue: (field: FormField, value: any) => {
     return value;
   },
-  getPreviousValue: (field: OHRIFormField, encounter: OpenmrsEncounter, allFormFields: Array<OHRIFormField>) => {
+  getPreviousValue: (field: FormField, encounter: OpenmrsEncounter, allFormFields: Array<FormField>) => {
     return null;
   },
 
diff --git a/src/utils/patient-identifier-helper.ts b/src/utils/patient-identifier-helper.ts
index 8ff279482..ec7673f0c 100644
--- a/src/utils/patient-identifier-helper.ts
+++ b/src/utils/patient-identifier-helper.ts
@@ -1,5 +1,5 @@
-import { PatientIdentifier } from "../api/types";
 import { savePatientIdentifier} from "../api/api";
+import { PatientIdentifier } from "../types";
 
 export const saveIdentifier = (patient: fhir.Patient, patientIdentifier:PatientIdentifier) =>{
     const identifier = getPatientLatestIdentifier(patient, patientIdentifier.identifierType);