-
Notifications
You must be signed in to change notification settings - Fork 48
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
WIP:Linked Project Calendar #27
base: master
Are you sure you want to change the base?
Conversation
} | ||
public void onPageRequest(final PageRequest request) { | ||
final Map<Integer, Integer> calendars = new HashMap<Integer, Integer>(); | ||
Integer CalendarId = 1; |
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.
The Java naming convention encourage naming variables with a first letter as lowercase .
CalendarId
should be spelled calendarId
.
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.
@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>(); |
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.
@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 ?
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, 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()) { |
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.
@Raphcal Changed to for loop as suggested.
This commit is halfway work for Issue 521.
This commit completes the integration of other related project calendar.a little GUI work is left.