Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java,v
diff -u -r1.1.2.14.2.7 -r1.1.2.14.2.8
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	4 Aug 2011 19:44:51 -0000	1.1.2.14.2.7
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	12 Aug 2011 12:25:40 -0000	1.1.2.14.2.8
@@ -50,6 +50,7 @@
 import org.lamsfoundation.lams.gradebook.dto.GBUserGridRowDTO;
 import org.lamsfoundation.lams.gradebook.dto.GradebookGridRowDTO;
 import org.lamsfoundation.lams.gradebook.util.GBGridView;
+import org.lamsfoundation.lams.gradebook.util.LessonComparator;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.ActivityEvaluation;
 import org.lamsfoundation.lams.learningdesign.CompetenceMapping;
@@ -650,7 +651,7 @@
 	    
 	    ExcelCell[] lessonAverageTimeTaken = new ExcelCell[2];
 	    lessonAverageTimeTaken[0] = new ExcelCell(getMessage("gradebook.export.average.lesson.time.taken"), true);
-	    lessonAverageTimeTaken[1] = new ExcelCell(gradebookDAO.getAverageDurationLesson(lesson.getLessonId()), false);
+	    lessonAverageTimeTaken[1] = new ExcelCell(gradebookDAO.getAverageDurationLesson(lesson.getLessonId())/1000, false);
 	    rowList.add(lessonAverageTimeTaken);
 	    rowList.add(EMPTY_ROW);
 	    //------------------------------------------------------------------
@@ -726,7 +727,8 @@
 	List<ExcelCell[]> rowList = new LinkedList<ExcelCell[]>();
 	
 	User user = (User) getUserService().findById(User.class, userId);
-	List<Lesson> lessonsFromDB = lessonService.getLessonsByGroupAndUser(userId, organisationId);
+	Set<Lesson> lessonsFromDB = new TreeSet<Lesson>(new LessonComparator());
+	lessonsFromDB.addAll(lessonService.getLessonsByGroupAndUser(userId, organisationId));
 	
 	List<Lesson> lessons = new LinkedList<Lesson>();
 	// Dont include lesson in list if the user doesnt have permission
@@ -738,7 +740,7 @@
 	    lessons.add(lesson);
 	}
 	if (lessons == null || (lessons.size() == 0)) {
-	    return null;
+	    return rowList.toArray(new ExcelCell[][] {});
 	}
 	
 	//collect users from all lessons
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/LessonComparator.java'.
Fisheye: No comparison available.  Pass `N' to diff?