Index: lams_central/src/java/org/lamsfoundation/lams/gradebook/service/GradeBookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/gradebook/service/Attic/GradeBookService.java,v
diff -u -r1.5 -r1.6
--- lams_central/src/java/org/lamsfoundation/lams/gradebook/service/GradeBookService.java	24 Mar 2009 23:35:32 -0000	1.5
+++ lams_central/src/java/org/lamsfoundation/lams/gradebook/service/GradeBookService.java	25 Mar 2009 03:05:25 -0000	1.6
@@ -24,7 +24,6 @@
 package org.lamsfoundation.lams.gradebook.service;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -68,19 +67,11 @@
     private IGradeBookDAO gradeBookDAO;
 
     /**
-     * Gets a list of GradeBookGridRowDTO for a given lesson and learner
-     * 
-     * The result should be used for the "user view" of gradebook, where users
-     * are listed, then expanding a sub-grid will bring up the activites
-     * 
-     * the mark applies to the ebture kessib
-     * 
-     * @param lesson
-     * @param learner
-     * @return Collection<GradeBookGridRow>
+     * @see org.lamsfoundation.lams.gradebook.service.IGradeBookService#getGBActivityRowsForLearner(org.lamsfoundation.lams.lesson.Lesson,
+     *      org.lamsfoundation.lams.usermanagement.User)
      */
     @SuppressWarnings("unchecked")
