diff --git a/src/completed-list/completed-list.component.tsx b/src/completed-list/completed-list.component.tsx index d62863b..f26c185 100644 --- a/src/completed-list/completed-list.component.tsx +++ b/src/completed-list/completed-list.component.tsx @@ -1,7 +1,12 @@ 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 { + ErrorState, + formatDate, + parseDate, + usePagination, +} from "@openmrs/esm-framework"; import { DataTable, DataTableSkeleton, @@ -55,24 +60,33 @@ const CompletedList: React.FC = ({ fulfillerStatus }) => { // get picked orders let columns = [ - { id: 0, header: t("orderNumber", "Order Number"), key: "orderNumber" }, + { id: 0, header: t("date", "Date"), key: "date" }, + + { id: 1, header: t("orderNumber", "Order Number"), key: "orderNumber" }, { - id: 1, + id: 2, 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" }, + { 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" }, ]; const tableRows = useMemo(() => { return paginatedWorkListEntries?.map((entry, index) => ({ ...entry, id: entry.uuid, + date: { + content: ( + <> + {formatDate(parseDate(entry.dateActivated))} + + ), + }, orderNumber: { content: {entry.orderNumber} }, accessionNumber: { content: {entry.accessionNumber} }, test: { content: {entry.concept.display} }, diff --git a/src/review-list/review-list.component.tsx b/src/review-list/review-list.component.tsx index f7fccab..2d95648 100644 --- a/src/review-list/review-list.component.tsx +++ b/src/review-list/review-list.component.tsx @@ -1,7 +1,13 @@ import React, { useCallback, useMemo, useState } from "react"; import { useTranslation } from "react-i18next"; import { useGetOrdersWorklist } from "../work-list/work-list.resource"; -import { ErrorState, showModal, usePagination } from "@openmrs/esm-framework"; +import { + ErrorState, + formatDate, + parseDate, + showModal, + usePagination, +} from "@openmrs/esm-framework"; import { DataTable, DataTableSkeleton, @@ -85,24 +91,33 @@ const ReviewList: React.FC = ({ fulfillerStatus }) => { // get picked orders let columns = [ - { id: 0, header: t("orderNumber", "Order Number"), key: "orderNumber" }, + { id: 0, header: t("date", "Date"), key: "date" }, + + { id: 1, header: t("orderNumber", "Order Number"), key: "orderNumber" }, { - id: 1, + id: 2, 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" }, + { 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" }, ]; const tableRows = useMemo(() => { return paginatedWorkListEntries?.map((entry, index) => ({ ...entry, id: entry.uuid, + date: { + content: ( + <> + {formatDate(parseDate(entry.dateActivated))} + + ), + }, orderNumber: { content: {entry.orderNumber} }, accessionNumber: { content: {entry.accessionNumber} }, test: { content: {entry.concept.display} }, diff --git a/src/work-list/work-list.component.tsx b/src/work-list/work-list.component.tsx index beb813c..bd16d26 100644 --- a/src/work-list/work-list.component.tsx +++ b/src/work-list/work-list.component.tsx @@ -33,7 +33,7 @@ import { } from "@carbon/react"; import { Result, useGetOrdersWorklist } from "./work-list.resource"; import styles from "./work-list.scss"; -import { usePagination } from "@openmrs/esm-framework"; +import { formatDate, parseDate, usePagination } from "@openmrs/esm-framework"; import { launchOverlay } from "../components/overlay/hook"; import ResultForm from "../results/result-form.component"; import { getStatusColor } from "../utils/functions"; @@ -70,19 +70,21 @@ const WorkList: React.FC = ({ fulfillerStatus }) => { // get picked orders let columns = [ - { id: 0, header: t("orderNumber", "Order Number"), key: "orderNumber" }, + { id: 0, header: t("date", "Date"), key: "date" }, + + { id: 1, header: t("orderNumber", "Order Number"), key: "orderNumber" }, { - id: 1, + id: 2, 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" }, - { id: 8, header: t("actions", "Actions"), key: "actions" }, + { 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 ResultsOrder: React.FC = ({ @@ -107,6 +109,13 @@ const WorkList: React.FC = ({ fulfillerStatus }) => { return paginatedWorkListEntries?.map((entry, index) => ({ ...entry, id: entry.uuid, + date: { + content: ( + <> + {formatDate(parseDate(entry.dateActivated))} + + ), + }, orderNumber: { content: {entry.orderNumber} }, accessionNumber: { content: {entry.accessionNumber} }, test: { content: {entry.concept.display} },