Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as =================================================================== diff -u -r9a0cbd4ea917b16ea5826f4c35e130c306a0996f -r11765e8f5349c176a12537b883e1a06014521781 --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision 9a0cbd4ea917b16ea5826f4c35e130c306a0996f) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as (.../MonitorModel.as) (revision 11765e8f5349c176a12537b883e1a06014521781) @@ -57,7 +57,9 @@ private var _staffLoaded:Boolean; private var _learnersLoaded:Boolean; - private var _isProgressChanged:Boolean; + private var _isLessonProgressChanged:Boolean; + private var _isSequenceProgressChanged:Boolean; + private var _isLearnerProgressChanged:Boolean; private var _isSequenceSet:Boolean = false; private var _isDragging:Boolean; private var monitor_y:Number; @@ -128,16 +130,23 @@ public function setSequence(activeSeq:Sequence){ - if(_activeSeq == null){ - setLastSelectedSequence(activeSeq); - } else { - setLastSelectedSequence(_activeSeq); - } + //if(_activeSeq == null){ + //setLastSelectedSequence(activeSeq); + //} else { + //setLastSelectedSequence(_activeSeq); + //} _activeSeq = activeSeq; - if (!getIsSequenceSet){ + trace("value of isSetSequence (outside if): "+getIsSequenceSet()) + if (!getIsSequenceSet()){ + trace("value of isSetSequence (inside if): "+getIsSequenceSet()) _monitor.openLearningDesign(_activeSeq) } + var seq:Sequence = Sequence(_activeSeq); + if (seq.getLearningDesignModel() == null){ + seq.setLearningDesignModel(getMonitor().ddm); + } + //_monitor.getContributeActivities(_activeSeq.getSequenceID()); setChanged(); @@ -155,7 +164,7 @@ public function setIsSequenceSet(setSeq:Boolean){ _isSequenceSet = setSeq; } - + private function getIsSequenceSet():Boolean{ return _isSequenceSet; } @@ -223,12 +232,24 @@ return _lastSelectedSeq; } - public function setIsProgressChanged(isChanged:Boolean):Void{ - _isProgressChanged = isChanged; + public function setIsProgressChangedLesson(isChanged:Boolean):Void{ + _isLessonProgressChanged = isChanged; } + public function setIsProgressChangedSequence(isChanged:Boolean):Void{ + _isSequenceProgressChanged = isChanged; + } + public function setIsProgressChangedLearner(isChanged:Boolean):Void{ + _isLearnerProgressChanged = isChanged; + } - public function getIsProgressChanged():Boolean{ - return _isProgressChanged; + public function getIsProgressChangedLesson():Boolean{ + return _isLessonProgressChanged; + } + public function getIsProgressChangedSequence():Boolean{ + return _isSequenceProgressChanged; + } + public function getIsProgressChangedLearner():Boolean{ + return _isLearnerProgressChanged; } public function setOrganisation(org:Organisation){ _org = org; @@ -869,6 +890,7 @@ } public function getActivityKeys():Array{ + trace("ddmActivity_keys length: "+ ddmActivity_keys.length) return ddmActivity_keys; }