Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml
===================================================================
diff -u -r2db1c52567bf8f79ccb7589d1d8785be4ed1118c -raa94cd10d358b4a0f36be5d5f77a1edc3f0c61d1
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml	(.../LearnerProgress.hbm.xml)	(revision 2db1c52567bf8f79ccb7589d1d8785be4ed1118c)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml	(.../LearnerProgress.hbm.xml)	(revision aa94cd10d358b4a0f36be5d5f77a1edc3f0c61d1)
@@ -2,69 +2,66 @@
 <!DOCTYPE hibernate-mapping PUBLIC
     "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
     "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
-    
+
 <hibernate-mapping>
-<!-- 
-    Created by the Middlegen Hibernate plugin 2.1
+	<!-- 
+		Created by the Middlegen Hibernate plugin 2.1
+		
+		http://boss.bekk.no/boss/middlegen/
+		http://www.hibernate.org/
+	-->
 
-    http://boss.bekk.no/boss/middlegen/
-    http://www.hibernate.org/
--->
+	<class name="org.lamsfoundation.lams.lesson.LearnerProgress"
+		table="lams_learner_progress">
 
-<class 
-    name="org.lamsfoundation.lams.lesson.LearnerProgress" 
-    table="lams_learner_progress"
->
-    <meta attribute="class-description" inherit="false">
-       @hibernate.class
-        table="lams_learner_progress"
-    </meta>
-    <meta attribute="implement-equals" inherit="false">true</meta>
+		<id name="learnerProgressId" type="java.lang.Long"
+			column="learner_progress_id">
+			<generator class="identity" />
+		</id>
 
-    <id
-        name="learnerProgressId"
-        type="java.lang.Long"
-        column="learner_progress_id"
-    >
-        <meta attribute="field-description">
-           @hibernate.id
-            generator-class="identity"
-            type="java.lang.Long"
-            column="learner_progress_id"
+		<property name="lessonComplete" type="java.lang.Boolean"
+			column="lesson_completed_flag" />
 
+		<!-- Associations -->
 
-        </meta>
-        <generator class="identity" />
-    </id>
+		<!-- bi-directional one-to-many association to attempted acitivities -->
+		<set name="attemptedActivities" lazy="true" inverse="true"
+			cascade="none" table="lams_progress_attempted">
+			<key>
+				<column name="learner_progress_id" />
+			</key>
+			<many-to-many column="activity_id"
+				class="org.lamsfoundation.lams.learningdesign.Activity" />
+		</set>
 
+		<!-- bi-directional one-to-many association to completed activities -->
+		<set name="completedActivities" lazy="true" inverse="true"
+			cascade="none" table="lams_progress_completed">
+			<key>
+				<column name="learner_progress_id" />
+			</key>
+			<many-to-many column="activity_id"
+				class="org.lamsfoundation.lams.learningdesign.Activity" />
+		</set>
 
-    <!-- Associations -->  
-    <!-- bi-directional many-to-one association to User -->
-    <many-to-one
-        name="user"
-        class="org.lamsfoundation.lams.usermanagement.User"
-        not-null="true"
-    >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="user_id"         
-        </meta>
-        <column name="user_id" />
-    </many-to-one>
-    <!-- bi-directional many-to-one association to Lesson -->
-    <many-to-one
-        name="lesson"
-        class="org.lamsfoundation.lams.lesson.Lesson"
-        not-null="true"
-    >
-        <meta attribute="field-description">
-           @hibernate.many-to-one
-            not-null="true"
-           @hibernate.column name="lesson_id"         
-        </meta>
-        <column name="lesson_id" />
-    </many-to-one>
+		<!-- bi-directional many-to-one association to User -->
+		<many-to-one name="user"
+			class="org.lamsfoundation.lams.usermanagement.User"
+			not-null="true">
+			<column name="user_id" />
+		</many-to-one>
 
-</class>
+		<!-- bi-directional many-to-one association to Lesson -->
+		<many-to-one name="lesson"
+			class="org.lamsfoundation.lams.lesson.Lesson" not-null="true">
+			<column name="lesson_id" />
+		</many-to-one>
+
+		<!-- bi-directional many-to-one association to current activites -->
+		<!-- many-to-one name="currentActivity"
+			class="org.lamsfoundation.lams.learningdesign.Activity">
+			<column name="current_activity_id" />
+		</many-to-one-->
+
+	</class>
 </hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
===================================================================
diff -u -r2db1c52567bf8f79ccb7589d1d8785be4ed1118c -raa94cd10d358b4a0f36be5d5f77a1edc3f0c61d1
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	(.../Lesson.hbm.xml)	(revision 2db1c52567bf8f79ccb7589d1d8785be4ed1118c)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	(.../Lesson.hbm.xml)	(revision aa94cd10d358b4a0f36be5d5f77a1edc3f0c61d1)
@@ -2,131 +2,100 @@
 <!DOCTYPE hibernate-mapping PUBLIC
     "-//Hibernate/Hibernate Mapping DTD 2.0//EN"
     "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
-    
+
 <hibernate-mapping>
 
 
-<class 
-    name="org.lamsfoundation.lams.lesson.Lesson" 
-    table="lams_lesson"
->
+	<class name="org.lamsfoundation.lams.lesson.Lesson"
+		table="lams_lesson">
 
-    <meta attribute="implement-equals" inherit="false">true</meta>
+		<meta attribute="implement-equals" inherit="false">true</meta>
 
-    <id
-        name="lessonId"
-        type="java.lang.Long"
-        column="lesson_id"
-    >
+		<id name="lessonId" type="java.lang.Long" column="lesson_id">
+			<generator class="identity" />
+		</id>
 
