@openmrs/esm-ward-app 9.2.1-pre.6649 → 9.2.1-pre.6655

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (97) hide show
  1. package/.turbo/turbo-build.log +6 -6
  2. package/dist/1119.js +1 -1
  3. package/dist/1197.js +1 -1
  4. package/dist/1326.js +1 -1
  5. package/dist/1326.js.map +1 -1
  6. package/dist/2146.js +1 -1
  7. package/dist/2690.js +1 -1
  8. package/dist/3099.js +1 -1
  9. package/dist/3584.js +1 -1
  10. package/dist/4055.js +1 -1
  11. package/dist/4132.js +1 -1
  12. package/dist/4300.js +1 -1
  13. package/dist/4335.js +1 -1
  14. package/dist/4618.js +1 -1
  15. package/dist/4652.js +1 -1
  16. package/dist/4944.js +1 -1
  17. package/dist/5173.js +1 -1
  18. package/dist/5241.js +1 -1
  19. package/dist/5442.js +1 -1
  20. package/dist/5661.js +1 -1
  21. package/dist/5885.js +1 -1
  22. package/dist/5885.js.map +1 -1
  23. package/dist/6012.js +1 -1
  24. package/dist/6022.js +1 -1
  25. package/dist/6468.js +1 -1
  26. package/dist/6679.js +1 -1
  27. package/dist/6840.js +1 -1
  28. package/dist/6859.js +1 -1
  29. package/dist/7097.js +1 -1
  30. package/dist/7159.js +1 -1
  31. package/dist/723.js +1 -1
  32. package/dist/7617.js +1 -1
  33. package/dist/795.js +1 -1
  34. package/dist/8163.js +1 -1
  35. package/dist/8349.js +1 -1
  36. package/dist/{5734.js → 8610.js} +1 -1
  37. package/dist/8610.js.map +1 -0
  38. package/dist/8618.js +1 -1
  39. package/dist/890.js +1 -1
  40. package/dist/9214.js +1 -1
  41. package/dist/9538.js +1 -1
  42. package/dist/9569.js +1 -1
  43. package/dist/986.js +1 -1
  44. package/dist/9879.js +1 -1
  45. package/dist/9895.js +1 -1
  46. package/dist/9900.js +1 -1
  47. package/dist/9913.js +1 -1
  48. package/dist/main.js +1 -1
  49. package/dist/openmrs-esm-ward-app.js.buildmanifest.json +150 -150
  50. package/dist/routes.json +1 -1
  51. package/package.json +1 -1
  52. package/src/ward-patient-card/card-rows/incorrect-admission-warning-row.component.tsx +49 -0
  53. package/src/ward-view/default-ward/default-ward-beds.component.tsx +4 -3
  54. package/src/ward-view/default-ward/default-ward-patient-card.component.tsx +2 -0
  55. package/src/ward-view/materal-ward/maternal-ward-beds.component.tsx +4 -3
  56. package/src/ward-view/materal-ward/maternal-ward-patient-card.component.tsx +3 -1
  57. package/src/ward-view/ward.component.tsx +12 -9
  58. package/translations/am.json +3 -0
  59. package/translations/ar.json +3 -0
  60. package/translations/ar_SY.json +3 -0
  61. package/translations/bn.json +3 -0
  62. package/translations/de.json +3 -0
  63. package/translations/en.json +3 -0
  64. package/translations/en_US.json +3 -0
  65. package/translations/es.json +3 -0
  66. package/translations/es_MX.json +3 -0
  67. package/translations/fr.json +3 -0
  68. package/translations/he.json +3 -0
  69. package/translations/hi.json +3 -0
  70. package/translations/hi_IN.json +3 -0
  71. package/translations/id.json +3 -0
  72. package/translations/it.json +3 -0
  73. package/translations/ka.json +3 -0
  74. package/translations/km.json +3 -0
  75. package/translations/ku.json +3 -0
  76. package/translations/ky.json +3 -0
  77. package/translations/lg.json +3 -0
  78. package/translations/ne.json +3 -0
  79. package/translations/pl.json +3 -0
  80. package/translations/pt.json +3 -0
  81. package/translations/pt_BR.json +3 -0
  82. package/translations/qu.json +3 -0
  83. package/translations/ro_RO.json +3 -0
  84. package/translations/ru_RU.json +3 -0
  85. package/translations/si.json +3 -0
  86. package/translations/sw.json +3 -0
  87. package/translations/sw_KE.json +3 -0
  88. package/translations/tr.json +3 -0
  89. package/translations/tr_TR.json +3 -0
  90. package/translations/uk.json +3 -0
  91. package/translations/uz.json +3 -0
  92. package/translations/uz@Latn.json +3 -0
  93. package/translations/uz_UZ.json +3 -0
  94. package/translations/vi.json +3 -0
  95. package/translations/zh.json +3 -0
  96. package/translations/zh_CN.json +3 -0
  97. package/dist/5734.js.map +0 -1
