Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r75bae9f675cec296dd7e79715454b0c09b593c21 -r898ec561f901223f8091a00d6891d027fbd95f9a Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r75bae9f675cec296dd7e79715454b0c09b593c21 -r898ec561f901223f8091a00d6891d027fbd95f9a Binary files differ Index: lams_flash/src/central/flash/lams_authoring.fla =================================================================== diff -u -r75bae9f675cec296dd7e79715454b0c09b593c21 -r898ec561f901223f8091a00d6891d027fbd95f9a Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as =================================================================== diff -u -r7b65bab3de4ed5068c5631a245c30cb4eaa8f098 -r898ec561f901223f8091a00d6891d027fbd95f9a --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as (.../Grouping.as) (revision 7b65bab3de4ed5068c5631a245c30cb4eaa8f098) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as (.../Grouping.as) (revision 898ec561f901223f8091a00d6891d027fbd95f9a) @@ -40,6 +40,7 @@ public static var LEARNER_CHOICE_GROUPING:Number = 4; private var _equalGroupSizes:Boolean; + private var _viewStudentsBeforeSelection:Boolean; private var _groupingID:Number; private var _groupingUIID:Number; @@ -88,6 +89,7 @@ _maxNumberOfGroups = dto.maxNumberOfGroups; _learnersPerGroups = dto.learnersPerGroup; _equalGroupSizes = dto.equalNumberOfLearnersPerGroup; + _viewStudentsBeforeSelection = dto.viewStudentsBeforeSelection; populateGroups(dto.groups); } @@ -131,6 +133,7 @@ dto.numberOfGroups = (_numberOfGroups > 0) ? _numberOfGroups : Config.NUMERIC_NULL_VALUE; dto.maxNumberOfGroups = (_maxNumberOfGroups > 0) ? _maxNumberOfGroups : Config.NUMERIC_NULL_VALUE; dto.equalNumberOfLearnersPerGroup = (_equalGroupSizes != null && _equalGroupSizes != undefined) ? equalGroupSizes : Config.BOOLEAN_NULL_VALUE; + dto.viewStudentsBeforeSelection = (_viewStudentsBeforeSelection != null && _viewStudentsBeforeSelection != undefined) ? viewStudentsBeforeSelection : Config.BOOLEAN_NULL_VALUE; dto.learnersPerGroup = (_learnersPerGroups > 0) ? _learnersPerGroups : Config.NUMERIC_NULL_VALUE; dto.groups = new Array(); @@ -295,8 +298,25 @@ /** * * @usage + * @param vsbs true if learners can see who's in what group before they pick theirs * @return */ + public function set viewStudentsBeforeSelection (vsbs:Boolean):Void { + _viewStudentsBeforeSelection = vsbs; + } + /** + * + * @usage + * @return + */ + public function get viewStudentsBeforeSelection ():Boolean { + return _viewStudentsBeforeSelection; + } + /** + * + * @usage + * @return + */ public function get equalGroupSizes ():Boolean { return _equalGroupSizes; } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as =================================================================== diff -u -r75bae9f675cec296dd7e79715454b0c09b593c21 -r898ec561f901223f8091a00d6891d027fbd95f9a --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as (.../PropertyInspector.as) (revision 75bae9f675cec296dd7e79715454b0c09b593c21) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as (.../PropertyInspector.as) (revision 898ec561f901223f8091a00d6891d027fbd95f9a) @@ -128,6 +128,7 @@ numRandomGroups_stp.addEventListener("focusOut", Delegate.create(this, updateGroupingMethodData)); equalGroupSizes_chk.addEventListener("click", Delegate.create(this, updateGroupingMethodData)); + preview_student_groups_chk.addEventListener("click", Delegate.create(this, updateGroupingMethodData)); _group_match_btn.addEventListener("click", Delegate.create(this, onGroupMatchClick)); _group_naming_btn.addEventListener("click", Delegate.create(this, onGroupNamingClick)); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as =================================================================== diff -u -r75bae9f675cec296dd7e79715454b0c09b593c21 -r898ec561f901223f8091a00d6891d027fbd95f9a --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 75bae9f675cec296dd7e79715454b0c09b593c21) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 898ec561f901223f8091a00d6891d027fbd95f9a) @@ -127,8 +127,9 @@ private var rndGroup_radio:RadioButtonGroup; private var numGroups_stp:NumericStepper; private var numRandomGroups_stp:NumericStepper; - private var numLearners_stp:NumericStepper; - + private var numLearners_stp:NumericStepper; + private var preview_student_groups_lbl:Label; + private var preview_student_groups_chk:CheckBox; private var equalGroupSizes_chk:CheckBox; private var _group_naming_btn:Button; @@ -515,6 +516,8 @@ }else{ numGroups_lbl.visible = v; numLearners_lbl.visible = v; + preview_student_groups_lbl.visible = v; + preview_student_groups_chk.visible = v; equalGroupSizes_lbl.visible = v; equalGroupSizes_chk.visible = v; numGroups_rdo.visible = v; @@ -537,6 +540,8 @@ if(g.groupingTypeID == Grouping.CHOSEN_GROUPING){ numGroups_lbl.visible = true; numLearners_lbl.visible = false; + preview_student_groups_lbl.visible = false; + preview_student_groups_chk.visible = false; equalGroupSizes_lbl.visible = false; equalGroupSizes_chk.visible = false; numGroups_stp.visible = true; @@ -555,6 +560,8 @@ else if(g.groupingTypeID == Grouping.LEARNER_CHOICE_GROUPING){ numGroups_lbl.visible = true; numLearners_lbl.visible = true; + preview_student_groups_lbl.visible = true; + preview_student_groups_chk.visible = true; equalGroupSizes_lbl.visible = true; equalGroupSizes_chk.visible = true; numRandomGroups_stp.visible = false; @@ -571,6 +578,7 @@ equalGroupSizes_lbl.enabled = e; numLearners_rdo.enabled = e; numGroups_rdo.enabled = e; + preview_student_groups_chk.enabled = e; equalGroupSizes_chk.enabled = e; _group_naming_btn.enabled = e; @@ -582,6 +590,8 @@ else if(g.groupingTypeID == Grouping.RANDOM_GROUPING) { numGroups_lbl.visible = true; numLearners_lbl.visible = true; + preview_student_groups_lbl.visible = false; + preview_student_groups_chk.visible = false; equalGroupSizes_lbl.visible = false; equalGroupSizes_chk.visible = false; numGroups_stp.visible = false; @@ -695,6 +705,9 @@ if (g.groupingTypeID == Grouping.LEARNER_CHOICE_GROUPING) { equalGroupSizes_chk.enabled = (e != null) ? e : true; + preview_student_groups_chk.enabled = (e != null) ? e : true; + preview_student_groups_lbl.visible = true; + preview_student_groups_chk.visible = true; equalGroupSizes_lbl.visible = true; equalGroupSizes_chk.visible = true; } @@ -722,6 +735,8 @@ _group_naming_btn.visible = false; if (g.groupingTypeID == Grouping.LEARNER_CHOICE_GROUPING) { + preview_student_groups_lbl.visible = true; + preview_student_groups_chk.visible = true; equalGroupSizes_lbl.visible = true; equalGroupSizes_chk.visible = true; } @@ -758,7 +773,8 @@ numGroups_stp.value = (g.numberOfGroups != null) ? g.numberOfGroups : 0; numLearners_stp.value = (g.learnersPerGroups != null) ? g.learnersPerGroups : 0; - equalGroupSizes_chk.selected = (g.equalGroupSizes != null) ? g.equalGroupSizes : false; + 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 : 0; @@ -798,6 +814,7 @@ g.numberOfGroups = numGroups_stp.value; g.maxNumberOfGroups = 0; g.equalGroupSizes = equalGroupSizes_chk.selected; + g.viewStudentsBeforeSelection = preview_student_groups_chk.selected; }else{ g.maxNumberOfGroups = numGroups_stp.value; @@ -891,12 +908,14 @@ hoursEnd_lbl.setStyle('styleName', styleObj); minsEnd_lbl.setStyle('styleName', styleObj); numGroups_lbl.setStyle('styleName', styleObj); + preview_student_groups_lbl.setStyle('styleName', styleObj); equalGroupSizes_lbl.setStyle('styleName', styleObj); numLearners_lbl.setStyle('styleName', styleObj); groupType_lbl.setStyle('styleName', styleObj); applied_grouping_lbl.setStyle('styleName', styleObj); title_txt.setStyle('styleName', styleObj); desc_txt.setStyle('styleName', styleObj); + preview_student_groups_chk.setStyle('styleName', styleObj); runOffline_chk.setStyle('styleName', styleObj); defineLater_chk.setStyle('styleName', styleObj); days_stp.setStyle('styleName', styleObj); @@ -1385,30 +1404,6 @@ evt.target.scrollContent.loadLists(); } - /** - * @depricated - * - * @usage - * @param branches - * @return - * - private function getValidBranches(branches:Array):Array { - Debugger.log("validating br len: " + branches.length, Debugger.CRITICAL, "getvalidbranches", "PIC*"); - - for(var i=0; i < branches.length; i++) { - Debugger.log("validating br: " + branches[i].sequenceActivity.title, Debugger.CRITICAL, "getvalidbranches", "PIC*"); - Debugger.log("validating br dir: " + branches[i].direction, Debugger.CRITICAL, "getvalidbranches", "PIC*"); - - if(branches[i].direction != BranchConnector.DIR_FROM_START && branches[i].direction != BranchConnector.DIR_SINGLE) { - branches.splice(i, 1); - i=i-1; - } - } - - return branches; - } - */ - private function getValidSequences(seqs:Array):Array { for(var i=0; i < seqs.length; i++) { var sequence:SequenceActivity = SequenceActivity(seqs[i]);