Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java,v diff -u -r1.4 -r1.5 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java 15 Feb 2008 07:13:21 -0000 1.4 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java 4 Jun 2008 04:29:46 -0000 1.5 @@ -126,8 +126,9 @@ ContributeActivityDTO dto = new ContributeActivityDTO(a); subActivities.add(dto); - statusMap.put(a.getActivityId(), learnerProgress.getProgressState(a)); - + Byte status = learnerProgress.getProgressState(a); + statusMap.put(a.getActivityId(), status); + if (a.isSequenceActivity()) { request.setAttribute("hasSequenceActivity", true); // map learner progress urls of each activity in the sequence @@ -136,6 +137,10 @@ processSequenceChildren(lessonID, userID, monitoringService, user, statusMap, urlMap, learnerProgress, sequenceActivity, dto, null); + } else { + if (status.equals(LearnerProgress.ACTIVITY_ATTEMPTED) || status.equals(LearnerProgress.ACTIVITY_COMPLETED)) { + urlMap.put(a.getActivityId(), monitoringService.getLearnerActivityURL(lessonID, a.getActivityId(), userID, user.getUserID())); + } } }