Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
===================================================================
diff -u -re95659a8cfef4e2aa19b1ea3565fa2d67ef96f52 -r077455f6c7ce0f7784a308cc66bb62969cf2c68f
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	(.../Lesson.hbm.xml)	(revision e95659a8cfef4e2aa19b1ea3565fa2d67ef96f52)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	(.../Lesson.hbm.xml)	(revision 077455f6c7ce0f7784a308cc66bb62969cf2c68f)
@@ -80,7 +80,9 @@
 		  WHERE ({lesson}.class_grouping_id = lams_grouping.grouping_id)
 		    AND (lams_grouping.grouping_id = lams_group.grouping_id)
 		    AND (lams_group.group_id = lams_user_group.group_id)
+		    AND ({lesson}.lesson_state_id IN (3,4,5))		    
 		    AND (lams_user_group.user_id = :userId)
+
 	</sql-query>
 	
 </hibernate-mapping>
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
===================================================================
diff -u -rcc4e58f3d56692a3798caa48226f4f0399644ed2 -r077455f6c7ce0f7784a308cc66bb62969cf2c68f
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java	(.../LessonDAO.java)	(revision cc4e58f3d56692a3798caa48226f4f0399644ed2)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java	(.../LessonDAO.java)	(revision 077455f6c7ce0f7784a308cc66bb62969cf2c68f)
@@ -82,15 +82,6 @@
                 }
             }
         );
-    	/*Session session = this.getSession();
-    	try {
-	    	Query query = session.getNamedQuery("activeLessons");
-	    	query.setInteger("userId", learner.getUserId().intValue());
-	    	lessons = query.list();
-    	}
-    	catch (HibernateException e) {
-    		throw new DataRetrievalFailureException(e.getMessage(), e);
-    	}*/
         return lessons;
     }
     
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLessonDAO.java
===================================================================
diff -u -r748079a1454fb5ce008b036ee9ce98f11a528478 -r077455f6c7ce0f7784a308cc66bb62969cf2c68f
--- lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLessonDAO.java	(.../TestLessonDAO.java)	(revision 748079a1454fb5ce008b036ee9ce98f11a528478)
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLessonDAO.java	(.../TestLessonDAO.java)	(revision 077455f6c7ce0f7784a308cc66bb62969cf2c68f)
@@ -9,6 +9,8 @@
 
 package org.lamsfoundation.lams.lesson.dao;
 
+import java.util.List;
+
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.LessonDataAccessTestCase;
 
@@ -56,6 +58,13 @@
         
     }
 
+    public void testGetActiveLessonsForLearner()
+    {
+        List lessons = this.lessonDao.getActiveLessonsForLearner(this.testUser);
+        
+        assertEquals("verify the number of lesson we get",0,lessons.size());
+    }
+    
     public void testUpdateLesson()
     {
         Lesson createdLesson = this.lessonDao.getLesson(this.testLesson.getLessonId());
@@ -68,5 +77,10 @@
         Lesson updatedLesson = lessonDao.getLesson(testLesson.getLessonId());
         
         assertEquals("verify the updated lesson state",Lesson.STARTED_STATE,updatedLesson.getLessonStateId());
+    
+        List lessons = this.lessonDao.getActiveLessonsForLearner(this.testUser);
+        
+        assertEquals("verify the number of lesson we get",1,lessons.size());
+
     }
 }