-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ft/update result error display (#13)
* fix : key arrangements * chore : catch error * fix : printing * ft: print * ft : update print * fix : print table * fix : results table display * fix : table border and font size * fix : reduce size of headers * fix : image print size and margin * fix : update print out * fix : add worklist table * ft : add overlay * ft : add patient banner * ft : submit results * ft : add completed and review list setup * ft : add review and active list tables * ft : add in table empty state display * ft : setup dynamic search * chore : remove unneccessary data * fix : fix resulting issue * ft : approve result setup * fix : fix value type error * chore : remove debug code * ft : setup results approval dialog UI * fix : fix approve results dialog * ft : add status * ft : get checked tests * fix : overlay full overlap * ft : add range and units in review approve dialog
- Loading branch information
Showing
48 changed files
with
4,075 additions
and
477 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,219 @@ | ||
import React, { useMemo, useState } from "react"; | ||
import { useTranslation } from "react-i18next"; | ||
import { useGetOrdersWorklist } from "../work-list/work-list.resource"; | ||
import { ErrorState, usePagination } from "@openmrs/esm-framework"; | ||
import { | ||
DataTable, | ||
DataTableSkeleton, | ||
Pagination, | ||
Table, | ||
TableBody, | ||
TableCell, | ||
TableContainer, | ||
TableHead, | ||
TableHeader, | ||
TableRow, | ||
TableToolbar, | ||
TableToolbarContent, | ||
TableToolbarSearch, | ||
Layer, | ||
Tile, | ||
DatePicker, | ||
DatePickerInput, | ||
Select, | ||
SelectItem, | ||
Tag, | ||
Dropdown, | ||
} from "@carbon/react"; | ||
import styles from "./completed-list.scss"; | ||
import { getStatusColor } from "../utils/functions"; | ||
|
||
interface CompletedlistProps { | ||
fulfillerStatus: string; | ||
} | ||
|
||
const CompletedList: React.FC<CompletedlistProps> = ({ fulfillerStatus }) => { | ||
const { t } = useTranslation(); | ||
|
||
const [activatedOnOrAfterDate, setActivatedOnOrAfterDate] = useState(""); | ||
|
||
const { workListEntries, isLoading } = useGetOrdersWorklist( | ||
activatedOnOrAfterDate, | ||
fulfillerStatus | ||
); | ||
|
||
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: paginatedWorkListEntries, | ||
currentPage, | ||
} = usePagination(workListEntries, currentPageSize); | ||
|
||
// get picked orders | ||
let columns = [ | ||
{ id: 0, header: t("orderNumber", "Order Number"), key: "orderNumber" }, | ||
{ | ||
id: 1, | ||
header: t("accessionNumber", "Accession Number"), | ||
key: "accessionNumber", | ||
}, | ||
{ id: 2, header: t("test", "Test"), key: "test" }, | ||
{ id: 3, header: t("action", "Action"), key: "action" }, | ||
{ id: 4, header: t("status", "Status"), key: "status" }, | ||
{ id: 5, header: t("orderer", "Orderer"), key: "orderer" }, | ||
{ id: 6, header: t("orderType", "Order Type"), key: "orderType" }, | ||
{ id: 7, header: t("urgency", "Urgency"), key: "urgency" }, | ||
]; | ||
|
||
const tableRows = useMemo(() => { | ||
return paginatedWorkListEntries?.map((entry, index) => ({ | ||
...entry, | ||
id: entry.uuid, | ||
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> }, | ||
})); | ||
}, [paginatedWorkListEntries]); | ||
|
||
if (isLoading) { | ||
return <DataTableSkeleton role="progressbar" />; | ||
} | ||
|
||
if (paginatedWorkListEntries?.length >= 0) { | ||
return ( | ||
<div> | ||
<div className={styles.headerBtnContainer}></div> | ||
<DataTable rows={tableRows} headers={columns} isSortable useZebraStyles> | ||
{({ | ||
rows, | ||
headers, | ||
getHeaderProps, | ||
getTableProps, | ||
getRowProps, | ||
onInputChange, | ||
}) => ( | ||
<TableContainer className={styles.tableContainer}> | ||
<TableToolbar | ||
style={{ | ||
position: "static", | ||
height: "3rem", | ||
overflow: "visible", | ||
backgroundColor: "color", | ||
}} | ||
> | ||
<TableToolbarContent className={styles.toolbar}> | ||
<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 style={{ margin: "5px" }}> | ||
<TableToolbarSearch | ||
onChange={onInputChange} | ||
placeholder={t("searchThisList", "Search this list")} | ||
size="sm" | ||
/> | ||
</Layer> | ||
</TableToolbarContent> | ||
</TableToolbar> | ||
<br /> | ||
<Table | ||
{...getTableProps()} | ||
className={styles.activePatientsTable} | ||
> | ||
<TableHead> | ||
<TableRow> | ||
{headers.map((header) => ( | ||
<TableHeader {...getHeaderProps({ header })}> | ||
{header.header} | ||
</TableHeader> | ||
))} | ||
</TableRow> | ||
</TableHead> | ||
<TableBody> | ||
{rows.map((row, index) => { | ||
return ( | ||
<React.Fragment key={row.id}> | ||
<TableRow {...getRowProps({ row })} key={row.id}> | ||
{row.cells.map((cell) => ( | ||
<TableCell key={cell.id}> | ||
{cell.value?.content ?? cell.value} | ||
</TableCell> | ||
))} | ||
</TableRow> | ||
</React.Fragment> | ||
); | ||
})} | ||
</TableBody> | ||
</Table> | ||
{rows.length === 0 ? ( | ||
<div className={styles.tileContainer}> | ||
<Tile className={styles.tile}> | ||
<div className={styles.tileContent}> | ||
<p className={styles.content}> | ||
{t( | ||
"noCompletedListToDisplay", | ||
"No Completed List to display" | ||
)} | ||
</p> | ||
</div> | ||
</Tile> | ||
</div> | ||
) : null} | ||
<Pagination | ||
forwardText="Next page" | ||
backwardText="Previous page" | ||
page={currentPage} | ||
pageSize={currentPageSize} | ||
pageSizes={pageSizes} | ||
totalItems={paginatedWorkListEntries?.length} | ||
className={styles.pagination} | ||
onChange={({ pageSize, page }) => { | ||
if (pageSize !== currentPageSize) { | ||
setPageSize(pageSize); | ||
} | ||
if (page !== currentPage) { | ||
goTo(page); | ||
} | ||
}} | ||
/> | ||
</TableContainer> | ||
)} | ||
</DataTable> | ||
</div> | ||
); | ||
} | ||
}; | ||
|
||
export default CompletedList; |
Empty file.
Oops, something went wrong.