@openmrs/esm-ward-app 10.0.2 → 10.0.3-pre.2

package/src/ward-workspace/admit-patient-form-workspace/admit-patient-form.workspace.tsx

@@ -12,8 +12,12 @@ import {
   type Workspace2DefinitionProps,
 } from '@openmrs/esm-framework';
 import type { WardPatientWorkspaceProps, WardViewContext } from '../../types';
-import { useAssignedBedByPatient } from '../../hooks/useAssignedBedByPatient';
-import { assignPatientToBed, removePatientFromBed, useAdmitPatient } from '../../ward.resource';
+import {
+  assignPatientToBed,
+  getAssignedBedByPatient,
+  removePatientFromBed,
+  useAdmitPatient,
+} from '../../ward.resource';
 import useWardLocation from '../../hooks/useWardLocation';
 import BedSelector from '../bed-selector.component';
 import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
@@ -26,7 +30,7 @@ import styles from './admit-patient-form.scss';
  * a bed to assign to patient
  */
 const AdmitPatientFormWorkspace: React.FC<Workspace2DefinitionProps<WardPatientWorkspaceProps, {}, {}>> = ({
-  workspaceProps: { wardPatient },
+  workspaceProps: { wardPatient, relatedTransferPatients },
   closeWorkspace,
 }) => {
   const { patient, inpatientRequest, visit } = wardPatient ?? {};
@@ -40,9 +44,6 @@ const AdmitPatientFormWorkspace: React.FC<Workspace2DefinitionProps<WardPatientW
   const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
   const { isLoading } = wardPatientGroupDetails?.admissionLocationResponse ?? {};
 
-  const { data: bedsAssignedToPatient, isLoading: isLoadingBedsAssignedToPatient } = useAssignedBedByPatient(
-    patient.uuid,
-  );
   const beds = isLoading ? [] : (wardPatientGroupDetails?.bedLayouts ?? []);
 
   const zodSchema = useMemo(
@@ -67,69 +68,76 @@ const AdmitPatientFormWorkspace: React.FC<Workspace2DefinitionProps<WardPatientW
     setShowErrorNotifications(false);
     setIsSubmitting(true);
     const bedSelected = beds.find((bed) => bed.bedId === values.bedId);
-    admitPatient(patient, dispositionType, visit.uuid)
-      .then(
-        async (response) => {
-          if (response.ok) {
-            if (bedSelected) {
-              return assignPatientToBed(values.bedId, patient.uuid, response.data.uuid);
-            } else {
-              const assignedBedId = bedsAssignedToPatient?.data?.results?.[0]?.bedId;
-              if (assignedBedId) {
-                return removePatientFromBed(assignedBedId, patient.uuid);
-              }
-              return response;
+    const allPatientsToAdmit = [wardPatient, ...(relatedTransferPatients ?? [])];
+
+    return Promise.allSettled(
+      allPatientsToAdmit.map((wp) =>
+        admitPatient(wp.patient, wp.inpatientRequest?.dispositionType ?? dispositionType, wp.visit.uuid),
+      ),
+    )
+      .then(async (admitResults) => {
+        await Promise.allSettled(
+          admitResults.map(async (result, i) => {
+            const wp = allPatientsToAdmit[i];
+            const patientName = wp.patient.person.preferredName.display;
+
+            if (result.status === 'rejected') {
+              showSnackbar({
+                kind: 'error',
+                title: t('errorAdmittingPatient', 'Failed to admit {{patientName}}', { patientName }),
+                subtitle: (result.reason as Error)?.message,
+              });
+              return;
             }
-          }
-        },
-        (err: Error) => {
-          showSnackbar({
-            kind: 'error',
-            title: t('errorCreatingEncounter', 'Failed to admit patient'),
-            subtitle: err.message,
-          });
-        },
-      )
-      .then(
-        (response) => {
-          if (response && response?.ok) {
-            if (bedSelected) {
+
+            try {
+              if (bedSelected) {
+                // assign patient, and related transfer patients to the same bed.
+                // (Support for related patients is only implemented for maternal ward)
+                await assignPatientToBed(values.bedId, wp.patient.uuid, result.value.data.uuid);
+                showSnackbar({
+                  kind: 'success',
+                  title: t('patientAdmittedSuccessfully', 'Patient admitted successfully'),
+                  subtitle: t(
+                    'patientAdmittedSuccessfullySubtitle',
+                    '{{patientName}} has been successfully admitted and assigned to bed {{bedNumber}}',
+                    { patientName, bedNumber: bedSelected.bedNumber },
+                  ),
+                });
+              } else {
+                const bedResponse = await getAssignedBedByPatient(wp.patient.uuid);
+                const assignedBedId = bedResponse.data?.results?.[0]?.bedId;
+                if (assignedBedId) {
+                  await removePatientFromBed(assignedBedId, wp.patient.uuid);
+                }
+                showSnackbar({
+                  kind: 'success',
+                  title: t('patientAdmittedSuccessfully', 'Patient admitted successfully'),
+                  subtitle: t('patientAdmittedWoBed', '{{patientName}} admitted successfully to {{location}}', {
+                    patientName,
+                    location: location?.display,
+                  }),
+                });
+              }
+            } catch {
               showSnackbar({
-                kind: 'success',
+                kind: 'warning',
                 title: t('patientAdmittedSuccessfully', 'Patient admitted successfully'),
                 subtitle: t(
-                  'patientAdmittedSuccessfullySubtitle',
-                  '{{patientName}} has been successfully admitted and assigned to bed {{bedNumber}}',
-                  {
-                    patientName: patient.person.preferredName.display,
-                    bedNumber: bedSelected.bedNumber,
-                  },
+                  'patientAdmittedButBedNotAssigned',
+                  '{{patientName}} admitted successfully but failed to assign bed',
+                  { patientName },
                 ),
               });
-            } else {
-              showSnackbar({
-                kind: 'success',
-                title: t('patientAdmittedSuccessfully', 'Patient admitted successfully'),
-                subtitle: t('patientAdmittedWoBed', 'Patient admitted successfully to {{location}}', {
-                  location: location?.display,
-                }),
-              });
             }
-            closeWorkspace({ discardUnsavedChanges: true });
-            closeWorkspaceGroup2();
-          }
-        },
-        () => {
-          showSnackbar({
-            kind: 'warning',
-            title: t('patientAdmittedSuccessfully', 'Patient admitted successfully'),
-            subtitle: t(
-              'patientAdmittedButBedNotAssigned',
-              'Patient admitted successfully but fail to assign bed to patient',
-            ),
-          });
-        },
-      )
+          }),
+        );
+
+        if (admitResults.some((r) => r.status === 'fulfilled')) {
+          closeWorkspace({ discardUnsavedChanges: true });
+          closeWorkspaceGroup2();
+        }
+      })
       .finally(async () => {
         await wardPatientGroupDetails?.mutate?.();
         setIsSubmitting(false);
@@ -149,6 +157,9 @@ const AdmitPatientFormWorkspace: React.FC<Workspace2DefinitionProps<WardPatientW
     <Workspace2 title={t('admitPatient', 'Admit patient')} hasUnsavedChanges={isDirty}>
       <div className={styles.flexWrapper}>
         <WardPatientWorkspaceBanner {...{ wardPatient }} />
+        {relatedTransferPatients?.map((rp) => (
+          <WardPatientWorkspaceBanner key={rp.patient.uuid} wardPatient={rp} />
+        ))}
         <Form className={styles.form} onSubmit={handleSubmit(onSubmit, onError)}>
           <div className={styles.formContent}>
             <Row>
@@ -195,13 +206,7 @@ const AdmitPatientFormWorkspace: React.FC<Workspace2DefinitionProps<WardPatientW
             <Button
               type="submit"
               size="xl"
-              disabled={
-                isSubmitting ||
-                isLoadingEmrConfiguration ||
-                errorFetchingEmrConfiguration ||
-                isLoading ||
-                isLoadingBedsAssignedToPatient
-              }>
+              disabled={isSubmitting || isLoadingEmrConfiguration || errorFetchingEmrConfiguration || isLoading}>
               {!isSubmitting ? t('admit', 'Admit') : t('admitting', 'Admitting...')}
             </Button>
           </ButtonSet>

package/src/ward-workspace/cancel-admission-request-workspace/cancel-admission-request.component.tsx

@@ -21,10 +21,15 @@ import styles from './cancel-admission-request.scss';
 
 interface CancelAdmissionRequestProps {
   wardPatient: WardPatient;
+  relatedTransferPatients?: WardPatient[];
   closeWorkspace: Workspace2DefinitionProps['closeWorkspace'];
 }
 
-const CancelAdmissionRequest: React.FC<CancelAdmissionRequestProps> = ({ closeWorkspace, wardPatient }) => {
+const CancelAdmissionRequest: React.FC<CancelAdmissionRequestProps> = ({
+  closeWorkspace,
+  wardPatient,
+  relatedTransferPatients,
+}) => {
   const { patient, visit } = wardPatient ?? {};
   const { t } = useTranslation();
   const [isSubmitting, setIsSubmitting] = useState(false);
@@ -75,21 +80,37 @@ const CancelAdmissionRequest: React.FC<CancelAdmissionRequestProps> = ({ closeWo
         },
       ];
 
-      createEncounter(patient, emrConfiguration?.cancelADTRequestEncounterType, visit?.uuid, obs)
-        .then(() => {
-          showSnackbar({
-            title: t('admissionRequestCancelled', 'Admission request cancelled.'),
-            kind: 'success',
-          });
-          closeWorkspace({ discardUnsavedChanges: true });
-          closeWorkspaceGroup2();
-        })
-        .catch((err: Error) => {
-          showSnackbar({
-            title: t('errorCancellingAdmissionRequest', 'Error cancelling admission request'),
-            subtitle: err.message,
-            kind: 'error',
+      const allPatientsToCancel = [wardPatient, ...(relatedTransferPatients ?? [])];
+      Promise.allSettled(
+        allPatientsToCancel.map(({ patient: p, visit: v }) =>
+          createEncounter(p, emrConfiguration?.cancelADTRequestEncounterType, v?.uuid, obs),
+        ),
+      )
+        .then((results) => {
+          results.forEach((result, i) => {
+            const patientName = allPatientsToCancel[i].patient.person.preferredName.display;
+            if (result.status === 'fulfilled') {
+              showSnackbar({
+                title: t('admissionRequestCancelledForPatient', 'Admission request cancelled for {{patientName}}', {
+                  patientName,
+                }),
+                kind: 'success',
+              });
+            } else {
+              showSnackbar({
+                title: t('errorCancellingAdmissionRequest', 'Error cancelling admission request for {{patientName}}', {
+                  patientName,
+                }),
+                subtitle: (result.reason as Error)?.message,
+                kind: 'error',
+              });
+            }
           });
+
+          if (results.some((r) => r.status === 'fulfilled')) {
+            closeWorkspace({ discardUnsavedChanges: true });
+            closeWorkspaceGroup2();
+          }
         })
         .finally(() => {
           setIsSubmitting(false);
@@ -102,10 +123,10 @@ const CancelAdmissionRequest: React.FC<CancelAdmissionRequestProps> = ({ closeWo
       emrConfiguration?.denyAdmissionConcept?.uuid,
       emrConfiguration?.cancelADTRequestEncounterType,
       createEncounter,
-      patient,
+      wardPatient,
+      relatedTransferPatients,
       t,
       wardPatientGroupDetails,
-      visit?.uuid,
       closeWorkspace,
     ],
   );
@@ -120,6 +141,9 @@ const CancelAdmissionRequest: React.FC<CancelAdmissionRequestProps> = ({ closeWo
     <Workspace2 title={t('cancelAdmissionRequest', 'Cancel admission request')} hasUnsavedChanges={isDirty}>
       <div className={styles.flexWrapper}>
         <WardPatientWorkspaceBanner wardPatient={wardPatient} />
+        {relatedTransferPatients?.map((rp) => (
+          <WardPatientWorkspaceBanner key={rp.patient.uuid} wardPatient={rp} />
+        ))}
         <Form
           onSubmit={handleSubmit(onSubmit, onError)}
           className={classNames(styles.formContainer, styles.workspaceContent)}>

package/src/ward-workspace/cancel-admission-request-workspace/cancel-admission-request.workspace.tsx

@@ -9,9 +9,15 @@ import { type Workspace2DefinitionProps } from '@openmrs/esm-framework/src';
  */
 const CancelAdmissionRequestWorkspace: React.FC<Workspace2DefinitionProps<WardPatientWorkspaceProps, {}, {}>> = ({
   closeWorkspace,
-  workspaceProps: { wardPatient },
+  workspaceProps: { wardPatient, relatedTransferPatients },
 }) => {
-  return <CancelAdmissionRequest closeWorkspace={closeWorkspace} wardPatient={wardPatient} />;
+  return (
+    <CancelAdmissionRequest
+      closeWorkspace={closeWorkspace}
+      wardPatient={wardPatient}
+      relatedTransferPatients={relatedTransferPatients}
+    />
+  );
 };
 
 export default CancelAdmissionRequestWorkspace;

package/src/ward-workspace/create-admission-encounter/create-admission-encounter.workspace.tsx

@@ -66,7 +66,7 @@ const CreateAdmissionEncounterWorkspace: React.FC<
     content = <SkeletonText />;
   } else if (hasError) {
     content = (
-      <div>
+      <>
         <InlineNotification
           kind="error"
           lowContrast={true}
@@ -80,7 +80,7 @@ const CreateAdmissionEncounterWorkspace: React.FC<
           onClick={() => closeWorkspace()}>
           <span>{t('backToSearchResults', 'Back to search results')}</span>
         </Button>
-      </div>
+      </>
     );
   } else {
     const assignedBedDetail = bedData.data.results[0];
@@ -102,7 +102,7 @@ const CreateAdmissionEncounterWorkspace: React.FC<
       inpatientRequest: null,
     };
     content = (
-      <div>
+      <>
         <WardPatientWorkspaceBanner wardPatient={wardPatient} />
         {activeVisit ? (
           <div>
@@ -162,11 +162,15 @@ const CreateAdmissionEncounterWorkspace: React.FC<
           onClick={() => closeWorkspace()}>
           <span>{t('backToSearchResults', 'Back to search results')}</span>
         </Button>
-      </div>
+      </>
     );
   }
 
-  return <Workspace2 title={t('admitPatient', 'Admit patient')}>{content}</Workspace2>;
+  return (
+    <Workspace2 title={t('admitPatient', 'Admit patient')}>
+      <div id="create-admission-encounter-workspace">{content}</div>
+    </Workspace2>
+  );
 };
 
 export default CreateAdmissionEncounterWorkspace;

package/src/ward-workspace/patient-transfer-bed-swap/patient-admit-or-transfer-request-form.component.tsx

@@ -35,6 +35,7 @@ export interface PatientAdmitOrTransferFormProps {
 
   onSuccess(): void;
   onCancel(): void;
+  preSelectRelatedPatients?: boolean;
 }
 
 /**
@@ -48,6 +49,7 @@ export default function PatientAdmitOrTransferForm({
   relatedTransferPatients = [],
   onSuccess,
   onCancel,
+  preSelectRelatedPatients,
 }: PatientAdmitOrTransferFormProps) {
   const { t } = useTranslation();
   const { patient, inpatientRequest, visit } = wardPatient ?? {};
@@ -61,7 +63,9 @@ export default function PatientAdmitOrTransferForm({
   );
   const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
   const currentAdmission = wardPatientGroupDetails?.inpatientAdmissionsByPatientUuid?.get(patient?.uuid);
-  const [selectedRelatedPatient, setCheckedRelatedPatient] = useState<string[]>([]);
+  const [selectedRelatedPatient, setCheckedRelatedPatient] = useState<string[]>(() =>
+    preSelectRelatedPatients ? relatedTransferPatients.map((rp) => rp.patient.uuid) : [],
+  );
 
   const zodSchema = useMemo(
     () =>
@@ -130,7 +134,7 @@ export default function PatientAdmitOrTransferForm({
         ...relatedTransferPatients.filter((rp) => selectedRelatedPatient.includes(rp.patient.uuid)),
       ];
 
-      Promise.all(
+      Promise.allSettled(
         wardPatientsToTransfer.map(async (wardPatientToTransfer) => {
           const { patient: patientToTransfer, visit: patientToTransferVisit } = wardPatientToTransfer;
 
@@ -147,19 +151,30 @@ export default function PatientAdmitOrTransferForm({
           );
         }),
       )
-        .then(() => {
-          showSnackbar({
-            title: t('patientTransferRequestCreated', 'Patient transfer request created'),
-            kind: 'success',
-          });
-          onSuccess();
-        })
-        .catch((err: Error) => {
-          showSnackbar({
-            title: t('errorCreatingTransferRequest', 'Error creating transfer request'),
-            subtitle: err.message,
-            kind: 'error',
+        .then((results) => {
+          results.forEach((result, i) => {
+            const patientName = wardPatientsToTransfer[i].patient.person.preferredName.display;
+            if (result.status === 'fulfilled') {
+              showSnackbar({
+                title: t('patientTransferRequestCreatedForPatient', 'Transfer request created for {{patientName}}', {
+                  patientName,
+                }),
+                kind: 'success',
+              });
+            } else {
+              showSnackbar({
+                title: t('errorCreatingTransferRequest', 'Error creating transfer request for {{patientName}}', {
+                  patientName,
+                }),
+                subtitle: (result.reason as Error)?.message,
+                kind: 'error',
+              });
+            }
           });
+
+          if (results.some((r) => r.status === 'fulfilled')) {
+            onSuccess();
+          }
         })
         .finally(() => {
           setIsSubmitting(false);

package/src/ward-workspace/patient-transfer-request-workspace/patient-transfer-request.workspace.tsx

@@ -11,7 +11,7 @@ import styles from './patient-transfer-request.scss';
  * button on a pending request patient card is clicked on
  */
 const PatientTransferRequestWorkspace: React.FC<Workspace2DefinitionProps<WardPatientWorkspaceProps, {}, {}>> = ({
-  workspaceProps: { wardPatient },
+  workspaceProps: { wardPatient, relatedTransferPatients },
   closeWorkspace,
 }) => {
   const { t } = useTranslation();
@@ -22,13 +22,18 @@ const PatientTransferRequestWorkspace: React.FC<Workspace2DefinitionProps<WardPa
       title={isTransfer ? t('transferElsewhere', 'Transfer elsewhere') : t('admitElsewhere', 'Admit elsewhere')}>
       <div className={styles.patientTransferRequestWorkspace}>
         <WardPatientWorkspaceBanner {...{ wardPatient }} />
+        {relatedTransferPatients?.map((rp) => (
+          <WardPatientWorkspaceBanner key={rp.patient.uuid} wardPatient={rp} />
+        ))}
         <PatientAdmitOrTransferForm
           wardPatient={wardPatient}
+          relatedTransferPatients={relatedTransferPatients}
           onSuccess={async () => {
             await closeWorkspace({ discardUnsavedChanges: true });
             closeWorkspaceGroup2();
           }}
           onCancel={() => closeWorkspace()}
+          preSelectRelatedPatients
         />
       </div>
     </Workspace2>

package/src/ward.resource.ts

@@ -81,3 +81,7 @@ export function removePatientFromBed(bedId: number, patientUuid: string) {
     method: 'DELETE',
   });
 }
+
+export function getAssignedBedByPatient(patientUuid: string) {
+  return openmrsFetch<{ results: Array<{ bedId: number }> }>(`${restBaseUrl}/beds?patientUuid=${patientUuid}`);
+}

package/translations/am.json

@@ -1,6 +1,6 @@
 {
   "addPatientToWard": "Add patient to ward",
-  "admissionRequestCancelled": "Admission request cancelled.",
+  "admissionRequestCancelledForPatient": "Admission request cancelled for {{patientName}}",
   "admissionRequests": "Admission requests",
   "admissionRequestsCount_one": "{{count}} admission request",
   "admissionRequestsCount_other": "{{count}} admission requests",
@@ -10,8 +10,10 @@
   "admitPatient": "Admit patient",
   "admittedTo": "Admitted to {{locationName}}",
   "admitting": "Admitting...",
+  "alsoAdmitOrCancel": "Also admit / cancel:",
   "alsoSwap": "Also swap:",
   "alsoTransfer": "Also transfer:",
+  "alsoTransferOrCancel": "Also transfer / cancel:",
   "backToSearchResults": "Back to search results",
   "bedShare": "Bed share",
   "bedSwap": "Bed swap",
@@ -25,19 +27,19 @@
   "countItems_other": "{{count}} {{item}}",
   "days_one": "{{count}} day",
   "days_other": "{{count}} days",
-  "deleteNote": "Delete Note",
+  "deleteNote": "Delete note",
   "deleteNoteConfirmationText": "Are you sure you want to delete this note? This action can't be undone.",
   "discharge": "Discharge",
   "editNote": "Edit note",
   "emptyBed": "Empty bed",
   "emptyText": "Empty",
   "encounterDisplay": "{{encounterType}} {{encounterDate}}",
-  "errorCancellingAdmissionRequest": "Error cancelling admission request",
+  "errorAdmittingPatient": "Failed to admit {{patientName}}",
+  "errorCancellingAdmissionRequest": "Error cancelling admission request for {{patientName}}",
   "errorChangingPatientBedAssignment": "Error changing patient bed assignment",
   "errorConfiguringPatientCard": "Error configuring patient card",
   "errorConfiguringPatientCardMessage": "Unable to find configuration for {{elementType}}, id: {{id}}",
-  "errorCreatingEncounter": "Failed to admit patient",
-  "errorCreatingTransferRequest": "Error creating transfer request",
+  "errorCreatingTransferRequest": "Error creating transfer request for {{patientName}}",
   "errorDeletingNote": "Error deleting note",
   "errorDischargingPatient": "Error discharging patient",
   "errorLoadingBedDetails": "Error loading bed details",
@@ -48,8 +50,7 @@
   "errorLoadingPatients": "Error loading admitted patients",
   "errorLoadingWardLocation": "Error loading ward location",
   "errorSavingPatientNote": "Error saving patient note",
-  "errorTransferringPatient": "Failed to transfer patient",
-  "errrorAdmitingPatient": "Failed to admit patient",
+  "errorTransferringPatient": "Failed to transfer {{patientName}}",
   "female": "Female",
   "fetchingEmrConfigurationFailed": "Fetching EMR configuration failed. Try refreshing the page or contact your system administrator.",
   "fetchingPatientNotesFailed": "Fetching patient notes failed. Try refreshing the page or contact your system administrator.",
@@ -83,11 +84,11 @@
   "Orders": "Orders",
   "other": "Other",
   "patient": "Patient",
-  "patientAdmittedButBedNotAssigned": "Patient admitted successfully but fail to assign bed to patient",
+  "patientAdmittedButBedNotAssigned": "{{patientName}} admitted successfully but failed to assign bed",
   "patientAdmittedSuccessfully": "Patient admitted successfully",
   "patientAdmittedSuccessfullySubtitle": "{{patientName}} has been successfully admitted and assigned to bed {{bedNumber}}",
-  "patientAdmittedToLocation": "Patient admitted successfully to {{location}}",
-  "patientAdmittedWoBed": "Patient admitted successfully to {{location}}",
+  "patientAdmittedToLocation": "{{patientName}} admitted successfully to {{location}}",
+  "patientAdmittedWoBed": "{{patientName}} admitted successfully to {{location}}",
   "patientAlreadyAdmittedToCurrentLocation": "Patient already admitted to current location",
   "patientAssignedNewBed": "Patient assigned to new bed",
   "patientAssignedNewBedDetail": "{{patientName}} assigned to bed {{bedNumber}}",
@@ -101,8 +102,8 @@
   "patientNotesDidntLoad": "Patient notes didn't load",
   "patients": "Patients",
   "patientTransferredSuccessfully": "Patient transferred successfully",
-  "patientTransferredToLocation": "Patient transferred successfully to {{location}}",
-  "patientTransferRequestCreated": "Patient transfer request created",
+  "patientTransferredToLocation": "{{patientName}} transferred successfully to {{location}}",
+  "patientTransferRequestCreatedForPatient": "Transfer request created for {{patientName}}",
   "patientUnassignedFromBed": "Patient unassigned from bed",
   "patientUnassignedFromBedDetail": "{{patientName}} is now unassigned from bed",
   "patientWasDischarged": "Patient was discharged",

package/translations/ar.json

@@ -1,6 +1,6 @@
 {
   "addPatientToWard": "Add patient to ward",
-  "admissionRequestCancelled": "Admission request cancelled.",
+  "admissionRequestCancelledForPatient": "Admission request cancelled for {{patientName}}",
   "admissionRequests": "Admission requests",
   "admissionRequestsCount_one": "{{count}} admission request",
   "admissionRequestsCount_other": "{{count}} admission requests",
@@ -10,8 +10,10 @@
   "admitPatient": "Admit patient",
   "admittedTo": "Admitted to {{locationName}}",
   "admitting": "Admitting...",
+  "alsoAdmitOrCancel": "Also admit / cancel:",
   "alsoSwap": "Also swap:",
   "alsoTransfer": "Also transfer:",
+  "alsoTransferOrCancel": "Also transfer / cancel:",
   "backToSearchResults": "Back to search results",
   "bedShare": "Bed share",
   "bedSwap": "Bed swap",
@@ -25,19 +27,19 @@
   "countItems_other": "{{count}} {{item}}",
   "days_one": "{{count}} day",
   "days_other": "{{count}} days",
-  "deleteNote": "Delete Note",
+  "deleteNote": "Delete note",
   "deleteNoteConfirmationText": "Are you sure you want to delete this note? This action can't be undone.",
   "discharge": "Discharge",
   "editNote": "Edit note",
   "emptyBed": "Empty bed",
   "emptyText": "Empty",
   "encounterDisplay": "{{encounterType}} {{encounterDate}}",
-  "errorCancellingAdmissionRequest": "Error cancelling admission request",
+  "errorAdmittingPatient": "Failed to admit {{patientName}}",
+  "errorCancellingAdmissionRequest": "Error cancelling admission request for {{patientName}}",
   "errorChangingPatientBedAssignment": "Error changing patient bed assignment",
   "errorConfiguringPatientCard": "Error configuring patient card",
   "errorConfiguringPatientCardMessage": "Unable to find configuration for {{elementType}}, id: {{id}}",
-  "errorCreatingEncounter": "Failed to admit patient",
-  "errorCreatingTransferRequest": "Error creating transfer request",
+  "errorCreatingTransferRequest": "Error creating transfer request for {{patientName}}",
   "errorDeletingNote": "Error deleting note",
   "errorDischargingPatient": "Error discharging patient",
   "errorLoadingBedDetails": "Error loading bed details",
@@ -48,8 +50,7 @@
   "errorLoadingPatients": "Error loading admitted patients",
   "errorLoadingWardLocation": "Error loading ward location",
   "errorSavingPatientNote": "Error saving patient note",
-  "errorTransferringPatient": "Failed to transfer patient",
-  "errrorAdmitingPatient": "Failed to admit patient",
+  "errorTransferringPatient": "Failed to transfer {{patientName}}",
   "female": "Female",
   "fetchingEmrConfigurationFailed": "Fetching EMR configuration failed. Try refreshing the page or contact your system administrator.",
   "fetchingPatientNotesFailed": "Fetching patient notes failed. Try refreshing the page or contact your system administrator.",
@@ -83,11 +84,11 @@
   "Orders": "Orders",
   "other": "Other",
   "patient": "Patient",
-  "patientAdmittedButBedNotAssigned": "Patient admitted successfully but fail to assign bed to patient",
+  "patientAdmittedButBedNotAssigned": "{{patientName}} admitted successfully but failed to assign bed",
   "patientAdmittedSuccessfully": "Patient admitted successfully",
   "patientAdmittedSuccessfullySubtitle": "{{patientName}} has been successfully admitted and assigned to bed {{bedNumber}}",
-  "patientAdmittedToLocation": "Patient admitted successfully to {{location}}",
-  "patientAdmittedWoBed": "Patient admitted successfully to {{location}}",
+  "patientAdmittedToLocation": "{{patientName}} admitted successfully to {{location}}",
+  "patientAdmittedWoBed": "{{patientName}} admitted successfully to {{location}}",
   "patientAlreadyAdmittedToCurrentLocation": "Patient already admitted to current location",
   "patientAssignedNewBed": "Patient assigned to new bed",
   "patientAssignedNewBedDetail": "{{patientName}} assigned to bed {{bedNumber}}",
@@ -101,8 +102,8 @@
   "patientNotesDidntLoad": "Patient notes didn't load",
   "patients": "Patients",
   "patientTransferredSuccessfully": "Patient transferred successfully",
-  "patientTransferredToLocation": "Patient transferred successfully to {{location}}",
-  "patientTransferRequestCreated": "Patient transfer request created",
+  "patientTransferredToLocation": "{{patientName}} transferred successfully to {{location}}",
+  "patientTransferRequestCreatedForPatient": "Transfer request created for {{patientName}}",
   "patientUnassignedFromBed": "Patient unassigned from bed",
   "patientUnassignedFromBedDetail": "{{patientName}} is now unassigned from bed",
   "patientWasDischarged": "Patient was discharged",