(fix) O3-2474 adding a patient to a queue should use active visit #1033
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: -55.8 kB (-2%) Total Size: 2.97 MB
ℹ️ View Unchanged
|
mseaton
commented
Mar 13, 2024
| height: 100vh; | ||
| z-index: 99999; | ||
| height: calc(100vh - 3rem); | ||
| z-index: 3; |
There was a problem hiding this comment.
This is an unrelated issue, but has been bothering me for a while, in that the buttons in the Add to queue overlay are barely visible on the screen. This adjustment here I copied from the appointments esm, which presumably had the same issue and was fixed there. Yet another reason not to have multiple overlay implementations all over the place.
| return ( | ||
| <div> | ||
| {isTablet && ( | ||
| <Row className={styles.headerGridRow}> |
There was a problem hiding this comment.
This form is really just a subset of the full visit-form, and uses the same extension slot to add in the queue fields.
| const err = error?.responseBody?.error?.message; | ||
| if (err && err === '[queue.entry.duplicate.patient]') { | ||
| subtitle = t('patientAlreadyInQueue', 'Patient is already in the queue'); | ||
| } |
There was a problem hiding this comment.
This is my admittedly somewhat hacky solution to the problem presented in https://openmrs.atlassian.net/browse/O3-2624 . In future refactors, we would not get to this point, but would have pre-submission validation in place, but this is an incremental improvement to at least inform the user of the error, which is caught in back end validation with a specific error message returned.
ojwanganto
reviewed
Mar 13, 2024
| showSnackbar({ | ||
| kind: 'success', | ||
| isLowContrast: true, | ||
| title: t('startAVisit', 'Start a visit'), |
There was a problem hiding this comment.
You can change this label to reflect the queue operation. I just picked it from the video
There was a problem hiding this comment.
Thanks @ojwanganto - looks like this PR was merged already by @makombe . I tried to apply this change last night, but am running into build errors at the moment that is preventing me from committing. @makombe maybe you can fix this for me since you merged the PR? Otherwise, I'll address it in a follow-up commit once I have my environment back.
|
Looks good, @mseaton. I have flagged just a simple label change. |
donaldkibet
approved these changes
Mar 14, 2024
chibongho
reviewed
Mar 14, 2024
| return null; | ||
| } | ||
|
|
||
| const handleSubmit = useCallback( |
There was a problem hiding this comment.
Don't really need useCallback here (see this). It makes it difficult to maintain with the list of dependencies.
| closePanel: () => void; | ||
| } | ||
|
|
||
| const ExistingVisitForm: React.FC<ExistingVisitFormProps> = ({ visit, toggleSearchType, closePanel }) => { |
There was a problem hiding this comment.
Maybe add a comment here? Just from the name, it's hard to know that it's meant to be a form to start a queue entry for a patient that already has an existing visit .
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
When using the service queues app, there is an option to "Add patient to queue", however the form this enables will always attempt to first start a visit before adding a new queue entry associated with that visit. This fails to correctly handle two scenarios:
Screenshots
Related Issue
https://openmrs.atlassian.net/browse/O3-2474
https://openmrs.atlassian.net/browse/O3-2624