Skip to content

Conversation

@manishvishnoi2
Copy link

@manishvishnoi2 manishvishnoi2 commented Jun 12, 2016

This commit is halfway work for Issue 521.
This commit completes the integration of other related project calendar.a little GUI work is left.

}
public void onPageRequest(final PageRequest request) {
final Map<Integer, Integer> calendars = new HashMap<Integer, Integer>();
Integer CalendarId = 1;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Java naming convention encourage naming variables with a first letter as lowercase .
CalendarId should be spelled calendarId.

Copy link
Author

@manishvishnoi2 manishvishnoi2 Jun 20, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Raphcal Done it.Thank You.

calendars.put(1, getOrgUnit().getId());
calendars.put(2, getOrgUnit().getCalendarId());
public void onPageRequest(final PageRequest request) {
final Map<Integer, Integer> calendars = new HashMap<Integer, Integer>();
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@spMohanty & @osarrat Organization calendar integration is done only in one way.That means parent calendar contains child entries while child does not contain any parent entry.Is this okay or should it be both way ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that is the expected behavior as expressed in issue #522 : http://www.sigmah.org/issues/view.php?id=522

calendars.put(calendarId, getOrgUnit().getChildrenOrgUnits().iterator().next().getCalendarId());
iter.next();

for(final OrgUnitDTO child : getOrgUnit().getChildrenOrgUnits()) {
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Raphcal Changed to for loop as suggested.

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