forked from sinteacon/openmrs-esm-patient-management
-
Notifications
You must be signed in to change notification settings - Fork 0
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
update to latest codebase #4
Open
sinteacon
wants to merge
663
commits into
CDC-HIS:feature/appointments_widget
Choose a base branch
from
openmrs:main
base: feature/appointments_widget
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
…n… (#1086) * O3-3043 - (feat) service queues - add new view of queue entries showing one table per status * move queue-table-for-all-statuses into view/
* (chore) Flag rules-of-hooks lint violations * Fix e2e tests
Co-authored-by: OpenMRS Bot <[email protected]> Co-authored-by: Ian <[email protected]>
* (feat) UI tweaks for the Today's appointments widget * Appointments dashboard fixes
* (chore) O3-3069 tweak syling for queue table * address PR comment
…its current columns and actions configurable (#1101) * (feat) O3-3068 - service queues - deprecate ActiveVisitsTable and have its current columns and actions configurable * translations * translation using t instead of translateFrom * add button to clear queue entries * comments * fix tests * remove unused imports * address feedback * address PR feedback
…ointment with no end date (#1108) * created form field to keep track of isRecurringAppointment * if isRecurring appointment is true, an end date should be provided
…ent for appointments not scheduled for today (#1100) * (fix): show time for appointments not scheduled for today * prevent testing library throwing error due to 35 appearing twice(age and in startDateTime) --------- Co-authored-by: Mark Goodrich <[email protected]>
…intment duration (#1106) * appointment duration should be greater than zero * added a translatable error message when the condition fails
…efactor … (#1112) * (chore) O3-3086 service queues - remove unused ActiveVisitsTabs and refactor usage of useConfig to always be typed * remove active-visits-tab.scss
…en it should not (#1115)
…1114) * (feat) - O3-3096 service queues - configuration-driven queue table * add more queue columns * remove tablesConfig mocks in tests * fix misnamed columns and add queue number column * preserve JSON formatting for defaultTablesConfig * misc
* feat: add expand appointments calendar view * fix: fix with service area row * chore: add translation
…#1128) O3-3147: Appointments: Checking in a Patient should change appointment status to checked in
…t appointment selection (#1127)
* Updated E2E tests for appointments * fix : Updated minor changes * fix : separated add,edit,delete appointments * feat : Update tests * Comment out logic for selecting a location from the locations dropdown * Comment out test case for cancelling a scheduled appointment * Restore logic for Cancel case --------- Co-authored-by: Dennis Kigen <[email protected]>
…#1312) * (feat) O3-3861 - ward app - add tooltip to obs to show encounter date * address PR comments
…nd extension rows (#1320)
…1324) * feat: configure pending orders * rename pending-orders to pending-items slot name * (fix): fix pendingItems config
…rics (#1307) * feat-metrics * update metrics * correct test * refactor useAdmission * fix e2e tests * (refactor) Refactor registration form cancel modal to match conventions (#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. * (feat) 03-3404: follow-up -ensure the dateAppointmentScheduled <= appointmentDate (#1295) * correct yarn.lock * fix metrics calculations * add internationalization * correct mocks * add dir attribute * remove i18n code * clean code --------- Co-authored-by: Dennis Kigen <[email protected]> Co-authored-by: Lucy Jemutai <[email protected]>
Co-authored-by: OpenMRS Bot <[email protected]> Co-authored-by: Dennis Kigen <[email protected]>
#1325) * (fix) - O3-3996 - Ward App - fix styling for patient card footer and mother child row * fix typo
…t old l… (#1326) * (fix) - O3-4015 - Ward App - patient get unassigned from bed at old location upon transfer to new location * address PR comment
Co-authored-by: OpenMRS Bot <[email protected]>
…#1323) This PR tweaks the logic for showing the discard changes confirmation modal in the patient registration form. Previously, the modal was being shown in cases where the user had not made any changes. Now, the modal will only be shown when the user has made changes and attempts to navigate away from the form. This is done by checking whether any of the form fields have been [touched](https://formik.org/docs/api/formik#touched--field-string-boolean-). This aligns with the expected behavior of the form and provides a better user experience. Also, this PR refactors the `DeleteIdentifierConfirmationModal` to leverage Carbon's ModalHeader, ModalBody, and ModalFooter components. It also refactors its registration in the `routes.json` file so it leverages the `modal` property of the route definition. This aligns with our best practices for registering modals.
Co-authored-by: OpenMRS Bot <[email protected]>
Co-authored-by: OpenMRS Bot <[email protected]>
* (feat) O3-4036: Mutate patient lists after submission This PR adds a mutation to the Patient Lists app submission logic to update the patient list with the new patient. It does so by creating a mutator function `mutateCohortMembers` that updates the SWR key used to fetch the patient list data after a successful submission. It also: - Adds test coverage for the `AddPatient` component. - Ports over API logic from the component to the resource file. - Updates the UI to match the [designs](https://zpl.io/JQEowL9) * Fixup Co-authored-by: Ian <[email protected]> --------- Co-authored-by: Ian <[email protected]>
* (fix) Identifier input test * Tweak identifier value property --------- Co-authored-by: Dennis Kigen <[email protected]>
* feat: add clinical forms to ward app * feat: add formentryworkspace name to props * feat: add clinical forms * (feat) add related workspace names props on clinical forms dashboard workspace * (fix) package.json
…ons on patients (#1327) * (fix) - O3-4017 - Ward App - ward view should refresh data after actions on patients * clean up tests * update esm-framework
…ng occupied beds (#1333) * feat-metrics * update metrics * correct test * refactor useAdmission * fix e2e tests * (refactor) Refactor registration form cancel modal to match conventions (#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. * (feat) 03-3404: follow-up -ensure the dateAppointmentScheduled <= appointmentDate (#1295) * correct yarn.lock * fix metrics calculations * add internationalization * correct mocks * add dir attribute * remove i18n code * clean code * use admissionLocation as source of truth * Update ward-view.resource.ts --------- Co-authored-by: Dennis Kigen <[email protected]> Co-authored-by: Lucy Jemutai <[email protected]>
* feat-metrics * update metrics * correct test * refactor useAdmission * fix e2e tests * (refactor) Refactor registration form cancel modal to match conventions (#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. * (feat) 03-3404: follow-up -ensure the dateAppointmentScheduled <= appointmentDate (#1295) * correct yarn.lock * fix metrics calculations * add internationalization * correct mocks * add dir attribute * remove i18n code * clean code * use admissionLocation as source of truth * fix patient error --------- Co-authored-by: Dennis Kigen <[email protected]> Co-authored-by: Lucy Jemutai <[email protected]>
…t Notes and Transfer Request (#1337)
* Updated the esm-framework and patient banner actions props * Additional mods --------- Co-authored-by: Dennis Kigen <[email protected]>
* add default ward * default ward view as an extension * stash * stash * things kind of working * reduce calls to motherAndChild endpoint * fix issue with keys in ward bed * get tests to pass * update config documentation + cleanup * fixup * fixup * fix admission request notes * add documenation of 'wards' config param * address PR comments
This PR ports over some left over modal registrations to use the modal system instead of the legacy extension modal registry. It also removes an [unused](https://github.com/search?q=org:openmrs+check-in-appointment-modal&type=code) modal registration from the Appointments app routes registry.
…on in workspace (#1346) * add depedency in use effect * undo changes in o3-4004 * correct type
…arch (#1345) * (feat) Restore recently searched patients functionality in compact patient search This restores the recently searched patients functionality in the compact patient search. It also introduces some refactoring of the code to make it more modular and easier to maintain. These changes include: - Tweaking the configuration schema to improve the names and descriptions of the config properties. This also includes renaming the `patientResultUrl` config property to `patientChartUrl`, which is more descriptive of what it is used for. Implementers will need to update their configurations to use the new key. - Cleaning up the logic in the `useInfinitePatientSearch`, `useRecentlyViewedPatients` and `useRestPatients` hooks to make them more modular and easier to maintain. This includes removing rendering logic from the hooks. We can now drop the `.tsx` extension for the patient search resource file as it no longer contains any JSX. - Annotating invocations of the `useConfig` hook with the `PatientSearchConfig` type for better type inference. - Adding some error handling logic to the `addViewedPatientAndCloseSearchResults` function. - Preloading user properties from the REST API when the user hovers over the search icon in the navbar using the SWR preload API. - Preserving recently searched patients when revalidating the recently viewed patients list by enabling the `keepPreviousData` option in the `useInfinitePatientSearch` hook for better UX. Without this, the UI would show a loading state when revalidating the recently viewed patients list which could be potentially jarring for the user. * Fixup * Fixup Co-authored-by: Ian <[email protected]> --------- Co-authored-by: Ian <[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
None.
Related Issue
None.
Other
None.