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.

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

(fix) O3-3211: Use admission Location as source of truth for detemining occupied beds #1333

Merged
merged 27 commits into from
Oct 7, 2024

Conversation

kb019
Copy link
Contributor

@kb019 kb019 commented Oct 1, 2024

Requirements

  • This PR has a title that briefly describes the work done including the ticket number. If there is a ticket, make sure your PR title includes a conventional commit label. See existing PR titles for inspiration.
  • My work conforms to the OpenMRS 3.0 Styleguide and design documentation.
  • My work includes tests or is validated by existing tests.

Summary

The useBeds api sometimes returns beds as occupied even though there are no patients assigned to it. So switching to admissionLocation as source of truth for calculating the occupied beds. Thanks

Screenshots

image

Related Issue

https://openmrs.atlassian.net/browse/O3-3211

kb019 and others added 25 commits June 26, 2024 19:38
…ns (#1294)

This PR refactors the registration form's cancel modal to match new modal naming and registration conventions. Modals
are now registered in the routes registry file under the `modals`. The naming convention has also changed - modals now use the `*.modal.tsx` suffix.
I've also amended the modal to use Carbon's ModalBody, ModalHeader, and ModalFooter components instead of using divs with
custom classes. Finally, I've amended the modal title and content to align with other confirmation modals in O3.
Copy link
Contributor

@chibongho chibongho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Looks good. Just 1 minor comment.

packages/esm-ward-app/src/ward-view/ward-view.resource.ts Outdated Show resolved Hide resolved
@kb019
Copy link
Contributor Author

kb019 commented Oct 3, 2024

Thanks! Looks good. Just 1 minor comment.

Made the changes @chibongho . Thanks

@chibongho chibongho merged commit c12e752 into openmrs:main Oct 7, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants