Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -re9e7042e16de3421b8c0cd6b1cf6c59dede544b4
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java	(.../ILearnerProgressDAO.java)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java	(.../ILearnerProgressDAO.java)	(revision e9e7042e16de3421b8c0cd6b1cf6c59dede544b4)
@@ -169,10 +169,14 @@
     /**
      * Count of the number of users that have attempted or completed an activity. Useful for activities that don't have
      * tool sessions.
-     *
-     * @param activityId
-     * @return List<User>
      */
+    Integer getNumUsersAttemptedOrCompletedActivity(Activity activity);
+
+    /**
+     * Count of the number of users that have attempted but not completed an activity. Useful for activities that don't
+     * have
+     * tool sessions.
+     */
     Integer getNumUsersAttemptedActivity(Activity activity);
 
     /**
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
===================================================================
diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -re9e7042e16de3421b8c0cd6b1cf6c59dede544b4
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java	(.../LearnerProgressDAO.java)	(revision 2188972474f8d186d6811e3dea2e4136be669335)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java	(.../LearnerProgressDAO.java)	(revision e9e7042e16de3421b8c0cd6b1cf6c59dede544b4)
@@ -295,16 +295,20 @@
     @Override
     public Integer getNumUsersAttemptedActivity(Activity activity) {
 	Object value = getSession().createQuery(LearnerProgressDAO.COUNT_ATTEMPTED_ACTIVITY)
-		.setLong("activityId", activity.getActivityId().longValue()).uniqueResult();
-	Integer attempted = new Integer(((Number) value).intValue());
-	return new Integer(attempted.intValue() + getNumUsersCompletedActivity(activity).intValue());
+		.setParameter("activityId", activity.getActivityId().longValue()).uniqueResult();
+	return ((Number) value).intValue();
     }
 
     @Override
+    public Integer getNumUsersAttemptedOrCompletedActivity(Activity activity) {
+	return getNumUsersAttemptedActivity(activity) + getNumUsersCompletedActivity(activity).intValue();
+    }
+
+    @Override
     public Integer getNumUsersCompletedActivity(Activity activity) {
 	Object value = getSession().createQuery(LearnerProgressDAO.COUNT_COMPLETED_ACTIVITY)
-		.setLong("activityId", activity.getActivityId().longValue()).uniqueResult();
-	return new Integer(((Number) value).intValue());
+		.setParameter("activityId", activity.getActivityId().longValue()).uniqueResult();
+	return ((Number) value).intValue();
     }
 
     @Override
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
===================================================================
diff -u -r0b789ab29e5a14f005e0978cdcad6add8606c83f -re9e7042e16de3421b8c0cd6b1cf6c59dede544b4
--- lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java	(.../ILessonService.java)	(revision 0b789ab29e5a14f005e0978cdcad6add8606c83f)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java	(.../ILessonService.java)	(revision e9e7042e16de3421b8c0cd6b1cf6c59dede544b4)
@@ -336,12 +336,15 @@
     List<User> getLearnersAttemptedOrCompletedActivity(Activity activity) throws LessonServiceException;
 
     /**
-     * Gets the count of the users who have attempted an activity. This is based on the progress engine records. This
+     * Gets the count of the users who have attempted or completed an activity. This is based on the progress engine
+     * records. This
      * will work on all activities, including ones that don't have any tool sessions, i.e. system activities such as
      * branching.
      */
-    Integer getCountLearnersHaveAttemptedActivity(Activity activity) throws LessonServiceException;
+    Integer getCountLearnersHaveAttemptedOrCompletedActivity(Activity activity) throws LessonServiceException;
 
+    Integer getCountLearnersHaveAttemptedActivity(Activity activity);
+
     /** Gets the count of the users who are currently in an activity */
     Integer getCountLearnersInCurrentActivity(Activity activity);
 
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
===================================================================
diff -u -r0b789ab29e5a14f005e0978cdcad6add8606c83f -re9e7042e16de3421b8c0cd6b1cf6c59dede544b4
--- lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	(.../LessonService.java)	(revision 0b789ab29e5a14f005e0978cdcad6add8606c83f)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	(.../LessonService.java)	(revision e9e7042e16de3421b8c0cd6b1cf6c59dede544b4)
@@ -617,7 +617,12 @@
     }
 
     @Override
-    public Integer getCountLearnersHaveAttemptedActivity(Activity activity) throws LessonServiceException {
+    public Integer getCountLearnersHaveAttemptedOrCompletedActivity(Activity activity) throws LessonServiceException {
+	return learnerProgressDAO.getNumUsersAttemptedOrCompletedActivity(activity);
+    }
+
+    @Override
+    public Integer getCountLearnersHaveAttemptedActivity(Activity activity) {
 	return learnerProgressDAO.getNumUsersAttemptedActivity(activity);
     }
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
diff -u -r96033f32ff880d045b4c087f52628d233dc98095 -re9e7042e16de3421b8c0cd6b1cf6c59dede544b4
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 96033f32ff880d045b4c087f52628d233dc98095)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision e9e7042e16de3421b8c0cd6b1cf6c59dede544b4)
@@ -681,7 +681,7 @@
 	if (evaluation == null) {
 	    return;
 	}
-	
+
 	ToolSession toolSession = lamsCoreToolService.getToolSessionByLearner(learner, activity);
 	if (toolSession == null) {
 	    return;
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -rb4b4d802a11bccab9ca9de7a0a91097b333c21f4 -re9e7042e16de3421b8c0cd6b1cf6c59dede544b4
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision b4b4d802a11bccab9ca9de7a0a91097b333c21f4)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision e9e7042e16de3421b8c0cd6b1cf6c59dede544b4)
@@ -2553,7 +2553,7 @@
 
     @Override
     public boolean isActivityAttempted(Activity activity) {
-	Integer numAttempted = lessonService.getCountLearnersHaveAttemptedActivity(activity);
+	Integer numAttempted = lessonService.getCountLearnersHaveAttemptedOrCompletedActivity(activity);
 	if (MonitoringService.log.isDebugEnabled()) {
 	    MonitoringService.log.debug("isActivityAttempted: num attempts for activity " + activity.getActivityId()
 		    + " is " + numAttempted);
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
===================================================================
diff -u -r70eb09e59b67dfc68c2cc425cd43e521c0d7fab8 -re9e7042e16de3421b8c0cd6b1cf6c59dede544b4
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision 70eb09e59b67dfc68c2cc425cd43e521c0d7fab8)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision e9e7042e16de3421b8c0cd6b1cf6c59dede544b4)
@@ -335,7 +335,7 @@
 	long forumActivityId = WebUtil.readLongParam(request, "activityId");
 	ToolActivity forumActivity = (ToolActivity) monitoringService.getActivityById(forumActivityId);
 
-	int attemptedLearnersNumber = lessonService.getCountLearnersHaveAttemptedActivity(forumActivity);
+	int attemptedLearnersNumber = lessonService.getCountLearnersHaveAttemptedOrCompletedActivity(forumActivity);
 	request.setAttribute("attemptedLearnersNumber", attemptedLearnersNumber);
 
 	Set<ToolSession> toolSessions = forumActivity.getToolSessions();
@@ -352,7 +352,8 @@
 	long peerreviewActivityId = WebUtil.readLongParam(request, "activityId");
 	ToolActivity peerreviewActivity = (ToolActivity) monitoringService.getActivityById(peerreviewActivityId);
 
-	int attemptedLearnersNumber = lessonService.getCountLearnersHaveAttemptedActivity(peerreviewActivity);
+	int attemptedLearnersNumber = lessonService
+		.getCountLearnersHaveAttemptedOrCompletedActivity(peerreviewActivity);
 	request.setAttribute("attemptedLearnersNumber", attemptedLearnersNumber);
 
 	Set<ToolSession> toolSessions = peerreviewActivity.getToolSessions();