(feat) O3-4009: Display stock and price information upon ordering #2028
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
usamaidrsk
force-pushed
the
ft-O3-4009
branch
from
a2c05fd
to
46990a4
Compare
|
Size Change: +692 B (0%) Total Size: 15.9 MB ℹ️ View Unchanged
|
|
@usamaidrsk, showing the price and stock directly on the order search screen will likely make an enormous amount of calls to the backend, right? Or is it simply one call? If so, then we probably want to only implement stock and price visibility after having selected a given drug. |
vasharma05
requested changes
Sep 24, 2024
packages/esm-patient-labs-app/src/lab-orders/add-lab-order/test-type-search.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-labs-app/src/lab-orders/add-lab-order/test-type-search.scss
Outdated
Show resolved
Hide resolved
...ient-labs-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-item-tile.component.tsx
Outdated
Show resolved
Hide resolved
...esm-patient-medications-app/src/drug-order-basket-panel/order-basket-item-tile.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-medications-app/src/drug-order-basket-panel/order-basket-item-tile.scss
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/components/order-price-details.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/components/order-price-details.scss
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/components/order-stock-details.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/components/order-stock-details.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/components/order-stock-details.component.tsx
Outdated
Show resolved
Hide resolved
vasharma05
reviewed
Sep 24, 2024
Thanks @rbuisson! |
|
@usamaidrsk , unless I'm mistaken, I don't see any test. |
|
@usamaidrsk is this configurable. ?? |
Hello @slubwama , it's not currently configurable. However, if you’d like it to be, could you clarify the specific aspects you'd like to be configurable? |
|
It's great to see a feature like this! When we built our local EMR many years ago, we had a "billboard" at the top of each order form (e.g., under the orderable name) that included helpful details that could be tweaked by the implementation (e.g., "The P&T committee recommends not giving doses over 10 mg in children"). This "billboard text" space was where we put estimated pricing information and it would be a good place for stock status as well. The benefit is having the information for the user before the item is added to the cart. Maybe something to consider for future iterations. |
Users will like having it this way. |
usamaidrsk
force-pushed
the
ft-O3-4009
branch
2 times, most recently
from
2358271
to
7a47e5e
Compare
vasharma05
approved these changes
Nov 6, 2024
There was a problem hiding this comment.
Great work @usamaidrsk!
A few suggestions before merging this PR.
Thanks!
packages/esm-patient-orders-app/src/components/order-price-details.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/components/order-price-details.scss
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/components/order-stock-details.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/components/order-stock-details.component.tsx
Outdated
Show resolved
Hide resolved
|
|
||
| .itemInStockIcon { | ||
| fill: $support-02; | ||
| margin-right: layout.$spacing-02; |
There was a problem hiding this comment.
Suggested change
| margin-right: layout.$spacing-02; | |
| margin-inline-end: layout.$spacing-02; |
packages/esm-patient-orders-app/src/components/order-stock-details.scss
Outdated
Show resolved
Hide resolved
usamaidrsk
force-pushed
the
ft-O3-4009
branch
from
262005e
to
493ef5f
Compare
denniskigen
reviewed
Nov 6, 2024
There was a problem hiding this comment.
Good start, @usamaidrsk. I've left some suggestions. Feel free to ignore the ones prefix with Nit.
...esm-patient-medications-app/src/drug-order-basket-panel/order-basket-item-tile.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/components/order-price-details.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/components/order-price-details.scss
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/components/order-price-details.test.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/components/order-price-details.test.tsx
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/hooks/useOrderStockInfo.test.ts
Outdated
Show resolved
Hide resolved
...ent-tests-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-item-tile.component.tsx
Outdated
Show resolved
Hide resolved
...ent-tests-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-item-tile.component.tsx
Show resolved
Hide resolved
This comment was marked as duplicate.
This comment was marked as duplicate.
Sorry, something went wrong.
denniskigen
reviewed
Nov 6, 2024
packages/esm-patient-medications-app/src/drug-order-basket-panel/order-basket-item-tile.scss
Outdated
Show resolved
Hide resolved
.../esm-patient-tests-app/src/lab-orders/lab-order-basket-panel/lab-order-basket-item-tile.scss
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/components/order-stock-details.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/components/order-stock-details.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/components/order-price-details.component.tsx
Outdated
Show resolved
Hide resolved
denniskigen
reviewed
Nov 7, 2024
packages/esm-patient-orders-app/src/hooks/useIsBackendModuleInstalled.tsx
Outdated
Show resolved
Hide resolved
| import { useIsBackendModuleInstalled } from './useIsBackendModuleInstalled'; | ||
|
|
||
| export const useOrderPrice = (orderItemUuid: string) => { | ||
| const { isInstalled, isLoading: isCheckingModules } = useIsBackendModuleInstalled(['fhirproxy', 'billing']); |
There was a problem hiding this comment.
Suggested change
| const { isInstalled, isLoading: isCheckingModules } = useIsBackendModuleInstalled(['fhirproxy', 'billing']); | |
| const { isInstalled, isLoading: isCheckingModules } = useAreBackendModuleInstalled(['fhirproxy', 'billing']); |
There was a problem hiding this comment.
@ibacher we'd still need to make sure these are added to the routes.json's backendDependencies, right?
There was a problem hiding this comment.
I had initially added them, @vasharma05 pointed out that since this is a major use-case for all user, it would not be good to always have a snackbar popup for them that some modules are missing
denniskigen
reviewed
Nov 7, 2024
packages/esm-patient-orders-app/src/hooks/useIsBackendModuleInstalled.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/hooks/useOrderPrice.test.tsx
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
This file doesn't contain any JSX, so it should use the .ts suffix instead.
denniskigen
reviewed
Nov 7, 2024
| const installedModules = data?.data?.results?.map((module) => module.uuid) ?? []; | ||
| const modulesToCheck = Array.isArray(modules) ? modules : [modules]; | ||
|
|
||
| const isInstalled = modulesToCheck.every((module) => installedModules.includes(module)); |
There was a problem hiding this comment.
Suggested change
| const isInstalled = modulesToCheck.every((module) => installedModules.includes(module)); | |
| const areModulesInstalled = modulesToCheck.every((module) => installedModules.includes(module)); |
Comment on lines
22
to
24
| isInstalled, | ||
| isLoading, | ||
| error, |
There was a problem hiding this comment.
Suggested change
| isInstalled, | |
| isLoading, | |
| error, | |
| areModulesInstalled, | |
| isCheckingModules: isLoading, | |
| moduleCheckError: error, |
So we don't have to do the aliasing further down the line.
| return priceData.entry[0].resource.propertyGroup[0]?.priceComponent[0]?.amount; | ||
| }, [priceData]); | ||
|
|
||
| const formatedPrice = useMemo((): string => { |
There was a problem hiding this comment.
Suggested change
| const formatedPrice = useMemo((): string => { | |
| const formattedPrice = useMemo((): string => { |
…reBackendModuleInstalled.tsx
usamaidrsk
force-pushed
the
ft-O3-4009
branch
from
c15e806
to
17feaf3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Requirements
Summary
This PR introduces the
order-item-additional-info-slotto enhance the display of order information in the patient medications app and labs app. The slot is implemented on the order-basket tiles (for drugs and lab orders). Additionally, two new components from theesm-patient-orders-appare added to populate this slot:OrderPriceDetailsComponentandOrderStockDetailsComponent.Screenshots
Related Issue
https://openmrs.atlassian.net/browse/O3-4009
Other