-        <generator class="identity" />
-    </id>
+		<property name="createDateTime" type="java.sql.Timestamp"
+			column="create_date_time" not-null="true" length="19">
+		</property>
+		<property name="startDateTime" type="java.sql.Timestamp"
+			column="start_date_time" length="19">
+		</property>
+		<property name="endDateTime" type="java.sql.Timestamp"
+			column="end_date_time" length="19">
+		</property>
+		<property name="lessonStateId" type="java.lang.Integer"
+			column="lesson_state_id" length="3">
+		</property>
 
-    <property
-        name="createDateTime"
-        type="java.sql.Timestamp"
-        column="create_date_time"
-        not-null="true"
-        length="19"
-    >
-   
-    </property>
-    <property
-        name="startDateTime"
-        type="java.sql.Timestamp"
-        column="start_date_time"
-        length="19"
-    >
-  
-    </property>
-    <property
-        name="endDateTime"
-        type="java.sql.Timestamp"
-        column="end_date_time"
-        length="19"
-    >
-   
-    </property>
-    
-    <property
-        name="lessonStateId"
-        type="java.lang.Integer"
-        column="lesson_state_id"
-        length="3"
-    >
-   
-    </property>
+		<!-- Associations -->
+		
+		<!-- bi-directional many-to-many association to User as learners -->
+		<set name="learners" lazy="true" inverse="true" cascade="none"
+			table="lams_lesson_learner">
+			<key column="lesson_id" />
+			<many-to-many column="user_id"
+				class="org.lamsfoundation.lams.usermanagement.User" />
+		</set>
 
-    <!-- Associations -->
-    <!-- bi-directional many-to-many association to User as learners -->
-    <set
-        name="learners"
-        lazy="true"
-        inverse="true"
-        cascade="none"
-        table="lams_lesson_learner"
-    >
-        <key>
-            <column name="lesson_id" />
-        </key>
-        <many-to-many 
-            column="user_id"
-            class="org.lamsfoundation.lams.usermanagement.User"
-        />
-    </set>
-    
-    
-    <!-- bi-directional many-to-one association to User -->
-    <many-to-one
-        name="user"
-        class="org.lamsfoundation.lams.usermanagement.User"
-        not-null="true"
-    >
-        <column name="user_id" />
-    </many-to-one>
-   
-    <!-- bi-directional many-to-one association to LearningDesign -->
-    <many-to-one
-        name="learningDesign"
-        class="org.lamsfoundation.lams.learningdesign.LearningDesign"
-        not-null="true"
-    >
+		<!-- bi-directional many-to-one association to User -->
+		<many-to-one name="user"
+			class="org.lamsfoundation.lams.usermanagement.User"
+			not-null="true">
+			<column name="user_id" />
+		</many-to-one>
 
-        <column name="learning_design_id" />
-    </many-to-one>
-    <!-- bi-directional one-to-many association to LearnerProgress -->
-    <set
-        name="learnerProgresses"
-        lazy="true"
-        inverse="true"
-		cascade="none"
-    >
+		<!-- bi-directional many-to-one association to LearningDesign -->
+		<many-to-one name="learningDesign"
+			class="org.lamsfoundation.lams.learningdesign.LearningDesign"
+			not-null="true">
+			<column name="learning_design_id" />
+		</many-to-one>
+		
+		<!-- bi-directional one-to-many association to LearnerProgress -->
+		<set name="learnerProgresses" lazy="true" inverse="true"
+			cascade="none">
+			<key>
+				<column name="lesson_id" />
+			</key>
+			<one-to-many
+				class="org.lamsfoundation.lams.lesson.LearnerProgress" />
+		</set>
+		
+		<!-- bi-directional many-to-one association to LessonClass -->
+		<!-- many-to-one name="lessonClass"
+			class="org.lamsfoundation.lams.lesson.LessonClass"
+			not-null="true"
+			unique="true">
+			<column name="class_grouping_id" />
+		</many-to-one-->
+		<!-- one-to-one name="lessonClass"
+			class="org.lamsfoundation.lams.lesson.LessonClass"
+			constrained="true"
+			cascade="all"
+			property-ref="lesson"
+			/-->
 
-        <key>
-            <column name="lesson_id" />
-        </key>
-        <one-to-many 
-            class="org.lamsfoundation.lams.lesson.LearnerProgress"
-        />
-    </set>
-    <!-- bi-directional many-to-one association to LessonClass -->
-    <many-to-one
-        name="lessonClass"
-        class="org.lamsfoundation.lams.lesson.LessonClass"
-        not-null="true"
-    >
+		<!-- bi-directional many-to-one association to Organisation -->
+		<many-to-one name="organisation"
+			class="org.lamsfoundation.lams.usermanagement.Organisation"
+			not-null="true">
+			<column name="organisation_id" />
+		</many-to-one>
 
-        <column name="class_grouping_id" />
-    </many-to-one>
-    <!-- bi-directional many-to-one association to Organisation -->
-    <many-to-one
-        name="organisation"
-        class="org.lamsfoundation.lams.usermanagement.Organisation"
-        not-null="true"
-    >
-
-        <column name="organisation_id" />
-    </many-to-one>
-
-</class>
+	</class>
+	
+	<sql-query name="activeLessons">
+		<return alias="lesson" class="org.lamsfoundation.lams.lesson.Lesson" />
+		SELECT DISTINCT {lesson.*}
+		  FROM lams_lesson {lesson},
+		    lams_grouping,
+		    lams_group,
+		    lams_user_group
+		  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 (lams_user_group.user_id = :userId)
+	</sql-query>
+	
 </hibernate-mapping>