From 83d4c739c4ffe8093c281394a0ac01198b41d507 Mon Sep 17 00:00:00 2001 From: Jabar Jeremy <24471994+jabahum@users.noreply.github.com> Date: Wed, 24 Jan 2024 16:39:28 +0300 Subject: [PATCH] U4X-335-Fix-Clinician-workflow (#151) * Disable the edit of patient demographics --- .../active-visits/active-visits-tab.component.tsx | 6 ++++-- .../active-visits-table.component.tsx | 14 +++++++++++--- packages/esm-patient-queues-app/src/constants.ts | 1 + 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/packages/esm-patient-queues-app/src/active-visits/active-visits-tab.component.tsx b/packages/esm-patient-queues-app/src/active-visits/active-visits-tab.component.tsx index 68b1b4a4..ba1ce759 100644 --- a/packages/esm-patient-queues-app/src/active-visits/active-visits-tab.component.tsx +++ b/packages/esm-patient-queues-app/src/active-visits/active-visits-tab.component.tsx @@ -13,6 +13,8 @@ function ActiveVisitsTabs() { const [selectedTab, setSelectedTab] = useState(0); const [overlayHeader, setOverlayTitle] = useState(''); + const status = 'completed' || 'serving' || 'pending'; + return (
- {t('pending', 'Pending')} + {t('pending', 'In Queue')} {t('completed', 'Completed')} - + diff --git a/packages/esm-patient-queues-app/src/active-visits/active-visits-table.component.tsx b/packages/esm-patient-queues-app/src/active-visits/active-visits-table.component.tsx index 131c342f..6bcd9e6c 100644 --- a/packages/esm-patient-queues-app/src/active-visits/active-visits-table.component.tsx +++ b/packages/esm-patient-queues-app/src/active-visits/active-visits-table.component.tsx @@ -36,6 +36,7 @@ import { useConfig, useLayoutType, usePagination, + userHasAccess, useSession, } from '@openmrs/esm-framework'; import React, { AnchorHTMLAttributes, MouseEvent, useMemo, useState } from 'react'; @@ -53,6 +54,7 @@ import EmptyState from '../utils/empty-state/empty-state.component'; import ViewActionsMenu from './view-action-menu.components'; import CurrentVisit from '../current-visit/current-visit-summary.component'; import NotesActionsMenu from './notes-action-menu.components'; +import { PRIVILEGE_ENABLE_EDIT_DEMOGRAPHICS } from '../constants'; type FilterProps = { rowIds: Array; @@ -187,15 +189,21 @@ const ActiveVisitsTable: React.FC = ({ status }) => { actions: { content: ( <> - true} /> - + {entry.status === 'COMPLETED' && ( + <> + true} /> + {session?.user && userHasAccess(PRIVILEGE_ENABLE_EDIT_DEMOGRAPHICS, session.user) && ( + + )} + + )} ), }, })); - }, [paginatedQueueEntries, t, fromPage]); + }, [paginatedQueueEntries, t, session.user, fromPage]); const handleFilter = ({ rowIds, headers, cellsById, inputValue, getCellId }: FilterProps): Array => { return rowIds.filter((rowId) => diff --git a/packages/esm-patient-queues-app/src/constants.ts b/packages/esm-patient-queues-app/src/constants.ts index b68cd4a6..b23cae9d 100644 --- a/packages/esm-patient-queues-app/src/constants.ts +++ b/packages/esm-patient-queues-app/src/constants.ts @@ -18,3 +18,4 @@ export const PRIVILEGE_CLINICIAN_METRIC = 'View Clinician Metrics'; export const PRIVILEGE_RECEPTION_QUEUE_LIST = 'View Reception Queuelist'; export const PRIVILEGE_TRIAGE_QUEUE_LIST = 'View Triage Queuelist'; export const PRIVILEGE_CLINICIAN_QUEUE_LIST = 'View Clinician Queuelist'; +export const PRIVILEGE_ENABLE_EDIT_DEMOGRAPHICS = 'Edit Patient Demographics';