Skip to content
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

Closed
wants to merge 1 commit into from

Conversation

gitcliff
Copy link
Contributor

link:https://issues.openmrs.org/browse/TRUNK-5650
Added parent order group to order group

@coveralls
Copy link

coveralls commented Aug 15, 2019

Coverage Status

Coverage increased (+0.007%) to 59.851% when pulling 373a36e on gitcliff:Trunk-5650 into a5c3bfc on openmrs:master.

@gitcliff gitcliff changed the title Trunk:Add parent order group to order group Trunk-5650:Add parent order group to order group Aug 15, 2019
@@ -35,6 +35,8 @@

private OrderSet orderSet;

private Concept parentOrderGroup;
Copy link
Member

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?

Copy link
Contributor Author

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
Copy link
Member

@dkayiwa dkayiwa Aug 16, 2019

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
Copy link
Member

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
Copy link
Member

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.

Copy link
Contributor Author

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
Copy link
Member

@dkayiwa dkayiwa Aug 16, 2019

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.

Copy link
Contributor Author

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

@dkayiwa
Copy link
Member

dkayiwa commented Nov 14, 2019

@gitcliff are you still working on this?

@gitcliff
Copy link
Contributor Author

closing this pull reques coz of the conflicts

@gitcliff gitcliff closed this Nov 15, 2019
@gitcliff gitcliff deleted the Trunk-5650 branch November 15, 2019 03:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants