Index: lams_common/src/flash/org/lamsfoundation/lams/common/Progress.as =================================================================== diff -u -r81e6bfcddb21315baa9fc1f9393d376c3afbc735 -ra4a47200e24c5074e7e6e63d19e36377a9f908cc --- lams_common/src/flash/org/lamsfoundation/lams/common/Progress.as (.../Progress.as) (revision 81e6bfcddb21315baa9fc1f9393d376c3afbc735) +++ lams_common/src/flash/org/lamsfoundation/lams/common/Progress.as (.../Progress.as) (revision a4a47200e24c5074e7e6e63d19e36377a9f908cc) @@ -34,7 +34,9 @@ /* data */ private var _lessonId:Number; private var _lessonName:String; - private var _userName:String; + private var _userName:String; + private var _learnerLName:String; + private var _learnerFName:String; private var _learnerId:Number; private var _currentActivityId:Number; private var _attemptedActivities:Array; @@ -43,9 +45,9 @@ /** * Constructor. */ - public function Progess (dto:Object){ - if(dto != null){ - populateFromDTO(dto); + public function Progess (dto:Object){ + if(dto != null){ + populateFromDTO(dto); } } @@ -60,61 +62,62 @@ return Progress._instance; } - public function populateFromDTO(dto:Object){ + public function populateFromDTO(dto:Object){ Debugger.log('populating from dto.',Debugger.CRITICAL,'populateFromDTO','org.lamsfoundation.lams.Progress'); trace('populating progress obj:' + dto.lessonId); _lessonId = dto.lessonId; _lessonName = dto.lessonName; _userName = dto.userName; - _learnerId = dto.learnerId; + _learnerId = dto.learnerId; + _learnerFName = dto.learnerFirstName; + _learnerLName = dto.learnerLastName; _currentActivityId = dto.currentActivityId; _attemptedActivities = dto.attemptedActivities; _completedActivities = dto.completedActivities; } - - public static function compareProgressData(learner:Object, activityID:Number):String{ - trace ("activity ID passed is: "+activityID) - trace("Number of Activities completed in the lesson are: "+learner.getCompletedActivities().length) - - var arrLearnerProgComp = learner.getCompletedActivities() - for (var i=0; i