-
Notifications
You must be signed in to change notification settings - Fork 3.7k
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
Trunk-5650:Add parent order group to order group #2985
Conversation
@@ -35,6 +35,8 @@ | |||
|
|||
private OrderSet orderSet; | |||
|
|||
private Concept parentOrderGroup; |
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.
Shouldn't a parent order group be an OrderGroup?
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.
yes @dkayiwa i have it made an OrderGroup,kindly review
* Sets the ParentOrderGroup to other OrderGroups, to maintain linkages between groups and | ||
* support group nesting | ||
* | ||
* @param ParentOrderGroup The ParentOrderGroup to set |
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.
Please follow this convention below:
@param parentOrderGroup the parent order group to set.
* Gets the ParentOrderGroup to other OrderGroups, to maintain linkages between groups and | ||
* support group nesting | ||
* | ||
* @param returns the ParentOrderGroup |
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.
returns the parent order group.
@@ -208,4 +210,26 @@ public void setId(Integer id) { | |||
setOrderGroupId(id); | |||
} | |||
|
|||
/** | |||
* Gets the ParentOrderGroup to other OrderGroups, to maintain linkages between groups and |
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.
Gets the parent order group, to maintain linkages between groups and support group nesting.
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.
@dkayiwa i have made the changes,,,kindly review
} | ||
|
||
/** | ||
* Sets the ParentOrderGroup to other OrderGroups, to maintain linkages between groups and |
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.
Edit this one like like you have just done for the getter.
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.
@dkayiwa i have done the editing of the setter,,requesting for review
@gitcliff are you still working on this? |
closing this pull reques coz of the conflicts |
link:https://issues.openmrs.org/browse/TRUNK-5650
Added parent order group to order group