Index: lams_common/src/flash/org/lamsfoundation/lams/common/Progress.as =================================================================== diff -u -r215bfc61ca7cef018c23a7b56a78f8987ffd00be -ra1522cd0c4cbbf9b50a2f0c41f0b3e0c3f567324 --- lams_common/src/flash/org/lamsfoundation/lams/common/Progress.as (.../Progress.as) (revision 215bfc61ca7cef018c23a7b56a78f8987ffd00be) +++ lams_common/src/flash/org/lamsfoundation/lams/common/Progress.as (.../Progress.as) (revision a1522cd0c4cbbf9b50a2f0c41f0b3e0c3f567324) @@ -37,7 +37,8 @@ private var _userName:String; private var _learnerLName:String; private var _learnerFName:String; - private var _learnerId:Number; + private var _learnerId:Number; + private var _lessonComplete:Boolean; private var _currentActivityId:Number; private var _attemptedActivities:Array; private var _completedActivities:Array; @@ -70,7 +71,8 @@ _userName = dto.userName; _learnerId = dto.learnerId; _learnerFName = dto.firstName; - _learnerLName = dto.lastName; + _learnerLName = dto.lastName; + _lessonComplete = dto.lessonComplete; _currentActivityId = dto.currentActivityId; _attemptedActivities = dto.attemptedActivities; _completedActivities = dto.completedActivities; @@ -108,6 +110,11 @@ if (activityID == learner.getCurrentActivityId()){ var clipName:String = "current_mc"; return clipName; + } + + if (learner.getCurrentActivityId() == null && learner.isLessonComplete){ + var clipName:String = "completed_mc"; + return clipName; } } @@ -141,6 +148,10 @@ public function getLearnerLastName():String{ return _learnerLName; } + + public function isLessonComplete():Boolean{ + return _lessonComplete; + } public function getCurrentActivityId():Number{ return _currentActivityId; @@ -166,6 +177,11 @@ _completedActivities = convertStringArrayToNumberArray(a); } + public function getFullName ():String{ + var fullName:String = _learnerFName +" "+ _learnerLName; + return fullName; + } + private function convertStringArrayToNumberArray(strArray:Array){ var tmpArray = new Array(); for(var i=0; i