Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.420.2.27 -r1.420.2.28
Binary files differ
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.4.2.4 -r1.4.2.5
--- lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java	10 Sep 2015 22:18:17 -0000	1.4.2.4
+++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java	11 Sep 2015 23:25:21 -0000	1.4.2.5
@@ -341,7 +341,7 @@
     @Override
     public List<User> getUsersByLesson(Long lessonId, int page, int size, String sortBy, String sortOrder, String searchString) {
 	
-	final String LOAD_LEARNERS_ORDERED_BY_NAME = "SELECT user.* " +
+	final String LOAD_LEARNERS_ORDERED_BY_NAME = "SELECT DISTINCT user.* " +
  		" FROM lams_lesson lesson, lams_group g, lams_user_group ug " +
  		" INNER JOIN lams_user user ON ug.user_id=user.user_id " +
  		" WHERE lesson.lesson_id = :lessonId " +
@@ -351,7 +351,7 @@
 		"ORDER BY CONCAT(user.last_name, ' ', user.first_name) " + sortOrder;
 	
 	//when :sortBy='timeTaken'
-	final String LOAD_LEARNERS_ORDERED_BY_TIME_TAKEN = "SELECT user.* " +
+	final String LOAD_LEARNERS_ORDERED_BY_TIME_TAKEN = "SELECT DISTINCT user.* " +
  		" FROM lams_lesson lesson, lams_group g, lams_user_group ug " +
  		" INNER JOIN lams_user user ON ug.user_id=user.user_id " +
  		" LEFT OUTER JOIN lams_learner_progress progress " +
@@ -363,7 +363,7 @@
 		"ORDER BY TIMEDIFF(progress.finish_date_time, progress.start_date_time) " + sortOrder;
 	
 	//when :sortBy='mark'
-	final String LOAD_LEARNERS_ORDERED_BY_MARK = "SELECT user.* " +
+	final String LOAD_LEARNERS_ORDERED_BY_MARK = "SELECT DISTINCT user.* " +
  		" FROM lams_lesson lesson, lams_group g, lams_user_group ug " +
  		" INNER JOIN lams_user user ON ug.user_id=user.user_id " +
  		" LEFT OUTER JOIN lams_gradebook_user_lesson gradebookUserLesson " +
@@ -375,7 +375,7 @@
 		" ORDER BY gradebookUserLesson.mark " + sortOrder;
 	
 	//when :sortBy='feedback'
-	final String LOAD_LEARNERS_ORDERED_BY_FEEDBACK = "SELECT user.* " +
+	final String LOAD_LEARNERS_ORDERED_BY_FEEDBACK = "SELECT DISTINCT user.* " +
  		" FROM lams_lesson lesson, lams_group g, lams_user_group ug " +
  		" INNER JOIN lams_user user ON ug.user_id=user.user_id " +
  		" LEFT OUTER JOIN lams_gradebook_user_lesson gradebookUserLesson " +
@@ -412,7 +412,7 @@
     public List<User> getUsersByActivity(Long lessonId, Long activityId, int page, int size, String sortBy,
 	    String sortOrder, String searchString) {
 	
-	final String LOAD_LEARNERS_ORDERED_BY_NAME = "SELECT user.* " +
+	final String LOAD_LEARNERS_ORDERED_BY_NAME = "SELECT DISTINCT user.* " +
 		" FROM lams_lesson lesson, lams_group g, lams_user_group ug " +
 		" INNER JOIN lams_user user ON ug.user_id=user.user_id " +
 		" WHERE lesson.lesson_id = :lessonId " +
@@ -422,7 +422,7 @@
 		" ORDER BY CONCAT(user.last_name, ' ', user.first_name) " + sortOrder;
 	
 	//when :sortBy='timeTaken'
-	final String LOAD_LEARNERS_ORDERED_BY_TIME_TAKEN_ACTIVITY = "SELECT user.* " +
+	final String LOAD_LEARNERS_ORDERED_BY_TIME_TAKEN_ACTIVITY = "SELECT DISTINCT user.* " +
  		" FROM lams_lesson lesson, lams_group g, lams_user_group ug " +
 		" INNER JOIN lams_user user ON ug.user_id=user.user_id " +
  		" LEFT OUTER JOIN lams_learner_progress progress " + 
@@ -437,7 +437,7 @@
 		"ORDER BY TIMEDIFF(completedActivityProgress.completed_date_time, completedActivityProgress.start_date_time) " + sortOrder;
 	
 	//when :sortBy='mark'
-	final String LOAD_LEARNERS_ORDERED_BY_MARK_ACTIVITY = "SELECT user.* " +
+	final String LOAD_LEARNERS_ORDERED_BY_MARK_ACTIVITY = "SELECT DISTINCT user.* " +
 		" FROM lams_lesson lesson, lams_group g, lams_user_group ug " +
  		" INNER JOIN lams_user user ON ug.user_id=user.user_id " +
  		" LEFT OUTER JOIN lams_gradebook_user_activity gradebookUserActivity " +
@@ -475,7 +475,7 @@
     public List<User> getUsersByGroup(Long lessonId, Long activityId, Long groupId, int page, int size, String sortBy,
 	    String sortOrder, String searchString) {
 	
-	final String LOAD_LEARNERS_ORDERED_BY_NAME = "SELECT user.* " +
+	final String LOAD_LEARNERS_ORDERED_BY_NAME = "SELECT DISTINCT user.* " +
 		" FROM lams_user_group ug " +
 		" INNER JOIN lams_user user ON ug.user_id=user.user_id " +
 		" WHERE ug.group_id=:groupId " +
@@ -484,7 +484,7 @@
 		sortOrder;
 	
 	//when :sortBy='timeTaken'
-	final String LOAD_LEARNERS_ORDERED_BY_TIME_TAKEN_GROUP = "SELECT user.* " +
+	final String LOAD_LEARNERS_ORDERED_BY_TIME_TAKEN_GROUP = "SELECT DISTINCT user.* " +
  		" FROM lams_user_group ug " +
 		" INNER JOIN lams_user user ON ug.user_id=user.user_id " +
  		" LEFT OUTER JOIN lams_learner_progress progress " + 
@@ -497,7 +497,7 @@
 		" ORDER BY TIMEDIFF(completedActivityProgress.completed_date_time, completedActivityProgress.start_date_time) " + sortOrder;
 	
 	//when :sortBy='mark'
-	final String LOAD_LEARNERS_ORDERED_BY_MARK_GROUP = "SELECT user.* " +
+	final String LOAD_LEARNERS_ORDERED_BY_MARK_GROUP = "SELECT DISTINCT user.* " +
  		" FROM lams_user_group ug " +
  		" INNER JOIN lams_user user ON ug.user_id=user.user_id " +
  		" LEFT OUTER JOIN lams_gradebook_user_activity gradebookUserActivity " +