Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java,v diff -u -r1.6 -r1.7 --- lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java 8 Sep 2015 23:55:10 -0000 1.6 +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java 9 Sep 2015 01:05:05 -0000 1.7 @@ -422,7 +422,7 @@ "AND lesson.lessonClass.groupingId = g.grouping.groupingId " + "AND ug.group.groupId = g.groupId " + "AND CONCAT(ug.user.lastName, ' ', ug.user.firstName) LIKE CONCAT('%', :searchString, '%') " + - "AND completedActivityProgress.learnerProgress.lesson.lessonId = :lessonId" + + "AND completedActivityProgress.learnerProgress.lesson.lessonId = :lessonId " + "AND completedActivityProgress.learnerProgress.user.userId = ug.user.userId " + "AND completedActivityProgress.activity.activityId = :activityId " + "ORDER BY TIMEDIFF(completedActivityProgress.finishDate, completedActivityProgress.startDate) " + sortOrder;