Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(bug fix): Fix sign and close drug order #938

Merged
merged 2 commits into from
Jan 11, 2023
Merged

(bug fix): Fix sign and close drug order #938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e1918d
fix the sign button and the null display
hadijahkyampeire Jan 11, 2023
ed76765
Arrange translation
hadijahkyampeire Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/esm-patient-medications-app/src/components/medications-details-table.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ const MedicationsDetailsTable = connect<
<div>
<p className={styles.bodyLong01}>
<strong>{capitalize(medication.drug?.concept?.display)}</strong> &mdash;{' '}
{medication.drug?.strength.toLowerCase()} &mdash; {medication.drug.dosageForm.display.toLowerCase()}
{medication.drug?.strength.toLowerCase()} &mdash; {medication.drug?.dosageForm?.display.toLowerCase()}
</p>
<p className={styles.bodyLong01}>
<span className={styles.label01}>{t('dose', 'Dose').toUpperCase()}</span>{' '}
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-medications-app/src/order-basket/order-basket.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ const OrderBasket = connect<OrderBasketProps, OrderBasketStoreActions, OrderBask
className={styles.button}
kind="primary"
onClick={handleSaveClicked}
disabled={!items?.length || !encounterUuid}
disabled={!patientOrderItems?.length || !encounterUuid}
>
{t('signAndClose', 'Sign and close')}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-medications-app/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"indicationPlaceholder": "e.g. \"Hypertension\"",
"medicationDurationAndUnit": "for {duration} {durationUnit}",
"medicationIndefiniteDuration": "Indefinite duration",
"medications": "Medications",
"modify": "Modify",
"noDurationHint": "An empty field indicates an indefinite duration.",
"none": "None",
Expand All @@ -54,7 +55,6 @@
"orderCompleted": "Order placed",
"orderCompletedSuccessText": "Your order is complete. The items will now appear on the Orders page.",
"orderForm": "Order Form",
"medications": "Medications",
"ordersAlreadyInBasketWithCount_one": "{count} item(s) already in your basket",
"ordersAlreadyInBasketWithCount_other": "{count} item(s) already in your basket",
"pastMedicationsDisplayText": "Past medications",
Expand Down