@openmrs/esm-bed-management-app 8.1.2-pre.4671 → 8.2.0

package/src/bed-administration/edit-bed-form.component.tsx

@@ -2,13 +2,13 @@ import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { showSnackbar } from '@openmrs/esm-framework';
 import { type BedAdministrationData } from './bed-administration-types';
-import { type BedFormData } from '../types';
+import { type BedWithLocation } from '../types';
 import { editBed, useBedType } from './bed-administration.resource';
 import { useLocationsWithAdmissionTag } from '../summary/summary.resource';
 import BedAdministrationForm from './bed-administration-form.component';
 
 interface EditBedFormProps {
-  editData: BedFormData;
+  editData: BedWithLocation;
   mutate: () => void;
   onModalChange: (showModal: boolean) => void;
   showModal: boolean;
@@ -31,7 +31,6 @@ const EditBedForm: React.FC<EditBedFormProps> = ({ showModal, onModalChange, edi
         bedId = editData.bedNumber,
         bedRow = editData.row.toString(),
         bedType = editData.bedType.name,
-        description = editData.description,
         location: { uuid: bedLocation = editData.location.uuid },
         occupancyStatus = editData.status,
       } = formData;
@@ -40,7 +39,6 @@ const EditBedForm: React.FC<EditBedFormProps> = ({ showModal, onModalChange, edi
         bedNumber: bedId,
         bedType,
         column: parseInt(bedColumn),
-        description,
         locationUuid: bedLocation,
         row: parseInt(bedRow),
         status: occupancyStatus.toUpperCase(),

package/src/bed-administration/new-bed-form.component.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { showSnackbar } from '@openmrs/esm-framework';
-import { type BedFormData } from '../types';
+import { type BedWithLocation } from '../types';
 import { type BedAdministrationData } from './bed-administration-types';
 import { saveBed, useBedType } from './bed-administration.resource';
 import { useLocationsWithAdmissionTag } from '../summary/summary.resource';
@@ -23,11 +23,10 @@ const NewBedForm: React.FC<NewBedFormProps> = ({ showModal, onModalChange, mutat
   const occupancyStatuses = ['Available', 'Occupied'];
   const availableBedTypes = bedTypes ? bedTypes : [];
 
-  const initialData: BedFormData = {
+  const initialData: BedWithLocation = {
     bedNumber: '',
     bedType: null,
     column: 0,
-    description: '',
     id: 0,
     location: defaultLocation || { display: '', uuid: '' },
     row: 0,
@@ -37,12 +36,11 @@ const NewBedForm: React.FC<NewBedFormProps> = ({ showModal, onModalChange, mutat
 
   const handleCreateBed = useCallback(
     (formData: BedAdministrationData) => {
-      const { bedId, description, occupancyStatus, bedRow, bedColumn, location, bedType } = formData;
+      const { bedId, occupancyStatus, bedRow, bedColumn, location, bedType } = formData;
 
       const bedObject = {
         bedNumber: bedId,
         bedType,
-        description,
         status: occupancyStatus.toUpperCase(),
         row: parseInt(bedRow.toString()),
         column: parseInt(bedColumn.toString()),

package/src/summary/summary.resource.ts

@@ -46,9 +46,8 @@ export const useBedsForLocation = (locationUuid: string) => {
   );
 
   const mappedBedData: MappedBedData = (data?.data?.results ?? []).map((bed) => ({
-    description: bed.bedType?.description,
     id: bed.id,
-    name: bed.bedType?.displayName,
+    type: bed.bedType?.displayName,
     number: bed.bedNumber,
     status: bed.status,
     uuid: bed.uuid,

package/src/types.ts

@@ -103,10 +103,6 @@ export interface BedType {
   resourceVersion: string;
 }
 
-export interface BedFormData extends BedWithLocation {
-  description: string;
-}
-
 export interface BedTypeData {
   uuid: string;
   name: string;
@@ -159,8 +155,7 @@ export type AdmissionLocation = {
 export type MappedBedData = Array<{
   id: number;
   number: string;
-  name: string;
-  description: string;
+  type: string;
   status: string;
   uuid: string;
 }>;

package/src/ward-with-beds/ward-with-beds.component.tsx

@@ -36,33 +36,28 @@ const WardWithBeds: React.FC = () => {
   const { results: paginatedData, goTo, currentPage } = usePagination(bedsData, pageSize);
 
   if (isLoadingBeds) {
-    <p>Loading...</p>;
+    <p>{t('loading', 'Loading...')}</p>;
   }
 
   const tableHeaders = [
     {
       id: 0,
-      header: 'ID',
+      header: t('id', 'ID'),
       key: 'id',
     },
     {
       id: 1,
-      header: 'Number',
+      header: t('number', 'Number'),
       key: 'number',
     },
     {
       id: 2,
-      header: 'Name',
-      key: 'name',
+      header: t('type', 'Type'),
+      key: 'type',
     },
     {
       id: 3,
-      header: 'Description',
-      key: 'description',
-    },
-    {
-      id: 4,
-      header: 'Occupied',
+      header: t('occupied', 'Occupied'),
       key: 'occupied',
     },
   ];
@@ -89,8 +84,7 @@ const WardWithBeds: React.FC = () => {
     return paginatedData?.map((bed) => ({
       id: bed.id,
       number: bed.number,
-      name: bed.name,
-      description: bed.description,
+      type: bed.type,
       occupied: <CustomTag condition={bed?.status === 'OCCUPIED'} />,
     }));
   }, [paginatedData]);
@@ -116,7 +110,7 @@ const WardWithBeds: React.FC = () => {
                   to: `${window.getOpenmrsSpaBase()}bed-management`,
                 })
               }>
-              <span>Return to summary</span>
+              <span>{t('returnToSummary', 'Return to summary')}</span>
             </Button>
             <span>{isValidating ? <InlineLoading /> : null}</span>
             <Button
@@ -164,11 +158,11 @@ const WardWithBeds: React.FC = () => {
               )}
             </DataTable>
             <Pagination
-              backwardText="Previous page"
-              forwardText="Next page"
-              itemsPerPageText="Items per page:"
+              backwardText={t('previousPage', 'Previous page')}
+              forwardText={t('nextPage', 'Next page')}
+              itemsPerPageText={t('itemsPerPage', 'Items per page:')}
               page={currentPage}
-              pageNumberText="Page Number"
+              pageNumberText={t('pageNumber', 'Page Number')}
               pageSize={pageSize}
               onChange={({ page, pageSize }) => {
                 goTo(page);

package/translations/en.json

@@ -4,13 +4,14 @@
   "addBedTag": "Create bed tag",
   "addBedType": "Add bed type",
   "allocationStatus": "Allocated",
-  "bedDescription": "Bed description",
+  "bedColumn": "Bed column",
   "bedId": "Bed ID",
   "bedLocation": "Location",
   "bedManagement": "Bed management",
   "bedManagementLeftPanel": "Bed management left panel",
   "bedName": "Bed name",
   "bedNumber": "Bed number",
+  "bedRow": "Bed row",
   "beds": "Beds",
   "bedTagCreated": "Bed tag created",
   "bedTagCreatedSuccessfully": "",
@@ -46,23 +47,38 @@
   "errorCreatingForm": "Error creating bed",
   "errorFetchingbedInformation": "Error fetching bed information",
   "filterByOccupancyStatus": "Filter by occupancy status",
+  "id": "ID",
   "ids": "Id",
+  "invalidBedId": "Bed ID cannot be empty",
+  "invalidBedType": "Please select a valid bed type",
+  "invalidLocation": "Please select a valid location",
+  "invalidNumber": "Please enter a valid number",
+  "invalidOccupancyStatus": "Please select a valid occupied status",
+  "itemsPerPage": "Items per page:",
+  "loading": "Loading...",
   "location": "Location",
   "manageBeds": "Manage beds",
   "name": "Name",
   "newBedCreated": "New bed created",
+  "nextPage": "Next page",
   "no": "No",
   "No data": "No data to display",
   "noDataToDisplay": "No data to display",
+  "number": "Number",
+  "occupancyStatus": "Occupancy status",
   "occupancyStatusAvailable": "Available",
   "occupancyStatusOccupied": "Occupied",
-  "occupancyStatus": "Occupied",
+  "occupied": "Occupied",
   "or": "or",
+  "pageNumber": "Page Number",
   "pleaseFillField": "",
+  "previousPage": "Previous page",
   "required": "Required",
+  "returnToSummary": "Return to summary",
   "save": "Save",
   "selectBedLocation": "Select a bed location",
   "summary": "Summary",
+  "type": "Type",
   "viewBeds": "View beds",
   "wardAllocation": "Ward allocation",
   "yes": "Yes"