-
Notifications
You must be signed in to change notification settings - Fork 548
RESTWS-760: Order resource does not include drug strength #661
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
base: master
Are you sure you want to change the base?
Conversation
|
@djazayeri @ibacher @dkayiwa could you please review this PR, your feedback will be appreciated. |
|
Is there a reason you're making the change in the BaseDelegatingResource instead of the DrugOrderResource? |
|
Let me make the changes in |
| * | ||
| * @param delegate the DrugOrder object that simple represents | ||
| */ | ||
| private void decorateWithStrengthProperty(SimpleObject simple, Order delegate) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ibacher what about this approach?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Much better if we could do it here instead of this...
6206bfc to
6a720bc
Compare
| } | ||
|
|
||
| @PropertyGetter("strength") | ||
| public String getStrength(DrugOrder delegate) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ibacher how about something like this?
|
@IamMujuziMoses do you mind looking into these merge conflicts? |
6a720bc to
d55c954
Compare
d55c954 to
44d4055
Compare
Issue I worked on
see https://issues.openmrs.org/browse/RESTWS-760
Checklist: I completed these to help reviewers :)
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 masterScreenshots
Strength property from Postman