Index: lams_common/db/sql/insert_test_data.sql =================================================================== diff -u -ra11b7a26aaf7bc8c21c41c63d120a9d9f173dda1 -raf2133eea2be056c211a5c29d6f68a3d8595a513 --- lams_common/db/sql/insert_test_data.sql (.../insert_test_data.sql) (revision a11b7a26aaf7bc8c21c41c63d120a9d9f173dda1) +++ lams_common/db/sql/insert_test_data.sql (.../insert_test_data.sql) (revision af2133eea2be056c211a5c29d6f68a3d8595a513) @@ -136,13 +136,20 @@ --insert a testing grouping insert into lams_grouping values(99,99,1,1,10,0,2); insert into lams_grouping values(100,100,2,1,10,0,2); +INSERT INTO lams_grouping values(101, NULL, 3, NULL, NULL, 89, NULL); insert into lams_group values(87,99,1); insert into lams_group values(88,100,1); +insert into lams_group values(89, 101, 1); +insert into lams_group values(90, 101, 1); insert into lams_user_group values(1,87); insert into lams_user_group values(2,88); +insert into lams_user_group values(2, 90); +insert into lams_user_group values(3, 89); +insert into lams_lesson values (1, 1, 1, '2005-02-23 17:37:25', 1, 3, NULL, NULL, 101); + -- Populates the lams_learning_activity table with default activity templates that would be avaialbe to the -- author in the left panel and a default dummy learning_design defination Index: lams_common/src/java/org/lamsfoundation/lams/tool/GroupedToolSession.java =================================================================== diff -u -r420ed5200c4cb6d9d220368cad111324e7984646 -raf2133eea2be056c211a5c29d6f68a3d8595a513 --- lams_common/src/java/org/lamsfoundation/lams/tool/GroupedToolSession.java (.../GroupedToolSession.java) (revision 420ed5200c4cb6d9d220368cad111324e7984646) +++ lams_common/src/java/org/lamsfoundation/lams/tool/GroupedToolSession.java (.../GroupedToolSession.java) (revision af2133eea2be056c211a5c29d6f68a3d8595a513) @@ -5,6 +5,7 @@ import org.lamsfoundation.lams.learningdesign.Group; import org.lamsfoundation.lams.learningdesign.ToolActivity; +import org.lamsfoundation.lams.lesson.Lesson; /** @@ -32,9 +33,10 @@ public GroupedToolSession(ToolActivity toolActivity, Date createDateTime, int toolSessionStateId, - Group group) + Group group, + Lesson lesson) { - super(null,toolActivity,createDateTime,toolSessionStateId); + super(null,toolActivity,createDateTime,toolSessionStateId,lesson); super.setUniqueKey(UNIQUE_KEY_PREFIX +toolActivity.getActivityId().toString() +group.getGroupId().toString()); Index: lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java =================================================================== diff -u -r2eeeb7da6fd05405ea0bdd511270423401536fa9 -raf2133eea2be056c211a5c29d6f68a3d8595a513 --- lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java (.../NonGroupedToolSession.java) (revision 2eeeb7da6fd05405ea0bdd511270423401536fa9) +++ lams_common/src/java/org/lamsfoundation/lams/tool/NonGroupedToolSession.java (.../NonGroupedToolSession.java) (revision af2133eea2be056c211a5c29d6f68a3d8595a513) @@ -9,6 +9,7 @@ import java.util.Date; import org.lamsfoundation.lams.learningdesign.ToolActivity; +import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.usermanagement.User; /** @@ -25,9 +26,10 @@ public NonGroupedToolSession(ToolActivity toolActivity, Date createDateTime, int toolSessionStateId, - User user) + User user, + Lesson lesson) { - super(null,toolActivity,createDateTime,toolSessionStateId); + super(null,toolActivity,createDateTime,toolSessionStateId,lesson); super.setUniqueKey(UNIQUE_KEY_PREFIX +toolActivity.getActivityId().toString() +user.getUserId().toString()); Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java =================================================================== diff -u -r2cd1d3a2b6688ab50b279a868648d7bf5c4c0b1c -raf2133eea2be056c211a5c29d6f68a3d8595a513 --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java (.../ToolSession.java) (revision 2cd1d3a2b6688ab50b279a868648d7bf5c4c0b1c) +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java (.../ToolSession.java) (revision af2133eea2be056c211a5c29d6f68a3d8595a513) @@ -48,11 +48,13 @@ public ToolSession(Long toolSessionId, ToolActivity toolActivity, Date createDateTime, - int toolSessionStateId) { + int toolSessionStateId, + Lesson lesson) { this.toolSessionId = toolSessionId; this.toolActivity = toolActivity; this.createDateTime = createDateTime; this.toolSessionStateId = toolSessionStateId; + this.lesson = lesson; } /** default constructor */ Index: lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java =================================================================== diff -u -r420ed5200c4cb6d9d220368cad111324e7984646 -raf2133eea2be056c211a5c29d6f68a3d8595a513 --- lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java (.../ToolDataAccessTestCase.java) (revision 420ed5200c4cb6d9d220368cad111324e7984646) +++ lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java (.../ToolDataAccessTestCase.java) (revision af2133eea2be056c211a5c29d6f68a3d8595a513) @@ -18,6 +18,9 @@ import org.lamsfoundation.lams.learningdesign.dao.IGroupDAO; import org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO; import org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupDAO; +import org.lamsfoundation.lams.lesson.Lesson; +import org.lamsfoundation.lams.lesson.dao.ILessonDAO; +import org.lamsfoundation.lams.lesson.dao.hibernate.LessonDAO; import org.lamsfoundation.lams.tool.dao.IToolContentDAO; @@ -46,7 +49,8 @@ protected IUserDAO userDao; protected IActivityDAO activityDAO; protected IGroupDAO groupDao; - + protected ILessonDAO lessonDao; + //Test tool id - survey tool protected final Long TEST_TOOL_ID = new Long(6); protected Tool testTool; @@ -56,11 +60,13 @@ protected Group testGroup; protected ToolActivity testNonGroupedActivity; protected ToolActivity testGroupedActivity; + protected Lesson testLesson; private final static Integer TEST_USER_ID = new Integer(1); private final static Long TEST_NON_GROUP_ACTIVITY_ID = new Long(20); private static final Long TEST_GROUPED_ACTIVITY_ID = new Long(19); private static final Long TEST_GROUP_ID = new Long(88); + private static final Long TEST_LESSON_ID = new Long(1); /* * @see AbstractLamsCommonTestCase#setUp() @@ -76,11 +82,14 @@ userDao = (UserDAO) this.context.getBean("userDAO"); groupDao = (GroupDAO)this.context.getBean("groupDAO"); + lessonDao = (LessonDAO)this.context.getBean("lessonDAO"); + //retrieve test domain data testUser = userDao.getUserById(TEST_USER_ID); testNonGroupedActivity = (ToolActivity)activityDAO.getActivityByActivityId(TEST_NON_GROUP_ACTIVITY_ID); testGroupedActivity = (ToolActivity)activityDAO.getActivityByActivityId(TEST_GROUPED_ACTIVITY_ID); testGroup = (Group)groupDao.getGroupById(TEST_GROUP_ID); + testLesson = lessonDao.getLesson(TEST_LESSON_ID); } /* @@ -104,7 +113,8 @@ */ protected String[] getContextConfigLocation() { - return new String[] { "/org/lamsfoundation/lams/tool/toolApplicationContext.xml", + return new String[] { "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml", + "/org/lamsfoundation/lams/tool/toolApplicationContext.xml", "/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml", "applicationContext.xml"}; } @@ -120,7 +130,8 @@ return new NonGroupedToolSession(testNonGroupedActivity, new Date(System.currentTimeMillis()), ToolSession.STARTED_STATE, - testUser); + testUser, + testLesson); } @@ -129,7 +140,8 @@ return new GroupedToolSession(testGroupedActivity, new Date(System.currentTimeMillis()), ToolSession.STARTED_STATE, - testGroup); + testGroup, + testLesson); } } Index: lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolSessionDAO.java =================================================================== diff -u -r420ed5200c4cb6d9d220368cad111324e7984646 -raf2133eea2be056c211a5c29d6f68a3d8595a513 --- lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolSessionDAO.java (.../TestToolSessionDAO.java) (revision 420ed5200c4cb6d9d220368cad111324e7984646) +++ lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolSessionDAO.java (.../TestToolSessionDAO.java) (revision af2133eea2be056c211a5c29d6f68a3d8595a513) @@ -85,6 +85,4 @@ toolSessionDao.saveToolSession(this.ngToolSession); } - - }