diff --git a/src/main/java/org/olat/modules/gotomeeting/ui/GoToMeetingController.java b/src/main/java/org/olat/modules/gotomeeting/ui/GoToMeetingController.java index 77546709b0fadf9b4de4a50bae1a88c5dba12379..92878fa621695ad476688dcab3332a3857de16b9 100644 --- a/src/main/java/org/olat/modules/gotomeeting/ui/GoToMeetingController.java +++ b/src/main/java/org/olat/modules/gotomeeting/ui/GoToMeetingController.java @@ -19,6 +19,7 @@ */ package org.olat.modules.gotomeeting.ui; +import java.util.Calendar; import java.util.Date; import java.util.List; @@ -119,9 +120,16 @@ public class GoToMeetingController extends BasicController { Date end = meeting.getEndDate(); Date now = new Date(); boolean canStart = (start.compareTo(now) <= 0 && end.compareTo(now) > 0); + + Calendar cal = Calendar.getInstance(); + cal.setTime(start); + cal.add(Calendar.MINUTE, -60); + Date startMinusOne = cal.getTime(); + boolean canCoachStart = (startMinusOne.compareTo(now) <= 0 && end.compareTo(now) > 0); + boolean ended = (end.compareTo(now) <= 0); if(administrator || moderator) { - if(canStart) { + if(canCoachStart) { startLink.setVisible(true); registerLink.setVisible(false); } else if(ended) { diff --git a/src/main/java/org/olat/modules/gotomeeting/ui/GoToMeetingsController.java b/src/main/java/org/olat/modules/gotomeeting/ui/GoToMeetingsController.java index 9684dfd6b73a6d8fd39ee6160fec5f22dd613509..d015e84218d1ac9a9296a503837e97608203ecde 100644 --- a/src/main/java/org/olat/modules/gotomeeting/ui/GoToMeetingsController.java +++ b/src/main/java/org/olat/modules/gotomeeting/ui/GoToMeetingsController.java @@ -99,7 +99,7 @@ public class GoToMeetingsController extends FormBasicController { pastColumnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(MeetingsCols.end.i18nHeaderKey(), MeetingsCols.end.ordinal(), true, MeetingsCols.end.name())); pastColumnsModel.addFlexiColumnModel(new StaticFlexiColumnModel("select", translate("select"), "select-past")); - pastTableModel = new GoToMeetingTableModel(columnsModel); + pastTableModel = new GoToMeetingTableModel(pastColumnsModel); pastTableEl = uifactory.addTableElement(getWindowControl(), "pastmeetings", pastTableModel, getTranslator(), formLayout); FlexiTableSortOptions pastSortOptions = new FlexiTableSortOptions();