Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -rd0f3c4123c6fe0c3b59887be6f7a56e25c002cef -r0c35a9cd829778237177b85b8174e55e5e17d060 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r94e6298fe17c7a68fc67026081f2b5d87fe16d19 -r0c35a9cd829778237177b85b8174e55e5e17d060 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as =================================================================== diff -u -r94e6298fe17c7a68fc67026081f2b5d87fe16d19 -r0c35a9cd829778237177b85b8174e55e5e17d060 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as (.../Grouping.as) (revision 94e6298fe17c7a68fc67026081f2b5d87fe16d19) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as (.../Grouping.as) (revision 0c35a9cd829778237177b85b8174e55e5e17d060) @@ -39,6 +39,9 @@ public static var CHOSEN_GROUPING:Number = 2; //TeacherChosen public static var LEARNER_CHOICE_GROUPING:Number = 4; + public static var MINIMUM_NUMBER_OF_GROUPS = 2; + public static var MINIMUM_NUMBER_OF_LEARNERS = 1; + private var _equalGroupSizes:Boolean; private var _viewStudentsBeforeSelection:Boolean; Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as =================================================================== diff -u -rf1269ae0a26dba294ec02a457561b0b63447565e -r0c35a9cd829778237177b85b8174e55e5e17d060 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision f1269ae0a26dba294ec02a457561b0b63447565e) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as (.../CanvasModel.as) (revision 0c35a9cd829778237177b85b8174e55e5e17d060) @@ -229,6 +229,7 @@ //first create the grouping object var newGrouping = new Grouping(_cv.ddm.newUIID()); newGrouping.groupingTypeID = _defaultGroupingTypeID; + newGrouping.numberOfGroups = Grouping.MINIMUM_NUMBER_OF_GROUPS; // set defualt number of groups _cv.ddm.addGrouping(newGrouping); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as =================================================================== diff -u -r94e6298fe17c7a68fc67026081f2b5d87fe16d19 -r0c35a9cd829778237177b85b8174e55e5e17d060 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 94e6298fe17c7a68fc67026081f2b5d87fe16d19) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 0c35a9cd829778237177b85b8174e55e5e17d060) @@ -675,8 +675,8 @@ var g:Grouping = _canvasModel.getCanvas().ddm.getGroupingByUIID(_canvasModel.selectedItem.activity.createGroupingUIID); if(groupingBy == 'num_learners'){ - numRandomGroups_stp.value = 2; - numGroups_stp.value = 2; + numRandomGroups_stp.value = Grouping.MINIMUM_NUMBER_OF_GROUPS; + numGroups_stp.value = Grouping.MINIMUM_NUMBER_OF_GROUPS; equalGroupSizes_chk.selected = false; numRandomGroups_stp.enabled = false; @@ -685,7 +685,7 @@ _group_naming_btn.visible = false; }else{ - numLearners_stp.value = 1; + numLearners_stp.value = Grouping.MINIMUM_NUMBER_OF_LEARNERS; numRandomGroups_stp.enabled = (e != null) ? e : true; numGroups_stp.enabled = (e != null) ? e : true; @@ -769,18 +769,18 @@ if(g.groupingTypeID == groupType_cmb.dataProvider[i].data) groupType_cmb.selectedIndex=i; if(g.groupingTypeID == Grouping.RANDOM_GROUPING) { - numLearners_stp.value = (g.learnersPerGroups != null) ? g.learnersPerGroups : 1;//0; - numRandomGroups_stp.value = (g.numberOfGroups != null) ? g.numberOfGroups : 2;//0; + numLearners_stp.value = (g.learnersPerGroups != null) ? g.learnersPerGroups : Grouping.MINIMUM_NUMBER_OF_LEARNERS; + numRandomGroups_stp.value = (g.numberOfGroups != null) ? g.numberOfGroups : Grouping.MINIMUM_NUMBER_OF_GROUPS; } else if (g.groupingTypeID == Grouping.LEARNER_CHOICE_GROUPING) { - numGroups_stp.value = (g.numberOfGroups != null) ? g.numberOfGroups : 2;//0; - numLearners_stp.value = (g.learnersPerGroups != null) ? g.learnersPerGroups : 1;//0; + numGroups_stp.value = (g.numberOfGroups != null) ? g.numberOfGroups : Grouping.MINIMUM_NUMBER_OF_GROUPS; + numLearners_stp.value = (g.learnersPerGroups != null) ? g.learnersPerGroups : Grouping.MINIMUM_NUMBER_OF_LEARNERS; equalGroupSizes_chk.selected = (g.equalGroupSizes != null && g.equalGroupSizes != undefined) ? g.equalGroupSizes : false; preview_student_groups_chk.selected = (g.viewStudentsBeforeSelection != null && g.viewStudentsBeforeSelection != undefined) ? g.viewStudentsBeforeSelection : false; } else { // Teacher Chosen Grouping - numGroups_stp.value = (g.maxNumberOfGroups != null) ? g.maxNumberOfGroups : 2;//0; + numGroups_stp.value = (g.maxNumberOfGroups != null) ? g.maxNumberOfGroups : Grouping.MINIMUM_NUMBER_OF_GROUPS; } }