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

OH2-394 | Patient - visits: highlight the most recent visit #688

Merged
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
@@ -1,13 +1,14 @@
import { CircularProgress } from "@mui/material";
import { useAppDispatch, useAppSelector } from "libraries/hooks/redux";
import React, { FunctionComponent, useEffect, useRef } from "react";
import React, { FunctionComponent, useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { OpdDTO, OpdWithOperationRowDTO } from "../../../../generated";
import { renderDateTime } from "../../../../libraries/formatUtils/dataFormatting";
import { usePermission } from "../../../../libraries/permissionUtils/usePermission";
import { getOpdsWithOperationRows } from "../../../../state/opds";
import InfoBox from "../../infoBox/InfoBox";
import Table from "../../table/Table";
import "./styles.scss";

interface IOwnProps {
shouldUpdateTable: boolean;
Expand All @@ -34,6 +35,9 @@ const PatientOPDTable: FunctionComponent<IOwnProps> = ({
const order = ["date", "disease"];
const dispatch = useAppDispatch();
const infoBoxRef = useRef<HTMLDivElement>(null);
const [mostRecentVisit, setMostRecentVisit] = useState<
OpdWithOperationRowDTO | undefined
>(undefined);

const data = useAppSelector((state) =>
state.opds.getOpds.data ? state.opds.getOpds.data : []
Expand Down Expand Up @@ -67,10 +71,34 @@ const PatientOPDTable: FunctionComponent<IOwnProps> = ({
return results;
};

useEffect(() => {
if (data.length > 0) {
const mostRecent = data.reduce((latest, item) => {
if (!!item.opdDTO?.date && latest.opdDTO?.date) {
return new Date(item.opdDTO?.date) > new Date(latest.opdDTO?.date)
? item
: latest;
} else {
return latest;
}
});

setMostRecentVisit(mostRecent);
}
}, [data]);

const onEdit = (row?: OpdDTO) => {
handleEdit(data.find((item) => item.opdDTO?.code === row?.code));
};

const getRowClassNames = (row: any): string => {
if ((row.opdDTO?.code ?? row.code) === mostRecentVisit?.opdDTO?.code) {
return "mostRecentVisit";
}

return "";
};

return (
<div className="patientOpdTable">
<h5>{t("opd.previousentries")}</h5>
Expand All @@ -83,6 +111,7 @@ const PatientOPDTable: FunctionComponent<IOwnProps> = ({
columnsOrder={order}
rowsPerPage={5}
isCollapsabile={true}
rowClassNames={getRowClassNames}
onEdit={canUpdate ? onEdit : undefined}
addTitle={t("opd.addoperation")}
/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.mostRecentVisit {
background-color: rgba(252, 24, 18, 0.04);

td {
color: rgb(252, 24, 18);
}
}
3 changes: 3 additions & 0 deletions src/components/accessories/table/Table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const Table: FunctionComponent<IProps> = ({
addTitle,
showEmptyCell = true,
renderItemDetails,
rowClassNames,
getCoreRow,
onClose,
onCancel,
Expand Down Expand Up @@ -259,6 +260,7 @@ const Table: FunctionComponent<IProps> = ({
filters,
manualFilter
),
// eslint-disable-next-line react-hooks/exhaustive-deps
[filterColumns, filters, manualFilter, rowData]
);

Expand Down Expand Up @@ -351,6 +353,7 @@ const Table: FunctionComponent<IProps> = ({
renderActions={() => renderActions(row)}
isCollapsabile={isCollapsabile}
showEmptyCell={showEmptyCell}
rowClassNames={rowClassNames}
renderCellDetails={renderItemDetails}
detailColSpan={detailColSpan}
expanded={expanded}
Expand Down
6 changes: 5 additions & 1 deletion src/components/accessories/table/TableBodyRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const TableBodyRow: FunctionComponent<IRowProps> = ({
isCollapsabile,
showEmptyCell = true,
renderCellDetails,
rowClassNames,
coreRow,
detailColSpan,
expanded,
Expand All @@ -30,7 +31,10 @@ const TableBodyRow: FunctionComponent<IRowProps> = ({

return (
<>
<TableRow key={rowIndex}>
<TableRow
className={rowClassNames ? rowClassNames(row) : ""}
key={rowIndex}
>
{isCollapsabile ? (
<TableCell width="40">
<IconButton
Expand Down
2 changes: 2 additions & 0 deletions src/components/accessories/table/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export interface IProps {
onAdd?: (row: any) => void;
addTitle?: string;
showEmptyCell?: boolean;
rowClassNames?: <T>(row: T) => string;
renderItemDetails?: (row: any) => void;
coreData?: Array<any>;
identifierColumn?: string;
Expand Down Expand Up @@ -66,6 +67,7 @@ export interface IRowProps {
isCollapsabile?: boolean;
renderActions: () => ReactNode;
showEmptyCell?: boolean;
rowClassNames?: <T>(row: T) => string;
renderCellDetails?: <T>(row: T) => any;
coreRow?: any;
detailColSpan?: number;
Expand Down