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
684
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
…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 <kigen.work@gmail.com>
--------- Co-authored-by: Mark Goodrich <mgoodrich@pih.org>
tweak: show patient header on app form
… entries; define a default actions column (#1131)
…cations (#1125) * Added select skeletons when fetching queues and queue locations * Updated useQueues mocks * UI Improvements
…ils (#1130) * feat: add support for telphone on appointment details * fix: fix tests * refactor: rename contact label * refactor: extract translation * refactor: remove unused file --------- Co-authored-by: Mark Goodrich <mgoodrich@pih.org>
* Support Date Obs field in the registration form * Add tests for date obs field * Add tests for date obs field * Support date obs field in the registration form * Add test for date obs field * Support date Obs i9n the registration form * Adding tests for the date obs field * Adding tests for the date obs field * Adding tests for the date obs field * adding tests for the date obs field * Adding tests for the date obs field * Adding tests for date obs field * Adding tests for the date obs field * Adding tests for the date obs field * Adding tests for the date obs field * Adding tests for the date obs field * Adding tests for the date obs field * Adding tests for the date obs field * Adding tests for the date obs field * Adding tests for the date obs field * Adding tests for the date obs field * Adding tests for the date obs field * Adding tests for the date obs field * Adding tests for the date obs field * Adding tests for the date obs field * O3-299, support Date type obs in the registration form * O3-299, support Date type obs on the registration form * O3-299, support Date type obs on the registration form --------- Co-authored-by: Jamie Arodi <51090527+arodidev@users.noreply.github.com>
#1135) * (fix) O3-3096 - service queues - minor fixup to formatting of visit start time column * use formatDatetime
…frontend (#1124) * Fetching all the queue entries since fetching is happening on the frontend * UI improvements * Review changes * Typescript fixes
(don't stack trace if appointment location is null)
…patient visit (#1137) * feat: only select one appointment when starting a visit * refactor: change label on appointment to fulfill
* Release v7.0.0 * Upgrade yarn and bump core tooling --------- Co-authored-by: Dennis Kigen <kigen.work@gmail.com>
…ales (#1140) * Introduce locale datepicker * Add OpenmrsDatePicker manual mock override * Reuse OpenmrsDatePicker mock from framework --------- Co-authored-by: Dennis Kigen <kigen.work@gmail.com>
#1136) * (feat) - O3-3200 service queues - allow manually enter and edit the date/time of queue transitions * add toggle to transition date time fields
* (feat) - O3-3197 - initial ward app * address PR comments * add tests and config * add webpack config * Update packages/esm-ward-app/package.json Co-authored-by: Dennis Kigen <kigen.work@gmail.com> --------- Co-authored-by: Dennis Kigen <kigen.work@gmail.com>
…endar (#1148) * feat: navigate to appointments on clickink calender date * refactor: rename onclick to navigateToAppointmentsByDate
…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 <kigen.work@gmail.com> Co-authored-by: Lucy Jemutai <130601439+lucyjemutai@users.noreply.github.com>
* 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 <kigen.work@gmail.com> Co-authored-by: Lucy Jemutai <130601439+lucyjemutai@users.noreply.github.com>
…t Notes and Transfer Request (#1337)
* Updated the esm-framework and patient banner actions props * Additional mods --------- Co-authored-by: Dennis Kigen <kigen.work@gmail.com>
* 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 <52504170+ibacher@users.noreply.github.com> --------- Co-authored-by: Ian <52504170+ibacher@users.noreply.github.com>
#1348) * (feat) - O3-4022 - Ward App - handling rendering of mother / child in same bed * translation
* (feat) O3-4065 Allow manual entry of auto generated identifiers * Remove id field configuration Interpolate optional identifier label * Update packages/esm-patient-registration-app/src/patient-registration/form-manager.test.ts Co-authored-by: Ian <52504170+ibacher@users.noreply.github.com> * Restore line * Update packages/esm-patient-registration-app/src/patient-registration/input/custom-input/identifier/identifier-input.component.tsx Co-authored-by: Ian <52504170+ibacher@users.noreply.github.com> --------- Co-authored-by: Ian <52504170+ibacher@users.noreply.github.com>
…on (#1032) * ft-create-location-attribute component * feat: create person location attribute * (fix) remove useSWR in useCallback * (fix) update locationTag key description * (fix) selectedItem logic * (fix) fix interface naming * add commonets on the onInputChange func * (fix) add required param * (fix) update location-tag description * (fix) use handleInputChange function naming * feat: add loading status for searching location * feat: append loading on the location attribute combobox * fix: increase number of locations loaded
…ns (#1352) This PR refactors some left over some CSS carbon spacing module imports to import from `@carbon/layout` instead of `@carbon/styles/scss/spacing`. It also replaces CSS imports from the vars library in the framework that use the old `@import` directive, replacing them with the `@use` directive.
* (fix) service queues: Fix React missing key warning for table filters in QueueTable This PR fixes a missing React key warning for the tableFilter prop in QueueTable. `tableFilter` is an array of React nodes that get rendered as children of the `TableToolbarContent` component. I've renamed the prop to `tableFilters` to better describe that it's an array of filters. Second, I've updated the rendering logic to use the `map` function to iterate over the `tableFilters` array and provide a unique `key` prop to each child. I'm using a `React.Fragment` to wrap each child in the array to avoid unnecessary additional DOM elements. Each of these fragments uses the index of the array as the key. This is not a perfect solution in the sense that keys should be stable and unique identifiers for elements in the array. However, in this case, the array contents are dynamic and may change in size, so a static index identifier works for now. I've also added keys to the `QueueTableByStatusMenu` and `QueueTableMetricsCard` components. I've also fixed the spacing of the filters in the `QueueTable` component as well as removed some unnecessary space from the filter label text. * Review feedback
… transferring / discharging (#1350)
…ll ward workspaces (#1356) * (fix) O3-3849 Ward App - make patient header appear consistently in all ward workspaces * refactor + add header to clinical forms workspace
…ransfer location selector (#1357)
Co-authored-by: OpenMRS Bot <infrastructure@openmrs.org>
Co-authored-by: OpenMRS Bot <infrastructure@openmrs.org>
…1364) * Enable Admission request bar to always be displayed * Clean up
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.