Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

U4X-314 : Add visibility of notes taken somewhere in the patient summary chart #143

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,32 +31,29 @@ import { Add, Dashboard } from '@carbon/react/icons';

import {
ConfigObject,
ExtensionSlot,
interpolateUrl,
isDesktop,
navigate,
useConfig,
useLayoutType,
usePagination,
UserHasAccess,
useSession,
} from '@openmrs/esm-framework';
import React, { AnchorHTMLAttributes, MouseEvent, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { PRIVILEGE_CHECKIN } from '../constants';
import { buildStatusString, formatWaitTime, getTagColor, getTagType, trimVisitNumber } from '../helpers/functions';
import { buildStatusString, formatWaitTime, getTagColor, trimVisitNumber } from '../helpers/functions';
import PastVisit from '../past-visit/past-visit.component';
import PatientSearch from '../patient-search/patient-search.component';
import StatusIcon from '../queue-entry-table-components/status-icon.component';
import { SearchTypes } from '../types';
import { getOriginFromPathName } from './active-visits-table.resource';
import styles from './active-visits-table.scss';
import EditActionsMenu from './edit-action-menu.components';
import { usePatientQueuesList, useParentLocation } from './patient-queues.resource';
import { usePatientQueuesList } from './patient-queues.resource';
import PickPatientActionMenu from '../queue-entry-table-components/pick-patient-queue-entry-menu.component';
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';

type FilterProps = {
rowIds: Array<string>;
Expand Down Expand Up @@ -110,7 +107,6 @@ const ActiveVisitsTable: React.FC<ActiveVisitsTableProps> = ({ status }) => {
const [viewState, setViewState] = useState<{ selectedPatientUuid: string }>(null);
const layout = useLayoutType();
const config = useConfig() as ConfigObject;
const useQueueTableTabs = config.showQueueTableTab;

const currentPathName: string = window.location.pathname;
const fromPage: string = getOriginFromPathName(currentPathName);
Expand Down Expand Up @@ -191,6 +187,7 @@ const ActiveVisitsTable: React.FC<ActiveVisitsTableProps> = ({ status }) => {
<PickPatientActionMenu queueEntry={entry} closeModal={() => true} />
<EditActionsMenu to={`\${openmrsSpaBase}/patient/${entry?.patientUuid}/edit`} from={fromPage} />
<ViewActionsMenu to={`\${openmrsSpaBase}/patient/${entry?.patientUuid}/chart`} from={fromPage} />
<NotesActionsMenu note={entry} />
</>
),
},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { Button, Tooltip } from '@carbon/react';
import { CatalogPublish } from '@carbon/react/icons';
import React, { useCallback } from 'react';
import { useTranslation } from 'react-i18next';
import { showModal } from '@openmrs/esm-framework';
import { MappedPatientQueueEntry } from './patient-queues.resource';

interface NotesActionsMenuProps {
note: MappedPatientQueueEntry;
}

const NotesActionsMenu: React.FC<NotesActionsMenuProps> = ({ note }) => {
const { t } = useTranslation();
const launchNotesModal = useCallback(() => {
const dispose = showModal('notes-dialog-modal', {
queueEntry: note,
closeModal: () => dispose(),
});
}, [note]);
return (
<Tooltip align="bottom" label="View Notes">
<Button
kind="ghost"
onClick={launchNotesModal}
iconDescription={t('viewNotes', 'View Notes')}
renderIcon={(props) => <CatalogPublish size={16} {...props} />}
/>
</Tooltip>
);
};
export default NotesActionsMenu;
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import React from 'react';
import { MappedQueueEntry } from '../types';
import { Button, Form, ModalBody, ModalFooter, ModalHeader } from '@carbon/react';
import { useTranslation } from 'react-i18next';
import styles from './change-status-dialog.scss';
import { MappedPatientQueueEntry } from './patient-queues.resource';

interface NotesDialogProps {
queueEntry: MappedPatientQueueEntry;
closeModal: () => void;
}

const NotesDialog: React.FC<NotesDialogProps> = ({ queueEntry, closeModal }) => {
const { t } = useTranslation();

return (
<div>
<Form>
<ModalHeader closeModal={closeModal}>
<section className={styles.section}>
<p>Clinical Notes</p>
</section>
</ModalHeader>
<ModalBody>
<div className={styles.modalBody}>
<section className={styles.section}>
<p>{queueEntry.comment}</p>
</section>
</div>
</ModalBody>
<ModalFooter>
<Button kind="secondary" onClick={closeModal}>
{t('cancel', 'Cancel')}
</Button>
<Button type="submit" onClick={closeModal}>
{t('submit', 'Submit')}
</Button>
</ModalFooter>
</Form>
</div>
);
};

export default NotesDialog;
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export interface MappedPatientQueueEntry {
patientUuid: string;
priority: string;
priorityComment: string;
comment: string;
status: string;
waitTime: string;
locationFrom?: string;
Expand Down
2 changes: 2 additions & 0 deletions packages/esm-patient-queues-app/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ export const addProviderToRoomModal = getAsyncLifecycle(
},
);

export const notesModal = getAsyncLifecycle(() => import('./active-visits/notes-dialog.component'), options);

export const addQueueEntryWidget = getAsyncLifecycle(
() => import('./patient-search/visit-form-queue-fields/visit-form-queue-fields.component'),
options,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ function ClinicMetrics() {
value: 0,
});
});

console.info(JSON.stringify(childLocations, null, 2));

// receptionist ui
return (
<>
Expand Down
4 changes: 4 additions & 0 deletions packages/esm-patient-queues-app/src/routes.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@
"name": "add-queue-entry-widget",
"slot": "add-queue-entry-slot",
"component": "addQueueEntryWidget"
},
{
"name" :"notes-dialog-modal",
"component": "notesModal"
}
]
}
Loading