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

[KHP3-6545 ] Implement ability to move patient from radiology to new queue #91

Merged
merged 3 commits into from
Oct 1, 2024
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
30 changes: 26 additions & 4 deletions src/radiology-tabs/common/groupedOrdersTable.component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
TableToolbarSearch,
} from "@carbon/react";
import ListOrderDetails from "./listOrderDetails.component";
import TransitionLatestQueueEntryButton from "../test-ordered/transition-patient-new-queue/transition-latest-queue-entry-button.component";

// render Grouped by patient Orders in radiology module
const GroupedOrdersTable: React.FC<GroupedOrdersTableProps> = (props) => {
Expand Down Expand Up @@ -68,13 +69,34 @@ const GroupedOrdersTable: React.FC<GroupedOrdersTableProps> = (props) => {
patientname: patient.orders[0].patient?.display?.split("-")[1],
orders: patient.orders,
totalorders: patient.orders?.length,
fulfillerStatus: patient.orders[0].fulfillerStatus,
action:
patient.orders[0].fulfillerStatus === "COMPLETED" ? (
<TransitionLatestQueueEntryButton patientUuid={patient.patientId} />
) : null,
}));
}, [paginatedResults]);

const tableColumns = [
{ id: 0, header: t("patient", "Patient"), key: "patientname" },
{ id: 1, header: t("totalorders", "Total Orders"), key: "totalorders" },
];
const tableColumns = useMemo(() => {
const showActionColumn = workListEntries.some(
(order) => order.fulfillerStatus === "COMPLETED"
);

const columns = [
{ id: 0, header: t("patientName", "Patient Name"), key: "patientname" },
{ id: 1, header: t("totalorders", "Total Orders"), key: "totalorders" },
];

if (showActionColumn) {
columns.push({
id: 2,
header: t("action", "Action"),
key: "action",
});
}

return columns;
}, [workListEntries, t]);
return (
<div>
<DataTable
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import React from "react";
import { useTranslation } from "react-i18next";
import styles from "./transition-latest-queue-entry-button.scss";
import { showModal } from "@openmrs/esm-framework";
import { Button } from "@carbon/react";
import { AirlineManageGates } from "@carbon/react/icons";

interface TransitionLatestQueueEntryButtonProps {
patientUuid: string;
}

const TransitionLatestQueueEntryButton: React.FC<
TransitionLatestQueueEntryButtonProps
> = ({ patientUuid }) => {
const { t } = useTranslation();

const launchModal = () => {
const dispose = showModal("transition-patient-to-latest-queue-modal", {
closeModal: () => dispose(),
patientUuid,
});
};

return (
<Button
kind="tertiary"
className={styles.addPatientToQueue}
onClick={launchModal}
size="sm"
renderIcon={() => <AirlineManageGates size={18} />}
>
{t("transition", "Transition")}
</Button>
);
};

export default TransitionLatestQueueEntryButton;
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@use '@carbon/layout';
@use '@carbon/styles/scss/type';

.addPatientToQueue {
--cds-layout-size-height-context: var(--cds-layout-size-height-sm, 2rem);
--cds-layout-size-height: var(--cds-layout-size-height-context);
display: flex;
align-items: center;
justify-content: center;
text-align: center;
padding: 0 layout.$spacing-04;
gap: layout.$spacing-05;
}
Loading