Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java,v
diff -u -r1.1 -r1.2
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java	9 Apr 2009 04:55:57 -0000	1.1
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java	15 Apr 2009 05:48:34 -0000	1.2
@@ -62,7 +62,7 @@
 		ret.add(rowName);
 	    }
 	    ret.add(status);
-	    ret.add(output);
+	    ret.add((output != null) ? output.toString() : CELL_EMPTY);
 	    ret.add(competences);
 	    ret.add((timeTaken != null) ? convertTimeToString(timeTaken) : CELL_EMPTY);
 	    ret.add(feedback);
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java,v
diff -u -r1.1 -r1.2
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java	9 Apr 2009 04:55:57 -0000	1.1
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java	15 Apr 2009 05:48:34 -0000	1.2
@@ -64,7 +64,7 @@
 	    }
 	    ret.add(status);
 	    ret.add((timeTaken != null) ? convertTimeToString(timeTaken) : CELL_EMPTY);
-	    ret.add(output);
+	    ret.add((output != null) ? output.toString() : CELL_EMPTY);
 	    ret.add(feedback);
 	    ret.add((mark != null) ? mark.toString() : CELL_EMPTY);
 	    
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java,v
diff -u -r1.3 -r1.4
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	14 Apr 2009 06:12:15 -0000	1.3
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	15 Apr 2009 05:48:34 -0000	1.4
@@ -200,14 +200,17 @@
 
 		// Get the tool outputs for this user if there are any
 		ToolSession toolSession = toolService.getToolSessionByLearner(learner, activity);
-		if (toolSession != null) {
+		if (toolSession != null && learnerProgress != null) {
 		    // Set the activityLearner URL for this gradebook activity
-		    gUserDTO.setActivityUrl(Configuration.get(ConfigurationKeys.SERVER_URL)
-			    + activity.getTool().getLearnerProgressUrl() + "&userID=" + learner.getUserId()
-			    + "&toolSessionID=" + toolSession.getToolSessionId().toString());
+		    byte activityState = learnerProgress.getProgressState(activity);
+		    if (activityState == LearnerProgress.ACTIVITY_ATTEMPTED
+			    || activityState == LearnerProgress.ACTIVITY_COMPLETED) {
+			gUserDTO.setActivityUrl(Configuration.get(ConfigurationKeys.SERVER_URL)
+				+ activity.getTool().getLearnerProgressUrl() + "&userID=" + learner.getUserId()
+				+ "&toolSessionID=" + toolSession.getToolSessionId().toString());
 
-		    gUserDTO.setOutput(this.getToolOutputsStr(activity, toolSession, learner));
-
+			gUserDTO.setOutput(this.getToolOutputsStr(activity, toolSession, learner));
+		    }
 		}
 
 		// Add marks and feedback
@@ -545,13 +548,16 @@
 
 	// Get the tool outputs for this user if there are any
 	ToolSession toolSession = toolService.getToolSessionByLearner(learner, activity);
-	if (toolSession != null) {
-	    // Set the activityLearner URL for this gradebook activity
-	    gactivityDTO.setActivityUrl(Configuration.get(ConfigurationKeys.SERVER_URL)
-		    + activity.getTool().getLearnerProgressUrl() + "&userID=" + learner.getUserId() + "&toolSessionID="
-		    + toolSession.getToolSessionId().toString());
-
-	    gactivityDTO.setOutput(this.getToolOutputsStr(activity, toolSession, learner));
+	if (toolSession != null && learnerProgress != null) {
+	    byte activityState = learnerProgress.getProgressState(activity);
+	    if (activityState == LearnerProgress.ACTIVITY_ATTEMPTED
+		    || activityState == LearnerProgress.ACTIVITY_COMPLETED) {
+		// Set the activityLearner URL for this gradebook activity
+		gactivityDTO.setActivityUrl(Configuration.get(ConfigurationKeys.SERVER_URL)
+			+ activity.getTool().getLearnerProgressUrl() + "&userID=" + learner.getUserId()
+			+ "&toolSessionID=" + toolSession.getToolSessionId().toString());
+		gactivityDTO.setOutput(this.getToolOutputsStr(activity, toolSession, learner));
+	    }
 	}
 
 	return gactivityDTO;
Index: lams_gradebook/web/gradebookCourseLearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/gradebookCourseLearner.jsp,v
diff -u -r1.2 -r1.3
--- lams_gradebook/web/gradebookCourseLearner.jsp	14 Apr 2009 05:04:59 -0000	1.2
+++ lams_gradebook/web/gradebookCourseLearner.jsp	15 Apr 2009 05:48:34 -0000	1.3
@@ -83,7 +83,7 @@
 						     	'<fmt:message key="gradebook.columntitle.activityFeedback"/>', 
 						     	'<fmt:message key="gradebook.columntitle.averageTimeTaken"/>', 
 						     	'<fmt:message key="gradebook.columntitle.timeTaken"/>', 
-						     	'<fmt:message key="gradebook.columntitle.aveargeMark"/>', 
+						     	'<fmt:message key="gradebook.columntitle.averageMark"/>', 
 						     	'<fmt:message key="gradebook.columntitle.mark"/>'
 						     ],
 						     colModel: [