@openmrs/esm-laboratory-app 1.2.1-pre.739 → 1.2.1-pre.745
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/cache/a60408b5239ac3b0-meta.json +1 -0
- package/.turbo/cache/a60408b5239ac3b0.tar.zst +0 -0
- package/.turbo/turbo-build.log +3 -3
- package/dist/1120.js +1 -1
- package/dist/1120.js.map +1 -1
- package/dist/1788.js +1 -1
- package/dist/1788.js.map +1 -1
- package/dist/3656.js +1 -1
- package/dist/3656.js.map +1 -1
- package/dist/4069.js +1 -1
- package/dist/4069.js.map +1 -1
- package/dist/4300.js +1 -1
- package/dist/5085.js +1 -1
- package/dist/5085.js.map +1 -1
- package/dist/6134.js +1 -1
- package/dist/6134.js.map +1 -1
- package/dist/7423.js +1 -1
- package/dist/7423.js.map +1 -1
- package/dist/8554.js +1 -1
- package/dist/8554.js.map +1 -1
- package/dist/8667.js +1 -1
- package/dist/8667.js.map +1 -1
- package/dist/main.js +1 -1
- package/dist/main.js.map +1 -1
- package/dist/openmrs-esm-laboratory-app.js +1 -1
- package/dist/openmrs-esm-laboratory-app.js.buildmanifest.json +34 -34
- package/dist/routes.json +1 -1
- package/package.json +1 -1
- package/src/components/orders-table/list-order-details.component.tsx +31 -24
- package/src/components/orders-table/list-order-details.scss +0 -1
- package/src/components/orders-table/orders-data-table.component.tsx +143 -56
- package/src/components/orders-table/orders-data-table.test.tsx +215 -0
- package/src/config-schema.ts +20 -1
- package/src/lab-tabs/data-table-extensions/tests-ordered-table.extension.tsx +1 -1
- package/src/lab-tiles/all-lab-requests-tile.component.tsx +1 -1
- package/src/lab-tiles/completed-lab-requests-tile.component.tsx +1 -1
- package/src/lab-tiles/in-progress-lab-requests-tile.component.tsx +1 -1
- package/src/laboratory-resource.ts +24 -33
- package/src/types.ts +20 -17
- package/translations/en.json +2 -2
- package/.turbo/cache/26dd8861bd3eca6d-meta.json +0 -1
- package/.turbo/cache/26dd8861bd3eca6d.tar.zst +0 -0
package/src/types.ts
CHANGED
|
@@ -1,15 +1,27 @@
|
|
|
1
|
-
import { type Order } from '@openmrs/esm-patient-common-lib';
|
|
1
|
+
import { type Order, type FulfillerStatus, type OrderUrgency } from '@openmrs/esm-patient-common-lib';
|
|
2
2
|
|
|
3
|
-
export
|
|
3
|
+
export interface FlattenedOrder {
|
|
4
|
+
id: string;
|
|
5
|
+
patientUuid: string;
|
|
6
|
+
orderNumber: string;
|
|
7
|
+
display: string;
|
|
8
|
+
dateActivated: string;
|
|
9
|
+
fulfillerStatus: FulfillerStatus;
|
|
10
|
+
urgency: OrderUrgency;
|
|
11
|
+
orderer: string;
|
|
12
|
+
instructions: string;
|
|
13
|
+
fulfillerComment: string;
|
|
14
|
+
}
|
|
4
15
|
|
|
5
16
|
export interface GroupedOrders {
|
|
17
|
+
patientUuid: string;
|
|
6
18
|
patientId: string;
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
19
|
+
patientName: string;
|
|
20
|
+
patientAge: number;
|
|
21
|
+
patientSex: string;
|
|
22
|
+
totalOrders: number;
|
|
23
|
+
orders: Array<FlattenedOrder>;
|
|
24
|
+
originalOrders: Array<Order>;
|
|
13
25
|
}
|
|
14
26
|
|
|
15
27
|
export interface OrderAction {
|
|
@@ -17,15 +29,6 @@ export interface OrderAction {
|
|
|
17
29
|
order: 0 | number;
|
|
18
30
|
}
|
|
19
31
|
|
|
20
|
-
export interface OrdersDataTableProps {
|
|
21
|
-
useFilter?: boolean;
|
|
22
|
-
actionsSlotName?: string;
|
|
23
|
-
excludeColumns?: string[];
|
|
24
|
-
fulfillerStatus?: FulfillerStatus;
|
|
25
|
-
excludeCanceledAndDiscontinuedOrders?: boolean;
|
|
26
|
-
actions: Array<OrderAction>;
|
|
27
|
-
}
|
|
28
|
-
|
|
29
32
|
export type DateFilterContext = {
|
|
30
33
|
dateRange: Array<Date>;
|
|
31
34
|
setDateRange: React.Dispatch<React.SetStateAction<Array<Date>>>;
|
package/translations/en.json
CHANGED
|
@@ -18,14 +18,12 @@
|
|
|
18
18
|
"exceptionStatus": "EXCEPTION",
|
|
19
19
|
"filterOrdersByStatus": "Filter orders by status",
|
|
20
20
|
"fulfillerComment": "Fulfiller comment",
|
|
21
|
-
"gender": "Gender",
|
|
22
21
|
"In progress": "In progress",
|
|
23
22
|
"inProgress": "In progress",
|
|
24
23
|
"inProgressStatus": "IN_PROGRESS",
|
|
25
24
|
"laboratory": "Laboratory",
|
|
26
25
|
"Laboratory": "Laboratory",
|
|
27
26
|
"loading": "Loading",
|
|
28
|
-
"newStatus": "NEW",
|
|
29
27
|
"nextPage": "Next page",
|
|
30
28
|
"NoInstructionLeft": "No instructions are provided.",
|
|
31
29
|
"noLabRequestsFound": "No lab requests found",
|
|
@@ -40,6 +38,7 @@
|
|
|
40
38
|
"orders": "Orders",
|
|
41
39
|
"orderStatus": "Status:",
|
|
42
40
|
"patient": "Patient",
|
|
41
|
+
"patientId": "Patient ID",
|
|
43
42
|
"pickedAnOrder": "Picked an order",
|
|
44
43
|
"pickRequest": "Pick lab request",
|
|
45
44
|
"pickRequestConfirmationText": "Continuing will update the request status to \"In Progress\" and advance it to the next stage. Are you sure you want to proceed?",
|
|
@@ -55,6 +54,7 @@
|
|
|
55
54
|
"rejectLabRequestTitle": "Lab request rejected",
|
|
56
55
|
"results": "Results",
|
|
57
56
|
"searchThisList": "Search this list",
|
|
57
|
+
"sex": "Sex",
|
|
58
58
|
"tabletOverlay": "Tablet overlay",
|
|
59
59
|
"testOrdered": "Test ordered: ",
|
|
60
60
|
"Tests ordered": "Tests ordered",
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"hash":"26dd8861bd3eca6d","duration":49969}
|
|
Binary file
|