Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java =================================================================== diff -u -r39ceb19b74c579d46fb624c3b3ab02fd8e79683a -r98434014914e1f22cac864e59e5918087ac1dc50 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision 39ceb19b74c579d46fb624c3b3ab02fd8e79683a) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision 98434014914e1f22cac864e59e5918087ac1dc50) @@ -191,13 +191,12 @@ } @Override - public List getGBLessonComplete(Long lessonId, Integer userId) { + public Object[] getGBLessonComplete(Long lessonId, Integer userId) { GradebookService.logger .debug("Getting lesson complete gradebook user data for lesson: " + lessonId + ". For user: " + userId); Lesson lesson = lessonService.getLesson(lessonId); User learner = (User) userService.findById(User.class, userId); - List gradebookActivityDTOs = new ArrayList(); List activities = getLessonActivitiesForLearner(lesson, userId); @@ -227,7 +226,9 @@ gradebookActivityDTOs.add(activityDTO); } - return gradebookActivityDTOs; + return new Object[] { gradebookActivityDTOs, + gradebookDAO.getGradebookUserDataForLesson(lessonId, userId).getMark(), + getAverageMarkForLesson(lessonId), isWeightedMarks(lesson.getLearningDesign()) }; } @Override