Skip to content

Commit d1288fc

Browse files
committed
Events: Time Grid
- fixed an issue in the start/end slot computation that caused Monday meetings to be ignored - introduced accidentally in commit 0d797d9
1 parent 0fc4b59 commit d1288fc

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

JavaSource/org/unitime/timetable/gwt/client/events/EventResourceTimetable.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,7 @@ public void onClick(ClickEvent clickEvent) {
575575
if (event.getType() == EventType.Unavailabile && !iEvents.hasChip(new Chip("type", "Not Available"))) continue;
576576
for (MeetingInterface meeting: event.getMeetings()) {
577577
if (filterEvent(event, meeting)) continue;
578+
if (meeting.isArrangeHours()) continue;
578579
if (meeting.getApprovalStatus() != ApprovalStatus.Pending && meeting.getApprovalStatus() != ApprovalStatus.Approved) continue;
579580
if (firstSlot > meeting.getStartSlot()) firstSlot = meeting.getStartSlot();
580581
if (lastSlot < meeting.getEndSlot()) lastSlot = meeting.getEndSlot();
@@ -920,7 +921,7 @@ private void tabOrDataChanged(boolean keepSelection) {
920921
if (event.getType() == EventType.Unavailabile && !iEvents.hasChip(new Chip("type", "Not Available"))) continue;
921922
for (MeetingInterface meeting: event.getMeetings()) {
922923
if (filterEvent(event, meeting)) continue;
923-
if (meeting.getDayOfWeek() == 0) continue;
924+
if (meeting.isArrangeHours()) continue;
924925
if (meeting.getApprovalStatus() != ApprovalStatus.Pending && meeting.getApprovalStatus() != ApprovalStatus.Approved) continue;
925926
if (firstSlot > meeting.getStartSlot()) firstSlot = meeting.getStartSlot();
926927
if (lastSlot < meeting.getEndSlot()) lastSlot = meeting.getEndSlot();

0 commit comments

Comments
 (0)