Index: lams_central/src/java/org/lamsfoundation/lams/util/IndexUtils.java =================================================================== diff -u -re76fd654d97033acef2c7bbe4c0def48e37f79f3 -r5c85cfda092e7e27ab618e86469821a4587f3849 --- lams_central/src/java/org/lamsfoundation/lams/util/IndexUtils.java (.../IndexUtils.java) (revision e76fd654d97033acef2c7bbe4c0def48e37f79f3) +++ lams_central/src/java/org/lamsfoundation/lams/util/IndexUtils.java (.../IndexUtils.java) (revision 5c85cfda092e7e27ab618e86469821a4587f3849) @@ -55,9 +55,11 @@ } } - // append lesson beans not mentioned in orderedLessonIds + // prepend lesson beans not mentioned in orderedLessonIds if (!map.values().isEmpty()) { - orderedList.addAll(map.values()); + for (Object obj : map.values()) { + orderedList.add(0, (IndexLessonBean)obj); + } } return orderedList; Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java =================================================================== diff -u -rfdca3605f0b782b19e214abbe94df6f4a457b88e -r5c85cfda092e7e27ab618e86469821a4587f3849 --- lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java (.../LessonService.java) (revision fdca3605f0b782b19e214abbe94df6f4a457b88e) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java (.../LessonService.java) (revision 5c85cfda092e7e27ab618e86469821a4587f3849) @@ -25,12 +25,12 @@ package org.lamsfoundation.lams.lesson.service; import java.util.Collection; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TreeMap; import org.apache.log4j.Logger; import org.lamsfoundation.lams.dao.IBaseDAO; @@ -649,7 +649,7 @@ } public Map getLessonsByOrgAndUserWithCompletedFlag(Integer userId, Integer orgId, boolean isStaff) { - HashMap map = new HashMap(); + TreeMap map = new TreeMap(); List list = this.lessonDAO.getLessonsByOrgAndUserWithCompletedFlag(userId, orgId, isStaff); if (list != null) { Iterator iterator = list.iterator();