HTML-843: Obs Tag: Support Radio Set widget when selecting Locations … #303
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
mseaton
approved these changes
Jul 11, 2024
| @@ -236,8 +238,12 @@ else if (conceptId == null && conceptIds == null) | |||
| clazz = parameters.get("class"); | |||
| } | |||
|
|
|||
| isLocationObs = "location".equals(parameters.get("style")); | |||
| isProviderObs = "provider".equals(parameters.get("style")); | |||
| isLocationObs = "location".equals(parameters.get("style")) || "location_radio".equals(parameters.get("style")) | |||
There was a problem hiding this comment.
Or maybe if style contains or startsWith location?
There was a problem hiding this comment.
I was originally thinking that, as it would be more succinct, but at the end of the day I l liked it this way because it was explicit about what we are currently supporting and what this was meant to account for.
| isProviderObs = "provider".equals(parameters.get("style")); | ||
| isLocationObs = "location".equals(parameters.get("style")) || "location_radio".equals(parameters.get("style")) | ||
| || "location_dropdown".equals(parameters.get("style")); | ||
| isProviderObs = "provider".equals(parameters.get("style")) || "provider_radio".equals(parameters.get("style")) |
There was a problem hiding this comment.
Or maybe if style contains or startsWith provider?
| || "location_dropdown".equals(parameters.get("style")); | ||
| isProviderObs = "provider".equals(parameters.get("style")) || "provider_radio".equals(parameters.get("style")) | ||
| || "provider_dropdown".equals(parameters.get("style")); | ||
| isRadioSet = "radio".equals(parameters.get("style")) || "location_radio".equals(parameters.get("style")) |
There was a problem hiding this comment.
Or maybe if style contains or endsWith radio?
|
thanks @mseaton , merging! |
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.
…and Providers
https://openmrs.atlassian.net/browse/HTML-843
Description of what I changed
Issue I worked on
see https://issues.openmrs.org/browse/HTML-
Checklist: I completed these to help reviewers :)
My pull request only contains ONE single commit
(the number above, next to the 'Commits' tab is 1).
No? -> read here on how to squash multiple commits into one
My IDE is configured to follow the code style of this project.
No? Unsure? -> configure your IDE, format the code and add the changes with
git add . && git commit --amendI have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)
No? -> write tests and add them to this commit
git add . && git commit --amendI ran
mvn clean packageright before creating this pull request andadded all formatting changes to my commit.
No? -> execute above command
All new and existing tests passed.
No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.
My pull request is based on the latest changes of the master branch.
No? Unsure? -> execute command
git pull --rebase upstream master