diff --git a/package.json b/package.json
index b3b63e68..0a39ec18 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
"main": "src/index.ts",
"source": true,
"scripts": {
- "start": "openmrs develop --backend https://ugandaemr-backend.mets.or.ug",
+ "start": "openmrs develop --backend http://194.163.171.253:8282",
"serve": "webpack serve --mode=development",
"build": "webpack --mode production",
"analyze": "webpack --mode=production --env analyze=true",
@@ -46,11 +46,7 @@
},
"dependencies": {
"@carbon/react": "^1.14.0",
- "@types/nodemailer-express-handlebars": "^4.0.4",
- "handlebars": "^4.7.8",
"lodash-es": "^4.17.21",
- "nodemailer": "^6.9.7",
- "nodemailer-express-handlebars": "^6.1.0",
"react-to-print": "^2.14.15"
},
"peerDependencies": {
@@ -76,7 +72,6 @@
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^14.4.3",
"@types/jest": "^28.1.8",
- "@types/nodemailer": "^6.4.13",
"@types/react": "^18.2.8",
"@types/react-dom": "^18.2.4",
"@types/react-router": "^5.1.20",
diff --git a/src/queue-list/lab-tests/lab-tests.component.tsx b/src/queue-list/lab-tests/lab-tests.component.tsx
index 2177dfc7..e0b44316 100644
--- a/src/queue-list/lab-tests/lab-tests.component.tsx
+++ b/src/queue-list/lab-tests/lab-tests.component.tsx
@@ -1,7 +1,39 @@
import React from "react";
+import { useTranslation } from "react-i18next";
+import { useGetLabOrders } from "./lab-tests.resource";
+
+import { DataTableSkeleton } from "@carbon/react";
+import { ErrorState } from "@openmrs/esm-framework";
const LabTests = () => {
- return Lab Tests;
+ const { t } = useTranslation();
+
+ // get lab orders
+ const { data: labOrders, isLoading, isError } = useGetLabOrders("");
+
+ if (isLoading) {
+ return ;
+ }
+
+ if (isError) {
+ return ;
+ }
+
+ // const filteredItems = labOrders.orders.filter(
+ // (ob) => ob?.order?.type === "testorder"
+ // );
+
+ let columns = [
+ {
+ id: 1,
+ header: t("date", "Date"),
+ key: "date",
+ },
+ { id: 2, header: t("orderNumber", "Order Number"), key: "orderNumber" },
+ { id: 3, header: t("order", "Order"), key: "order" },
+
+ { id: 5, header: t("actions", "Actions"), key: "actions" },
+ ];
};
export default LabTests;
diff --git a/src/queue-list/lab-tests/lab-tests.resource.ts b/src/queue-list/lab-tests/lab-tests.resource.ts
index a4a597c4..4a6324b6 100644
--- a/src/queue-list/lab-tests/lab-tests.resource.ts
+++ b/src/queue-list/lab-tests/lab-tests.resource.ts
@@ -1,6 +1,17 @@
-export function useLabTests() {
+import { FetchResponse, openmrsFetch, useConfig } from "@openmrs/esm-framework";
+import useSWR from "swr";
+import { EncounterResponse } from "../../patient-chart/laboratory-item/view-laboratory-item.resource";
+export function useGetLabOrders(encounterUuid: string) {
+ const apiUrl = `/ws/rest/v1/encounter/${encounterUuid}`;
+
+ const { data, error, isLoading } = useSWR<{ data: EncounterResponse }, Error>(
+ apiUrl,
+ openmrsFetch
+ );
+
return {
- data: {},
- count: 0,
+ data: data.data ? data.data.orders : "",
+ isLoading,
+ isError: error,
};
}
diff --git a/src/queue-list/laboratory-patient-list.component.tsx b/src/queue-list/laboratory-patient-list.component.tsx
index 03289c00..9f7884d1 100644
--- a/src/queue-list/laboratory-patient-list.component.tsx
+++ b/src/queue-list/laboratory-patient-list.component.tsx
@@ -58,7 +58,7 @@ const LaboratoryPatientList: React.FC = () => {
const { patientQueueEntries, isLoading } = usePatientQueuesList(
session?.sessionLocation?.uuid,
- status
+ "pending"
);
const pageSizes = [10, 20, 30, 40, 50];
diff --git a/src/summary-tiles/laboratory-summary-tiles.component.tsx b/src/summary-tiles/laboratory-summary-tiles.component.tsx
index a6a63f70..37e4d2fa 100644
--- a/src/summary-tiles/laboratory-summary-tiles.component.tsx
+++ b/src/summary-tiles/laboratory-summary-tiles.component.tsx
@@ -9,7 +9,7 @@ const LaboratorySummaryTiles: React.FC = () => {
const { t } = useTranslation();
const { metrics, isError, isLoading } = useMetrics();
- if (isLoading) {
+ if (isLoading || isError) {
return ;
}