diff --git a/src/completed-list/completed-list.component.tsx b/src/completed-list/completed-list.component.tsx index 05d760c..09e60b7 100644 --- a/src/completed-list/completed-list.component.tsx +++ b/src/completed-list/completed-list.component.tsx @@ -63,11 +63,12 @@ export const CompletedList: React.FC = ({ { id: 4, header: t("status", "Status"), key: "status" }, { id: 5, header: t("urgency", "Priority"), key: "urgency" }, { id: 6, header: t("orderer", "Orderer"), key: "orderer" }, + { id: 7, header: t("actions", "Actions"), key: "actions" }, ]; const tableRows = useMemo(() => { return paginatedWorkListEntries - ?.filter((item) => item.fulfillerStatus === "COMPLETED") + ?.filter((item) => item.fulfillerStatus === "IN_PROGRESS") .map((entry, index) => ({ ...entry, id: entry.uuid, @@ -107,6 +108,7 @@ export const CompletedList: React.FC = ({ orderer: { content: {entry.orderer.display} }, orderType: { content: {entry?.orderType?.display} }, priority: { content: {entry.urgency} }, + actions: "--", })); }, [paginatedWorkListEntries, t]); diff --git a/src/index.ts b/src/index.ts index e9bee0e..c3c0f4e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -6,11 +6,11 @@ import { } from "@openmrs/esm-framework"; import { configSchema } from "./config-schema"; import { createLeftPanelLink } from "./left-panel-link"; -import orderedProceduresTile from "./procedure-tiles/procedures-ordered-tile.component"; -import worklistProceduresTile from "./procedure-tiles/worklist-tile.component"; -import referredOutProceduresTile from "./procedure-tiles/referred-tile.component"; -import completedProceduresTile from "./procedure-tiles/completed-tile.component"; -import notDoneProceduresTile from "./procedure-tiles/not-done-tile.component"; +import orderedTile from "./procedure-tiles/procedures-ordered-tile.component"; +import worklistTile from "./procedure-tiles/worklist-tile.component"; +import referredOutTile from "./procedure-tiles/referred-tile.component"; +import completedTile from "./procedure-tiles/completed-tile.component"; +import notDoneTile from "./procedure-tiles/not-done-tile.component"; import workListProcedures from "./procedure-tabs/work-list-tab.component"; import referredProcedures from "./procedure-tabs/referred-tab.component"; import completedProcedures from "./procedure-tabs/completed-tab.component"; @@ -59,26 +59,14 @@ export const rejectOrderDialogComponent = getSyncLifecycle( options ); -export const worklistProceduresTileComponent = getSyncLifecycle( - worklistProceduresTile, - options -); -export const referredOutProceduresTileComponent = getSyncLifecycle( - referredOutProceduresTile, - options -); -export const completedProceduresTileComponent = getSyncLifecycle( - completedProceduresTile, - options -); -export const orderedProceduresTileComponent = getSyncLifecycle( - orderedProceduresTile, - options -); -export const notDoneProceduresTileComponent = getSyncLifecycle( - notDoneProceduresTile, +export const worklistTileComponent = getSyncLifecycle(worklistTile, options); +export const referredOutTileComponent = getSyncLifecycle( + referredOutTile, options ); +export const completedTileComponent = getSyncLifecycle(completedTile, options); +export const OrderedTileComponent = getSyncLifecycle(orderedTile, options); +export const notDoneTileComponent = getSyncLifecycle(notDoneTile, options); export const worklistProceduresTabComponent = getSyncLifecycle( workListProcedures, options diff --git a/src/procedure-tiles/completed-tile.component.tsx b/src/procedure-tiles/completed-tile.component.tsx index 0b31614..a6e285d 100644 --- a/src/procedure-tiles/completed-tile.component.tsx +++ b/src/procedure-tiles/completed-tile.component.tsx @@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next"; import SummaryTile from "../summary-tiles/summary-tile.component"; import { useProcedureOrderStats } from "../summary-tiles/procedure-summary.resource"; -const CompletedProceduresTileComponent = () => { +const CompletedTileComponent = () => { const { t } = useTranslation(); const { count: completedCount } = useProcedureOrderStats("COMPLETED"); @@ -17,4 +17,4 @@ const CompletedProceduresTileComponent = () => { ); }; -export default CompletedProceduresTileComponent; +export default CompletedTileComponent; diff --git a/src/procedure-tiles/not-done-tile.component.tsx b/src/procedure-tiles/not-done-tile.component.tsx index 0dc8398..175b9ff 100644 --- a/src/procedure-tiles/not-done-tile.component.tsx +++ b/src/procedure-tiles/not-done-tile.component.tsx @@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next"; import SummaryTile from "../summary-tiles/summary-tile.component"; import { useProcedureOrderStats } from "../summary-tiles/procedure-summary.resource"; -const NotDoneProceduresTileComponent = () => { +const NotDoneTileComponent = () => { const { t } = useTranslation(); const { count: declinedCount } = useProcedureOrderStats("DECLINED"); @@ -17,4 +17,4 @@ const NotDoneProceduresTileComponent = () => { ); }; -export default NotDoneProceduresTileComponent; +export default NotDoneTileComponent; diff --git a/src/procedure-tiles/procedures-ordered-tile.component.tsx b/src/procedure-tiles/procedures-ordered-tile.component.tsx index 55c40ad..b04eb16 100644 --- a/src/procedure-tiles/procedures-ordered-tile.component.tsx +++ b/src/procedure-tiles/procedures-ordered-tile.component.tsx @@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next"; import SummaryTile from "../summary-tiles/summary-tile.component"; import { useProcedureOrderStats } from "../summary-tiles/procedure-summary.resource"; -const OrderedProceduresTileComponent = () => { +const OrderedTileComponent = () => { const { t } = useTranslation(); const { count: testOrderedCount } = useProcedureOrderStats(""); @@ -17,4 +17,4 @@ const OrderedProceduresTileComponent = () => { ); }; -export default OrderedProceduresTileComponent; +export default OrderedTileComponent; diff --git a/src/procedure-tiles/referred-tile.component.tsx b/src/procedure-tiles/referred-tile.component.tsx index 191fe4f..f4692d3 100644 --- a/src/procedure-tiles/referred-tile.component.tsx +++ b/src/procedure-tiles/referred-tile.component.tsx @@ -3,17 +3,17 @@ import { useTranslation } from "react-i18next"; import SummaryTile from "../summary-tiles/summary-tile.component"; import { useProcedureOrderStats } from "../summary-tiles/procedure-summary.resource"; -const ReferredOutProceduresTileComponent = () => { +const ReferredOutTileComponent = () => { const { t } = useTranslation(); const { count: referredOutCount } = useProcedureOrderStats("EXCEPTION"); return ( ); }; -export default ReferredOutProceduresTileComponent; +export default ReferredOutTileComponent; diff --git a/src/procedure-tiles/worklist-tile.component.tsx b/src/procedure-tiles/worklist-tile.component.tsx index d70a8c1..e5c13a4 100644 --- a/src/procedure-tiles/worklist-tile.component.tsx +++ b/src/procedure-tiles/worklist-tile.component.tsx @@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next"; import SummaryTile from "../summary-tiles/summary-tile.component"; import { useProcedureOrderStats } from "../summary-tiles/procedure-summary.resource"; -const WorklistProceduresTileComponent = () => { +const WorklistTileComponent = () => { const { t } = useTranslation(); const { count: worklistCount } = useProcedureOrderStats("IN_PROGRESS"); @@ -17,4 +17,4 @@ const WorklistProceduresTileComponent = () => { ); }; -export default WorklistProceduresTileComponent; +export default WorklistTileComponent; diff --git a/src/referred-procedures/referred-procedures.component.tsx b/src/referred-procedures/referred-procedures.component.tsx index 3d8e4c1..aab8eae 100644 --- a/src/referred-procedures/referred-procedures.component.tsx +++ b/src/referred-procedures/referred-procedures.component.tsx @@ -37,7 +37,7 @@ import { showSnackbar, } from "@openmrs/esm-framework"; import { launchOverlay } from "../components/overlay/hook"; -import PostProcedureForm from "../form/post-procedures/post-procedure-form.component"; +import PostProcedureForm from "../results/result-form.component"; import { getStatusColor } from "../utils/functions"; import Overlay from "../components/overlay/overlay.component"; import { useOrdersWorklist } from "../hooks/useOrdersWorklist"; @@ -176,6 +176,7 @@ const WorkList: React.FC = ({ fulfillerStatus }) => { { id: 3, header: t("procedure", "Procedure"), key: "procedure" }, { id: 4, header: t("status", "Status"), key: "status" }, { id: 5, header: t("urgency", "Priority"), key: "urgency" }, + { id: 10, header: t("start", "Start"), key: "start" }, { id: 6, header: t("orderer", "Orderer"), key: "orderer" }, { id: 7, header: t("actions", "Actions"), key: "actions" }, ]; diff --git a/src/routes.json b/src/routes.json index 384dddb..2319546 100644 --- a/src/routes.json +++ b/src/routes.json @@ -21,47 +21,47 @@ "slot": "procedure-dashboard-slot" }, { - "name": "procedures-ordered-tile-component", + "name": "ordered-tile-component", "slot": "procedure-tiles-slot", - "component": "orderedProceduresTileComponent", + "component": "OrderedTileComponent", "meta": { "name": "proceduresOrderedTileSlot", "title": "Active Orders" } }, { - "name": "procedures-worklist-tile-component", + "name": "worklist-tile-component", "slot": "procedure-tiles-slot", - "component": "worklistProceduresTileComponent", + "component": "worklistTileComponent", "meta": { - "name": "worklistProceduresTileSlot", + "name": "worklisTileSlot", "title": "Worklist" } }, { "name": "referred-tile-component", "slot": "procedure-tiles-slot", - "component": "referredOutProceduresTileComponent", + "component": "referredOutTileComponent", "meta": { - "name": "referredProceduresTileSlot", + "name": "referredTileSlot", "title": "Referred Out" } }, { "name": "not-done-tile-component", "slot": "procedure-tiles-slot", - "component": "notDoneProceduresTileComponent", + "component": "notDoneTileComponent", "meta": { - "name": "notDoneProceduresTileSlot", + "name": "notDoneTileSlot", "title": "Not Done" } }, { "name": "completed-tile-component", "slot": "procedure-tiles-slot", - "component": "completedProceduresTileComponent", + "component": "completedTileComponent", "meta": { - "name": "completedProceduresTileSlot", + "name": "completedTileSlot", "title": "Completed" } }, diff --git a/src/work-list/work-list.component.tsx b/src/work-list/work-list.component.tsx index 4d71c67..d376fd2 100644 --- a/src/work-list/work-list.component.tsx +++ b/src/work-list/work-list.component.tsx @@ -45,6 +45,11 @@ interface WorklistProps { fulfillerStatus: string; } +interface ResultsOrderProps { + order: Result; + patientUuid: string; +} + interface RejectOrderProps { order: Result; } @@ -60,8 +65,11 @@ interface ResultsOrderProps { const WorkList: React.FC = ({ fulfillerStatus }) => { const { t } = useTranslation(); - const { workListEntries, isLoading } = useOrdersWorklist("", fulfillerStatus); - + // eslint-disable-next-line prefer-const + let { workListEntries, isLoading } = useOrdersWorklist("", fulfillerStatus); + // workListEntries = workListEntries.filter( + // (order) => order?.procedures?.length == 0 + // ); const [activatedOnOrAfterDate, setActivatedOnOrAfterDate] = useState(""); const pageSizes = [10, 20, 30, 40, 50]; const [currentPageSize, setPageSize] = useState(10);