package/dist/routes.json CHANGED
@@ -1 +1 @@
1
- {"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0","emrapi":"^2.0.0 || 2.0.0-SNAPSHOT"},"optionalBackendDependencies":{"bedmanagement":{"version":"^6.0.0 || 6.0.0-SNAPSHOT","feature":{"flagName":"bedmanagement-module","label":"Ward App Patient Service","description":"This module, if installed, provides services for managing patients admitted to the ward."}}},"extensions":[{"name":"ward-dashboard-link","component":"wardDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"ward","slot":"ward-dashboard-slot","title":"Wards"}},{"component":"root","name":"ward-dashboard","slot":"ward-dashboard-slot"},{"component":"wardView","name":"ward-view","slot":"ward-view-slot"},{"component":"wardPatientActionButtonExtension","name":"ward-patient-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"wardPatientNotesActionButtonExtension","name":"ward-inpatient-notes-form-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"coloredObsTagCardRowExtension","name":"colored-obs-tags-card-row","slot":"ward-patient-card-slot"},{"name":"transfer-swap-patient-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientTransferAndSwapWorkspaceSiderailIcon"},{"name":"patient-discharge-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientDischargeWorkspaceSideRailIcon"},{"name":"clinical-forms-workspace-siderail-button","component":"clinicalFormWorkspaceSideRailIcon","slot":"action-menu-ward-patient-items-slot"},{"name":"admission-requests-workspace-siderail-button","component":"admissionRequestsWorkspaceSideRailIcon","slot":"action-menu-ward-patient-admission-requests-items-slot"},{"name":"create-admission-request-workspace-siderail-button","component":"createAdmissionEncounterWorkspaceSideRailIcon","slot":"action-menu-ward-patient-admission-requests-items-slot"},{"component":"defaultWardView","name":"default-ward","slot":"default-ward"},{"component":"maternalWardView","name":"maternal-ward","slot":"maternal-ward"},{"component":"wardPatientWorkspaceBanner","name":"ward-patient-workspace-banner","slot":"ward-workspace-patient-banner-slot"}],"workspaces":[{"name":"admission-requests-workspace","component":"admissionRequestWorkspace","title":"admissionRequests","type":"pending-admission-requests","width":"wider"},{"name":"create-admission-encounter-workspace","component":"createAdmissionEncounterWorkspace","title":"admitPatient","type":"patient-search-workspace","width":"wider"},{"name":"ward-patient-notes-workspace","component":"wardPatientNotesWorkspace","type":"ward-patient-notes","title":"inpatientNotesWorkspaceTitle"},{"name":"admit-patient-form-workspace","component":"admitPatientFormWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-workspace","component":"wardPatientWorkspace","type":"ward","title":"Ward patient","width":"extra-wide"},{"name":"patient-transfer-swap-workspace","component":"patientTransferAndSwapWorkspace","title":"transfers","type":"transfer-swap-bed-form"},{"name":"patient-transfer-request-workspace","component":"patientTransferRequestWorkspace","title":"transferRequest","type":"transfer-request-form"},{"name":"patient-discharge-workspace","component":"patientDischargeWorkspace","title":"discharge","type":"ward-patient-discharge"},{"name":"ward-patient-clinical-forms-workspace","component":"patientClinicalFormsWorkspace","title":"clinicalForms","type":"ward-patient-clinical-forms","width":"wider"},{"name":"cancel-admission-request-workspace","component":"cancelAdmissionRequestWorkspace","title":"cancelAdmissionRequest","type":"cancel-admission-request"}],"workspaceGroups":[{"name":"ward-patient","members":["ward-patient-workspace","ward-patient-notes-workspace","patient-transfer-swap-workspace","patient-discharge-workspace","ward-patient-clinical-forms-workspace","add-drug-order","order-basket","add-lab-order"]},{"name":"ward-patient-admission-requests","members":["admission-requests-workspace","create-admission-encounter-workspace"]}],"version":"9.2.1-pre.6649"}
1
+ {"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0","emrapi":"^2.0.0 || 2.0.0-SNAPSHOT"},"optionalBackendDependencies":{"bedmanagement":{"version":"^6.0.0 || 6.0.0-SNAPSHOT","feature":{"flagName":"bedmanagement-module","label":"Ward App Patient Service","description":"This module, if installed, provides services for managing patients admitted to the ward."}}},"extensions":[{"name":"ward-dashboard-link","component":"wardDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"ward","slot":"ward-dashboard-slot","title":"Wards"}},{"component":"root","name":"ward-dashboard","slot":"ward-dashboard-slot"},{"component":"wardView","name":"ward-view","slot":"ward-view-slot"},{"component":"wardPatientActionButtonExtension","name":"ward-patient-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"wardPatientNotesActionButtonExtension","name":"ward-inpatient-notes-form-action-button","slot":"action-menu-ward-patient-items-slot"},{"component":"coloredObsTagCardRowExtension","name":"colored-obs-tags-card-row","slot":"ward-patient-card-slot"},{"name":"transfer-swap-patient-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientTransferAndSwapWorkspaceSiderailIcon"},{"name":"patient-discharge-siderail-button","slot":"action-menu-ward-patient-items-slot","component":"patientDischargeWorkspaceSideRailIcon"},{"name":"clinical-forms-workspace-siderail-button","component":"clinicalFormWorkspaceSideRailIcon","slot":"action-menu-ward-patient-items-slot"},{"name":"admission-requests-workspace-siderail-button","component":"admissionRequestsWorkspaceSideRailIcon","slot":"action-menu-ward-patient-admission-requests-items-slot"},{"name":"create-admission-request-workspace-siderail-button","component":"createAdmissionEncounterWorkspaceSideRailIcon","slot":"action-menu-ward-patient-admission-requests-items-slot"},{"component":"defaultWardView","name":"default-ward","slot":"default-ward"},{"component":"maternalWardView","name":"maternal-ward","slot":"maternal-ward"},{"component":"wardPatientWorkspaceBanner","name":"ward-patient-workspace-banner","slot":"ward-workspace-patient-banner-slot"}],"workspaces":[{"name":"admission-requests-workspace","component":"admissionRequestWorkspace","title":"admissionRequests","type":"pending-admission-requests","width":"wider"},{"name":"create-admission-encounter-workspace","component":"createAdmissionEncounterWorkspace","title":"admitPatient","type":"patient-search-workspace","width":"wider"},{"name":"ward-patient-notes-workspace","component":"wardPatientNotesWorkspace","type":"ward-patient-notes","title":"inpatientNotesWorkspaceTitle"},{"name":"admit-patient-form-workspace","component":"admitPatientFormWorkspace","title":"admissionRequests","type":"admission-requests"},{"name":"ward-patient-workspace","component":"wardPatientWorkspace","type":"ward","title":"Ward patient","width":"extra-wide"},{"name":"patient-transfer-swap-workspace","component":"patientTransferAndSwapWorkspace","title":"transfers","type":"transfer-swap-bed-form"},{"name":"patient-transfer-request-workspace","component":"patientTransferRequestWorkspace","title":"transferRequest","type":"transfer-request-form"},{"name":"patient-discharge-workspace","component":"patientDischargeWorkspace","title":"discharge","type":"ward-patient-discharge"},{"name":"ward-patient-clinical-forms-workspace","component":"patientClinicalFormsWorkspace","title":"clinicalForms","type":"ward-patient-clinical-forms","width":"wider"},{"name":"cancel-admission-request-workspace","component":"cancelAdmissionRequestWorkspace","title":"cancelAdmissionRequest","type":"cancel-admission-request"}],"workspaceGroups":[{"name":"ward-patient","members":["ward-patient-workspace","ward-patient-notes-workspace","patient-transfer-swap-workspace","patient-discharge-workspace","ward-patient-clinical-forms-workspace","add-drug-order","order-basket","add-lab-order"]},{"name":"ward-patient-admission-requests","members":["admission-requests-workspace","create-admission-encounter-workspace"]}],"version":"9.2.1-pre.6655"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openmrs/esm-ward-app",
3
- "version": "9.2.1-pre.6649",
3
+ "version": "9.2.1-pre.6655",
4
4
  "description": "Ward and bed management module for O3",
5
5
  "browser": "dist/openmrs-esm-ward-app.js",
6
6
  "main": "src/index.ts",
@@ -0,0 +1,49 @@
1
+ import React from 'react';
2
+ import { type WardPatient } from '../../types';
3
+ import useWardLocation from '../../hooks/useWardLocation';
4
+ import { InlineNotification } from '@carbon/react';
5
+ import { useTranslation } from 'react-i18next';
6
+
7
+ interface IncorrectAdmissionWarningRowProps {
8
+ wardPatient: WardPatient;
9
+ }
10
+
11
+ /**
12
+ * This row appears in the patient card when the patient either has no active visit,
13
+ * or has no inpatient admission, or their inpatient admission is not for the current ward.
14
+ * This is unlikely an inconsistent data state, and this component shows a warning to indicate that.
15
+ */
16
+ const IncorrectAdmissionWarningRow: React.FC<IncorrectAdmissionWarningRowProps> = ({ wardPatient }) => {
17
+ const { location } = useWardLocation();
18
+ const { t } = useTranslation();
19
+
20
+ const { visit, inpatientAdmission } = wardPatient;
21
+
22
+ if (!visit) {
23
+ return (
24
+ <InlineNotification hideCloseButton kind="warning" lowContrast title={t('noActiveVisit', 'No active visit')} />
25
+ );
26
+ }
27
+ if (!inpatientAdmission) {
28
+ return (
29
+ <InlineNotification hideCloseButton kind="warning" lowContrast title={t('noAdmission', 'No admission found')} />
30
+ );
31
+ }
32
+
33
+ if (inpatientAdmission.currentInpatientLocation.uuid !== location?.uuid) {
34
+ return (
35
+ <InlineNotification
36
+ hideCloseButton
37
+ kind="warning"
38
+ lowContrast
39
+ title={t('admittedTo', 'Admitted to {{locationName}}', {
40
+ locationName: inpatientAdmission.currentInpatientLocation.display,
41
+ })}
42
+ />
43
+ );
44
+ }
45
+
46
+ return null;
47
+ };
48
+
49
+ export default IncorrectAdmissionWarningRow;
@@ -7,7 +7,7 @@ import DefaultWardPatientCard from './default-ward-patient-card.component';
7
7
 
8
8
  function DefaultWardBeds() {
9
9
  const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
10
- const { bedLayouts, wardAdmittedPatientsWithBed } = wardPatientGroupDetails ?? {};
10
+ const { bedLayouts, wardAdmittedPatientsWithBed, inpatientAdmissionsByPatientUuid } = wardPatientGroupDetails ?? {};
11
11
 
12
12
  const wardBeds = bedLayouts?.map((bedLayout) => {
13
13
  const { patients } = bedLayout;
@@ -18,12 +18,13 @@ function DefaultWardBeds() {
18
18
  const { patient, visit, currentInpatientRequest } = inpatientAdmission;
19
19
  return { patient, visit, bed, inpatientAdmission, inpatientRequest: currentInpatientRequest || null };
20
20
  } else {
21
+ const admissionElsewhere = inpatientAdmissionsByPatientUuid.get(patient.uuid);
21
22
  // for some reason this patient is in a bed but not in the list of admitted patients, so we need to use the patient data from the bed endpoint
22
23
  return {
23
24
  patient: patient,
24
- visit: null,
25
+ visit: admissionElsewhere?.visit,
25
26
  bed,
26
- inpatientAdmission: null, // populate after BED-13
27
+ inpatientAdmission: admissionElsewhere,
27
28
  inpatientRequest: null,
28
29
  };
29
30
  }
@@ -5,6 +5,7 @@ import PendingItemsRow from '../../ward-patient-card/card-rows/pending-items-row
5
5
  import WardPatientCard from '../../ward-patient-card/ward-patient-card.component';
6
6
  import styles from '../../ward-patient-card/ward-patient-card.scss';
7
7
  import DefaultWardPatientCardHeader from './default-ward-patient-card-header.component';
8
+ import IncorrectAdmissionWarningRow from '../../ward-patient-card/card-rows/incorrect-admission-warning-row.component';
8
9
 
9
10
  const DefaultWardPatientCard: WardPatientCardType = ({ wardPatient }) => {
10
11
  const { bed } = wardPatient;
@@ -12,6 +13,7 @@ const DefaultWardPatientCard: WardPatientCardType = ({ wardPatient }) => {
12
13
  const card = (
13
14
  <WardPatientCard wardPatient={wardPatient}>
14
15
  <DefaultWardPatientCardHeader {...{ wardPatient }} />
16
+ <IncorrectAdmissionWarningRow wardPatient={wardPatient} />
15
17
  <PendingItemsRow id={'pending-items'} wardPatient={wardPatient} />
16
18
  <AdmissionRequestNoteRow id={'admission-request-note'} wardPatient={wardPatient} />
17
19
  </WardPatientCard>
@@ -8,7 +8,7 @@ import MaternalWardPatientCard from './maternal-ward-patient-card.component';
8
8
  const MaternalWardBeds: React.FC<MotherChildRelationships> = (motherChildRelationships) => {
9
9
  const { motherByChildUuid, isLoading: isLoadingMotherChildRelationships } = motherChildRelationships ?? {};
10
10
  const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
11
- const { bedLayouts, wardAdmittedPatientsWithBed } = wardPatientGroupDetails ?? {};
11
+ const { bedLayouts, wardAdmittedPatientsWithBed, inpatientAdmissionsByPatientUuid } = wardPatientGroupDetails ?? {};
12
12
 
13
13
  const wardBeds = bedLayouts?.map((bedLayout) => {
14
14
  const { patients: patientsInCurrentBed } = bedLayout;
@@ -22,13 +22,14 @@ const MaternalWardBeds: React.FC<MotherChildRelationships> = (motherChildRelatio
22
22
  const { patient, visit, currentInpatientRequest } = inpatientAdmission;
23
23
  return { patient, visit, bed, inpatientAdmission, inpatientRequest: currentInpatientRequest || null };
24
24
  } else {
25
+ const admissionElsewhere = inpatientAdmissionsByPatientUuid.get(patient.uuid);
25
26
  // for some reason this patient is in a bed but not in the list of admitted patients,
26
27
  // so we need to use the patient data from the bed endpoint
27
28
  return {
28
29
  patient: patient,
29
- visit: null,
30
+ visit: admissionElsewhere?.visit,
30
31
  bed,
31
- inpatientAdmission: null,
32
+ inpatientAdmission: admissionElsewhere,
32
33
  inpatientRequest: null,
33
34
  };
34
35
  }
@@ -2,7 +2,7 @@ import React from 'react';
2
2
  import classNames from 'classnames';
3
3
  import { Tag } from '@carbon/react';
4
4
  import { useTranslation } from 'react-i18next';
5
- import { type WardPatient } from '../../types';
5
+ import { WardViewContext, type WardPatient } from '../../types';
6
6
  import CodedObsTagsRow from '../../ward-patient-card/card-rows/coded-obs-tags-row.component';
7
7
  import MaternalWardPatientCardHeader from './maternal-ward-patient-card-header.component';
8
8
  import maternalWardPatientCardStyles from './maternal-ward-patient-card.scss';
@@ -12,6 +12,7 @@ import WardPatientCard from '../../ward-patient-card/ward-patient-card.component
12
12
  import WardPatientObs from '../../ward-patient-card/row-elements/ward-patient-obs.component';
13
13
  import WardPatientTimeOnWard from '../../ward-patient-card/row-elements/ward-patient-time-on-ward.component';
14
14
  import styles from '../../ward-patient-card/ward-patient-card.scss';
15
+ import IncorrectAdmissionWarningRow from '../../ward-patient-card/card-rows/incorrect-admission-warning-row.component';
15
16
 
16
17
  export interface MaternalWardPatientCardProps {
17
18
  /**
@@ -50,6 +51,7 @@ const MaternalWardPatientCard: React.FC<MaternalWardPatientCardProps> = (props)
50
51
  />
51
52
  <WardPatientObs id={'gravida'} patient={patient} visit={visit} />
52
53
  </div>
54
+ <IncorrectAdmissionWarningRow wardPatient={wardPatient} />
53
55
  <PendingItemsRow id={'pending-items'} wardPatient={wardPatient} />
54
56
  <CodedObsTagsRow id="pregnancy-complications" {...wardPatient} />
55
57
  <MotherChildRow {...props} />
@@ -13,11 +13,9 @@ const Ward = ({ wardBeds, wardUnassignedPatients }: { wardBeds: ReactNode; wardU
13
13
  const { t } = useTranslation();
14
14
 
15
15
  const { wardPatientGroupDetails } = useAppContext<WardViewContext>('ward-view-context') ?? {};
16
- const { bedLayouts } = wardPatientGroupDetails ?? {};
17
- const { isLoading: isLoadingAdmissionLocation, error: errorLoadingAdmissionLocation } =
18
- wardPatientGroupDetails?.admissionLocationResponse ?? {};
16
+ const { bedLayouts, isLoading } = wardPatientGroupDetails ?? {};
17
+ const { error: errorLoadingAdmissionLocation } = wardPatientGroupDetails?.admissionLocationResponse ?? {};
19
18
  const {
20
- isLoading: isLoadingInpatientAdmissions,
21
19
  error: errorLoadingInpatientAdmissions,
22
20
  hasMore: hasMoreInpatientAdmissions,
23
21
  loadMore: loadMoreInpatientAdmissions,
@@ -31,7 +29,7 @@ const Ward = ({ wardBeds, wardUnassignedPatients }: { wardBeds: ReactNode; wardU
31
29
  (entries) => {
32
30
  entries.forEach((entry) => {
33
31
  if (entry.isIntersecting) {
34
- if (hasMoreInpatientAdmissions && !errorLoadingInpatientAdmissions && !isLoadingInpatientAdmissions) {
32
+ if (hasMoreInpatientAdmissions && !errorLoadingInpatientAdmissions && !isLoading) {
35
33
  loadMoreInpatientAdmissions();
36
34
  }
37
35
  }
@@ -55,9 +53,9 @@ const Ward = ({ wardBeds, wardUnassignedPatients }: { wardBeds: ReactNode; wardU
55
53
  [
56
54
  errorLoadingInpatientAdmissions,
57
55
  hasMoreInpatientAdmissions,
58
- isLoadingInpatientAdmissions,
59
56
  loadMoreInpatientAdmissions,
60
57
  scrollToLoadMoreTrigger,
58
+ isLoading,
61
59
  ],
62
60
  );
63
61
 
@@ -65,7 +63,14 @@ const Ward = ({ wardBeds, wardUnassignedPatients }: { wardBeds: ReactNode; wardU
65
63
 
66
64
  return (
67
65
  <div className={classNames(styles.wardViewMain, styles.verticalTiling)}>
68
- {wardBeds}
66
+ {isLoading ? (
67
+ <EmptyBeds />
68
+ ) : (
69
+ <>
70
+ {wardBeds}
71
+ {wardUnassignedPatients}
72
+ </>
73
+ )}
69
74
  {bedLayouts?.length == 0 && isBedManagementModuleInstalled && (
70
75
  <InlineNotification
71
76
  kind="warning"
@@ -73,8 +78,6 @@ const Ward = ({ wardBeds, wardUnassignedPatients }: { wardBeds: ReactNode; wardU
73
78
  title={t('noBedsConfigured', 'No beds configured for this location')}
74
79
  />
75
80
  )}
76
- {wardUnassignedPatients}
77
- {(isLoadingAdmissionLocation || isLoadingInpatientAdmissions) && <EmptyBeds />}
78
81
  {errorLoadingAdmissionLocation && (
79
82
  <InlineNotification
80
83
  kind="error"
@@ -6,6 +6,7 @@
6
6
  "admit": "Admit",
7
7
  "admitElsewhere": "Admit elsewhere",
8
8
  "admitPatient": "Admit patient",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Admitting...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Mother / Child",
61
62
  "nextPage": "Next page",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "No bed",
63
66
  "noBedsConfigured": "No beds configured for this location",
64
67
  "noBedsConfiguredForLocation": "No beds configured for {{location}} location",
@@ -6,6 +6,7 @@
6
6
  "admit": "Admit",
7
7
  "admitElsewhere": "Admit elsewhere",
8
8
  "admitPatient": "Admit patient",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Admitting...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Mother / Child",
61
62
  "nextPage": "Next page",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "No bed",
63
66
  "noBedsConfigured": "No beds configured for this location",
64
67
  "noBedsConfiguredForLocation": "No beds configured for {{location}} location",
@@ -6,6 +6,7 @@
6
6
  "admit": "Admit",
7
7
  "admitElsewhere": "Admit elsewhere",
8
8
  "admitPatient": "Admit patient",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Admitting...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Mother / Child",
61
62
  "nextPage": "Next page",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "No bed",
63
66
  "noBedsConfigured": "No beds configured for this location",
64
67
  "noBedsConfiguredForLocation": "No beds configured for {{location}} location",
@@ -6,6 +6,7 @@
6
6
  "admit": "Admit",
7
7
  "admitElsewhere": "Admit elsewhere",
8
8
  "admitPatient": "Admit patient",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Admitting...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Mother / Child",
61
62
  "nextPage": "Next page",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "No bed",
63
66
  "noBedsConfigured": "No beds configured for this location",
64
67
  "noBedsConfiguredForLocation": "No beds configured for {{location}} location",
@@ -6,6 +6,7 @@
6
6
  "admit": "Admit",
7
7
  "admitElsewhere": "Admit elsewhere",
8
8
  "admitPatient": "Admit patient",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Admitting...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Mother / Child",
61
62
  "nextPage": "Next page",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "No bed",
63
66
  "noBedsConfigured": "No beds configured for this location",
64
67
  "noBedsConfiguredForLocation": "No beds configured for {{location}} location",
@@ -6,6 +6,7 @@
6
6
  "admit": "Admit",
7
7
  "admitElsewhere": "Admit elsewhere",
8
8
  "admitPatient": "Admit patient",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Admitting...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Mother / Child",
61
62
  "nextPage": "Next page",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "No bed",
63
66
  "noBedsConfigured": "No beds configured for this location",
64
67
  "noBedsConfiguredForLocation": "No beds configured for {{location}} location",
@@ -6,6 +6,7 @@
6
6
  "admit": "Admit",
7
7
  "admitElsewhere": "Admit elsewhere",
8
8
  "admitPatient": "Admit patient",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Admitting...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Mother / Child",
61
62
  "nextPage": "Next page",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "No bed",
63
66
  "noBedsConfigured": "No beds configured for this location",
64
67
  "noBedsConfiguredForLocation": "No beds configured for {{location}} location",
@@ -6,6 +6,7 @@
6
6
  "admit": "Admitir",
7
7
  "admitElsewhere": "Admitir en otro lugar",
8
8
  "admitPatient": "Admitir paciente",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Admitiendo...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Madre / Hijo",
61
62
  "nextPage": "Siguiente página",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "Sin cama",
63
66
  "noBedsConfigured": "No hay camas configuradas para esta ubicación",
64
67
  "noBedsConfiguredForLocation": "No hay camas configuradas para la ubicación {{location}}",
@@ -6,6 +6,7 @@
6
6
  "admit": "Admit",
7
7
  "admitElsewhere": "Admit elsewhere",
8
8
  "admitPatient": "Admit patient",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Admitting...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Mother / Child",
61
62
  "nextPage": "Next page",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "No bed",
63
66
  "noBedsConfigured": "No beds configured for this location",
64
67
  "noBedsConfiguredForLocation": "No beds configured for {{location}} location",
@@ -6,6 +6,7 @@
6
6
  "admit": "Admettre",
7
7
  "admitElsewhere": "Admit elsewhere",
8
8
  "admitPatient": "Admettre le patient",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Admission en cours...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Mère / Enfant",
61
62
  "nextPage": "Page suivante",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "Sans lit",
63
66
  "noBedsConfigured": "Aucun lit configuré pour cette unité",
64
67
  "noBedsConfiguredForLocation": "Aucun lit configuré pour {{location}}",
@@ -6,6 +6,7 @@
6
6
  "admit": "Admit",
7
7
  "admitElsewhere": "Admit elsewhere",
8
8
  "admitPatient": "Admit patient",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Admitting...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Mother / Child",
61
62
  "nextPage": "Next page",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "No bed",
63
66
  "noBedsConfigured": "No beds configured for this location",
64
67
  "noBedsConfiguredForLocation": "No beds configured for {{location}} location",
@@ -6,6 +6,7 @@
6
6
  "admit": "Admit",
7
7
  "admitElsewhere": "Admit elsewhere",
8
8
  "admitPatient": "Admit patient",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Admitting...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Mother / Child",
61
62
  "nextPage": "Next page",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "No bed",
63
66
  "noBedsConfigured": "No beds configured for this location",
64
67
  "noBedsConfiguredForLocation": "No beds configured for {{location}} location",
@@ -6,6 +6,7 @@
6
6
  "admit": "Admit",
7
7
  "admitElsewhere": "Admit elsewhere",
8
8
  "admitPatient": "Admit patient",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Admitting...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Mother / Child",
61
62
  "nextPage": "Next page",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "No bed",
63
66
  "noBedsConfigured": "No beds configured for this location",
64
67
  "noBedsConfiguredForLocation": "No beds configured for {{location}} location",
@@ -6,6 +6,7 @@
6
6
  "admit": "Terima",
7
7
  "admitElsewhere": "Terima di tempat lain",
8
8
  "admitPatient": "Terima pasien",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Menerima...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} menit",
60
61
  "motherChildBedShare": "Ibu / Anak",
61
62
  "nextPage": "Halaman berikutnya",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "Tidak ada tempat tidur",
63
66
  "noBedsConfigured": "Tidak ada tempat tidur yang dikonfigurasi untuk lokasi ini",
64
67
  "noBedsConfiguredForLocation": "Tidak ada tempat tidur yang dikonfigurasi untuk lokasi {{location}}",
@@ -6,6 +6,7 @@
6
6
  "admit": "Ricovera",
7
7
  "admitElsewhere": "Ricovera altrove",
8
8
  "admitPatient": "Ricovera paziente",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Ricovero in corso...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minuti",
60
61
  "motherChildBedShare": "Madre / Bambino",
61
62
  "nextPage": "Pagina successiva",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "Nessun letto",
63
66
  "noBedsConfigured": "Nessun letto configurato per questa posizione",
64
67
  "noBedsConfiguredForLocation": "Nessun letto configurato per la posizione {{location}}",
@@ -6,6 +6,7 @@
6
6
  "admit": "მიღება",
7
7
  "admitElsewhere": "სხვაგან მიღება",
8
8
  "admitPatient": "პაციენტის მიღება",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "მიმდინარეობს მიღება...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} წუთი",
60
61
  "motherChildBedShare": "დედა / შვილი",
61
62
  "nextPage": "შემდეგი გვერდი",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "საწოლების გარეშე",
63
66
  "noBedsConfigured": "No beds configured for this location",
64
67
  "noBedsConfiguredForLocation": "No beds configured for {{location}} location",
@@ -6,6 +6,7 @@
6
6
  "admit": "Admit",
7
7
  "admitElsewhere": "Admit elsewhere",
8
8
  "admitPatient": "Admit patient",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Admitting...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Mother / Child",
61
62
  "nextPage": "Next page",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "No bed",
63
66
  "noBedsConfigured": "No beds configured for this location",
64
67
  "noBedsConfiguredForLocation": "No beds configured for {{location}} location",
@@ -6,6 +6,7 @@
6
6
  "admit": "Admit",
7
7
  "admitElsewhere": "Admit elsewhere",
8
8
  "admitPatient": "Admit patient",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Admitting...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Mother / Child",
61
62
  "nextPage": "Next page",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "No bed",
63
66
  "noBedsConfigured": "No beds configured for this location",
64
67
  "noBedsConfiguredForLocation": "No beds configured for {{location}} location",
@@ -6,6 +6,7 @@
6
6
  "admit": "Admit",
7
7
  "admitElsewhere": "Admit elsewhere",
8
8
  "admitPatient": "Admit patient",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Admitting...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Mother / Child",
61
62
  "nextPage": "Next page",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "No bed",
63
66
  "noBedsConfigured": "No beds configured for this location",
64
67
  "noBedsConfiguredForLocation": "No beds configured for {{location}} location",
@@ -6,6 +6,7 @@
6
6
  "admit": "Yingiza",
7
7
  "admitElsewhere": "Yingiza Ewalala",
8
8
  "admitPatient": "Yingiza Omulwadde Mu Ddwaliro",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Okuyingiza...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Okugabana ekitanda ne nnyina n’omwana",
61
62
  "nextPage": "Omuko oguddako",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "Tewali kitanda",
63
66
  "noBedsConfigured": "Tewali bitanda byateekebwawo ku kifo kino",
64
67
  "noBedsConfiguredForLocation": "No beds configured for {{location}} location",
@@ -6,6 +6,7 @@
6
6
  "admit": "Admit",
7
7
  "admitElsewhere": "Admit elsewhere",
8
8
  "admitPatient": "Admit patient",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Admitting...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Mother / Child",
61
62
  "nextPage": "Next page",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "No bed",
63
66
  "noBedsConfigured": "No beds configured for this location",
64
67
  "noBedsConfiguredForLocation": "No beds configured for {{location}} location",
@@ -6,6 +6,7 @@
6
6
  "admit": "Admit",
7
7
  "admitElsewhere": "Admit elsewhere",
8
8
  "admitPatient": "Admit patient",
9
+ "admittedTo": "Admitted to {{locationName}}",
9
10
  "admitting": "Admitting...",
10
11
  "alsoSwap": "Also swap:",
11
12
  "alsoTransfer": "Also transfer:",
@@ -59,6 +60,8 @@
59
60
  "minutes_other": "{{count}} minutes",
60
61
  "motherChildBedShare": "Mother / Child",
61
62
  "nextPage": "Next page",
63
+ "noActiveVisit": "No active visit",
64
+ "noAdmission": "No admission found",
62
65
  "noBed": "No bed",
63
66
  "noBedsConfigured": "No beds configured for this location",
64
67
  "noBedsConfiguredForLocation": "No beds configured for {{location}} location",