(feat) Add ability to cancel orders #1640
Merged
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
|
Size Change: -98.1 kB (-1%) Total Size: 10.7 MB
ℹ️ View Unchanged
|
pirupius
force-pushed
the
feat/cancel-order
branch
from
aeeebc0 to
70e5951
Compare
eudson
reviewed
Feb 7, 2024
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.scss
Show resolved
Hide resolved
vasharma05
reviewed
Feb 8, 2024
There was a problem hiding this comment.
I have shared my comments in the PR.
My main question to this PR is, why aren't we using the order basket's Discontinue functionality which is already present in the order basket.
The same is being used for medications. I see there's a separate API you are hitting, but isn't it better to use the same /order for these operations?
Thanks!
CC: @denniskigen @ibacher
packages/esm-patient-orders-app/src/components/orders-details-table.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.scss
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.scss
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.scss
Outdated
Show resolved
Hide resolved
vasharma05
reviewed
Feb 8, 2024
There was a problem hiding this comment.
I have shared my comments in the PR.
My main question to this PR is, why aren't we using the order basket's Discontinue functionality which is already present in the order basket.
The same is being used for medications. I see there's a separate API you are hitting, but isn't it better to use the same /order for these operations?
Thanks!
CC: @denniskigen @ibacher
samuelmale
reviewed
Feb 8, 2024
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Outdated
Show resolved
Hide resolved
denniskigen
reviewed
Feb 9, 2024
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Outdated
Show resolved
Hide resolved
|
@vasharma05 @denniskigen all the comments have been resolved. Please take a second pass and merge if all good. |
pirupius
force-pushed
the
feat/cancel-order
branch
from
59861b4 to
46c1cfc
Compare
ibacher
changed the title
ibacher
requested changes
Feb 9, 2024
packages/esm-patient-orders-app/src/components/orders-details-table.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Outdated
Show resolved
Hide resolved
pirupius
force-pushed
the
feat/cancel-order
branch
from
46c1cfc to
28c1969
Compare
denniskigen
reviewed
Feb 16, 2024
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-orders-app/src/order-cancellation-form/cancel-order-form.component.tsx
Show resolved
Hide resolved
pirupius
force-pushed
the
feat/cancel-order
branch
from
72e2300 to
61bb3ee
Compare
pirupius
force-pushed
the
feat/cancel-order
branch
3 times, most recently
from
3bf7dea to
d575cf3
Compare
|
Thanks @ibacher @denniskigen @denniskigen for the feedback. All the concerns and comments have been addressed. |
|
Could you please resolve the conflicts? |
denniskigen
reviewed
Feb 25, 2024
packages/esm-patient-orders-app/src/components/orders-details-table.component.tsx
Outdated
Show resolved
Hide resolved
pirupius
force-pushed
the
feat/cancel-order
branch
from
d575cf3 to
6f67e8d
Compare
|
@denniskigen @ibacher are we able to get this in? |
denniskigen
approved these changes
Feb 26, 2024
denniskigen
changed the title
|
Thanks @denniskigen |
jnsereko
added a commit
to jnsereko/openmrs-esm-patient-chart
that referenced
this pull request
Mar 3, 2024
(feat) O3-2760: Add a `closeWorkspaceWithSavedChanges` function to the workspace API (openmrs#1689) * Added new function 'closeWorkspaceWithSavedChanges' to close workspace after form is saved * Passing 'closeWorkspaceWithSavedChanges' as workspace props (docs) Amend steps for updating core libraries in README (openmrs#1690) (chore) Bump @openmrs/ngx-formentry (openmrs#1684) (fix) O3 2804: Reuse the ResponsiveWrapper component from esm-framework (openmrs#1673) * (feat) Reuse ResponsiveWrapper component from esm-framework * feat: Added Layer in visit-notes-form * Fix styleguide imports by bumping both openmrs tooling and framework * Misc fixes --------- Co-authored-by: Dennis Kigen <[email protected]> (refactor) O3-2815: Replace usages of `/ws/rest/v1` with `restBaseUrl` (openmrs#1661) * (Refactor)O3-2815: Replace usages of '/ws/rest/v1' with restBaseUrl * Fixup --------- Co-authored-by: jwnasambu <wamalwa1844.com> Co-authored-by: Dennis Kigen <[email protected]> (feat) Add ability to cancel orders (openmrs#1640) * (feat) cancel order * clean up * pr changes, reload fixes and clean up * translations * wip cancel order via action * mutate orders on cancel * order mutations and pr comments * fixes to labs * button text change * Fixup * More tweaks --------- Co-authored-by: Dennis Kigen <[email protected]> (chore) Add generic slot to Visit Form (openmrs#1688) * (chore) Add billing slot to Start Visit Form * Add generic visit attribute slot * remove slot from config --------- Co-authored-by: CynthiaKamau <[email protected]> (chore) Bump Angular form engine (openmrs#1694) (feat) Makes orders widget expandable and adds detailed order view (openmrs#1696) * (feat) Expandable orders widget * adds order item cards when expanded * changes button to tooltip (fix) O3-2629: Submit button on Allergy Form remains disabled when filling allergen and severity before reactions (openmrs#1699) fix the allergy reaction dependency (feat) Hide bottom navigation on tablets and phones when workspace is active (openmrs#1695) (feat) Relocate Load More button in visits section (openmrs#1702) (chore) Relocate Load More button in visits section add closeWorkspaceWithSavedChanges argument to Allergy form parameterised allergy reaction should be checked correctly maintain non-coded allergen array remove test (chore) Prettier should only list files that don't formatting config (feat) Add config to handle bill submission in start visit form (openmrs#1700) Upgrade peter-evans/create-pull-request See peter-evans/create-pull-request#2790 (chore) Update translations from Transifex (openmrs#1683) add test fix added test
jnsereko
added a commit
to jnsereko/openmrs-esm-patient-chart
that referenced
this pull request
Mar 3, 2024
(feat) O3-2760: Add a `closeWorkspaceWithSavedChanges` function to the workspace API (openmrs#1689) * Added new function 'closeWorkspaceWithSavedChanges' to close workspace after form is saved * Passing 'closeWorkspaceWithSavedChanges' as workspace props (docs) Amend steps for updating core libraries in README (openmrs#1690) (chore) Bump @openmrs/ngx-formentry (openmrs#1684) (fix) O3 2804: Reuse the ResponsiveWrapper component from esm-framework (openmrs#1673) * (feat) Reuse ResponsiveWrapper component from esm-framework * feat: Added Layer in visit-notes-form * Fix styleguide imports by bumping both openmrs tooling and framework * Misc fixes --------- Co-authored-by: Dennis Kigen <[email protected]> (refactor) O3-2815: Replace usages of `/ws/rest/v1` with `restBaseUrl` (openmrs#1661) * (Refactor)O3-2815: Replace usages of '/ws/rest/v1' with restBaseUrl * Fixup --------- Co-authored-by: jwnasambu <wamalwa1844.com> Co-authored-by: Dennis Kigen <[email protected]> (feat) Add ability to cancel orders (openmrs#1640) * (feat) cancel order * clean up * pr changes, reload fixes and clean up * translations * wip cancel order via action * mutate orders on cancel * order mutations and pr comments * fixes to labs * button text change * Fixup * More tweaks --------- Co-authored-by: Dennis Kigen <[email protected]> (chore) Add generic slot to Visit Form (openmrs#1688) * (chore) Add billing slot to Start Visit Form * Add generic visit attribute slot * remove slot from config --------- Co-authored-by: CynthiaKamau <[email protected]> (chore) Bump Angular form engine (openmrs#1694) (feat) Makes orders widget expandable and adds detailed order view (openmrs#1696) * (feat) Expandable orders widget * adds order item cards when expanded * changes button to tooltip (fix) O3-2629: Submit button on Allergy Form remains disabled when filling allergen and severity before reactions (openmrs#1699) fix the allergy reaction dependency (feat) Hide bottom navigation on tablets and phones when workspace is active (openmrs#1695) (feat) Relocate Load More button in visits section (openmrs#1702) (chore) Relocate Load More button in visits section add closeWorkspaceWithSavedChanges argument to Allergy form parameterised allergy reaction should be checked correctly maintain non-coded allergen array remove test (chore) Prettier should only list files that don't formatting config (feat) Add config to handle bill submission in start visit form (openmrs#1700) Upgrade peter-evans/create-pull-request See peter-evans/create-pull-request#2790 (chore) Update translations from Transifex (openmrs#1683) add test fix added test
jnsereko
pushed a commit
to jnsereko/openmrs-esm-patient-chart
that referenced
this pull request
Mar 4, 2024
* (feat) cancel order * clean up * pr changes, reload fixes and clean up * translations * wip cancel order via action * mutate orders on cancel * order mutations and pr comments * fixes to labs * button text change * Fixup * More tweaks --------- Co-authored-by: Dennis Kigen <[email protected]>
denniskigen
added a commit
that referenced
this pull request
Mar 7, 2024
) * Add functionality to allow deleting and editing an allergy (feat) O3-2760: Add a `closeWorkspaceWithSavedChanges` function to the workspace API (#1689) * Added new function 'closeWorkspaceWithSavedChanges' to close workspace after form is saved * Passing 'closeWorkspaceWithSavedChanges' as workspace props (docs) Amend steps for updating core libraries in README (#1690) (chore) Bump @openmrs/ngx-formentry (#1684) (fix) O3 2804: Reuse the ResponsiveWrapper component from esm-framework (#1673) * (feat) Reuse ResponsiveWrapper component from esm-framework * feat: Added Layer in visit-notes-form * Fix styleguide imports by bumping both openmrs tooling and framework * Misc fixes --------- Co-authored-by: Dennis Kigen <[email protected]> (refactor) O3-2815: Replace usages of `/ws/rest/v1` with `restBaseUrl` (#1661) * (Refactor)O3-2815: Replace usages of '/ws/rest/v1' with restBaseUrl * Fixup --------- Co-authored-by: jwnasambu <wamalwa1844.com> Co-authored-by: Dennis Kigen <[email protected]> (feat) Add ability to cancel orders (#1640) * (feat) cancel order * clean up * pr changes, reload fixes and clean up * translations * wip cancel order via action * mutate orders on cancel * order mutations and pr comments * fixes to labs * button text change * Fixup * More tweaks --------- Co-authored-by: Dennis Kigen <[email protected]> (chore) Add generic slot to Visit Form (#1688) * (chore) Add billing slot to Start Visit Form * Add generic visit attribute slot * remove slot from config --------- Co-authored-by: CynthiaKamau <[email protected]> (chore) Bump Angular form engine (#1694) (feat) Makes orders widget expandable and adds detailed order view (#1696) * (feat) Expandable orders widget * adds order item cards when expanded * changes button to tooltip (fix) O3-2629: Submit button on Allergy Form remains disabled when filling allergen and severity before reactions (#1699) fix the allergy reaction dependency (feat) Hide bottom navigation on tablets and phones when workspace is active (#1695) (feat) Relocate Load More button in visits section (#1702) (chore) Relocate Load More button in visits section add closeWorkspaceWithSavedChanges argument to Allergy form parameterised allergy reaction should be checked correctly maintain non-coded allergen array remove test (chore) Prettier should only list files that don't formatting config (feat) Add config to handle bill submission in start visit form (#1700) Upgrade peter-evans/create-pull-request See peter-evans/create-pull-request#2790 (chore) Update translations from Transifex (#1683) add test fix added test * clean deletePatientAllergy function * Update packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.component.tsx Co-authored-by: Dennis Kigen <[email protected]> * Update packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx Co-authored-by: Dennis Kigen <[email protected]> * Update packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.resource.ts Co-authored-by: Dennis Kigen <[email protected]> * (chore) Bump @openmrs/ngx-formentry * make default allergy loading more clean * fix linting --------- Co-authored-by: Dennis Kigen <[email protected]>
usamaidrsk
pushed a commit
to usamaidrsk/openmrs-esm-patient-chart
that referenced
this pull request
Mar 11, 2024
* (feat) cancel order * clean up * pr changes, reload fixes and clean up * translations * wip cancel order via action * mutate orders on cancel * order mutations and pr comments * fixes to labs * button text change * Fixup * More tweaks --------- Co-authored-by: Dennis Kigen <[email protected]>
usamaidrsk
pushed a commit
to usamaidrsk/openmrs-esm-patient-chart
that referenced
this pull request
Mar 11, 2024
…enmrs#1703) * Add functionality to allow deleting and editing an allergy (feat) O3-2760: Add a `closeWorkspaceWithSavedChanges` function to the workspace API (openmrs#1689) * Added new function 'closeWorkspaceWithSavedChanges' to close workspace after form is saved * Passing 'closeWorkspaceWithSavedChanges' as workspace props (docs) Amend steps for updating core libraries in README (openmrs#1690) (chore) Bump @openmrs/ngx-formentry (openmrs#1684) (fix) O3 2804: Reuse the ResponsiveWrapper component from esm-framework (openmrs#1673) * (feat) Reuse ResponsiveWrapper component from esm-framework * feat: Added Layer in visit-notes-form * Fix styleguide imports by bumping both openmrs tooling and framework * Misc fixes --------- Co-authored-by: Dennis Kigen <[email protected]> (refactor) O3-2815: Replace usages of `/ws/rest/v1` with `restBaseUrl` (openmrs#1661) * (Refactor)O3-2815: Replace usages of '/ws/rest/v1' with restBaseUrl * Fixup --------- Co-authored-by: jwnasambu <wamalwa1844.com> Co-authored-by: Dennis Kigen <[email protected]> (feat) Add ability to cancel orders (openmrs#1640) * (feat) cancel order * clean up * pr changes, reload fixes and clean up * translations * wip cancel order via action * mutate orders on cancel * order mutations and pr comments * fixes to labs * button text change * Fixup * More tweaks --------- Co-authored-by: Dennis Kigen <[email protected]> (chore) Add generic slot to Visit Form (openmrs#1688) * (chore) Add billing slot to Start Visit Form * Add generic visit attribute slot * remove slot from config --------- Co-authored-by: CynthiaKamau <[email protected]> (chore) Bump Angular form engine (openmrs#1694) (feat) Makes orders widget expandable and adds detailed order view (openmrs#1696) * (feat) Expandable orders widget * adds order item cards when expanded * changes button to tooltip (fix) O3-2629: Submit button on Allergy Form remains disabled when filling allergen and severity before reactions (openmrs#1699) fix the allergy reaction dependency (feat) Hide bottom navigation on tablets and phones when workspace is active (openmrs#1695) (feat) Relocate Load More button in visits section (openmrs#1702) (chore) Relocate Load More button in visits section add closeWorkspaceWithSavedChanges argument to Allergy form parameterised allergy reaction should be checked correctly maintain non-coded allergen array remove test (chore) Prettier should only list files that don't formatting config (feat) Add config to handle bill submission in start visit form (openmrs#1700) Upgrade peter-evans/create-pull-request See peter-evans/create-pull-request#2790 (chore) Update translations from Transifex (openmrs#1683) add test fix added test * clean deletePatientAllergy function * Update packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.component.tsx Co-authored-by: Dennis Kigen <[email protected]> * Update packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.test.tsx Co-authored-by: Dennis Kigen <[email protected]> * Update packages/esm-patient-allergies-app/src/allergies/allergies-form/allergy-form.resource.ts Co-authored-by: Dennis Kigen <[email protected]> * (chore) Bump @openmrs/ngx-formentry * make default allergy loading more clean * fix linting --------- Co-authored-by: Dennis Kigen <[email protected]>
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
Screenshots
Screen.Recording.2024-02-22.at.15.19.11.mov
Related Issue
Other