HAI-753, add warning on the patient header when HIV program location … #445
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
…is different than the login location
… into HAI-753 # Conflicts: # omod/src/main/java/org/openmrs/module/pihcore/fragment/controller/hiv/ProgramLocationWarningFragmentController.java # omod/src/main/webapp/fragments/hiv/programLocationWarning.gsp
|
Hi @Dutervil , this looks good to me. Just wanted to highlight the changes I introduced as part of this ticket are the files only included in this commit: Since then, this branch has diverged from main, and a lot of the files that show now as different were already merged in the main branch. So, you would probably have to manually merge this branch and just to make sure you are not overwriting most recent changes in other files. |
|
I fix the conflic |
|
Hi @Dutervil , this looks good to me. I glad to hear you were able to get this working in your environment. Do you want me to merge this PR in? Thanks! |
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.
@Dutervil , here is the PR with the changes that @mogoodrich have proposed yesterday during our meeting. I will comment more on the ticket with more details about this boilerplate code. Please let me know what you think and if you have any questions.