Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java =================================================================== diff -u -rbec136e7207405d99fa7f18e39a19bed555f0ee3 -r8a5d84dff430824f702e8b701885a8668b42c545 --- lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java (.../GradebookDAO.java) (revision bec136e7207405d99fa7f18e39a19bed555f0ee3) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java (.../GradebookDAO.java) (revision 8a5d84dff430824f702e8b701885a8668b42c545) @@ -697,14 +697,14 @@ public List getArchivedLessonMarks(Long lessonId, Integer userId) { final String GET_ARCHIVED_LESSON_MARKS = "FROM GradebookUserLessonArchive a WHERE " - + " a.lesson.lessonId = :lessonId AND a.learner.userId = :userId"; + + " a.lesson.lessonId = :lessonId AND a.learner.userId = :userId ORDER BY a.archiveDate DESC"; return getSession().createQuery(GET_ARCHIVED_LESSON_MARKS).setLong("lessonId", lessonId) .setInteger("userId", userId).list(); } public List getArchivedActivityMarks(Long activityId, Integer userId) { final String GET_ARCHIVED_ACTIVITY_MARKS = "FROM GradebookUserActivityArchive a WHERE " - + " a.activity.activityId = :activityId AND a.learner.userId = :userId"; + + " a.activity.activityId = :activityId AND a.learner.userId = :userId ORDER BY a.archiveDate DESC"; return getSession().createQuery(GET_ARCHIVED_ACTIVITY_MARKS).setLong("activityId", activityId) .setInteger("userId", userId).list(); }