Revert "Cleanup"

src/completed-list/completed-list.component.tsx

@@ -63,12 +63,13 @@
     { 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,
         date: {
@@ -107,8 +108,9 @@
         orderer: { content: <span>{entry.orderer.display}</span> },
         orderType: { content: <span>{entry?.orderType?.display}</span> },
         priority: { content: <span>{entry.urgency}</span> },
+        actions: "--",
       }));
   }, [paginatedWorkListEntries, t]);
 
   if (isLoading) {
     return <DataTableSkeleton role="progressbar" />;
@@ -172,7 +174,7 @@
                     </TableRow>
                   </TableHead>
                   <TableBody>
                     {rows.map((row, index) => {
                       return (
                         <React.Fragment key={row.id}>
                           <TableRow {...getRowProps({ row })} key={row.id}>

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

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;

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;

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;

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 (
     <SummaryTile
-      label={t("transferredOut", "Transferred")}
+      label={t("referredOut", "Referred Out")}
       value={referredOutCount}
-      headerLabel={t("referredOutProcedures", "Referred Out")}
+      headerLabel={t("referredOut", "Referred Out")}
     />
   );
 };
 
-export default ReferredOutProceduresTileComponent;
+export default ReferredOutTileComponent;

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;

src/referred-procedures/referred-procedures.component.tsx

@@ -37,7 +37,7 @@
   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 @@
     { 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" },
   ];
@@ -191,7 +192,7 @@
           onClick={() => {
             launchOverlay(
               t("postProcedureResultForm", "Procedure report form"),
               <PostProcedureForm patientUuid={patientUuid} procedure={order} />
             );
           }}
           renderIcon={(props) => (

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"
     }
 },

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<WorklistProps> = ({ 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);