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

Jump to bottom

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

Merged
merged 27 commits into from
Oct 7, 2024
Merged

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

merged 27 commits into from
Oct 7, 2024

Commits on Jun 26, 2024

  1. feat-metrics

    @kb019
    kb019 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    e710137 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. resolve conflicts

    @kb019
    kb019 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    f56fc3a View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2024

  1. update metrics

    @kb019
    kb019 committed Aug 26, 2024
    Configuration menu
    Copy the full SHA
    5104ac5 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2024

  1. Merge branch 'main' into feat/metrics

    @kb019
    kb019 authored Aug 28, 2024
    Configuration menu
    Copy the full SHA
    321625b View commit details
    Browse the repository at this point in the history

  2. correct test

    @kb019
    kb019 committed Aug 28, 2024
    Configuration menu
    Copy the full SHA
    801177b View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. refactor useAdmission

    @kb019
    kb019 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    dd661e0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/openmrs/openmrs-esm-patient… 

    …-management into feat/metrics
    @kb019
    kb019 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    c870aba View commit details
    Browse the repository at this point in the history

  3. fix e2e tests

    @kb019
    kb019 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    7c947c8 View commit details
    Browse the repository at this point in the history

  4. (refactor) Refactor registration form cancel modal to match conventio… 

    …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.
    @denniskigen @kb019
    denniskigen authored and kb019 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    82b6817 View commit details
    Browse the repository at this point in the history

  5. (feat) 03-3404: follow-up -ensure the dateAppointmentScheduled <= app… 

    …ointmentDate (#1295)
    @lucyjemutai @kb019
    lucyjemutai authored and kb019 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    9a4671a View commit details
    Browse the repository at this point in the history

  6. Merge branch 'feat/metrics' of https://github.com/kb019/openmrs-esm-p… 

    …atient-management into feat/metrics
    @kb019
    kb019 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    7bb7ed3 View commit details
    Browse the repository at this point in the history

  7. correct yarn.lock

    @kb019
    kb019 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    6a7e24d View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' of https://github.com/openmrs/openmrs-esm-patient… 

    …-management into feat/metrics
    @kb019
    kb019 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    5e7d993 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. fix metrics calculations

    @kb019
    kb019 committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    a83b944 View commit details
    Browse the repository at this point in the history

  2. resolve conflicts

    @kb019
    kb019 committed Sep 4, 2024
    Configuration menu
    Copy the full SHA
    74d4137 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. add internationalization

    @kb019
    kb019 committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    e4671c5 View commit details
    Browse the repository at this point in the history

  2. correct mocks

    @kb019
    kb019 committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    d1f9f4b View commit details
    Browse the repository at this point in the history

  3. add dir attribute

    @kb019
    kb019 committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    4211d83 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. resolve conflicts

    @kb019
    kb019 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    d2bb04d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/openmrs/openmrs-esm-patient… 

    …-management into fix/metrics
    @kb019
    kb019 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    bc68943 View commit details
    Browse the repository at this point in the history

  3. remove i18n code

    @kb019
    kb019 committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    9a1ca44 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. clean code

    @kb019
    kb019 committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    18f854a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/openmrs/openmrs-esm-patient… 

    …-management into fix/metrics
    @kb019
    kb019 committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    7eac5bf View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. use admissionLocation as source of truth

    @kb019
    kb019 committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    57a7dfa View commit details
    Browse the repository at this point in the history

  2. resolved conflicts

    @kb019
    kb019 committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    37101fc View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. resolve conflicts

    @kb019
    kb019 committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    af5f66e View commit details
    Browse the repository at this point in the history

  2. Update ward-view.resource.ts

    @kb019
    kb019 authored Oct 7, 2024
    Configuration menu
    Copy the full SHA
    528552b View commit details
    Browse the repository at this point in the history