Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -r0267a9238f122504943b400c11ca0fa751698aba -r8e4fc8d67f4733b5b989e9baf079daa75832193d Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -r0267a9238f122504943b400c11ca0fa751698aba -r8e4fc8d67f4733b5b989e9baf079daa75832193d Binary files differ Index: lams_flash/src/central/flash/lams_authoring.fla =================================================================== diff -u -rc09edcc3e54b8a8324169e0877b057b3abb8b483 -r8e4fc8d67f4733b5b989e9baf079daa75832193d Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as =================================================================== diff -u -r0267a9238f122504943b400c11ca0fa751698aba -r8e4fc8d67f4733b5b989e9baf079daa75832193d --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as (.../GroupMatchingDialog.as) (revision 0267a9238f122504943b400c11ca0fa751698aba) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as (.../GroupMatchingDialog.as) (revision 8e4fc8d67f4733b5b989e9baf079daa75832193d) @@ -142,6 +142,7 @@ public function loadLists() { Debugger.log("Loading Lists: branch length: " + _branches.length, Debugger.CRITICAL, "loadLists", "GroupMatchingDialog"); + Debugger.log("Loading Lists: branching act: " + _branchingActivity.activityUIID, Debugger.CRITICAL, "loadLists", "GroupMatchingDialog"); groups_lst.dataProvider = _groups; groups_lst.sortItemsBy("groupUIID", Array.NUMERIC); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as =================================================================== diff -u -r0267a9238f122504943b400c11ca0fa751698aba -r8e4fc8d67f4733b5b989e9baf079daa75832193d --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 0267a9238f122504943b400c11ca0fa751698aba) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 8e4fc8d67f4733b5b989e9baf079daa75832193d) @@ -240,7 +240,6 @@ maxAct_stp.tabIndex = 404 //Gate Activities - //gateType_cmb.enabled = true gateType_cmb.tabIndex = 402 days_stp.tabIndex = 403 hours_stp.tabIndex = 404 @@ -292,7 +291,6 @@ } } - private function showGeneralInfo(v:Boolean, e:Boolean){ total_num_activities_lbl.visible = v; total_num_activities_lbl.enabled = (e != null) ? e : true; @@ -329,7 +327,6 @@ grouping_lbl.visible = false; - } private function showGateControls(v:Boolean, e:Boolean){ @@ -366,7 +363,13 @@ branchType_lbl.visible = v; branchType_cmb.visible = v; - if(_group_match_btn.visible && !v) _group_match_btn.visible = v; + if(_group_match_btn.visible && !v) _group_match_btn.visible = v; + + if(_canvasModel.selectedItem.activity.groupingUIID != null) { + var grouping:Grouping = _canvasModel.getCanvas().ddm.getGroupingByUIID(_canvasModel.selectedItem.activity.groupingUIID); + + _group_match_btn.visible = (grouping.numberOfGroups > 0 || grouping.maxNumberOfGroups > 0) ? v : false; + } if(e != null) { branchType_lbl.enabled = e; @@ -432,7 +435,8 @@ private function showRelevantGroupOptions(e:Boolean){ var ga = _canvasModel.selectedItem.activity; - var g = _canvasModel.getCanvas().ddm.getGroupingByUIID(ga.createGroupingUIID); + var g = _canvasModel.getCanvas().ddm.getGroupingByUIID(ga.createGroupingUIID); + Debugger.log('g.groupingTypeID:'+g.groupingTypeID,Debugger.GEN,'showRelevantGroupOptions','org.lamsfoundation.lams.common.cv.PropertyInspector'); Debugger.log('Grouping.CHOSEN_GROUPING:'+Grouping.CHOSEN_GROUPING,Debugger.GEN,'showRelevantGroupOptions','org.lamsfoundation.lams.common.cv.PropertyInspector'); Debugger.log('Grouping.RANDOM_GROUPING:'+Grouping.RANDOM_GROUPING,Debugger.GEN,'showRelevantGroupOptions','org.lamsfoundation.lams.common.cv.PropertyInspector'); @@ -453,7 +457,7 @@ _group_naming_btn.enabled = e; } - }else if(g.groupingTypeID == Grouping.RANDOM_GROUPING){ + } else if(g.groupingTypeID == Grouping.RANDOM_GROUPING) { numGroups_lbl.visible = true; numLearners_lbl.visible = true; numGroups_stp.visible = false; @@ -476,25 +480,21 @@ _group_naming_btn.enabled = e; } - checkEnableGroupsOptions(e); }else{ //error dont understand the grouping type } - } private function reDrawTroublesomeSteppers(e:Boolean){ numLearners_stp.visible = true; numRandomGroups_stp.visible = true; - - } private function checkEnableGateControls(e:Boolean){ - if(_canvasModel.selectedItem.activity.activityTypeID == Activity.SCHEDULE_GATE_ACTIVITY_TYPE){ + if(_canvasModel.selectedItem.activity.activityTypeID == Activity.SCHEDULE_GATE_ACTIVITY_TYPE) { if(e != null) { days_stp.enabled = e; hours_stp.enabled = e; @@ -509,9 +509,7 @@ endMins_stp.enabled = true; } - } - /**/ - else{ + } else { days_stp.enabled = false; hours_stp.enabled = false; mins_stp.enabled = false; @@ -537,16 +535,22 @@ var groupingBy = rndGroup_radio.selection.data; Debugger.log('groupingBy:'+groupingBy,Debugger.GEN,'checkEnableGroupsOptions','PropertyInspector'); + var g:Grouping = _canvasModel.getCanvas().ddm.getGroupingByUIID(_canvasModel.selectedItem.activity.createGroupingUIID); if(groupingBy == 'num_learners'){ - numRandomGroups_stp.value = 0; - numRandomGroups_stp.enabled = false; + numRandomGroups_stp.value = 0; + g.numberOfGroups = 0; + + numRandomGroups_stp.enabled = false; + numLearners_stp.enabled = (e != null) ? e :true; _group_naming_btn.enabled = false; }else{ numRandomGroups_stp.enabled = (e != null) ? e : true; - numLearners_stp.value = 0; + numLearners_stp.value = 0; + g.learnersPerGroups = 0; + numLearners_stp.enabled = false; _group_naming_btn.enabled = (e != null) ? e : true; @@ -619,8 +623,17 @@ g.learnersPerGroups = numLearners_stp.value; g.numberOfGroups = numRandomGroups_stp.value; + numGroups_stp.value = 0; + g.maxNumberOfGroups = 0; }else{ g.maxNumberOfGroups = numGroups_stp.value; + + numRandomGroups_stp.value = 0; + numLearners_stp.value = 0; + g.learnersPerGroups = 0; + g.numberOfGroups = 0; + + _group_naming_btn.enabled = true; } setModified(); @@ -689,7 +702,6 @@ * @return */ private function setStyles() { - // Debugger.log('Button stykle obejct',Debugger.GEN,'setStyles','PropertyInspector'); var styleObj = _tm.getStyleObject('button'); editGrouping_btn.setStyle('styleName',styleObj); _group_match_btn.setStyle('styleName',styleObj); @@ -752,7 +764,6 @@ } - ///////////////////////////////////////////////// //------------ controller section -------------// @@ -857,9 +868,13 @@ private function showGroupBasedBranchingControls(v:Boolean, e:Boolean) { var ca = _canvasModel.selectedItem; var branches:Object = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(ca.activity.activityUIID); - + + Debugger.log("grouping UIID: " + ca.activity.groupingUIID, Debugger.CRITICAL, "showGroupBasedBranchingControls", "PIC*"); + if(branches.myBranches.length > 0 && ca.activity.groupingUIID != null) { - _group_match_btn.visible = v; + var grouping:Grouping = _canvasModel.getCanvas().ddm.getGroupingByUIID(ca.activity.groupingUIID); + + _group_match_btn.visible = (grouping.numberOfGroups > 0 || grouping.maxNumberOfGroups > 0) ? v : false; _group_match_btn.enabled = e; } else { _group_match_btn.visible = false; @@ -874,7 +889,8 @@ * @return */ private function onGroupingMethodChange(evt:Object){ - checkEnableGroupsOptions(!_canvasModel.selectedItem.activity.readOnly); + checkEnableGroupsOptions(!_canvasModel.selectedItem.activity.readOnly); + setModified(); } @@ -883,8 +899,10 @@ var startOffsetMins:Number = (days_stp.value * 60 * 24) + (hours_stp.value * 60) + mins_stp.value; _canvasModel.selectedItem.activity.gateStartTimeOffset = startOffsetMins; + var endOffsetMins:Number = (endHours_stp.value * 60) + endMins_stp.value; _canvasModel.selectedItem.activity.gateEndTimeOffset = endOffsetMins; + Debugger.log('activity.gateStartTimeOffset :'+_canvasModel.selectedItem.activity.gateStartTimeOffset ,Debugger.GEN,'onScheduleOffsetChange','PropertyInspector'); Debugger.log('activity.gateEndTimeOffset :'+_canvasModel.selectedItem.activity.gateEndTimeOffset,Debugger.GEN,'onScheduleOffsetChange','PropertyInspector'); @@ -914,7 +932,7 @@ var branches:Object = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(_canvasModel.selectedItem.activity.activityUIID); var grouping = _canvasModel.getCanvas().ddm.getGroupingByUIID(_canvasModel.selectedItem.activity.groupingUIID); - evt.target.scrollContent.branchingActivity = _canvasModel.selectedItem.activity; + evt.target.scrollContent.branchingActivity = BranchingActivity(_canvasModel.selectedItem.activity); evt.target.scrollContent.groups = grouping.getGroups(_canvasModel.getCanvas().ddm); evt.target.scrollContent.branches = getValidBranches(branches.myBranches); @@ -949,6 +967,7 @@ /**/ public function click(e):Void{ var tgt:String = new String(e.target); + if(tgt.indexOf("defineLater_chk") != -1){ _canvasModel.selectedItem.activity.defineLater = defineLater_chk.selected; @@ -981,6 +1000,7 @@ }else if(tgt.indexOf("desc_txt") != -1){ _canvasModel.selectedItem.activity.description= desc_txt.text; } + _canvasModel.selectedItem.refresh(); if (_canvasModel.selectedItem.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || _canvasModel.selectedItem.activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE){ _canvasModel.selectedItem.init(); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as =================================================================== diff -u -r60db93c549c96bad95e890f34add10c4ef9d3d2e -r8e4fc8d67f4733b5b989e9baf079daa75832193d --- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as (.../Application.as) (revision 60db93c549c96bad95e890f34add10c4ef9d3d2e) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as (.../Application.as) (revision 8e4fc8d67f4733b5b989e9baf079daa75832193d) @@ -206,7 +206,6 @@ private function setupUI():Void { - trace('Setting up UI...'); //Create the application root _appRoot_mc = _container_mc.createEmptyMovieClip('appRoot_mc',APP_ROOT_DEPTH); Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Header.as =================================================================== diff -u -rd7823922f404944822957e6c051bc0f1335a76de -r8e4fc8d67f4733b5b989e9baf079daa75832193d --- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Header.as (.../Header.as) (revision d7823922f404944822957e6c051bc0f1335a76de) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Header.as (.../Header.as) (revision 8e4fc8d67f4733b5b989e9baf079daa75832193d) @@ -88,8 +88,7 @@ /** * Called a frame after movie attached to allow components to initialise */ - public function init(){ - trace('initialing header..'); + public function init(){ //Delete the enterframe dispatcher delete this.onEnterFrame; @@ -105,13 +104,11 @@ //Add event listeners for resume and exit buttons resume_btn.onRelease = function(){ - trace('on releasing resuming button..'); var app:Application = Application.getInstance(); app.getLesson().resumeLesson(); } exit_btn.onRelease = function(){ - trace('on releasing exit button..'); var app:Application = Application.getInstance(); app.getLesson().exitLesson(); }