-    public List<GradeBookGridRowDTO> getUserGradeBookActivityDTOs(Lesson lesson, User learner) {
+    public List<GradeBookGridRowDTO> getGBActivityRowsForLearner(Lesson lesson, User learner) {
 
 	logger.debug("Getting gradebook user data for lesson: " + lesson.getLessonId() + ". For user: "
 		+ learner.getUserId());
@@ -119,19 +110,11 @@
     }
 
     /**
-     * Gets a list of GradeBookGridRowDTO for a given lesson and learner
-     * 
-     * The result should be used for the "user view" of gradebook, where users
-     * are listed, then expanding a sub-grid will bring up the activites
-     * 
-     * the mark applies to the activity
-     * 
-     * @param lesson
-     * @param learner
-     * @return Collection<GradeBookGridRow>
+     * @see org.lamsfoundation.lams.gradebook.service.IGradeBookService#getGBUserRowsForActivity(org.lamsfoundation.lams.lesson.Lesson,
+     *      org.lamsfoundation.lams.learningdesign.Activity)
      */
     @SuppressWarnings("unchecked")
-    public List<GBUserGridRowDTO> getUserGradeBookActivityDTOs(Lesson lesson, Activity activity) {
+    public List<GBUserGridRowDTO> getGBUserRowsForActivity(Lesson lesson, Activity activity) {
 
 	List<GBUserGridRowDTO> gradeBookUserDTOs = new ArrayList<GBUserGridRowDTO>();
 
@@ -152,7 +135,6 @@
 			.getLessonId());
 		gUserDTO.setStatus(getActivityStatusStr(learnerProgress, activity));
 
-
 		// Set the outputs and activity url, if there is one
 		if (activity.isToolActivity() && activity instanceof ToolActivity) {
 		    ToolActivity toolAct = (ToolActivity) activity;
@@ -184,24 +166,15 @@
     }
 
     /**
-     * Gets the user gradebook and outputs data for a given lesson, which is a
-     * list of GBActivityGridRowDTO, this one is specifically for the user view
-     * 
-     * @param lesson
-     * @param learner
-     * @return Collection<GradeBookGridRow>
+     * @see org.lamsfoundation.lams.gradebook.service.IGradeBookService#getGBActivityRowsForLesson(org.lamsfoundation.lams.lesson.Lesson)
      */
     @SuppressWarnings("unchecked")
-    public List<GradeBookGridRowDTO> getUserGradeBookActivityDTOsActivityView(Lesson lesson, User learner) {
+    public List<GradeBookGridRowDTO> getGBActivityRowsForLesson(Lesson lesson) {
 
-	logger.debug("Getting gradebook user data for lesson: " + lesson.getLessonId() + ". For user: "
-		+ learner.getUserId());
+	logger.debug("Getting gradebook data for lesson: " + lesson.getLessonId());
 
 	List<GradeBookGridRowDTO> gradeBookActivityDTOs = new ArrayList<GradeBookGridRowDTO>();
 
-	LearnerProgress learnerProgress = monitoringService.getLearnerProgress(learner.getUserId(), lesson
-		.getLessonId());
-
 	Set<Activity> activities = (Set<Activity>) lesson.getLearningDesign().getActivities();
 
 	/*
@@ -217,68 +190,164 @@
 		.getActivityId());
 
 	if (firstActivity.isToolActivity() && firstActivity instanceof ToolActivity) {
-	    GBActivityGridRowDTO activityDTO = getGradeBookActivityDTO(firstActivity, learner, learnerProgress);
+	    GBActivityGridRowDTO activityDTO = getGradeBookActivityDTO(firstActivity, lesson);
 	    gradeBookActivityDTOs.add(activityDTO);
 	}
 
 	for (Activity activity : activities) {
 	    if (activity.getActivityId().longValue() != firstActivity.getActivityId().longValue()) {
-		GBActivityGridRowDTO activityDTO = getGradeBookActivityDTO(activity, learner, learnerProgress);
+		GBActivityGridRowDTO activityDTO = getGradeBookActivityDTO(activity, lesson);
 		gradeBookActivityDTOs.add(activityDTO);
 	    }
 	}
+
 	return gradeBookActivityDTOs;
+
     }
 
     /**
-     * Given a lesson, this method returns the GBUserGridRowDTO for act
-     * 
-     * @param lesson
-     * @return
+     * @see org.lamsfoundation.lams.gradebook.service.IGradeBookService#getGBUserRowsForLesson(org.lamsfoundation.lams.lesson.Lesson)
      */
-    public List<GradeBookGridRowDTO> getActivityGradeBookUserDTOs(Lesson lesson) {
+    @SuppressWarnings("unchecked")
+    public ArrayList<GBUserGridRowDTO> getGBUserRowsForLesson(Lesson lesson) {
 
-	logger.debug("Getting gradebook data for lesson: " + lesson.getLessonId());
+	ArrayList<GBUserGridRowDTO> gradeBookUserDTOs = new ArrayList<GBUserGridRowDTO>();
 
-	List<GradeBookGridRowDTO> gradeBookActivityDTOs = new ArrayList<GradeBookGridRowDTO>();
+	if (lesson != null) {
+	    Set<User> learners = (Set<User>) lesson.getAllLearners();
 
-	Set<Activity> activities = (Set<Activity>) lesson.getLearningDesign().getActivities();
+	    if (learners != null) {
 
-	/*
-	 * Hibernate CGLIB is failing to load the first activity in
-	 * the sequence as a ToolActivity for some mysterious reason
-	 * Causes a ClassCastException when you try to cast it, even
-	 * if it is a ToolActivity.
-	 * 
-	 * THIS IS A HACK to retrieve the first tool activity 
-	 * manually so it can be cast as a ToolActivity - if it is one
-	 */
-	Activity firstActivity = monitoringService.getActivityById(lesson.getLearningDesign().getFirstActivity()
-		.getActivityId());
+		for (User learner : learners) {
+		    GBUserGridRowDTO gradeBookUserDTO = new GBUserGridRowDTO();
+		    gradeBookUserDTO.setLogin(learner.getLogin());
+		    gradeBookUserDTO.setFirstName(learner.getFirstName());
+		    gradeBookUserDTO.setLastName(learner.getLastName());
 
-	if (firstActivity.isToolActivity() && firstActivity instanceof ToolActivity) {
-	    GBActivityGridRowDTO activityDTO = getGradeBookActivityDTO(firstActivity, lesson);
-	    gradeBookActivityDTOs.add(activityDTO);
+		    // Setting the status for the user's lesson
+		    LearnerProgress learnerProgress = monitoringService.getLearnerProgress(learner.getUserId(), lesson
+			    .getLessonId());
+		    gradeBookUserDTO.setStatus(getLessonStatusStr(learnerProgress));
+
+		    GradeBookUserLesson gradeBookUserLesson = gradeBookDAO.getGradeBookUserDataForLesson(lesson
+			    .getLessonId(), learner.getUserId());
+		    if (gradeBookUserLesson != null) {
+			gradeBookUserDTO.setMark(gradeBookUserLesson.getMark());
+			gradeBookUserDTO.setFeedback(gradeBookUserLesson.getFeedback());
+		    }
+		    gradeBookUserDTOs.add(gradeBookUserDTO);
+		}
+	    }
 	}
 
-	for (Activity activity : activities) {
-	    if (activity.getActivityId().longValue() != firstActivity.getActivityId().longValue()) {
-		GBActivityGridRowDTO activityDTO = getGradeBookActivityDTO(activity, lesson);
-		gradeBookActivityDTOs.add(activityDTO);
+	return gradeBookUserDTOs;
+
+    }
+
+    /**
+     * @see org.lamsfoundation.lams.gradebook.service.IGradeBookService#updateUserLessonGradeBookMark(org.lamsfoundation.lams.lesson.Lesson,
+     *      org.lamsfoundation.lams.usermanagement.User, java.lang.Double)
+     */
+    public void updateUserLessonGradeBookMark(Lesson lesson, User learner, Double mark) {
+	if (lesson != null && learner != null) {
+	    GradeBookUserLesson gradeBookUserLesson = gradeBookDAO.getGradeBookUserDataForLesson(lesson.getLessonId(),
+		    learner.getUserId());
+
+	    if (gradeBookUserLesson == null) {
+		gradeBookUserLesson = new GradeBookUserLesson(lesson, learner);
 	    }
+	    gradeBookUserLesson.setMark(mark);
+	    gradeBookDAO.insertOrUpdate(gradeBookUserLesson);
 	}
+    }
 
-	return gradeBookActivityDTOs;
+    /**
+     * @see org.lamsfoundation.lams.gradebook.service.IGradeBookService#updateUserActivityGradeBookMark(org.lamsfoundation.lams.lesson.Lesson,
+     *      org.lamsfoundation.lams.usermanagement.User,
+     *      org.lamsfoundation.lams.learningdesign.Activity, java.lang.Double)
+     */
+    public void updateUserActivityGradeBookMark(Lesson lesson, User learner, Activity activity, Double mark) {
+	if (lesson != null && activity != null && learner != null && activity.isToolActivity()) {
 
+	    // First, update the mark for the activity
+	    GradeBookUserActivity gradeBookUserActivity = gradeBookDAO.getGradeBookUserDataForActivity(activity
+		    .getActivityId(), learner.getUserId());
+
+	    if (gradeBookUserActivity == null) {
+		gradeBookUserActivity = new GradeBookUserActivity((ToolActivity) activity, learner);
+	    }
+
+	    gradeBookUserActivity.setMark(mark);
+	    gradeBookDAO.insertOrUpdate(gradeBookUserActivity);
+
+	    // Now update the lesson mark
+	    GradeBookUserLesson gradeBookUserLesson = gradeBookDAO.getGradeBookUserDataForLesson(lesson.getLessonId(),
+		    learner.getUserId());
+
+	    if (gradeBookUserLesson == null) {
+		gradeBookUserLesson = new GradeBookUserLesson();
+		gradeBookUserLesson.setLearner(learner);
+		gradeBookUserLesson.setLesson(lesson);
+	    }
+
+	    aggregateTotalMarkForLesson(gradeBookUserLesson);
+	}
     }
 
     /**
-     * Gets the gradebook data for a user for a given activity and lesson
+     * @see org.lamsfoundation.lams.gradebook.service.IGradeBookService#updateUserLessonGradeBookFeedback(org.lamsfoundation.lams.lesson.Lesson,
+     *      org.lamsfoundation.lams.usermanagement.User, java.lang.String)
+     */
+    public void updateUserLessonGradeBookFeedback(Lesson lesson, User learner, String feedback) {
+
+	GradeBookUserLesson gradeBookUserLesson = gradeBookDAO.getGradeBookUserDataForLesson(lesson.getLessonId(),
+		learner.getUserId());
+
+	if (gradeBookUserLesson == null) {
+	    gradeBookUserLesson = new GradeBookUserLesson(lesson, learner);
+	}
+
+	gradeBookUserLesson.setFeedback(feedback);
+	gradeBookDAO.insertOrUpdate(gradeBookUserLesson);
+    }
+
+    /**
+     * @see org.lamsfoundation.lams.gradebook.service.IGradeBookService#updateUserActivityGradeBookFeedback(org.lamsfoundation.lams.learningdesign.Activity,
+     *      org.lamsfoundation.lams.usermanagement.User, java.lang.String)
+     */
+    public void updateUserActivityGradeBookFeedback(Activity activity, User learner, String feedback) {
+
+	GradeBookUserActivity gradeBookUserActivity = gradeBookDAO.getGradeBookUserDataForActivity(activity
+		.getActivityId(), learner.getUserId());
+
+	if (gradeBookUserActivity == null) {
+	    gradeBookUserActivity = new GradeBookUserActivity((ToolActivity) activity, learner);
+	}
+
+	gradeBookUserActivity.setFeedback(feedback);
+	gradeBookDAO.insertOrUpdate(gradeBookUserActivity);
+    }
+
+    /**
+     * Adds a mark to the aggregated total and saves it
      * 
+     * @param gradeBookUserLesson
+     */
+    private void aggregateTotalMarkForLesson(GradeBookUserLesson gradeBookUserLesson) {
+	Double totalMark = gradeBookDAO.getGradeBookUserActivityMarkSum(gradeBookUserLesson.getLesson().getLessonId(),
+		gradeBookUserLesson.getLearner().getUserId());
+	gradeBookUserLesson.setMark(totalMark);
+	gradeBookDAO.insertOrUpdate(gradeBookUserLesson);
+    }
+
+    /**
+     * Gets the GBActivityGridRowDTO fro a given activity and lesson
+     * 
      * @param activity
-     * @return GradeBookActivityDTO
+     * @param lesson
+     * @return
      */
-    public GBActivityGridRowDTO getGradeBookActivityDTO(Activity activity, Lesson lesson) {
+    private GBActivityGridRowDTO getGradeBookActivityDTO(Activity activity, Lesson lesson) {
 	GBActivityGridRowDTO gactivityDTO = new GBActivityGridRowDTO();
 	gactivityDTO.setActivityId(activity.getActivityId());
 	gactivityDTO.setActivityTitle(activity.getTitle());
@@ -326,14 +395,15 @@
     }
 
     /**
-     * Gets the gradebook data for a user for a given activity and user
+     * Gets the GBActivityGridRowDTO for a given user and activity
      * 
      * @param activity
      * @param learner
      * @param learnerProgress
-     * @return GradeBookActivityDTO
+     * @return
      */
-    public GBActivityGridRowDTO getGradeBookActivityDTO(Activity activity, User learner, LearnerProgress learnerProgress) {
+    private GBActivityGridRowDTO getGradeBookActivityDTO(Activity activity, User learner,
+	    LearnerProgress learnerProgress) {
 
 	logger.debug("Getting gradebook data for activity: " + activity.getActivityId() + ". For user: "
 		+ learner.getUserId());
@@ -378,223 +448,19 @@
 			+ "&toolSessionID=" + toolSession.getToolSessionId().toString());
 
 		gactivityDTO.setOutput(this.getToolOutputsStr(toolAct, toolSession, learner));
-
-		//		SortedMap<String, ToolOutputDefinition> map = toolService.getOutputDefinitionsFromTool(toolAct
-		//			.getToolContentId());
-		//
-		//		Set<ToolOutput> toolOutputs = new HashSet<ToolOutput>();
-		//
-		//		
-		//
-		//		// Setting the tool outputs
-		//		String toolOutputsStr = "";
-		//		boolean noOutputs = true;
-		//		if (map.keySet().size() > 0) {
-		//
-		//		    for (String outputName : map.keySet()) {
-		//
-		//			try {
-		//			    ToolOutput toolOutput = toolService.getOutputFromTool(outputName, toolSession, learner
-		//				    .getUserId());
-		//
-		//			    if (toolOutput != null && toolOutput.getValue().getType() != OutputType.OUTPUT_COMPLEX) {
-		//				toolOutputs.add(toolOutput);
-		//
-		//				toolOutputsStr += "<option style='width:100%;'>";
-		//				toolOutputsStr += toolOutput.getDescription() + ": "
-		//					+ toolOutput.getValue().getString();
-		//				toolOutputsStr += "</option>";
-		//
-		//				noOutputs = false;
-		//			    }
-		//
-		//			} catch (RuntimeException e) {
-		//			    logger.debug("Runtime exception when attempted to get outputs for activity: "
-		//				    + toolAct.getActivityId() + ", continuing for other activities", e);
-		//			}
-		//		    }
-		//		    toolOutputsStr += "</select>";
-		//		}
-		//
-		//		// Fix up outputs html if there are not outputs available
-		//		if (noOutputs) {
-		//		    toolOutputsStr = "No output available.";
-		//		} else {
-		//		    toolOutputsStr = "<select style='width:150px;'><option style='width:100%;'>View outputs</option>"
-		//			    + toolOutputsStr;
-		//		}
-		//
-		//		gactivityDTO.setOutput(toolOutputsStr);
 	    }
 	}
 
 	return gactivityDTO;
     }
 
     /**
-     * Returns the gradebook data for an entire lesson, which is essentailly a
-     * list of GradeBookUserDTOs
+     * Returns the lesson status string which is a reference to an image
      * 
-     * @param lesson
-     * @return ArrayList<GradeBookUserDTO>
+     * @param learnerProgress
+     * @return
      */
-    @SuppressWarnings("unchecked")
-    public ArrayList<GBUserGridRowDTO> getGradeBookLessonData(Lesson lesson) {
-
-	ArrayList<GBUserGridRowDTO> gradeBookUserDTOs = new ArrayList<GBUserGridRowDTO>();
-
-	if (lesson != null) {
-	    Set<User> learners = (Set<User>) lesson.getAllLearners();
-
-	    if (learners != null) {
-
-		for (User learner : learners) {
-		    GBUserGridRowDTO gradeBookUserDTO = new GBUserGridRowDTO();
-		    gradeBookUserDTO.setLogin(learner.getLogin());
-		    gradeBookUserDTO.setFirstName(learner.getFirstName());
-		    gradeBookUserDTO.setLastName(learner.getLastName());
-
-		    // Setting the status for the user's lesson
-		    LearnerProgress learnerProgress = monitoringService.getLearnerProgress(learner.getUserId(), lesson
-			    .getLessonId());
-		    gradeBookUserDTO.setStatus(getLessonStatusStr(learnerProgress));
-
-		    GradeBookUserLesson gradeBookUserLesson = gradeBookDAO.getGradeBookUserDataForLesson(lesson
-			    .getLessonId(), learner.getUserId());
-		    if (gradeBookUserLesson != null) {
-			gradeBookUserDTO.setMark(gradeBookUserLesson.getMark());
-			gradeBookUserDTO.setFeedback(gradeBookUserLesson.getFeedback());
-		    }
-		    gradeBookUserDTOs.add(gradeBookUserDTO);
-		}
-	    }
-	}
-
-	return gradeBookUserDTOs;
-
-    }
-
-    /**
-     * Updates a user's mark for an entire lesson
-     * 
-     * @param lesson
-     * @param learner
-     * @param mark
-     */
-    public void updateUserLessonGradeBookMark(Lesson lesson, User learner, Double mark) {
-	if (lesson != null && learner != null) {
-	    GradeBookUserLesson gradeBookUserLesson = gradeBookDAO.getGradeBookUserDataForLesson(lesson.getLessonId(),
-		    learner.getUserId());
-
-	    if (gradeBookUserLesson == null) {
-		gradeBookUserLesson = new GradeBookUserLesson(lesson, learner);
-	    }
-	    gradeBookUserLesson.setMark(mark);
-	    gradeBookDAO.insertOrUpdate(gradeBookUserLesson);
-	}
-    }
-
-    /**
-     * Updates a user mark for an activity, when then aggregates their total
-     * lesson mark
-     * 
-     * @param lesson
-     * @param learner
-     * @param activity
-     * @param mark
-     */
-    public void updateUserActivityGradeBookMark(Lesson lesson, User learner, Activity activity, Double mark) {
-	if (lesson != null && activity != null && learner != null && activity.isToolActivity()) {
-
-	    // First, update the mark for the activity
-	    GradeBookUserActivity gradeBookUserActivity = gradeBookDAO.getGradeBookUserDataForActivity(activity
-		    .getActivityId(), learner.getUserId());
-
-	    if (gradeBookUserActivity == null) {
-		gradeBookUserActivity = new GradeBookUserActivity((ToolActivity) activity, learner);
-	    }
-
-	    gradeBookUserActivity.setMark(mark);
-	    gradeBookDAO.insertOrUpdate(gradeBookUserActivity);
-
-	    // Now update the lesson mark
-	    GradeBookUserLesson gradeBookUserLesson = gradeBookDAO.getGradeBookUserDataForLesson(lesson.getLessonId(),
-		    learner.getUserId());
-
-	    if (gradeBookUserLesson == null) {
-		gradeBookUserLesson = new GradeBookUserLesson();
-		gradeBookUserLesson.setLearner(learner);
-		gradeBookUserLesson.setLesson(lesson);
-	    }
-
-	    aggregateTotalMarkForLesson(gradeBookUserLesson);
-	}
-    }
-
-    /**
-     * Adds up the total mark for a lesson based on the activity marks
-     * 
-     * @param gradeBookUserLesson
-     */
-    private void aggregateTotalMarkForLesson(GradeBookUserLesson gradeBookUserLesson) {
-	Double totalMark = gradeBookDAO.getGradeBookUserActivityMarkSum(gradeBookUserLesson.getLesson().getLessonId(),
-		gradeBookUserLesson.getLearner().getUserId());
-	gradeBookUserLesson.setMark(totalMark);
-	gradeBookDAO.insertOrUpdate(gradeBookUserLesson);
-    }
-
-    /**
-     * Updates the feedback for a learners performance in a lesson
-     * 
-     * @param lesson
-     * @param learner
-     * @param feedback
-     */
-    public void updateUserLessonGradeBookFeedback(Lesson lesson, User learner, String feedback) {
-
-	GradeBookUserLesson gradeBookUserLesson = gradeBookDAO.getGradeBookUserDataForLesson(lesson.getLessonId(),
-		learner.getUserId());
-
-	if (gradeBookUserLesson == null) {
-	    gradeBookUserLesson = new GradeBookUserLesson(lesson, learner);
-	}
-
-	gradeBookUserLesson.setFeedback(feedback);
-	gradeBookDAO.insertOrUpdate(gradeBookUserLesson);
-    }
-
-    /**
-     * Updates the feedback for a learner's performance in an Activity
-     * 
-     * @param activity
-     * @param learner
-     * @param feedback
-     */
-    public void updateUserActivityGradeBookFeedback(Activity activity, User learner, String feedback) {
-
-	GradeBookUserActivity gradeBookUserActivity = gradeBookDAO.getGradeBookUserDataForActivity(activity
-		.getActivityId(), learner.getUserId());
-
-	if (gradeBookUserActivity == null) {
-	    gradeBookUserActivity = new GradeBookUserActivity((ToolActivity) activity, learner);
-	}
-
-	gradeBookUserActivity.setFeedback(feedback);
-	gradeBookDAO.insertOrUpdate(gradeBookUserActivity);
-    }
-
-    public String getLessonStatusStr(LearnerProgress learnerProgress) {
-//	String status = "NOT STARTED";
-//
-//	if (learnerProgress != null) {
-//	    if (learnerProgress.isComplete()) {
-//		status = "FINISHED";
-//	    } else if (learnerProgress.getAttemptedActivities() != null
-//		    && learnerProgress.getAttemptedActivities().size() > 0) {
-//		status = "STARTED";
-//	    }
-//	}
-	
+    private String getLessonStatusStr(LearnerProgress learnerProgress) {
 	String status = "-";
 
 	if (learnerProgress != null) {
@@ -605,28 +471,39 @@
 		status = "<img src='images/pencil.png' />";
 	    }
 	}
-	
-	
-
 	return status;
     }
 
-    public String getActivityStatusStr(LearnerProgress learnerProgress, Activity activity) {
+    /**
+     * Returns the activity status string which is a reference to an image
+     * 
+     * @param learnerProgress
+     * @param activity
+     * @return
+     */
+    private String getActivityStatusStr(LearnerProgress learnerProgress, Activity activity) {
 
 	if (learnerProgress != null) {
 	    byte statusByte = learnerProgress.getProgressState(activity);
 	    if (statusByte == LearnerProgress.ACTIVITY_ATTEMPTED) {
 		return "<img src='images/pencil.png' />";
 	    } else if (statusByte == LearnerProgress.ACTIVITY_COMPLETED) {
 		return "<img src='images/tick.png' />";
-	    } 
-	} 
-	
+	    }
+	}
 	return "-";
-
     }
 
-    public String getToolOutputsStr(ToolActivity toolAct, ToolSession toolSession, User learner) {
+    /**
+     * Gets the outputs for a tool activity and returns the html for the ouputs
+     * cell in the grid
+     * 
+     * @param toolAct
+     * @param toolSession
+     * @param learner
+     * @return
+     */
+    private String getToolOutputsStr(ToolActivity toolAct, ToolSession toolSession, User learner) {
 	String toolOutputsStr = "";
 	boolean noOutputs = true;
 
@@ -676,7 +553,7 @@
 	return toolOutputsStr;
     }
 
-    // Getter and setter methods below -----------------------------------------
+    // Getter and setter methods -----------------------------------------------
 
     public IMonitoringService getMonitoringService() {
 	return monitoringService;
@@ -701,6 +578,6 @@
     public void setGradeBookDAO(IGradeBookDAO gradeBookDAO) {
 	this.gradeBookDAO = gradeBookDAO;
     }
-
-    // Getter and setter methods above -----------------------------------------
+    
+    // -------------------------------------------------------------------------
 }
Index: lams_central/src/java/org/lamsfoundation/lams/gradebook/service/IGradeBookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/gradebook/service/Attic/IGradeBookService.java,v
diff -u -r1.4 -r1.5
--- lams_central/src/java/org/lamsfoundation/lams/gradebook/service/IGradeBookService.java	24 Mar 2009 23:35:32 -0000	1.4
+++ lams_central/src/java/org/lamsfoundation/lams/gradebook/service/IGradeBookService.java	25 Mar 2009 03:05:25 -0000	1.5
@@ -25,35 +25,90 @@
 
 import java.util.List;
 
-import org.lamsfoundation.lams.gradebook.dto.GBActivityGridRowDTO;
 import org.lamsfoundation.lams.gradebook.dto.GBUserGridRowDTO;
 import org.lamsfoundation.lams.gradebook.dto.GradeBookGridRowDTO;
 import org.lamsfoundation.lams.learningdesign.Activity;
-import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.usermanagement.User;
  
 public interface IGradeBookService {
+
     
     
-    public GBActivityGridRowDTO getGradeBookActivityDTO(Activity activity, User learner, LearnerProgress learnerProgress);
+    /**
+     * Gets all the activity rows for a lesson, with the mark for each activity
+     * being the average for all users in the lesson
+     * 
+     * @param lesson 
+     * @return
+     */
+    public List<GradeBookGridRowDTO> getGBActivityRowsForLesson(Lesson lesson);
     
-    public List<GradeBookGridRowDTO> getUserGradeBookActivityDTOs(Lesson lesson, User learner);
+    /**
+     * Gets all the activity rows for a user, with the mark for the activity 
+     * being the user's individual mark
+     * 
+     * @param 
+     * @param learner 
+     * @return
+     */
+    public List<GradeBookGridRowDTO> getGBActivityRowsForLearner(Lesson lesson, User learner);
     
-    public List<GBUserGridRowDTO> getUserGradeBookActivityDTOs(Lesson lesson, Activity activity);
+    /**
+     * Gets the GBActivityDTO list for an activity, which provides the marks
+     * for all users in an activity
+     * 
+     * @param lesson
+     * @param activity
+     * @return
+     */
+    public List<GBUserGridRowDTO> getGBUserRowsForActivity(Lesson lesson, Activity activity);
     
-    public List<GradeBookGridRowDTO> getUserGradeBookActivityDTOsActivityView(Lesson lesson, User learner);
-    
-    public List<GradeBookGridRowDTO> getActivityGradeBookUserDTOs(Lesson lesson);
-    
-    public List<GBUserGridRowDTO> getGradeBookLessonData(Lesson lesson);
+    /**
+     * Gets the user rows and the user's entire lesson mark for all users 
+     * in a lesson
+     * @param lesson
+     * @return
+     */
+    public List<GBUserGridRowDTO> getGBUserRowsForLesson(Lesson lesson);
 
+    /**
+     * Updates a user's lesson mark, this will make it desynchronised with the
+     * aggregated marks from the activities
+     * 
+     * @param lesson
+     * @param learner
+     * @param mark
+     */
     public void updateUserLessonGradeBookMark(Lesson lesson, User learner, Double mark);
     
+    /**
+     * Updates a user's activity mark, this will automatically add up all the 
+     * user's activity marks for a lesson and set the lesson mark too
+     * 
+     * @param lesson
+     * @param learner
+     * @param activity
+     * @param mark
+     */
     public void updateUserActivityGradeBookMark(Lesson lesson, User learner, Activity activity, Double mark);
     
+    /**
+     * Updates the user's feedback for an activity
+     * 
+     * @param activity
+     * @param learner
+     * @param feedback
+     */
     public void updateUserActivityGradeBookFeedback(Activity activity, User learner, String feedback);
     
+    /**
+     * Updates the user's feedback for a lesson
+     * 
+     * @param lesson
+     * @param learner
+     * @param feedback
+     */
     public void updateUserLessonGradeBookFeedback(Lesson lesson, User learner, String feedback);
     
 }
Index: lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/Attic/GradeBookAction.java,v
diff -u -r1.3 -r1.4
--- lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookAction.java	20 Mar 2009 04:54:48 -0000	1.3
+++ lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookAction.java	25 Mar 2009 03:05:25 -0000	1.4
@@ -24,6 +24,8 @@
 package org.lamsfoundation.lams.gradebook.web.action;
 
 import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import javax.servlet.ServletContext;
@@ -35,12 +37,17 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.lamsfoundation.lams.gradebook.dto.GBUserGridRowDTO;
 import org.lamsfoundation.lams.gradebook.dto.GradeBookGridRowDTO;
+import org.lamsfoundation.lams.gradebook.dto.comparators.GBUserFullNameComparator;
+import org.lamsfoundation.lams.gradebook.dto.comparators.GBUserMarkComparator;
 import org.lamsfoundation.lams.gradebook.service.IGradeBookService;
 import org.lamsfoundation.lams.gradebook.util.GradeBookConstants;
 import org.lamsfoundation.lams.gradebook.util.GradeBookUtil;
+import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.service.ILessonService;
+import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
@@ -69,51 +76,198 @@
     private static IGradeBookService gradeBookService;
     private static IUserManagementService userService;
     private static ILessonService lessonService;
+    private static IMonitoringService monitoringService;
 
     public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 	return null;
     }
-
+    
     /**
-     * Returns an xml representation of a user's a gradebook data. It is
-     * essential a list of the activities and the user's output for those
-     * activities. This corresponds to the learner view
+     * Returns an xml representation of the activity grid for gradebook
      * 
-     * This is in the sub-grid area of gradebook, and is called when the teacher
-     * clicks to expand the gradebook info for a specified user
+     * This has two modes, userView and activityView
      * 
+     * User view will get the grid data for a specified user, which is all their
+     * activity marks/outputs etc
+     * 
+     * Activity view will get the grid data for all activities, without user 
+     * info, instead there is an average mark for each activity
+     * 
      * @param mapping
      * @param form
      * @param request
      * @param response
      * @return
      * @throws Exception
      */
-    public ActionForward getUserGradeBookActivitiesForUserView(ActionMapping mapping, ActionForm form,
-	    HttpServletRequest request, HttpServletResponse response) throws Exception {
+    @SuppressWarnings(value={"unchecked", "unused"})
+    public ActionForward getActivityGridData(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
 	initServices();
 	int page = WebUtil.readIntParam(request, GradeBookConstants.PARAM_PAGE);
 	int rowLimit = WebUtil.readIntParam(request, GradeBookConstants.PARAM_ROWS);
+	
+	// Leaving the sorting params here if we decide to sort the activities in some way
 	String sortOrder = WebUtil.readStrParam(request, GradeBookConstants.PARAM_SORD);
 	String sortBy = WebUtil.readStrParam(request, GradeBookConstants.PARAM_SIDX, true);
+	
 	Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
-	String login = WebUtil.readStrParam(request, GradeBookConstants.PARAM_LOGIN);
+	String method = WebUtil.readStrParam(request, "method");
 
 	Lesson lesson = lessonService.getLesson(lessonID);
-	User learner = userService.getUserByLogin(login);
 
-	if (lesson != null && learner != null) {
+	if (lesson != null) {
 	    
-	    List<GradeBookGridRowDTO> gradeBookActivityDTOs = gradeBookService.getUserGradeBookActivityDTOs(lesson, learner);
-	    String ret = GradeBookUtil.toGridXML(gradeBookActivityDTOs, page, rowLimit, GradeBookUtil.GRID_TYPE_MONITOR_USER_VIEW);
+	    List<GradeBookGridRowDTO> gradeBookActivityDTOs = new ArrayList<GradeBookGridRowDTO>(); 
+	    
+	    // Get the user gradebook list from the db
+	    // A slightly different list is needed for userview or activity view
+	    if (method.equals("userView")) {
+		String login = WebUtil.readStrParam(request, GradeBookConstants.PARAM_LOGIN);
+		User learner = userService.getUserByLogin(login);
+		if (learner != null) {
+		    gradeBookActivityDTOs = gradeBookService.getGBActivityRowsForLearner(lesson, learner);
+		} else {
+		    // TODO: handle error
+		}
+	    } else if (method.equals("activityView")) {
+		gradeBookActivityDTOs = gradeBookService.getGBActivityRowsForLesson(lesson);
+	    }
+	    
+	    
+	    // Work out the sublist to fetch based on rowlimit and current page.
+	    int totalPages = 1;
+	    if (rowLimit < gradeBookActivityDTOs.size()) {
 
+		totalPages = new Double(Math.ceil(new Integer(gradeBookActivityDTOs.size()).doubleValue()
+			/ new Integer(rowLimit).doubleValue())).intValue();
+		int firstRow = (page - 1) * rowLimit;
+		int lastRow = firstRow + rowLimit;
+
+		if (lastRow > gradeBookActivityDTOs.size()) {
+		    gradeBookActivityDTOs = gradeBookActivityDTOs.subList(firstRow, gradeBookActivityDTOs.size());
+		} else {
+		    gradeBookActivityDTOs = gradeBookActivityDTOs.subList(firstRow, lastRow);
+		}
+
+	    }
+	    
+	    String ret = "";
+	    if (method.equals("userView")) {
+		ret = GradeBookUtil.toGridXML(gradeBookActivityDTOs, page, rowLimit, GradeBookUtil.GRID_TYPE_MONITOR_USER_VIEW);
+	    } else if (method.equals("activityView")){
+		ret = GradeBookUtil.toGridXML(gradeBookActivityDTOs, page, totalPages, GradeBookUtil.GRID_TYPE_MONITOR_ACTIVITY_VIEW);
+	    }
+	    
 	    response.setContentType("text/xml");
 	    PrintWriter out = response.getWriter();
 	    out.print(ret);
+	} else {
+	    // TODO: handle error
+	}
 
+	return null;
+    }
+    
+    /**
+     * Returns an xml representation of the user grid for gradebook
+     * 
+     * This has two modes, userView and activityView
+     * 
+     * User view will get all the learners in a lesson and print their
+     * gradebook data with their mark for the entire lesson]
+     * 
+     * Activity view will take an extra parameter (activityID) and instead show
+     * the user's mark just for one activity
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     * @throws Exception
+     */
+    @SuppressWarnings("unchecked")
+    public ActionForward getUserGridData(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
+	initServices();
+	int page = WebUtil.readIntParam(request, GradeBookConstants.PARAM_PAGE);
+	int rowLimit = WebUtil.readIntParam(request, GradeBookConstants.PARAM_ROWS);
+	String sortOrder = WebUtil.readStrParam(request, GradeBookConstants.PARAM_SORD);
+	String sortBy = WebUtil.readStrParam(request, GradeBookConstants.PARAM_SIDX, true);
+	Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
+	
+	String method = WebUtil.readStrParam(request, "method");
+
+	Lesson lesson = lessonService.getLesson(lessonID);
+
+	if (lesson != null) {
+	    
+	    // Get the user gradebook list from the db
+	    List<GBUserGridRowDTO> gradeBookUserDTOs = new ArrayList<GBUserGridRowDTO>();
+	    
+	    if (method.equals("userView")) {
+		gradeBookUserDTOs = gradeBookService.getGBUserRowsForLesson(lesson);
+	    } else if (method.equals("activityView")) {
+		Long activityID = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
+		
+		Activity activity = monitoringService.getActivityById(activityID);
+		if(activity != null) {
+		    gradeBookUserDTOs = gradeBookService.getGBUserRowsForActivity(lesson, activity);
+		} else {
+		    // TODO: handle error
+		}
+	    }
+
+	    // Sort the list appropriately
+	    if (sortBy != null) {
+		if (sortBy.equals("fullName")) {
+		    Collections.sort(gradeBookUserDTOs, new GBUserFullNameComparator());
+		} else if (sortBy.equals("mark")) {
+		    Collections.sort(gradeBookUserDTOs, new GBUserMarkComparator());
+		} else {
+		    Collections.sort(gradeBookUserDTOs, new GBUserFullNameComparator());
+		}
+	    } else {
+		Collections.sort(gradeBookUserDTOs, new GBUserFullNameComparator());
+	    }
+
+	    // Reverse the order if requested
+	    if (sortOrder != null && sortOrder.equals("desc")) {
+		Collections.reverse(gradeBookUserDTOs);
+	    }
+
+	    // Work out the sublist to fetch based on rowlimit and current page.
+	    int totalPages = 1;
+	    if (rowLimit < gradeBookUserDTOs.size()) {
+
+		totalPages = new Double(Math.ceil(new Integer(gradeBookUserDTOs.size()).doubleValue()
+			/ new Integer(rowLimit).doubleValue())).intValue();
+		int firstRow = (page - 1) * rowLimit;
+		int lastRow = firstRow + rowLimit;
+
+		if (lastRow > gradeBookUserDTOs.size()) {
+		    gradeBookUserDTOs = gradeBookUserDTOs.subList(firstRow, gradeBookUserDTOs.size());
+		} else {
+		    gradeBookUserDTOs = gradeBookUserDTOs.subList(firstRow, lastRow);
+		}
+
+	    }
+
+	    String ret = "";
+	    
+	    if (method.equals("userView")) {
+		ret = GradeBookUtil.toGridXML(gradeBookUserDTOs, page, totalPages, GradeBookUtil.GRID_TYPE_MONITOR_USER_VIEW); 
+	    } else if (method.equals("activityView")) {
+		ret = GradeBookUtil.toGridXML(gradeBookUserDTOs, page, totalPages, GradeBookUtil.GRID_TYPE_MONITOR_ACTIVITY_VIEW);
+	    }
+	    
+	    response.setContentType("text/xml");
+	    PrintWriter out = response.getWriter();
+	    out.print(ret);
 	} else {
-	    // Handle error
+	    // TODO: handle error
 	}
 
 	return null;
@@ -155,5 +309,9 @@
 	if (lessonService == null)
 	    lessonService = (ILessonService) WebApplicationContextUtils.getRequiredWebApplicationContext(context)
 		    .getBean("lessonService");
+	
+	if (monitoringService == null)
+	    monitoringService = (IMonitoringService) WebApplicationContextUtils.getRequiredWebApplicationContext(
+		    context).getBean("monitoringService");
     }
 }
Index: lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/Attic/GradeBookMonitoringAction.java,v
diff -u -r1.5 -r1.6
--- lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookMonitoringAction.java	24 Mar 2009 23:35:32 -0000	1.5
+++ lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookMonitoringAction.java	25 Mar 2009 03:05:25 -0000	1.6
@@ -23,11 +23,6 @@
 /* $Id$ */
 package org.lamsfoundation.lams.gradebook.web.action;
 
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -37,13 +32,8 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.gradebook.dto.GBUserGridRowDTO;
-import org.lamsfoundation.lams.gradebook.dto.GradeBookGridRowDTO;
-import org.lamsfoundation.lams.gradebook.dto.comparators.GBUserFullNameComparator;
-import org.lamsfoundation.lams.gradebook.dto.comparators.GBUserMarkComparator;
 import org.lamsfoundation.lams.gradebook.service.IGradeBookService;
 import org.lamsfoundation.lams.gradebook.util.GradeBookConstants;
-import org.lamsfoundation.lams.gradebook.util.GradeBookUtil;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.dto.LessonDetailsDTO;
@@ -119,199 +109,18 @@
 	    logger.error("Failed to load monitor lesson", e);
 	    return mapping.findForward("error");
 	}
-    }
+    }       
 
     /**
-     * Returns an xml representation of the entire lesson's gradebook data. It
-     * is essentially a list of users and their marks.
+     * Updates a user's mark or feedback for an entire lesson
      * 
-     * This will fill the top grid area of monitor gradebook, when a user row is
-     * clicked then the activity-specific data will be loaded
-     * 
      * @param mapping
      * @param form
      * @param request
      * @param response
      * @return
      * @throws Exception
      */
-    @SuppressWarnings("unchecked")
-    public ActionForward getGradeBookUserRows(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
-	initServices();
-	int page = WebUtil.readIntParam(request, GradeBookConstants.PARAM_PAGE);
-	int rowLimit = WebUtil.readIntParam(request, GradeBookConstants.PARAM_ROWS);
-	String sortOrder = WebUtil.readStrParam(request, GradeBookConstants.PARAM_SORD);
-	String sortBy = WebUtil.readStrParam(request, GradeBookConstants.PARAM_SIDX, true);
-	Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
-	
-	String method = WebUtil.readStrParam(request, "method");
-
-	Lesson lesson = lessonService.getLesson(lessonID);
-
-	if (lesson != null) {
-	    
-	    // Get the user gradebook list from the db
-	    List<GBUserGridRowDTO> gradeBookUserDTOs = new ArrayList<GBUserGridRowDTO>();
-	    
-	    if (method.equals("userView")) {
-		gradeBookUserDTOs = gradeBookService.getGradeBookLessonData(lesson);
-	    } else if (method.equals("activityView")) {
-		Long activityID = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
-		
-		Activity activity = monitoringService.getActivityById(activityID);
-		if(activity != null) {
-		    gradeBookUserDTOs = gradeBookService.getUserGradeBookActivityDTOs(lesson, activity);
-		} else {
-		    // TODO: handle error
-		}
-	    }
-
-	    // Sort the list appropriately
-	    if (sortBy != null) {
-		if (sortBy.equals("fullName")) {
-		    Collections.sort(gradeBookUserDTOs, new GBUserFullNameComparator());
-		} else if (sortBy.equals("mark")) {
-		    Collections.sort(gradeBookUserDTOs, new GBUserMarkComparator());
-		} else {
-		    Collections.sort(gradeBookUserDTOs, new GBUserFullNameComparator());
-		}
-	    } else {
-		Collections.sort(gradeBookUserDTOs, new GBUserFullNameComparator());
-	    }
-
-	    // Reverse the order if requested
-	    if (sortOrder != null && sortOrder.equals("desc")) {
-		Collections.reverse(gradeBookUserDTOs);
-	    }
-
-	    // Work out the sublist to fetch based on rowlimit and current page.
-	    int totalPages = 1;
-	    if (rowLimit < gradeBookUserDTOs.size()) {
-
-		totalPages = new Double(Math.ceil(new Integer(gradeBookUserDTOs.size()).doubleValue()
-			/ new Integer(rowLimit).doubleValue())).intValue();
-		int firstRow = (page - 1) * rowLimit;
-		int lastRow = firstRow + rowLimit;
-
-		if (lastRow > gradeBookUserDTOs.size()) {
-		    gradeBookUserDTOs = gradeBookUserDTOs.subList(firstRow, gradeBookUserDTOs.size());
-		} else {
-		    gradeBookUserDTOs = gradeBookUserDTOs.subList(firstRow, lastRow);
-		}
-
-	    }
-
-	    String ret = "";
-	    
-	    if (method.equals("userView")) {
-		ret = GradeBookUtil.toGridXML(gradeBookUserDTOs, page, totalPages, GradeBookUtil.GRID_TYPE_MONITOR_USER_VIEW); 
-	    } else if (method.equals("activityView")) {
-		ret = GradeBookUtil.toGridXML(gradeBookUserDTOs, page, totalPages, GradeBookUtil.GRID_TYPE_MONITOR_ACTIVITY_VIEW);
-	    }
-	    
-	    response.setContentType("text/xml");
-	    PrintWriter out = response.getWriter();
-	    out.print(ret);
-	} else {
-	    // TODO: handle error
-	}
-
-	return null;
-    }
-    
-    
-    /**
-     * Returns an xml representation of the entire lesson's gradebook data. It
-     * is essentially a list of users and their marks.
-     * 
-     * This will fill the top grid area of monitor gradebook, when a user row is
-     * clicked then the activity-specific data will be loaded
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws Exception
-     */
-    @SuppressWarnings("unchecked")
-    public ActionForward getActivityViewLessonGradeBookData(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
-	initServices();
-	int page = WebUtil.readIntParam(request, GradeBookConstants.PARAM_PAGE);
-	int rowLimit = WebUtil.readIntParam(request, GradeBookConstants.PARAM_ROWS);
-	String sortOrder = WebUtil.readStrParam(request, GradeBookConstants.PARAM_SORD);
-	String sortBy = WebUtil.readStrParam(request, GradeBookConstants.PARAM_SIDX, true);
-	Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
-	String method = WebUtil.readStrParam(request, "method");
-
-	Lesson lesson = lessonService.getLesson(lessonID);
-
-	if (lesson != null) {
-	    
-	    List<GradeBookGridRowDTO> gradeBookActivityDTOs = new ArrayList<GradeBookGridRowDTO>(); 
-	    
-	    // Get the user gradebook list from the db
-	    // A slightly different list is needed for userview or activity view
-	    if (method.equals("userView")) {
-		String login = WebUtil.readStrParam(request, GradeBookConstants.PARAM_LOGIN);
-		User learner = userService.getUserByLogin(login);
-		if (learner != null) {
-		    gradeBookActivityDTOs = gradeBookService.getUserGradeBookActivityDTOs(lesson, learner);
-		} else {
-		    // TODO: handle error
-		}
-	    } else if (method.equals("activityView")) {
-		gradeBookActivityDTOs = gradeBookService.getActivityGradeBookUserDTOs(lesson);
-	    }
-	    
-	    
-	    // Work out the sublist to fetch based on rowlimit and current page.
-	    int totalPages = 1;
-	    if (rowLimit < gradeBookActivityDTOs.size()) {
-
-		totalPages = new Double(Math.ceil(new Integer(gradeBookActivityDTOs.size()).doubleValue()
-			/ new Integer(rowLimit).doubleValue())).intValue();
-		int firstRow = (page - 1) * rowLimit;
-		int lastRow = firstRow + rowLimit;
-
-		if (lastRow > gradeBookActivityDTOs.size()) {
-		    gradeBookActivityDTOs = gradeBookActivityDTOs.subList(firstRow, gradeBookActivityDTOs.size());
-		} else {
-		    gradeBookActivityDTOs = gradeBookActivityDTOs.subList(firstRow, lastRow);
-		}
-
-	    }
-	    
-	    String ret = "";
-	    if (method.equals("userView")) {
-		ret = GradeBookUtil.toGridXML(gradeBookActivityDTOs, page, rowLimit, GradeBookUtil.GRID_TYPE_MONITOR_USER_VIEW);
-	    } else if (method.equals("activityView")){
-		ret = GradeBookUtil.toGridXML(gradeBookActivityDTOs, page, totalPages, GradeBookUtil.GRID_TYPE_MONITOR_ACTIVITY_VIEW);
-	    }
-	    
-	    response.setContentType("text/xml");
-	    PrintWriter out = response.getWriter();
-	    out.print(ret);
-	} else {
-	    // TODO: handle error
-	}
-
-	return null;
-    }
-    
-
-    /**
-     * Updates a user's mark directly for an entire lesson
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws Exception
-     */
     public ActionForward updateUserLessonGradeBookData(ActionMapping mapping, ActionForm form,
 	    HttpServletRequest request, HttpServletResponse response) throws Exception {
 	initServices();
@@ -340,8 +149,8 @@
     }
 
     /**
-     * Updates a user's mark for an activity, then aggregates their total lesson
-     * mark
+     * Updates a user's mark or feedback for an activity, 
+     * then aggregates their total lesson mark
      * 
      * @param mapping
      * @param form
@@ -356,8 +165,7 @@
 	Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 	
 	String method = WebUtil.readStrParam(request, "method");
-	
-	
+
 	Long activityID = null;
 	String login = null;
 	
@@ -393,44 +201,6 @@
 	}
 	return null;
     }
-    
-    /**
-     * 
-     * @param mapping
-     * @param form
-     * @param request
-     * @param response
-     * @return
-     * @throws Exception
-     */
-//    public ActionForward getUserGradeBookActivitiesForActivityView(ActionMapping mapping, ActionForm form,
-//	    HttpServletRequest request, HttpServletResponse response) throws Exception {
-//	initServices();
-//	int page = WebUtil.readIntParam(request, GradeBookConstants.PARAM_PAGE);
-//	int rowLimit = WebUtil.readIntParam(request, GradeBookConstants.PARAM_ROWS);
-//	String sortOrder = WebUtil.readStrParam(request, GradeBookConstants.PARAM_SORD);
-//	String sortBy = WebUtil.readStrParam(request, GradeBookConstants.PARAM_SIDX, true);
-//	Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
-//	Long activityID = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
-//
-//	Lesson lesson = lessonService.getLesson(lessonID);
-//	Activity activity = monitoringService.getActivityById(activityID);
-//
-//	if (lesson != null && activity != null) {
-//	    
-//	    List<GradeBookGridRowDTO> gradeBookActivityDTOs = gradeBookService.getUserGradeBookActivityDTOs(lesson, activity);
-//	    String ret = GradeBookUtil.toGridXML(gradeBookActivityDTOs, page, rowLimit, GradeBookUtil.GRID_TYPE_MONITOR_ACTIVITY_VIEW);
-//
-//	    response.setContentType("text/xml");
-//	    PrintWriter out = response.getWriter();
-//	    out.print(ret);
-//
-//	} else {
-//	    // Handle error
-//	}
-//
-//	return null;
-//    }
 
     private UserDTO getUser() {
 	HttpSession ss = SessionManager.getSession();