Index: lams_central/src/java/org/lamsfoundation/lams/util/IndexUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/util/IndexUtils.java,v diff -u -r1.2 -r1.3 --- lams_central/src/java/org/lamsfoundation/lams/util/IndexUtils.java 8 Jan 2008 07:02:32 -0000 1.2 +++ lams_central/src/java/org/lamsfoundation/lams/util/IndexUtils.java 30 Apr 2008 06:09:15 -0000 1.3 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java,v diff -u -r1.26 -r1.27 --- lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java 14 Apr 2008 06:36:07 -0000 1.26 +++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java 30 Apr 2008 06:09:16 -0000 1.27 @@ -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();