Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java =================================================================== diff -u -raf839eeb85f37cf68092401ad23a4613ca7cd001 -rbec136e7207405d99fa7f18e39a19bed555f0ee3 --- lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java (.../GradebookDAO.java) (revision af839eeb85f37cf68092401ad23a4613ca7cd001) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java (.../GradebookDAO.java) (revision bec136e7207405d99fa7f18e39a19bed555f0ee3) @@ -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 ORDER BY a.archiveDate DESC"; + + " a.lesson.lessonId = :lessonId AND a.learner.userId = :userId"; 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 ORDER BY a.archiveDate DESC"; + + " a.activity.activityId = :activityId AND a.learner.userId = :userId"; return getSession().createQuery(GET_ARCHIVED_ACTIVITY_MARKS).setLong("activityId", activityId) .setInteger("userId", userId).list(); } Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java =================================================================== diff -u -r0ed9749f00a1e1f92b989b270857d7f3c3f237cb -rbec136e7207405d99fa7f18e39a19bed555f0ee3 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision 0ed9749f00a1e1f92b989b270857d7f3c3f237cb) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision bec136e7207405d99fa7f18e39a19bed555f0ee3) @@ -207,7 +207,7 @@ List gradebookActivityDTOs = new ArrayList(); List lessonArchives = gradebookDAO.getArchivedLessonMarks(lesson.getLessonId(), userId); - int attemptOrder = lessonArchives.size(); + int attemptOrder = 1; List activityArchives = gradebookDAO.getArchivedActivityMarks(activityId, userId); for (GradebookUserLessonArchive lessonArchive : lessonArchives) { GBActivityArchiveGridRowDTO activityDTO = new GBActivityArchiveGridRowDTO(attemptOrder, @@ -229,7 +229,7 @@ } } gradebookActivityDTOs.add(activityDTO); - attemptOrder--; + attemptOrder++; } return gradebookActivityDTOs; Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java =================================================================== diff -u -raf839eeb85f37cf68092401ad23a4613ca7cd001 -rbec136e7207405d99fa7f18e39a19bed555f0ee3 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java (.../GradebookAction.java) (revision af839eeb85f37cf68092401ad23a4613ca7cd001) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java (.../GradebookAction.java) (revision bec136e7207405d99fa7f18e39a19bed555f0ee3) @@ -191,7 +191,7 @@ } String ret = GradebookUtil.toGridXML(gradebookActivityDTOs, view, GradebookConstants.PARAM_ID, false, null, - null, null, null, 100, 1); + null, null, GradebookConstants.SORT_DESC, 100, 1); writeResponse(response, LamsDispatchAction.CONTENT_TYPE_TEXT_XML, LamsDispatchAction.ENCODING_UTF8, ret); return null;