Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java,v
diff -u -r1.26 -r1.27
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java	7 Nov 2008 06:19:28 -0000	1.26
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java	12 Nov 2008 01:00:27 -0000	1.27
@@ -168,13 +168,13 @@
     public List getLessonsByOrgAndUserWithCompletedFlag(final Integer userId, final Integer orgId, final boolean isStaff);
     
     /**
-     * Gets all non-removed lessons for a user in an org; 
+     * Gets all non-removed lessons for a user in a group including sub-groups 
      * 
      * @param userId a user id that identifies the user.
      * @param orgId an org id that identifies the organisation.
      * @return a List containing a list of tuples containing lesson details and the lesson completed flag for the user.
      */
-    public List getLessonsByOrgAndUser(final Integer userId, final Integer orgId);
+    public List getLessonsByGroupAndUser(final Integer userId, final Integer orgId);
 
     /**
      * Get lessons based on learning designs where the original learning design has the given id.
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java,v
diff -u -r1.35 -r1.36
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java	7 Nov 2008 06:19:28 -0000	1.35
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java	12 Nov 2008 01:00:27 -0000	1.36
@@ -306,12 +306,12 @@
      * @see org.lamsfoundation.lams.lesson.dao.ILessonDAO#getLessonsByOrgAndUserWithCompletedFlag(Integer, Integer,
      *      boolean)
      */
-    public List getLessonsByOrgAndUser(final Integer userId, final Integer orgId) {
+    public List getLessonsByGroupAndUser(final Integer userId, final Integer orgId) {
 	List dtos = null;
 	HibernateTemplate hibernateTemplate = new HibernateTemplate(this.getSessionFactory());
 	dtos = (List) hibernateTemplate.execute(new HibernateCallback() {
 	    public Object doInHibernate(Session session) throws HibernateException {
-		Query query = session.getNamedQuery("lessonsByOrgAndUser");
+		Query query = session.getNamedQuery("lessonsByOrgAndUserWithChildOrgs");
 		query.setInteger("userId", userId.intValue());
 		query.setInteger("orgId", orgId.intValue());
 		List result = query.list();
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java,v
diff -u -r1.24 -r1.25
--- lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java	7 Nov 2008 06:19:28 -0000	1.24
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java	12 Nov 2008 01:00:27 -0000	1.25
@@ -325,13 +325,13 @@
 
     /**
      * 
-     * Returns map of lessons in an organisation for a particular user
+     * Returns map of lessons in a group (including sub-groups) for a particular user
      * 
      * @param userId
      * @param organisationId
      * @return map of lesson beans
      */
-    public abstract Map<Long, IndexLessonBean> getLessonsByOrgAndUser(Integer userId, Integer organisationId);
+    public abstract Map<Long, IndexLessonBean> getLessonsByGroupAndUser(Integer userId, Integer organisationId);
 
     /**
      * Gets the learner's progress details for a particular lesson. Will return null if the user has not started the
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.32 -r1.33
--- lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	7 Nov 2008 06:19:28 -0000	1.32
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	12 Nov 2008 01:00:27 -0000	1.33
@@ -745,9 +745,9 @@
 	return map;
     }
 
-    public Map<Long, IndexLessonBean> getLessonsByOrgAndUser(Integer userId, Integer organisationId) {
+    public Map<Long, IndexLessonBean> getLessonsByGroupAndUser(Integer userId, Integer organisationId) {
 	TreeMap<Long, IndexLessonBean> map = new TreeMap<Long, IndexLessonBean>();
-	List list = lessonDAO.getLessonsByOrgAndUser(userId, organisationId);
+	List list = lessonDAO.getLessonsByGroupAndUser(userId, organisationId);
 	if (list != null) {
 	    Iterator iterator = list.iterator();
 	    while (iterator.hasNext()) {