Index: lams_flex/LamsAuthor/src/assets/languages/dictionary.xml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/assets/languages/dictionary.xml,v diff -u -r1.5 -r1.6 --- lams_flex/LamsAuthor/src/assets/languages/dictionary.xml 3 Feb 2010 04:04:40 -0000 1.5 +++ lams_flex/LamsAuthor/src/assets/languages/dictionary.xml 3 Feb 2010 05:23:50 -0000 1.6 @@ -149,6 +149,7 @@ You are not allowed to have a circular sequence + Properties @@ -159,5 +160,40 @@ Optional Activity + + Grouping + + + Number of groups + + + Number of learners + + + + Grouping - Random + + + Grouping - Choose in monitor + + + Grouping - Learner's Choice + + + Click on a name to change its value. + + + Group Naming + + + Name Groups + + + View learners before selection? + + + Equal group sizes + + \ No newline at end of file Index: lams_flex/LamsAuthor/src/assets/languages/en_AU.xml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/assets/languages/en_AU.xml,v diff -u -r1.4 -r1.5 --- lams_flex/LamsAuthor/src/assets/languages/en_AU.xml 3 Feb 2010 04:04:40 -0000 1.4 +++ lams_flex/LamsAuthor/src/assets/languages/en_AU.xml 3 Feb 2010 05:23:50 -0000 1.5 @@ -185,6 +185,15 @@ Group Naming + + Name Groups + + + View learners before selection? + + + Equal group sizes + \ No newline at end of file Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml,v diff -u -r1.3 -r1.4 --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml 3 Feb 2010 04:04:40 -0000 1.3 +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml 3 Feb 2010 05:23:50 -0000 1.4 @@ -13,6 +13,8 @@ - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml,v diff -u -r1.12 -r1.13 --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml 3 Feb 2010 04:04:39 -0000 1.12 +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml 3 Feb 2010 05:23:49 -0000 1.13 @@ -242,10 +242,6 @@ } } - // A method to be overidden by child activity components - public function getPropetyInspectorView():UIComponent { - return null; - } ]]> Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/LearnerGroupActivityComponent.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/LearnerGroupActivityComponent.mxml,v diff -u -r1.1 -r1.2 --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/LearnerGroupActivityComponent.mxml 3 Feb 2010 04:04:40 -0000 1.1 +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/LearnerGroupActivityComponent.mxml 3 Feb 2010 05:23:50 -0000 1.2 @@ -2,7 +2,20 @@ Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/NameGroupsWindow.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/NameGroupsWindow.mxml,v diff -u -r1.1 -r1.2 --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/NameGroupsWindow.mxml 3 Feb 2010 04:04:40 -0000 1.1 +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/NameGroupsWindow.mxml 3 Feb 2010 05:23:50 -0000 1.2 @@ -9,6 +9,11 @@ - + Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/RandomGroupActivityComponent.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/RandomGroupActivityComponent.mxml,v diff -u -r1.1 -r1.2 --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/RandomGroupActivityComponent.mxml 3 Feb 2010 04:04:40 -0000 1.1 +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/RandomGroupActivityComponent.mxml 3 Feb 2010 05:23:50 -0000 1.2 @@ -3,21 +3,15 @@ - - - - - - Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as =================================================================== RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as,v diff -u -r1.11 -r1.12 --- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as 3 Feb 2010 04:04:40 -0000 1.11 +++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as 3 Feb 2010 05:23:50 -0000 1.12 @@ -142,7 +142,7 @@ monitorGroup.load(); monitorGroup.selectActivity(); break; - case Constants.SYSTEM_ACTIVITY_TYPE_GROUP_RANDOM: + case Constants.SYSTEM_ACTIVITY_TYPE_GROUP_LEARNER: var learnerGroup:GroupActivityComponent = new LearnerGroupActivityComponent(); learnerGroup.x = currentMousePoint.x; learnerGroup.y = currentMousePoint.y;