Skip to content

Commit

Permalink
(feat) O3-3635: Orders table modify action should launch workspace di…
Browse files Browse the repository at this point in the history
…rectly (#1950)

* O3-3635: Drug Order Modification Requires Two Steps Instead of Opening Directly in Order Basket

* Fix undefined uuid

* UI fixes

---------

Co-authored-by: jwnasambu <wamalwa1844.com>
Co-authored-by: Dennis Kigen <kigen.work@gmail.com>
  • Loading branch information
jwnasambu and denniskigen authored Aug 17, 2024
1 parent 8ba55b0 commit 5f82849
Show file tree
Hide file tree
Showing 11 changed files with 435 additions and 383 deletions.
2 changes: 1 addition & 1 deletion e2e/specs/lab-orders.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ test('Record a lab order', async ({ page }) => {
});

await test.step('Then I should see the newly added lab order in the list', async () => {
await expect(page.getByLabel('testorders').getByRole('cell', { name: /blood urea nitrogen/i })).toBeVisible();
await expect(page.getByRole('cell', { name: /blood urea nitrogen/i })).toBeVisible();
});
});

Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-medications-app/src/api/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export function prepMedicationOrderPostData(
? 'org.openmrs.FreeTextDosingInstructions'
: 'org.openmrs.SimpleDosingInstructions',
dosingInstructions: order.isFreeTextDosage ? order.freeTextDosage : order.patientInstructions,
concept: order.drug.concept.uuid,
concept: order?.drug?.concept?.uuid,
orderReasonNonCoded: order.indication,
};
} else if (order.action === 'DISCONTINUE') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@

.widgetCard {
border: 1px solid colors.$gray-20;
border-bottom: none;

> .desktop {
border-top: none !important;
}
}

.row {
Expand All @@ -19,13 +22,17 @@
}

.tooltip {
margin: 0 -(layout.$spacing-03) -0.625rem;
margin: 0 (-(layout.$spacing-03)) -0.625rem;
}

.menuItem {
max-width: none;
}

.dropdownContainer {
min-width: max-content;
}

.buttons {
justify-content: flex-end;
}
Expand Down Expand Up @@ -95,7 +102,27 @@
}

.table {
td:after {
display: none;
td {
&::after {
display: none;
}
}
}

.hiddenRow {
display: none;
}

.layer {
height: 100%;
}

.unknownOrderTypeText {
@include type.type-style('body-compact-01');
}

.paginationContainer {
> div {
border-top: none !important;
}
}
Loading

0 comments on commit 5f82849

Please # to comment.