Index: lams_bb_integration/web/modules/learnermonitor.jsp =================================================================== diff -u -r2eb92be1cecc23f8e94b9d3cabc8340c278bf9a4 -rf2da1da35475d9ae6c13914ce961e597a43800d1 --- lams_bb_integration/web/modules/learnermonitor.jsp (.../learnermonitor.jsp) (revision 2eb92be1cecc23f8e94b9d3cabc8340c278bf9a4) +++ lams_bb_integration/web/modules/learnermonitor.jsp (.../learnermonitor.jsp) (revision f2da1da35475d9ae6c13914ce961e597a43800d1) @@ -30,10 +30,42 @@ <%@ page import="blackboard.portal.servlet.*"%> <%@ page import="blackboard.portal.data.*"%> <%@ page import="org.lamsfoundation.ld.integration.blackboard.LamsSecurityUtil"%> +<%@ page import="org.lamsfoundation.ld.integration.dto.LearnerProgressDTO"%> <%@ page errorPage="/error.jsp"%> <%@ taglib uri="/bbNG" prefix="bbNG"%> + + + + + <% // Authorise current user for Course Access (automatic redirect) try{ @@ -133,6 +165,10 @@ } } boolean isScoreAvailable = (current_score != null); + + String strLessonId = request.getParameter("lsid").trim(); + long lessonId = Long.parseLong(strLessonId); + LearnerProgressDTO learnerProgressDto = LamsSecurityUtil.getLearnerProgress(ctx, lessonId); %> <%-- Breadcrumbs --%> @@ -165,11 +201,36 @@ <% } %> - - <% if(isScoreAvailable) { %> -
- You have completed this lesson. -
+ + <%=learnerProgressDto.getActivitiesCompleted()%> out of approximately <%=learnerProgressDto.getActivityCount()%> + ! <%=learnerProgressDto.getAttemptedActivities()%>! <%=learnerProgressDto.getLessonComplete()%> + <% if(learnerProgressDto.getAttemptedActivities() > 0 || learnerProgressDto.getLessonComplete()) { %> +
+
+ Your Lesson Progress +
+ + <% if(!learnerProgressDto.getLessonComplete()) { %> +

+ Lesson is not yet completed. +

+ +

+ You have completed: <%=learnerProgressDto.getActivitiesCompleted()%> out of approximately <%=learnerProgressDto.getActivityCount()%> activities + [*] +

+ +
+ * + Total activities depend on your learning path. +
+ + <% } else { %> +

+ You have completed this lesson. +

+ <% } %> +
<% } %>