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.

Sign up for GitHub

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

fix : decouple tests orders from patient queues #19

Merged
merged 3 commits into from
Dec 1, 2023
Merged

fix : decouple tests orders from patient queues #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d5f7c7
fix : decouple tests orders from patient queues
jabahum Nov 29, 2023
d290531
fix : remove unneccessary code
jabahum Nov 29, 2023
d5dc35f
ft : add order approval
jabahum Nov 29, 2023
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
9 changes: 2 additions & 7 deletions src/queue-list/lab-tests/lab-tests.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,11 @@ const LabTests: React.FC<LabTestsProps> = ({ encounter, queueId }) => {
},
actions: {
content: (
<PickLabRequestActionMenu
closeModal={() => true}
order={item}
encounter={encounter}
queueId={queueId}
/>
<PickLabRequestActionMenu closeModal={() => true} order={item} />
),
},
}));
}, [encounter, queueId]);
}, [encounter]);

if (!encounter) {
return (
Expand Down
184 changes: 94 additions & 90 deletions src/queue-list/laboratory-patient-list.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import {
TableExpandedRow,
Tile,
Button,
DatePicker,
DatePickerInput,
} from "@carbon/react";
import { TrashCan } from "@carbon/react/icons";

Expand All @@ -35,48 +37,34 @@ import {
useSession,
} from "@openmrs/esm-framework";
import styles from "./laboratory-queue.scss";
import { usePatientQueuesList } from "./laboratory-patient-list.resource";
import {
formatWaitTime,
getTagColor,
trimVisitNumber,
} from "../utils/functions";
import LabTests from "./lab-tests/lab-tests.component";
import { EmptyState } from "@openmrs/esm-patient-common-lib";

// type FilterProps = {
// rowIds: Array<string>;
// headers: Array<DataTableHeader>;
// cellsById: any;
// inputValue: string;
// getCellId: (row, key) => string;
// };
import { getStatusColor } from "../utils/functions";
import { Result, useGetOrdersWorklist } from "../work-list/work-list.resource";
import PickLabRequestActionMenu from "./pick-lab-request-menu.component";

interface LaboratoryPatientListProps {}

interface RejectOrderProps {
order: string;
order: Result;
}

const LaboratoryPatientList: React.FC<LaboratoryPatientListProps> = () => {
const { t } = useTranslation();
const session = useSession();

const { patientQueueEntries, isLoading } = usePatientQueuesList(
session?.sessionLocation?.uuid,
"pending"
const [activatedOnOrAfterDate, setActivatedOnOrAfterDate] = useState("");

const { workListEntries, isLoading } = useGetOrdersWorklist(
activatedOnOrAfterDate,
""
);

const pageSizes = [10, 20, 30, 40, 50];
const [page, setPage] = useState(1);
const [currentPageSize, setPageSize] = useState(10);
const [nextOffSet, setNextOffSet] = useState(0);

const {
goTo,
results: paginatedQueueEntries,
results: paginatedWorklistQueueEntries,
currentPage,
} = usePagination(patientQueueEntries, currentPageSize);
} = usePagination(workListEntries, currentPageSize);

const RejectOrder: React.FC<RejectOrderProps> = ({ order }) => {
const launchRejectOrderModal = useCallback(() => {
Expand All @@ -94,57 +82,78 @@ const LaboratoryPatientList: React.FC<LaboratoryPatientListProps> = () => {
);
};

// get picked orders
let columns = [
{ id: 0, header: t("visitId", "Visit ID"), key: "visitId" },
{ id: 1, header: t("names", "Names"), key: "names" },
{ id: 2, header: t("age", "Age"), key: "age" },
{ id: 3, header: t("orderedFrom", "Ordered from"), key: "orderedFrom" },
{ id: 4, header: t("waitingTime", "Waiting time"), key: "waitingTime" },
{ id: 5, header: t("actions", "Actions"), key: "actions" },
{ id: 0, header: t("date", "Date"), key: "date" },

{ id: 1, header: t("orderNumber", "Order Number"), key: "orderNumber" },
{
id: 2,
header: t("accessionNumber", "Accession Number"),
key: "accessionNumber",
},
{ id: 3, header: t("test", "Test"), key: "test" },
{ id: 4, header: t("action", "Action"), key: "action" },
{ id: 5, header: t("status", "Status"), key: "status" },
{ id: 6, header: t("orderer", "Orderer"), key: "orderer" },
{ id: 7, header: t("orderType", "Order Type"), key: "orderType" },
{ id: 8, header: t("urgency", "Urgency"), key: "urgency" },
{ id: 9, header: t("actions", "Actions"), key: "actions" },
];

const tableRows = useMemo(() => {
return paginatedQueueEntries?.map((entry, index) => ({
...entry,
encounter: entry.encounter,
visitId: {
content: <span>{trimVisitNumber(entry.visitNumber)}</span>,
},
names: {
content: <span>{entry.name}</span>,
},
age: {
content: <span>{age(entry.patientDob)}</span>,
},
orderedFrom: {
content: <span>{entry.locationFromName}</span>,
},
waitingTime: {
content: (
<Tag>
<span
className={styles.statusContainer}
style={{ color: `${getTagColor(entry.waitTime)}` }}
>
{formatWaitTime(entry.waitTime, t)}
</span>
</Tag>
),
},
actions: {
content: (
<>
<RejectOrder order={paginatedQueueEntries[index].encounter.uuid} />
</>
),
},
}));
}, [paginatedQueueEntries, t]);
return paginatedWorklistQueueEntries
?.filter((item) => item.action === "NEW")
.map((entry, index) => ({
...entry,
id: entry.uuid,
date: {
content: (
<>
<span>{formatDate(parseDate(entry.dateActivated))}</span>
</>
),
},
orderNumber: { content: <span>{entry.orderNumber}</span> },
accessionNumber: { content: <span>{entry.accessionNumber}</span> },
test: { content: <span>{entry.concept.display}</span> },
action: { content: <span>{entry.action}</span> },
status: {
content: (
<>
<Tag>
<span
className={styles.statusContainer}
style={{ color: `${getStatusColor(entry.fulfillerStatus)}` }}
>
<span>{entry.fulfillerStatus}</span>
</span>
</Tag>
</>
),
},
orderer: { content: <span>{entry.orderer.display}</span> },
orderType: { content: <span>{entry.orderType.display}</span> },
urgency: { content: <span>{entry.urgency}</span> },
actions: {
content: (
<>
<PickLabRequestActionMenu
order={paginatedWorklistQueueEntries[index]}
closeModal={() => true}
/>
<RejectOrder order={paginatedWorklistQueueEntries[index]} />
</>
),
},
}));
}, [paginatedWorklistQueueEntries]);

if (isLoading) {
return <DataTableSkeleton role="progressbar" />;
}

if (patientQueueEntries?.length >= 0) {
if (paginatedWorklistQueueEntries?.length >= 0) {
return (
<div>
<div className={styles.headerBtnContainer}></div>
Expand All @@ -167,6 +176,20 @@ const LaboratoryPatientList: React.FC<LaboratoryPatientListProps> = () => {
}}
>
<TableToolbarContent>
<Layer style={{ margin: "5px" }}>
<DatePicker dateFormat="Y-m-d" datePickerType="single">
<DatePickerInput
labelText={""}
id="activatedOnOrAfterDate"
placeholder="YYYY-MM-DD"
onChange={(event) => {
setActivatedOnOrAfterDate(event.target.value);
}}
type="date"
value={activatedOnOrAfterDate}
/>
</DatePicker>
</Layer>
<Layer>
<TableToolbarSearch
onChange={onInputChange}
Expand All @@ -182,7 +205,6 @@ const LaboratoryPatientList: React.FC<LaboratoryPatientListProps> = () => {
>
<TableHead>
<TableRow>
<TableExpandHeader />
{headers.map((header) => (
<TableHeader {...getHeaderProps({ header })}>
{header.header?.content ?? header.header}
Expand All @@ -194,31 +216,13 @@ const LaboratoryPatientList: React.FC<LaboratoryPatientListProps> = () => {
{rows.map((row, index) => {
return (
<React.Fragment key={row.id}>
<TableExpandRow {...getRowProps({ row })} key={row.id}>
<TableRow {...getRowProps({ row })} key={row.id}>
{row.cells.map((cell) => (
<TableCell key={cell.id}>
{cell.value?.content ?? cell.value}
</TableCell>
))}
</TableExpandRow>
{row.isExpanded ? (
<TableExpandedRow
className={styles.expandedLabQueueVisitRow}
colSpan={headers.length + 2}
>
<>
<LabTests
encounter={patientQueueEntries[index].encounter}
queueId={paginatedQueueEntries[index].uuid}
/>
</>
</TableExpandedRow>
) : (
<TableExpandedRow
className={styles.hiddenRow}
colSpan={headers.length + 2}
/>
)}
</TableRow>
</React.Fragment>
);
})}
Expand All @@ -244,7 +248,7 @@ const LaboratoryPatientList: React.FC<LaboratoryPatientListProps> = () => {
page={currentPage}
pageSize={currentPageSize}
pageSizes={pageSizes}
totalItems={patientQueueEntries?.length}
totalItems={workListEntries?.length}
className={styles.pagination}
onChange={({ pageSize, page }) => {
if (pageSize !== currentPageSize) {
Expand Down
23 changes: 8 additions & 15 deletions src/queue-list/pick-lab-request-menu.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,37 +8,30 @@ import { MappedPatientQueueEntry } from "./laboratory-patient-list.resource";
import { Encounter, Order } from "../types/patient-queues";

interface PickLabRequestActionMenuProps {
queueId: string;
encounter: Encounter;
order: Order;
closeModal: () => void;
}

const PickLabRequestActionMenu: React.FC<PickLabRequestActionMenuProps> = ({
queueId,
encounter,
order,
}) => {
const { t } = useTranslation();

const launchPickLabRequestQueueModal = useCallback(() => {
const dispose = showModal("add-to-worklist-dialog", {
closeModal: () => dispose(),
queueId,
encounter,

order,
});
}, [encounter, order, queueId]);
}, [order]);

return (
<Tooltip align="top" label="Pick Lab Request">
<Button
kind="ghost"
onClick={launchPickLabRequestQueueModal}
iconDescription={t("pickRequest", "Pick Lab Request ")}
renderIcon={(props) => <Notification size={16} {...props} />}
></Button>
</Tooltip>
<Button
kind="ghost"
onClick={launchPickLabRequestQueueModal}
iconDescription={t("pickRequest", "Pick Lab Request ")}
renderIcon={(props) => <Notification size={16} {...props} />}
/>
);
};

Expand Down
Loading
Loading