From 3f8c393364f900dede541c2c3a1eb45702bb5520 Mon Sep 17 00:00:00 2001 From: uhensler <urs.hensler@frentix.com> Date: Wed, 6 Jan 2021 08:30:01 +0100 Subject: [PATCH] no-jira: Delete obsolete variable --- .../course/nodes/livestream/ui/LiveStreamRunController.java | 4 ++-- .../nodes/livestream/ui/LiveStreamStatisticController.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/olat/course/nodes/livestream/ui/LiveStreamRunController.java b/src/main/java/org/olat/course/nodes/livestream/ui/LiveStreamRunController.java index 5deee5313f2..7419f27ea8d 100644 --- a/src/main/java/org/olat/course/nodes/livestream/ui/LiveStreamRunController.java +++ b/src/main/java/org/olat/course/nodes/livestream/ui/LiveStreamRunController.java @@ -140,8 +140,8 @@ public class LiveStreamRunController extends BasicController { if (statisticCtrl == null) { WindowControl swControl = addToHistory(ureq, OresHelper.createOLATResourceableType(STATISTIC_RES_TYPE), null); RepositoryEntry courseEntry = userCourseEnv.getCourseEnvironment().getCourseGroupManager().getCourseEntry(); - statisticCtrl = new LiveStreamStatisticController(ureq, swControl, courseEntry , courseNodeIdent, - moduleConfiguration, calendars); + statisticCtrl = new LiveStreamStatisticController(ureq, swControl, courseEntry , moduleConfiguration, + calendars); listenTo(statisticCtrl); } else { statisticCtrl.refreshData(); diff --git a/src/main/java/org/olat/course/nodes/livestream/ui/LiveStreamStatisticController.java b/src/main/java/org/olat/course/nodes/livestream/ui/LiveStreamStatisticController.java index 47c96e70536..b52be826c53 100644 --- a/src/main/java/org/olat/course/nodes/livestream/ui/LiveStreamStatisticController.java +++ b/src/main/java/org/olat/course/nodes/livestream/ui/LiveStreamStatisticController.java @@ -53,7 +53,6 @@ public class LiveStreamStatisticController extends FormBasicController { private LiveStreamEventDataModel dataModel; private RepositoryEntry courseEntry; - private String courseNodeIdent; private final CourseCalendars calendars; private final int bufferBeforeMin; @@ -61,10 +60,9 @@ public class LiveStreamStatisticController extends FormBasicController { private LiveStreamService liveStreamService; public LiveStreamStatisticController(UserRequest ureq, WindowControl wControl, RepositoryEntry courseEntry, - String courseNodeIdent, ModuleConfiguration moduleConfiguration, CourseCalendars calendars) { + ModuleConfiguration moduleConfiguration, CourseCalendars calendars) { super(ureq, wControl, LAYOUT_VERTICAL); this.courseEntry = courseEntry; - this.courseNodeIdent = courseNodeIdent; this.calendars = calendars; bufferBeforeMin = moduleConfiguration.getIntegerSafe(LiveStreamCourseNode.CONFIG_BUFFER_BEFORE_MIN, 0); @@ -101,6 +99,8 @@ public class LiveStreamStatisticController extends FormBasicController { List<LiveStreamEventRow> rows = new ArrayList<>(upcomingEvents.size()); for (LiveStreamEvent liveStreamEvent : upcomingEvents) { LiveStreamEventRow row = new LiveStreamEventRow(liveStreamEvent); + // Do not filter the launches by course node, because only the total number of launches is + // important, regardless of the course node. Long viewers = liveStreamService.getLaunchers(courseEntry, null, liveStreamEvent.getBegin(), liveStreamEvent.getEnd()); row.setViewers(viewers); -- GitLab