Trunk 4133 #526
Closed
Trunk 4133 #526
+365
−20
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
added 5 commits
January 10, 2014 13:09
…handle discontinue orders
| @@ -529,4 +529,20 @@ public CareSetting getCareSetting() { | |||
| public void setCareSetting(CareSetting careSetting) { | |||
| this.careSetting = careSetting; | |||
| } | |||
|
|
|||
| /** | |||
| * Creates a new order that can be used to discontinue <code>orderToDiscontinue</code>. | |||
There was a problem hiding this comment.
I think this should be:
Creates a discontinuation order for this order, sets the previousOrder and action fields, note that the discontinuation order needs to be saved for the discontinuation to take effect
Add annotations for junit tests. Some extra documentation. Remove unnecessary executeDataset calls in OrderServiceTest Make concept for discontinuation a normal concept, not a numeric Additional assert statements
|
Made changes based on review comments |
| throw new APIException("Concept of previous order and this order should be the same"); | ||
| } | ||
|
|
||
| if (previousOrder.getDateStopped() == null) { |
There was a problem hiding this comment.
you also need to check that it is not expired
|
Merged at 4e98261 |
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.
Hi,
This is for the addition and implementation of the API methods on https://tickets.openmrs.org/browse/TRUNK-4133 .