Index: lams_common/db/sql/insert_test_data.sql =================================================================== diff -u -r420ed5200c4cb6d9d220368cad111324e7984646 -r85b8cf34fb47be6c60cfec9fd59e65939b7938c3 --- lams_common/db/sql/insert_test_data.sql (.../insert_test_data.sql) (revision 420ed5200c4cb6d9d220368cad111324e7984646) +++ lams_common/db/sql/insert_test_data.sql (.../insert_test_data.sql) (revision 85b8cf34fb47be6c60cfec9fd59e65939b7938c3) @@ -130,6 +130,13 @@ insert into lams_tool_content (tool_content_id,tool_id) values (17,6); insert into lams_tool_content (tool_content_id,tool_id) values (18,7); insert into lams_tool_content (tool_content_id,tool_id) values (19,8); + +--insert a testing grouping +insert into lams_grouping values(100,100,2,1,10,0,2); + +insert into lams_group values(88,100,1); + +insert into lams_user_group values(2,88); -- 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 @@ -364,7 +371,7 @@ gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image) values (19,5,'Message Board Activity','Message Board',10,20,13, -1,null,1,0, +1,100,1,0, 1,5,'20050101','Tool Activity Offline Instructions ', null,null,5,16, null,null,null,'image'); @@ -447,8 +454,6 @@ (1,'Test Learning Design','Test Learning Design title',15,1,1,0,1, 'Help Text',1,'20041223','1.0',null,1); -insert into lams_grouping values(100,100,2,1,10,0,2); - -insert into lams_group values(88,100,1); + SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java =================================================================== diff -u -rd6e24451f694815d6138e6189fa8ba2294ee6944 -r85b8cf34fb47be6c60cfec9fd59e65939b7938c3 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision d6e24451f694815d6138e6189fa8ba2294ee6944) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 85b8cf34fb47be6c60cfec9fd59e65939b7938c3) @@ -9,7 +9,6 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -import org.lamsfoundation.lams.lesson.LessonClass; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.util.Nullable; @@ -460,11 +459,18 @@ } + /** + * Return the group information for the requested user when he is running + * current activity instance. + * @param learner the requested user + * @return the group that this user belongs to. + */ public Group getGroupFor(User learner) { if(this.getGrouping()==null) throw new IllegalArgumentException("Exception occured in " + "getGroupFor, no grouping has been defined"); + for(Iterator i=this.getGrouping().getGroups().iterator();i.hasNext();) { Group group = (Group)i.next(); Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestActivity.java =================================================================== diff -u -r18704961d531a547a8a96928980c43a3bf169fd2 -r85b8cf34fb47be6c60cfec9fd59e65939b7938c3 --- lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestActivity.java (.../TestActivity.java) (revision 18704961d531a547a8a96928980c43a3bf169fd2) +++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestActivity.java (.../TestActivity.java) (revision 85b8cf34fb47be6c60cfec9fd59e65939b7938c3) @@ -27,6 +27,9 @@ private static final Long TEST_SEQUENCE_ACTIVITY=new Long(14); private static final Long TEST_SURVEY_ACTIVITY = new Long(20); + + private static final Long TEST_USER_ID = new Long(2); + /* * @see AbstractLamsTestCase#setUp() */ @@ -71,6 +74,11 @@ assertEquals("verify the number tool activity we should get",1,toolActivities.size()); } + + public void testGetGroupForUser() + { + + } /** * @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation() */