Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -re7d58455ba164aaacf47e088a304b2d7bea4e7ea -rfb2dde987b53f955ae6ef0cdb65992f579b89a50 Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -re7d58455ba164aaacf47e088a304b2d7bea4e7ea -rfb2dde987b53f955ae6ef0cdb65992f579b89a50 Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as =================================================================== diff -u -r7ec3ed9fc54b0664699912c50e636f697f271ff7 -rfb2dde987b53f955ae6ef0cdb65992f579b89a50 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as (.../PropertyInspector.as) (revision 7ec3ed9fc54b0664699912c50e636f697f271ff7) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as (.../PropertyInspector.as) (revision fb2dde987b53f955ae6ef0cdb65992f579b89a50) @@ -92,7 +92,7 @@ numGroups_rdo.addEventListener("click", Delegate.create(this, onGroupingMethodChange)); numLearners_rdo.addEventListener("click", Delegate.create(this, onGroupingMethodChange)); groupType_cmb.addEventListener("change", Delegate.create(this, onGroupTypeChange)); - gateType_cmb.addEventListener("change", Delegate.create(this, onGateTypeChange)); + gateType_cmb.addEventListener("change", Delegate.create(this, gateTypeChange)); branchType_cmb.addEventListener("change", Delegate.create(this, onBranchTypeChange)); toolActs_cmb.addEventListener("change", Delegate.create(this, onBranchToolInputChange)); @@ -108,13 +108,16 @@ days_stp.addEventListener("change", Delegate.create(this, onScheduleOffsetChange)); hours_stp.addEventListener("change", Delegate.create(this, onScheduleOffsetChange)); mins_stp.addEventListener("change", Delegate.create(this, onScheduleOffsetChange)); - days_stp.addEventListener("focusOut", Delegate.create(this, onScheduleOffsetChange)); + + days_stp.addEventListener("focusOut", Delegate.create(this, onScheduleOffsetChange)); hours_stp.addEventListener("focusOut", Delegate.create(this, onScheduleOffsetChange)); - mins_stp.addEventListener("focusOut", Delegate.create(this, onScheduleOffsetChange)); - endHours_stp.addEventListener("change", Delegate.create(this, onScheduleOffsetChange)); + mins_stp.addEventListener("focusOut", Delegate.create(this, onScheduleOffsetChange)); + + endHours_stp.addEventListener("change", Delegate.create(this, onScheduleOffsetChange)); endMins_stp.addEventListener("change", Delegate.create(this,onScheduleOffsetChange)); endHours_stp.addEventListener("focusOut", Delegate.create(this,onScheduleOffsetChange)); - endMins_stp.addEventListener("focusOut", Delegate.create(this, onScheduleOffsetChange)); + endMins_stp.addEventListener("focusOut", Delegate.create(this, onScheduleOffsetChange)); + numGroups_stp.addEventListener("change", Delegate.create(this, updateGroupingMethodData)); numLearners_stp.addEventListener("change", Delegate.create(this, updateGroupingMethodData)); numLearners_stp.addEventListener("focusOut", Delegate.create(this, updateGroupingMethodData)); @@ -138,6 +141,11 @@ setTabIndex(); hideAllSteppers(false); + } + + private function gateTypeChange(evt:Object):Void { + onGateTypeChange(evt); + showGateActivityProperties(GateActivity(_canvasModel.selectedItem.activity)); } public function setupLabels(){ @@ -655,9 +663,22 @@ if(_canvasModel.selectedItem.activity.activityTypeID == Activity.SCHEDULE_GATE_ACTIVITY_TYPE) { var offset:Number = GateActivity(_canvasModel.selectedItem.activity).gateStartTimeOffset; - days_stp.value = (offset/60/24); - hours_stp.value = (offset%(days_stp.value*60*24))/60; - mins_stp.value = (offset%((days_stp.value*60*24) + (hours_stp.value*60))); + Debugger.log("offset: " + offset, Debugger.CRITICAL, "showGateActivityProperties", "PropertyInspector"); + + if(offset > 0) { + var rem_days = offset%1440; + var rem_hours = rem_days%60; + var rem_mins = rem_hours + + days_stp.value = Math.floor((offset-rem_days)/1440); + hours_stp.value = Math.floor((rem_days-rem_hours)/60); + mins_stp.value = rem_mins; + + } else { + days_stp.value = 0; + hours_stp.value = 0; + mins_stp.value = 0; + } } //TODO: set the stepper values too! Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as =================================================================== diff -u -r7ec3ed9fc54b0664699912c50e636f697f271ff7 -rfb2dde987b53f955ae6ef0cdb65992f579b89a50 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision 7ec3ed9fc54b0664699912c50e636f697f271ff7) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as (.../PropertyInspectorControls.as) (revision fb2dde987b53f955ae6ef0cdb65992f579b89a50) @@ -576,7 +576,6 @@ endHours_stp.enabled = true; endMins_stp.enabled = true; } - } //this is a crazy hack to stop the steppter dissapearing after its .enabled property is set. @@ -1104,13 +1103,13 @@ private function onScheduleOffsetChange(evt:Object){ var startOffsetMins:Number = (days_stp.value * 60 * 24) + (hours_stp.value * 60) + mins_stp.value; - _canvasModel.selectedItem.activity.gateStartTimeOffset = startOffsetMins; + GateActivity(_canvasModel.selectedItem.activity).gateStartTimeOffset = startOffsetMins; var endOffsetMins:Number = (endHours_stp.value * 60) + endMins_stp.value; - _canvasModel.selectedItem.activity.gateEndTimeOffset = endOffsetMins; + GateActivity(_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'); + Debugger.log('activity.gateStartTimeOffset :'+GateActivity(_canvasModel.selectedItem.activity).gateStartTimeOffset ,Debugger.GEN,'onScheduleOffsetChange','PropertyInspector'); + Debugger.log('activity.gateEndTimeOffset :'+GateActivity(_canvasModel.selectedItem.activity).gateEndTimeOffset,Debugger.GEN,'onScheduleOffsetChange','PropertyInspector'); setModified();