Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
===================================================================
diff -u -r4b24094f139dd10a9779ce6e678cb8ca38317148 -ra61aaf1873bcb6a8f9aeeed3941112de120e438d
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml (.../Lesson.hbm.xml) (revision 4b24094f139dd10a9779ce6e678cb8ca38317148)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml (.../Lesson.hbm.xml) (revision a61aaf1873bcb6a8f9aeeed3941112de120e438d)
@@ -1,249 +1,263 @@
-
-
-
-
-
-
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- SELECT DISTINCT {lesson.*}
- FROM lams_lesson {lesson},
- lams_grouping,
- lams_group,
- lams_user_group,
- lams_learning_design
- WHERE ({lesson}.class_grouping_id = lams_grouping.grouping_id)
- AND (lams_grouping.staff_group_id = lams_group.group_id)
- AND (lams_group.group_id = lams_user_group.group_id)
- AND NOT ({lesson}.lesson_state_id = 7)
- AND (lams_user_group.user_id = :userId)
- AND ({lesson}.learning_design_id = lams_learning_design.learning_design_id)
- AND (lams_learning_design.copy_type_id=2)
-
- UNION
-
- SELECT DISTINCT {lesson.*}
- FROM lams_lesson {lesson}
- WHERE ({lesson}.user_id = :userId)
- AND ({lesson}.class_grouping_id IS NULL)
- AND NOT ({lesson}.lesson_state_id = 7)
-
-
-
-
- SELECT DISTINCT {lesson.*}
- FROM lams_lesson {lesson},
- lams_grouping,
- lams_group,
- lams_user_group,
- lams_learning_design
- WHERE ({lesson}.class_grouping_id = lams_grouping.grouping_id)
- AND (lams_grouping.staff_group_id = lams_group.group_id)
- AND (lams_group.group_id = lams_user_group.group_id)
- AND NOT ({lesson}.lesson_state_id = 7)
- AND (lams_user_group.user_id = :userId)
- AND ({lesson}.learning_design_id = lams_learning_design.learning_design_id)
- AND (lams_learning_design.copy_type_id=2)
- AND ({lesson}.organisation_id = :organisationId)
-
-
-
-
- SELECT DISTINCT {lesson.*}
- FROM lams_lesson {lesson},
- lams_grouping,
- lams_group,
- lams_user_group,
- lams_learning_design
- 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,5))
- AND (lams_user_group.user_id = :userId)
- AND ({lesson}.learning_design_id = lams_learning_design.learning_design_id)
- AND (lams_learning_design.copy_type_id=2)
- AND (lams_group.group_id != lams_grouping.staff_group_id)
- AND ({lesson}.organisation_id = :organisationId)
-
-
-
-
- SELECT DISTINCT {lesson.*}
- FROM lams_lesson {lesson},
- lams_grouping,
- lams_group,
- lams_user_group,
- lams_learning_design
- 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,5))
- AND (lams_user_group.user_id = :userId)
- AND ({lesson}.learning_design_id = lams_learning_design.learning_design_id)
- AND (lams_learning_design.copy_type_id=2)
- AND (lams_group.group_id != lams_grouping.staff_group_id)
-
-
-
-
- SELECT DISTINCT {learner.*}
- FROM lams_user {learner},
- lams_learner_progress
- WHERE ({learner}.user_id = lams_learner_progress.user_id)
- AND (lams_learner_progress.lesson_id = :lessonId)
-
-
-
-
- SELECT DISTINCT {learner.*}
- FROM lams_user {learner},
- lams_learner_progress,
- lams_user_group
- WHERE ({learner}.user_id = lams_learner_progress.user_id)
- AND (lams_learner_progress.lesson_id = :lessonId)
- AND ({learner}.user_id = lams_user_group.user_id)
- AND (lams_user_group.group_id = :groupId)
-
-
-
-
-
-
-
-
- SELECT l.lesson_id, l.name, l.description, l.lesson_state_id, lp.lesson_completed_flag
- FROM (lams_lesson l, lams_learning_design ld, lams_group g, lams_user_group ug, lams_grouping gi)
- LEFT JOIN lams_learner_progress lp ON lp.user_id = ug.user_id AND lp.lesson_id = l.lesson_id
- WHERE l.learning_design_id = ld.learning_design_id
- AND ld.copy_type_id != 3
- AND l.organisation_id = :orgId
- AND l.class_grouping_id = g.grouping_id
- AND l.lesson_state_id != 7
- AND ug.group_id = g.group_id
- AND ug.user_id = :userId
- AND gi.grouping_id = g.grouping_id
- AND g.group_id != gi.staff_group_id
-
-
-
-
-
-
-
-
- SELECT l.lesson_id, l.name, l.description, l.lesson_state_id, lp.lesson_completed_flag
- FROM (lams_lesson l, lams_learning_design ld, lams_group g, lams_user_group ug, lams_grouping gi)
- LEFT JOIN lams_learner_progress lp ON lp.user_id = ug.user_id AND lp.lesson_id = l.lesson_id
- WHERE l.learning_design_id = ld.learning_design_id
- AND ld.copy_type_id != 3
- AND l.organisation_id = :orgId
- AND l.class_grouping_id = g.grouping_id
- AND l.lesson_state_id != 7
- AND ug.group_id = g.group_id
- AND ug.user_id = :userId
- AND gi.grouping_id = g.grouping_id
- AND g.group_id = gi.staff_group_id
-
-
-
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ SELECT DISTINCT {lesson.*}
+ FROM lams_lesson {lesson},
+ lams_grouping,
+ lams_group,
+ lams_user_group,
+ lams_learning_design
+ WHERE ({lesson}.class_grouping_id = lams_grouping.grouping_id)
+ AND (lams_grouping.staff_group_id = lams_group.group_id)
+ AND (lams_group.group_id = lams_user_group.group_id)
+ AND NOT ({lesson}.lesson_state_id = 7)
+ AND (lams_user_group.user_id = :userId)
+ AND ({lesson}.learning_design_id = lams_learning_design.learning_design_id)
+ AND (lams_learning_design.copy_type_id=2)
+
+ UNION
+
+ SELECT DISTINCT {lesson.*}
+ FROM lams_lesson {lesson}
+ WHERE ({lesson}.user_id = :userId)
+ AND ({lesson}.class_grouping_id IS NULL)
+ AND NOT ({lesson}.lesson_state_id = 7)
+
+
+
+
+ SELECT DISTINCT {user.*}
+ FROM lams_lesson,
+ lams_grouping,
+ lams_group,
+ lams_user_group,
+ lams_learning_design,
+ lams_tool_session,
+ lams_user {user}
+ WHERE (lams_lesson.class_grouping_id = lams_grouping.grouping_id)
+ AND (lams_grouping.staff_group_id = lams_group.group_id)
+ AND (lams_group.group_id = lams_user_group.group_id)
+ AND ({user}.user_id = lams_user_group.user_id)
+ AND (lams_tool_session.tool_session_id = :sessionId)
+ AND (lams_tool_session.lesson_id = lams_lesson.lesson_id)
+ AND (lams_lesson.learning_design_id = lams_learning_design.learning_design_id)
+ AND (lams_learning_design.copy_type_id=2)
+
+
+
+
+ SELECT DISTINCT {lesson.*}
+ FROM lams_lesson {lesson},
+ lams_grouping,
+ lams_group,
+ lams_user_group,
+ lams_learning_design
+ WHERE ({lesson}.class_grouping_id = lams_grouping.grouping_id)
+ AND (lams_grouping.staff_group_id = lams_group.group_id)
+ AND (lams_group.group_id = lams_user_group.group_id)
+ AND NOT ({lesson}.lesson_state_id = 7)
+ AND (lams_user_group.user_id = :userId)
+ AND ({lesson}.learning_design_id = lams_learning_design.learning_design_id)
+ AND (lams_learning_design.copy_type_id=2)
+ AND ({lesson}.organisation_id = :organisationId)
+
+
+
+
+ SELECT DISTINCT {lesson.*}
+ FROM lams_lesson {lesson},
+ lams_grouping,
+ lams_group,
+ lams_user_group,
+ lams_learning_design
+ 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,5))
+ AND (lams_user_group.user_id = :userId)
+ AND ({lesson}.learning_design_id = lams_learning_design.learning_design_id)
+ AND (lams_learning_design.copy_type_id=2)
+ AND (lams_group.group_id != lams_grouping.staff_group_id)
+ AND ({lesson}.organisation_id = :organisationId)
+
+
+
+
+ SELECT DISTINCT {lesson.*}
+ FROM lams_lesson {lesson},
+ lams_grouping,
+ lams_group,
+ lams_user_group,
+ lams_learning_design
+ 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,5))
+ AND (lams_user_group.user_id = :userId)
+ AND ({lesson}.learning_design_id = lams_learning_design.learning_design_id)
+ AND (lams_learning_design.copy_type_id=2)
+ AND (lams_group.group_id != lams_grouping.staff_group_id)
+
+
+
+
+ SELECT DISTINCT {learner.*}
+ FROM lams_user {learner},
+ lams_learner_progress
+ WHERE ({learner}.user_id = lams_learner_progress.user_id)
+ AND (lams_learner_progress.lesson_id = :lessonId)
+
+
+
+
+ SELECT DISTINCT {learner.*}
+ FROM lams_user {learner},
+ lams_learner_progress,
+ lams_user_group
+ WHERE ({learner}.user_id = lams_learner_progress.user_id)
+ AND (lams_learner_progress.lesson_id = :lessonId)
+ AND ({learner}.user_id = lams_user_group.user_id)
+ AND (lams_user_group.group_id = :groupId)
+
+
+
+
+
+
+
+
+ SELECT l.lesson_id, l.name, l.description, l.lesson_state_id, lp.lesson_completed_flag
+ FROM (lams_lesson l, lams_learning_design ld, lams_group g, lams_user_group ug, lams_grouping gi)
+ LEFT JOIN lams_learner_progress lp ON lp.user_id = ug.user_id AND lp.lesson_id = l.lesson_id
+ WHERE l.learning_design_id = ld.learning_design_id
+ AND ld.copy_type_id != 3
+ AND l.organisation_id = :orgId
+ AND l.class_grouping_id = g.grouping_id
+ AND l.lesson_state_id != 7
+ AND ug.group_id = g.group_id
+ AND ug.user_id = :userId
+ AND gi.grouping_id = g.grouping_id
+ AND g.group_id != gi.staff_group_id
+
+
+
+
+
+
+
+
+ SELECT l.lesson_id, l.name, l.description, l.lesson_state_id, lp.lesson_completed_flag
+ FROM (lams_lesson l, lams_learning_design ld, lams_group g, lams_user_group ug, lams_grouping gi)
+ LEFT JOIN lams_learner_progress lp ON lp.user_id = ug.user_id AND lp.lesson_id = l.lesson_id
+ WHERE l.learning_design_id = ld.learning_design_id
+ AND ld.copy_type_id != 3
+ AND l.organisation_id = :orgId
+ AND l.class_grouping_id = g.grouping_id
+ AND l.lesson_state_id != 7
+ AND ug.group_id = g.group_id
+ AND ug.user_id = :userId
+ AND gi.grouping_id = g.grouping_id
+ AND g.group_id = gi.staff_group_id
+
+
+