Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java =================================================================== diff -u -r8a7a259deba12163c46440a712e41bde926fdaf8 -rc8173268ce2301a54d6e55acab297bd9c11cead4 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision 8a7a259deba12163c46440a712e41bde926fdaf8) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision c8173268ce2301a54d6e55acab297bd9c11cead4) @@ -2268,9 +2268,18 @@ } private List getTBLLessons(Integer organisationId, Integer userId) { - Set lessons = new TreeSet<>(new LessonComparator()); - lessons.addAll(lessonService.getLessonsByGroupAndUser(userId, organisationId)); + boolean isGroupManager = userService.isUserInRole(userId, organisationId, Role.GROUP_MANAGER); + Set lessons = new TreeSet<>(new LessonComparator()); + if (isGroupManager) { + lessons.addAll(lessonService.getLessonsByGroupAndUser(userId, organisationId)); + } else { + lessons.addAll(lessonService.getLessonsByGroup(organisationId)); + Organisation organisation = userService.getOrganisationById(organisationId); + for (Organisation childOrganisation : organisation.getChildOrganisations()) { + lessons.addAll(lessonService.getLessonsByGroup(childOrganisation.getOrganisationId())); + } + } List tblLessons = new LinkedList<>(); for (Lesson lesson : lessons) { boolean isTblLesson = learningDesignService.isTBLSequence(lesson.getLearningDesign().getLearningDesignId());