Index: lams_central/src/java/org/lamsfoundation/lams/gradebook/service/GradeBookService.java
===================================================================
diff -u -r7895606feec6effedc08860e4e1bb7f5157109c5 -rf4328ca969294c06bf12815f299236c17398c99c
--- lams_central/src/java/org/lamsfoundation/lams/gradebook/service/GradeBookService.java	(.../GradeBookService.java)	(revision 7895606feec6effedc08860e4e1bb7f5157109c5)
+++ lams_central/src/java/org/lamsfoundation/lams/gradebook/service/GradeBookService.java	(.../GradeBookService.java)	(revision f4328ca969294c06bf12815f299236c17398c99c)
@@ -26,22 +26,24 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.SortedMap;
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.gradebook.GradeBookUserActivity;
 import org.lamsfoundation.lams.gradebook.GradeBookUserLesson;
 import org.lamsfoundation.lams.gradebook.dao.IGradeBookDAO;
-import org.lamsfoundation.lams.gradebook.dto.GradeBookActivityDTO;
-import org.lamsfoundation.lams.gradebook.dto.GradeBookGridRow;
-import org.lamsfoundation.lams.gradebook.dto.GradeBookUserDTO;
+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.learningdesign.CompetenceMapping;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
+import org.lamsfoundation.lams.tool.OutputType;
 import org.lamsfoundation.lams.tool.ToolOutput;
 import org.lamsfoundation.lams.tool.ToolOutputDefinition;
 import org.lamsfoundation.lams.tool.ToolSession;
@@ -66,19 +68,24 @@
     private IGradeBookDAO gradeBookDAO;
 
     /**
-     * Gets the user gradebook and outputs data for a given activity
+     * 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>
      */
     @SuppressWarnings("unchecked")
-    public Collection<GradeBookGridRow> getUserGradeBookActivityDTOs(Lesson lesson, User learner) {
+    public List<GradeBookGridRowDTO> getUserGradeBookActivityDTOs(Lesson lesson, User learner) {
 
-	logger.debug("Getting gradebook data for lesson: " + lesson.getLessonId() + ". For user: "
+	logger.debug("Getting gradebook user data for lesson: " + lesson.getLessonId() + ". For user: "
 		+ learner.getUserId());
 
-	Collection<GradeBookGridRow> gradeBookActivityDTOs = new ArrayList<GradeBookGridRow>();
+	List<GradeBookGridRowDTO> gradeBookActivityDTOs = new ArrayList<GradeBookGridRowDTO>();
 
 	LearnerProgress learnerProgress = monitoringService.getLearnerProgress(learner.getUserId(), lesson
 		.getLessonId());
@@ -98,33 +105,240 @@
 		.getActivityId());
 
 	if (firstActivity.isToolActivity() && firstActivity instanceof ToolActivity) {
-	    GradeBookActivityDTO activityDTO = getGradeBookActivityDTO(firstActivity, learner, learnerProgress);
+	    GBActivityGridRowDTO activityDTO = getGradeBookActivityDTO(firstActivity, learner, learnerProgress);
 	    gradeBookActivityDTOs.add(activityDTO);
 	}
 
 	for (Activity activity : activities) {
 	    if (activity.getActivityId().longValue() != firstActivity.getActivityId().longValue()) {
-		GradeBookActivityDTO activityDTO = getGradeBookActivityDTO(activity, learner, learnerProgress);
+		GBActivityGridRowDTO activityDTO = getGradeBookActivityDTO(activity, learner, learnerProgress);
 		gradeBookActivityDTOs.add(activityDTO);
 	    }
 	}
 	return gradeBookActivityDTOs;
     }
 
     /**
-     * Gets the gradebook data for a user for a given activity
+     * 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>
+     */
+    @SuppressWarnings("unchecked")
+    public List<GradeBookGridRowDTO> getUserGradeBookActivityDTOs(Lesson lesson, Activity activity) {
+
+	List<GradeBookGridRowDTO> gradeBookUserDTOs = new ArrayList<GradeBookGridRowDTO>();
+
+	Set<User> learners = (Set<User>) lesson.getAllLearners();
+
+	if (learners != null) {
+	    for (User learner : learners) {
+		GBUserGridRowDTO gUserDTO = new GBUserGridRowDTO();
+		gUserDTO.setFirstName(learner.getFirstName());
+		gUserDTO.setLastName(learner.getLastName());
+		gUserDTO.setLogin(learner.getLogin());
+
+		GradeBookUserActivity gradeBookUserActivity = gradeBookDAO.getGradeBookUserDataForActivity(activity
+			.getActivityId(), learner.getUserId());
+
+		// Set the progress
+		LearnerProgress learnerProgress = monitoringService.getLearnerProgress(learner.getUserId(), lesson
+			.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;
+		    // Get the tool outputs for this user if there are any
+		    ToolSession toolSession = toolService.getToolSessionByLearner(learner, toolAct);
+		    if (toolSession != null) {
+			// Set the activityLearner URL for this gradebook activity
+			gUserDTO.setActivityUrl(Configuration.get(ConfigurationKeys.SERVER_URL)
+				+ toolAct.getTool().getLearnerProgressUrl() + "&userID=" + learner.getUserId()
+				+ "&toolSessionID=" + toolSession.getToolSessionId().toString());
+
+			gUserDTO.setOutput(this.getToolOutputsStr(toolAct, toolSession, learner));
+
+		    }
+		}
+
+		// Add marks and feedback
+		if (gradeBookUserActivity != null) {
+		    gUserDTO.setFeedback(gradeBookUserActivity.getFeedback());
+		    gUserDTO.setMark(gradeBookUserActivity.getMark());
+
+		}
+		gradeBookUserDTOs.add(gUserDTO);
+	    }
+	}
+
+	return gradeBookUserDTOs;
+
+    }
+
+    /**
+     * 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>
+     */
+    @SuppressWarnings("unchecked")
+    public List<GradeBookGridRowDTO> getUserGradeBookActivityDTOsActivityView(Lesson lesson, User learner) {
+
+	logger.debug("Getting gradebook user data for lesson: " + lesson.getLessonId() + ". For user: "
+		+ learner.getUserId());
+
+	List<GradeBookGridRowDTO> gradeBookActivityDTOs = new ArrayList<GradeBookGridRowDTO>();
+
+	LearnerProgress learnerProgress = monitoringService.getLearnerProgress(learner.getUserId(), lesson
+		.getLessonId());
+
+	Set<Activity> activities = (Set<Activity>) lesson.getLearningDesign().getActivities();
+
+	/*
+	 * 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());
+
+	if (firstActivity.isToolActivity() && firstActivity instanceof ToolActivity) {
+	    GBActivityGridRowDTO activityDTO = getGradeBookActivityDTO(firstActivity, learner, learnerProgress);
+	    gradeBookActivityDTOs.add(activityDTO);
+	}
+
+	for (Activity activity : activities) {
+	    if (activity.getActivityId().longValue() != firstActivity.getActivityId().longValue()) {
+		GBActivityGridRowDTO activityDTO = getGradeBookActivityDTO(activity, learner, learnerProgress);
+		gradeBookActivityDTOs.add(activityDTO);
+	    }
+	}
+	return gradeBookActivityDTOs;
+    }
+
+    /**
+     * Given a lesson, this method returns the GBUserGridRowDTO for act
+     * 
+     * @param lesson
+     * @return
+     */
+    public List<GradeBookGridRowDTO> getActivityGradeBookUserDTOs(Lesson lesson) {
+
+	logger.debug("Getting gradebook data for lesson: " + lesson.getLessonId());
+
+	List<GradeBookGridRowDTO> gradeBookActivityDTOs = new ArrayList<GradeBookGridRowDTO>();
+
+	Set<Activity> activities = (Set<Activity>) lesson.getLearningDesign().getActivities();
+
+	/*
+	 * 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());
+
+	if (firstActivity.isToolActivity() && firstActivity instanceof ToolActivity) {
+	    GBActivityGridRowDTO activityDTO = getGradeBookActivityDTO(firstActivity, lesson);
+	    gradeBookActivityDTOs.add(activityDTO);
+	}
+
+	for (Activity activity : activities) {
+	    if (activity.getActivityId().longValue() != firstActivity.getActivityId().longValue()) {
+		GBActivityGridRowDTO activityDTO = getGradeBookActivityDTO(activity, lesson);
+		gradeBookActivityDTOs.add(activityDTO);
+	    }
+	}
+
+	return gradeBookActivityDTOs;
+
+    }
+
+    /**
+     * Gets the gradebook data for a user for a given activity and lesson
+     * 
      * @param activity
+     * @return GradeBookActivityDTO
+     */
+    public GBActivityGridRowDTO getGradeBookActivityDTO(Activity activity, Lesson lesson) {
+	GBActivityGridRowDTO gactivityDTO = new GBActivityGridRowDTO();
+	gactivityDTO.setActivityId(activity.getActivityId());
+	gactivityDTO.setActivityTitle(activity.getTitle());
+
+	if (activity.isToolActivity() && activity instanceof ToolActivity) {
+	    ToolActivity toolAct = (ToolActivity) activity;
+
+	    // Get the competences for this activity
+	    Set<CompetenceMapping> competenceMappings = toolAct.getCompetenceMappings();
+	    String competenceMappingsStr = "";
+	    if (competenceMappings != null) {
+		for (CompetenceMapping mapping : competenceMappings) {
+		    competenceMappingsStr += mapping.getCompetence().getTitle() + ", ";
+		}
+
+		// trim the last comma off
+		if (competenceMappingsStr.length() > 0) {
+		    competenceMappingsStr = competenceMappingsStr.substring(0, competenceMappingsStr.lastIndexOf(","));
+		}
+	    }
+	    gactivityDTO.setCompetences(competenceMappingsStr);
+
+	    List<GradeBookUserActivity> gradeBookUserActivities = gradeBookDAO
+		    .getAllGradeBookUserActivitiesForActivity(activity.getActivityId());
+
+	    if (gradeBookUserActivities != null) {
+
+		double sum = 0;
+		double count = 0;
+		for (GradeBookUserActivity gact : gradeBookUserActivities) {
+		    if (gact.getMark() != null) {
+			count++;
+			sum += gact.getMark();
+		    }
+		}
+
+		if (count != 0) {
+		    gactivityDTO.setAverage(sum / count);
+		}
+	    }
+
+	}
+
+	return gactivityDTO;
+    }
+
+    /**
+     * Gets the gradebook data for a user for a given activity and user
+     * 
+     * @param activity
      * @param learner
      * @param learnerProgress
      * @return GradeBookActivityDTO
      */
-    public GradeBookActivityDTO getGradeBookActivityDTO(Activity activity, User learner, LearnerProgress learnerProgress) {
+    public GBActivityGridRowDTO getGradeBookActivityDTO(Activity activity, User learner, LearnerProgress learnerProgress) {
 
 	logger.debug("Getting gradebook data for activity: " + activity.getActivityId() + ". For user: "
 		+ learner.getUserId());
 
-	GradeBookActivityDTO gactivityDTO = new GradeBookActivityDTO();
+	GBActivityGridRowDTO gactivityDTO = new GBActivityGridRowDTO();
 	gactivityDTO.setActivityId(activity.getActivityId());
 	gactivityDTO.setActivityTitle(activity.getTitle());
 
@@ -134,19 +348,8 @@
 	    gactivityDTO.setMark(gradeBookActivity.getMark());
 	    gactivityDTO.setFeedback(gradeBookActivity.getFeedback());
 	}
-	if (learnerProgress != null) {
-	    byte progressState = learnerProgress.getProgressState(activity);
 
-	    if (progressState == LearnerProgress.ACTIVITY_COMPLETED) {
-		gactivityDTO.setStatus("COMPLETED");
-	    } else if (progressState == LearnerProgress.ACTIVITY_ATTEMPTED) {
-		gactivityDTO.setStatus("ATTEMPTED");
-	    } else {
-		gactivityDTO.setStatus("NOT ATTEMPTED");
-	    }
-	} else {
-	    gactivityDTO.setStatus("NOT ATTEMPTED");
-	}
+	gactivityDTO.setStatus(getActivityStatusStr(learnerProgress, activity));
 
 	if (activity.isToolActivity() && activity instanceof ToolActivity) {
 	    ToolActivity toolAct = (ToolActivity) activity;
@@ -169,37 +372,59 @@
 	    // Get the tool outputs for this user if there are any
 	    ToolSession toolSession = toolService.getToolSessionByLearner(learner, toolAct);
 	    if (toolSession != null) {
-		SortedMap<String, ToolOutputDefinition> map = toolService.getOutputDefinitionsFromTool(toolAct
-			.getToolContentId());
-
-		Set<ToolOutput> toolOutputs = new HashSet<ToolOutput>();
-
 		// Set the activityLearner URL for this gradebook activity
 		gactivityDTO.setActivityUrl(Configuration.get(ConfigurationKeys.SERVER_URL)
 			+ toolAct.getTool().getLearnerProgressUrl() + "&userID=" + learner.getUserId()
 			+ "&toolSessionID=" + toolSession.getToolSessionId().toString());
 
-		// Setting the tool outputs
-		String toolOutputsStr = "";
-		for (String outputName : map.keySet()) {
+		gactivityDTO.setOutput(this.getToolOutputsStr(toolAct, toolSession, learner));
 
-		    try {
-			ToolOutput toolOutput = toolService.getOutputFromTool(outputName, toolSession, learner
-				.getUserId());
-
-			if (toolOutput != null) {
-			    toolOutputs.add(toolOutput);
-			    toolOutputsStr += toolOutput.getDescription() + ": " + toolOutput.getValue().getString()
-				    + "<br />";
-			}
-
-		    } catch (RuntimeException e) {
-			logger.debug("Runtime exception when attempted to get outputs for activity: "
-				+ toolAct.getActivityId() + ", continuing for other activities", e);
-		    }
-		}
-		toolOutputsStr = (toolOutputsStr.equals("")) ? "No output available." : toolOutputsStr;
-		gactivityDTO.setOutput(toolOutputsStr);
+		//		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);
 	    }
 	}
 
@@ -214,40 +439,32 @@
      * @return ArrayList<GradeBookUserDTO>
      */
     @SuppressWarnings("unchecked")
-    public ArrayList<GradeBookUserDTO> getGradeBookLessonData(Lesson lesson) {
+    public ArrayList<GBUserGridRowDTO> getGradeBookLessonData(Lesson lesson) {
 
-	ArrayList<GradeBookUserDTO> gradeBookUserDTOs = new ArrayList<GradeBookUserDTO>();
+	ArrayList<GBUserGridRowDTO> gradeBookUserDTOs = new ArrayList<GBUserGridRowDTO>();
 
 	if (lesson != null) {
 	    Set<User> learners = (Set<User>) lesson.getAllLearners();
 
 	    if (learners != null) {
 
 		for (User learner : learners) {
-		    GradeBookUserDTO gradeBookUserDTO = new GradeBookUserDTO();
+		    GBUserGridRowDTO gradeBookUserDTO = new GBUserGridRowDTO();
 		    gradeBookUserDTO.setLogin(learner.getLogin());
 		    gradeBookUserDTO.setFirstName(learner.getFirstName());
 		    gradeBookUserDTO.setLastName(learner.getLastName());
 
 		    // Setting the status for the user's lesson
-		    gradeBookUserDTO.setStatus("NOT STARTED");
 		    LearnerProgress learnerProgress = monitoringService.getLearnerProgress(learner.getUserId(), lesson
 			    .getLessonId());
-		    if (learnerProgress != null) {
-			if (learnerProgress.isComplete()) {
-			    gradeBookUserDTO.setStatus("FINISHED");
-			} else if (learnerProgress.getAttemptedActivities() != null
-				&& learnerProgress.getAttemptedActivities().size() > 0) {
-			    gradeBookUserDTO.setStatus("STARTED");
-			}
-		    }
+		    gradeBookUserDTO.setStatus(getLessonStatusStr(learnerProgress));
 
 		    GradeBookUserLesson gradeBookUserLesson = gradeBookDAO.getGradeBookUserDataForLesson(lesson
 			    .getLessonId(), learner.getUserId());
 		    if (gradeBookUserLesson != null) {
-			gradeBookUserDTO.setTotalLessonMark(gradeBookUserLesson.getMark());
+			gradeBookUserDTO.setMark(gradeBookUserLesson.getMark());
 			gradeBookUserDTO.setFeedback(gradeBookUserLesson.getFeedback());
-		    } 
+		    }
 		    gradeBookUserDTOs.add(gradeBookUserDTO);
 		}
 	    }
@@ -366,6 +583,90 @@
 	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";
+	    }
+	}
+
+	return status;
+    }
+
+    public String getActivityStatusStr(LearnerProgress learnerProgress, Activity activity) {
+
+	if (learnerProgress != null) {
+	    byte statusByte = learnerProgress.getProgressState(activity);
+	    if (statusByte == LearnerProgress.ACTIVITY_ATTEMPTED) {
+		return "ATTEMPTED";
+	    } else if (statusByte == LearnerProgress.ACTIVITY_COMPLETED) {
+		return "COMPLETED";
+	    } else {
+		return "NOT ATTEMPTED";
+	    }
+	} else {
+	    return "NOT ATTEMPTED";
+	}
+
+    }
+
+    public String getToolOutputsStr(ToolActivity toolAct, ToolSession toolSession, User learner) {
+	String toolOutputsStr = "";
+	boolean noOutputs = true;
+
+	if (toolAct != null && toolSession != null && learner != null) {
+
+	    SortedMap<String, ToolOutputDefinition> map = toolService.getOutputDefinitionsFromTool(toolAct
+		    .getToolContentId());
+
+	    Set<ToolOutput> toolOutputs = new HashSet<ToolOutput>();
+
+	    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;
+	}
+
+	return toolOutputsStr;
+    }
+
+    // Getter and setter methods below -----------------------------------------
+
     public IMonitoringService getMonitoringService() {
 	return monitoringService;
     }
@@ -389,4 +690,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
===================================================================
diff -u -r7895606feec6effedc08860e4e1bb7f5157109c5 -rf4328ca969294c06bf12815f299236c17398c99c
--- lams_central/src/java/org/lamsfoundation/lams/gradebook/service/IGradeBookService.java	(.../IGradeBookService.java)	(revision 7895606feec6effedc08860e4e1bb7f5157109c5)
+++ lams_central/src/java/org/lamsfoundation/lams/gradebook/service/IGradeBookService.java	(.../IGradeBookService.java)	(revision f4328ca969294c06bf12815f299236c17398c99c)
@@ -23,13 +23,11 @@
 /* $Id$ */ 
 package org.lamsfoundation.lams.gradebook.service; 
 
-import java.util.ArrayList;
-import java.util.Collection;
+import java.util.List;
 
-import org.lamsfoundation.lams.gradebook.GradeBookUserLesson;
-import org.lamsfoundation.lams.gradebook.dto.GradeBookActivityDTO;
-import org.lamsfoundation.lams.gradebook.dto.GradeBookGridRow;
-import org.lamsfoundation.lams.gradebook.dto.GradeBookUserDTO;
+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;
@@ -38,11 +36,17 @@
 public interface IGradeBookService {
     
     
-    public GradeBookActivityDTO getGradeBookActivityDTO(Activity activity, User learner, LearnerProgress learnerProgress);
+    public GBActivityGridRowDTO getGradeBookActivityDTO(Activity activity, User learner, LearnerProgress learnerProgress);
     
-    public Collection<GradeBookGridRow> getUserGradeBookActivityDTOs(Lesson lesson, User learner);
+    public List<GradeBookGridRowDTO> getUserGradeBookActivityDTOs(Lesson lesson, User learner);
     
-    public ArrayList<GradeBookUserDTO> getGradeBookLessonData(Lesson lesson);
+    public List<GradeBookGridRowDTO> getUserGradeBookActivityDTOs(Lesson lesson, Activity activity);
+    
+    public List<GradeBookGridRowDTO> getUserGradeBookActivityDTOsActivityView(Lesson lesson, User learner);
+    
+    public List<GradeBookGridRowDTO> getActivityGradeBookUserDTOs(Lesson lesson);
+    
+    public List<GBUserGridRowDTO> getGradeBookLessonData(Lesson lesson);
 
     public void updateUserLessonGradeBookMark(Lesson lesson, User learner, Double mark);
     
Index: lams_central/src/java/org/lamsfoundation/lams/gradebook/util/GradeBookUtil.java
===================================================================
diff -u -r7895606feec6effedc08860e4e1bb7f5157109c5 -rf4328ca969294c06bf12815f299236c17398c99c
--- lams_central/src/java/org/lamsfoundation/lams/gradebook/util/GradeBookUtil.java	(.../GradeBookUtil.java)	(revision 7895606feec6effedc08860e4e1bb7f5157109c5)
+++ lams_central/src/java/org/lamsfoundation/lams/gradebook/util/GradeBookUtil.java	(.../GradeBookUtil.java)	(revision f4328ca969294c06bf12815f299236c17398c99c)
@@ -24,6 +24,7 @@
 package org.lamsfoundation.lams.gradebook.util;
 
 import java.io.StringWriter;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 
@@ -36,65 +37,17 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.lamsfoundation.lams.gradebook.dto.GradeBookActivityDTO;
-import org.lamsfoundation.lams.gradebook.dto.GradeBookGridRow;
+import org.lamsfoundation.lams.gradebook.dto.GradeBookGridRowDTO;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 public class GradeBookUtil {
 
-    public static String toGridXML2(Collection<GradeBookActivityDTO> gactivityDTOs, int page, int rowLimit) {
-	String xml = "";
-	try {
-	    Document document = getDocument();
+    public static final int GRID_TYPE_MONITOR_USER_VIEW = 0;
+    public static final int GRID_TYPE_MONITOR_ACTIVITY_VIEW = 1;
 
-	    // root element
-	    Element rootElement = document.createElement("rows");
-
-	    Element pageElement = document.createElement("page");
-	    pageElement.appendChild(document.createTextNode("" + page));
-	    rootElement.appendChild(pageElement);
-
-	    int totalPages = (gactivityDTOs.size() > rowLimit) ? (gactivityDTOs.size() / rowLimit) : 1;
-	    
-	    Element totalPageElement = document.createElement("total");
-	    totalPageElement.appendChild(document.createTextNode("" + totalPages));
-	    rootElement.appendChild(totalPageElement);
-
-	    Element recordsElement = document.createElement("records");
-	    recordsElement.appendChild(document.createTextNode("" + gactivityDTOs.size()));
-	    rootElement.appendChild(recordsElement);
-
-	    for (GradeBookActivityDTO gactivityDTO : gactivityDTOs) {
-		Element rowElement = document.createElement("row");
-		rowElement.setAttribute("id", "" + gactivityDTO.getActivityId());
-
-		for (String gradeBookItem : gactivityDTO.toStringArray()) {
-		    Element cellElement = document.createElement("cell");
-		    gradeBookItem = (gradeBookItem != null) ? gradeBookItem : "";
-		    cellElement.appendChild(document.createTextNode(gradeBookItem));
-		    rowElement.appendChild(cellElement);
-		}
-		rootElement.appendChild(rowElement);
-	    }
-	    
-	    document.appendChild(rootElement);
-
-	    xml = getStringFromDocument(document);
-	    
-	} catch (ParserConfigurationException e) {
-	    // TODO Auto-generated catch block
-	    e.printStackTrace();
-	} catch (TransformerException e) {
-	    // TODO Auto-generated catch block
-	    e.printStackTrace();
-	}
-
-	return xml;
-    }
-    
     @SuppressWarnings("unchecked")
-    public static String toGridXML(Collection gridRows, int page, int totalPages) {
+    public static String toGridXML(Collection gridRows, int page, int totalPages, int gridType) {
 	String xml = "";
 	try {
 	    Document document = getDocument();
@@ -105,7 +58,7 @@
 	    Element pageElement = document.createElement("page");
 	    pageElement.appendChild(document.createTextNode("" + page));
 	    rootElement.appendChild(pageElement);
-	    
+
 	    Element totalPageElement = document.createElement("total");
 	    totalPageElement.appendChild(document.createTextNode("" + totalPages));
 	    rootElement.appendChild(totalPageElement);
@@ -116,22 +69,34 @@
 
 	    Iterator iter = gridRows.iterator();
 	    while (iter.hasNext()) {
-		GradeBookGridRow gridRow = (GradeBookGridRow) iter.next();
+		GradeBookGridRowDTO gridRow = (GradeBookGridRowDTO) iter.next();
 		Element rowElement = document.createElement("row");
 		rowElement.setAttribute("id", gridRow.getRowId());
 
-		for (String gradeBookItem : gridRow.toStringArray()) {
+		// Work out which grid we want to put the data into
+		ArrayList<String> gridRowStringArray = new ArrayList<String>();
+		switch (gridType) {
+    		case GRID_TYPE_MONITOR_USER_VIEW:
+    		    gridRowStringArray = gridRow.toMonitorUserViewStringArray();
+    		    break;
+    		case GRID_TYPE_MONITOR_ACTIVITY_VIEW:
+    		    gridRowStringArray = gridRow.toMonitorActViewStringArray();
+    		    break;
+
+		}
+
+		for (String gradeBookItem : gridRowStringArray) {
 		    Element cellElement = document.createElement("cell");
 		    gradeBookItem = (gradeBookItem != null) ? gradeBookItem : "";
 		    cellElement.appendChild(document.createTextNode(gradeBookItem));
 		    rowElement.appendChild(cellElement);
 		}
 		rootElement.appendChild(rowElement);
 	    }
-	    
+
 	    document.appendChild(rootElement);
 	    xml = getStringFromDocument(document);
-	    
+
 	} catch (ParserConfigurationException e) {
 	    // TODO Auto-generated catch block
 	    e.printStackTrace();
Index: lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookAction.java
===================================================================
diff -u -rafc316b2f5873df7ad8c5c2fc50b6a8802a02c81 -rf4328ca969294c06bf12815f299236c17398c99c
--- lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookAction.java	(.../GradeBookAction.java)	(revision afc316b2f5873df7ad8c5c2fc50b6a8802a02c81)
+++ lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookAction.java	(.../GradeBookAction.java)	(revision f4328ca969294c06bf12815f299236c17398c99c)
@@ -24,7 +24,7 @@
 package org.lamsfoundation.lams.gradebook.web.action;
 
 import java.io.PrintWriter;
-import java.util.Collection;
+import java.util.List;
 
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
@@ -35,7 +35,7 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.gradebook.dto.GradeBookGridRow;
+import org.lamsfoundation.lams.gradebook.dto.GradeBookGridRowDTO;
 import org.lamsfoundation.lams.gradebook.service.IGradeBookService;
 import org.lamsfoundation.lams.gradebook.util.GradeBookConstants;
 import org.lamsfoundation.lams.gradebook.util.GradeBookUtil;
@@ -76,9 +76,9 @@
     }
 
     /**
-     * Returns an xml representation of a user's lesson gradebook data. It is
+     * 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.
+     * activities. This corresponds to the learner view
      * 
      * 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
@@ -90,7 +90,7 @@
      * @return
      * @throws Exception
      */
-    public ActionForward getLessonGradeBookDataForUser(ActionMapping mapping, ActionForm form,
+    public ActionForward getUserGradeBookActivitiesForUserView(ActionMapping mapping, ActionForm form,
 	    HttpServletRequest request, HttpServletResponse response) throws Exception {
 	initServices();
 	int page = WebUtil.readIntParam(request, GradeBookConstants.PARAM_PAGE);
@@ -102,13 +102,11 @@
 
 	Lesson lesson = lessonService.getLesson(lessonID);
 	User learner = userService.getUserByLogin(login);
-	
-	
 
 	if (lesson != null && learner != null) {
 	    
-	    Collection<GradeBookGridRow> gradeBookActivityDTOs = gradeBookService.getUserGradeBookActivityDTOs(lesson, learner);
-	    String ret = GradeBookUtil.toGridXML(gradeBookActivityDTOs, page, rowLimit);
+	    List<GradeBookGridRowDTO> gradeBookActivityDTOs = gradeBookService.getUserGradeBookActivityDTOs(lesson, learner);
+	    String ret = GradeBookUtil.toGridXML(gradeBookActivityDTOs, page, rowLimit, GradeBookUtil.GRID_TYPE_MONITOR_USER_VIEW);
 
 	    response.setContentType("text/xml");
 	    PrintWriter out = response.getWriter();
Index: lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookMonitoringAction.java
===================================================================
diff -u -r7895606feec6effedc08860e4e1bb7f5157109c5 -rf4328ca969294c06bf12815f299236c17398c99c
--- lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookMonitoringAction.java	(.../GradeBookMonitoringAction.java)	(revision 7895606feec6effedc08860e4e1bb7f5157109c5)
+++ lams_central/src/java/org/lamsfoundation/lams/gradebook/web/action/GradeBookMonitoringAction.java	(.../GradeBookMonitoringAction.java)	(revision f4328ca969294c06bf12815f299236c17398c99c)
@@ -36,10 +36,10 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.gradebook.dto.GradeBookUserDTO;
-import org.lamsfoundation.lams.gradebook.dto.comparators.GradeBookUserFirstNameComparator;
-import org.lamsfoundation.lams.gradebook.dto.comparators.GradeBookUserLastNameComparator;
-import org.lamsfoundation.lams.gradebook.dto.comparators.GradeBookUserMarkComparator;
+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;
@@ -135,7 +135,7 @@
      * @throws Exception
      */
     @SuppressWarnings("unchecked")
-    public ActionForward getLessonGradeBookData(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+    public ActionForward getUserViewLessonGradeBookData(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 	initServices();
 	int page = WebUtil.readIntParam(request, GradeBookConstants.PARAM_PAGE);
@@ -148,21 +148,19 @@
 
 	if (lesson != null) {
 	    // Get the user gradebook list from the db
-	    List<GradeBookUserDTO> gradeBookUserDTOs = gradeBookService.getGradeBookLessonData(lesson);
+	    List<GBUserGridRowDTO> gradeBookUserDTOs = gradeBookService.getGradeBookLessonData(lesson);
 
 	    // Sort the list appropriately
 	    if (sortBy != null) {
-		if (sortBy.equals("lastName")) {
-		    Collections.sort(gradeBookUserDTOs, new GradeBookUserLastNameComparator());
-		} else if (sortBy.equals("firstName")) {
-		    Collections.sort(gradeBookUserDTOs, new GradeBookUserFirstNameComparator());
-		} else if (sortBy.equals("totalMark")) {
-		    Collections.sort(gradeBookUserDTOs, new GradeBookUserMarkComparator());
+		if (sortBy.equals("fullName")) {
+		    Collections.sort(gradeBookUserDTOs, new GBUserFullNameComparator());
+		} else if (sortBy.equals("mark")) {
+		    Collections.sort(gradeBookUserDTOs, new GBUserMarkComparator());
 		} else {
-		    Collections.sort(gradeBookUserDTOs, new GradeBookUserLastNameComparator());
+		    Collections.sort(gradeBookUserDTOs, new GBUserFullNameComparator());
 		}
 	    } else {
-		Collections.sort(gradeBookUserDTOs, new GradeBookUserLastNameComparator());
+		Collections.sort(gradeBookUserDTOs, new GBUserFullNameComparator());
 	    }
 
 	    // Reverse the order if requested
@@ -187,15 +185,73 @@
 
 	    }
 
-	    String ret = GradeBookUtil.toGridXML(gradeBookUserDTOs, page, totalPages);
+	    String ret = GradeBookUtil.toGridXML(gradeBookUserDTOs, page, totalPages, GradeBookUtil.GRID_TYPE_MONITOR_USER_VIEW);
 	    response.setContentType("text/xml");
 	    PrintWriter out = response.getWriter();
 	    out.print(ret);
 	}
 
 	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);
 
+	Lesson lesson = lessonService.getLesson(lessonID);
+
+	if (lesson != null) {
+	    // Get the user gradebook list from the db
+	    List<GradeBookGridRowDTO> gradeBookUserDTOs = gradeBookService.getActivityGradeBookUserDTOs(lesson);
+
+	    // 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 = GradeBookUtil.toGridXML(gradeBookUserDTOs, page, totalPages, GradeBookUtil.GRID_TYPE_MONITOR_ACTIVITY_VIEW);
+	    response.setContentType("text/xml");
+	    PrintWriter out = response.getWriter();
+	    out.print(ret);
+	}
+
+	return null;
+    }
+    
+
     /**
      * Updates a user's mark directly for an entire lesson
      * 
@@ -248,8 +304,21 @@
 	    HttpServletRequest request, HttpServletResponse response) throws Exception {
 	initServices();
 	Long lessonID = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
-	Long activityID = WebUtil.readLongParam(request, "id");
-	String login = WebUtil.readStrParam(request, GradeBookConstants.PARAM_LOGIN);
+	
+	String method = WebUtil.readStrParam(request, "method");
+	
+	
+	Long activityID = null;
+	String login = null;
+	
+	// Fetch the id based on which grid it came from
+	if (method.equals("activityView")) {
+	    activityID = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID);
+	    login = WebUtil.readStrParam(request, "id");
+	} else if (method.equals("userView")) {
+	    activityID = WebUtil.readLongParam(request, "id");
+	    login = WebUtil.readStrParam(request, GradeBookConstants.PARAM_LOGIN);
+	}
 
 	String markStr = WebUtil.readStrParam(request, "mark", true);
 	String feedback =  WebUtil.readStrParam(request, "feedback", true);
@@ -274,7 +343,45 @@
 	}
 	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();
 	return (UserDTO) ss.getAttribute(AttributeNames.USER);
Index: lams_central/web/gradebook/gradeBookMonitor.jsp
===================================================================
diff -u -r7895606feec6effedc08860e4e1bb7f5157109c5 -rf4328ca969294c06bf12815f299236c17398c99c
--- lams_central/web/gradebook/gradeBookMonitor.jsp	(.../gradeBookMonitor.jsp)	(revision 7895606feec6effedc08860e4e1bb7f5157109c5)
+++ lams_central/web/gradebook/gradeBookMonitor.jsp	(.../gradeBookMonitor.jsp)	(revision f4328ca969294c06bf12815f299236c17398c99c)
@@ -22,44 +22,43 @@
 		
 		jQuery(document).ready(function(){
   
-			jQuery("#users").jqGrid({
+			jQuery("#userView").jqGrid({
+				caption: "Learner View",
 			    datatype: "xml",
-			    url: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=getLessonGradeBookData&lessonID=${lessonDetails.lessonID}",
+			    url: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=getUserViewLessonGradeBookData&lessonID=${lessonDetails.lessonID}",
 			    height: "100%",
 			    width: 707,
 			    cellEdit: true,
 			    sortorder: "asc", 
-			    sortname: "lastName", 
-			    pager: 'pager',
+			    sortname: "fullName", 
+			    pager: 'userViewPager',
 			    rowList:[5,10,20,30],
 			    rowNum:10,
 				cellurl: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=updateUserLessonGradeBookData&lessonID=${lessonDetails.lessonID}&login=test1",
-			    colNames:["", 'Last Name','First Name', 'Progress', 'Lesson FeedBack', 'Total Mark'],
+			    colNames:["", 'Name', 'Progress', 'Lesson FeedBack', 'Total Mark'],
 			    colModel:[
 			      {name:'login', index:'login', sortable:false, editable:false, hidden:true},
-			      {name:'lastName',index:'lastName', sortable:true, editable:false},
-			      {name:'firstName',index:'firstName', sortable:true, editable:false},
+			      {name:'fullName',index:'fullName', sortable:true, editable:false},
 			      {name:'status',index:'status', sortable:false, editable:false},
 			      {name:'feedback',index:'feedback', sortable:false, editable:true, edittype:'textarea', editoptions:{rows:'4',cols:'20'} },
-			      {name:'totalMark',index:'totalMark', sortable:true, editable:true, editrules:{number:true}}
+			      {name:'mark',index:'mark', sortable:true, editable:true, editrules:{number:true}}
 			    ],
-			    imgpath: 'themes/basic/images',
-			    caption: "Learners",
+			    imgpath: '<lams:LAMSURL />includes/javascript/jqgrid/themes/basic/images',
 			    subGrid: true,
 				subGridRowExpanded: function(subgrid_id, row_id) {
 				   var subgrid_table_id;
-				   var userName = jQuery("#users").getRowData(row_id)["login"];
+				   var userName = jQuery("#userView").getRowData(row_id)["login"];
 				   subgrid_table_id = subgrid_id+"_t";
 					 jQuery("#"+subgrid_id).html("<table id='"+subgrid_table_id+"' class='scroll'></table>");
 					   jQuery("#"+subgrid_table_id).jqGrid({
 					     datatype: "xml",
-					     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getLessonGradeBookDataForUser&lessonID=${lessonDetails.lessonID}&login=" + userName,
+					     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getUserGradeBookActivitiesForUserView&lessonID=${lessonDetails.lessonID}&login=" + userName,
 					     height: "100%",
 					     width: 650,
 					     cellEdit:true,
-					     cellurl: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=updateUserActivityGradeBookData&lessonID=${lessonDetails.lessonID}&login=" + userName,
+					     cellurl: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=updateUserActivityGradeBookData&lessonID=${lessonDetails.lessonID}&method=userView&login=" + userName,
 					     ExpandColumn: "Outputs",
-					     colNames: ['Id','Activity','Status','Outputs', 'Competences', 'Activity FeedBack', 'Mark'],
+					     colNames: ['Id','Activity','Progress','Outputs', 'Competences', 'Activity FeedBack', 'Mark'],
 					     colModel: [
 					       	{name:'activityId', width:10, index:'activityId', sortable:false, hidden:true},
 							{name:'activityTitle', width:60, index:'activityTitle', sortable:false, editable: false},
@@ -69,27 +68,104 @@
 							{name:'feedback', width:250, index:'feedback', sortable:false, editable: true, edittype:'textarea', editoptions:{rows:'4',cols:'20'}},
 							{name:'mark', width:100, index:'mark', sortable:false, editable: true, editrules:{number:true} }
 					                   ],
-					     editurl: "server.php",
 					     afterSaveCell: function(rowid, cellname,value, iRow, iCol) {
-					     	var ids = jQuery("#"+subgrid_table_id).getDataIDs()
-					     	var totalMark = 0.0;
-					     	for (var i=0; i < ids.length; i++) {
-					     		var rowData = jQuery("#"+subgrid_table_id).getRowData(ids[i]);
-					     		var activityMark = rowData["mark"];
-					     		
-					     		if (activityMark != "-") {
-					     			totalMark += parseFloat(activityMark);
-					     		}
+					     	
+					     	// Update the total lesson mark for the user
+					     	if (cellname == "mark") {
+						     	var ids = jQuery("#"+subgrid_table_id).getDataIDs()
+						     	var totalMark = 0.0;
+						     	for (var i=0; i < ids.length; i++) {
+						     		var rowData = jQuery("#"+subgrid_table_id).getRowData(ids[i]);
+						     		var userMark = rowData["mark"];
+						     		
+						     		if (userMark != "-") {
+						     			totalMark += parseFloat(userMark);
+						     		}
+						     	}
+						     	jQuery("#userView").setCell(row_id, "mark", totalMark, "", "");
 					     	}
-					     	jQuery("#users").setCell(row_id, "totalMark", totalMark, "", "");
 					     },
-						 imgpath: 'themes/basic/images'
+						 imgpath: '<lams:LAMSURL />includes/javascript/jqgrid/themes/basic/images'
 					  })
 				 	}
+				});
+				
+				jQuery("#activityView").jqGrid({
+					caption: "Activity View",
+				    datatype: "xml",
+				    url: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=getActivityViewLessonGradeBookData&lessonID=${lessonDetails.lessonID}",
+				    height: "100%",
+				    width: 707,
+				    cellEdit: true,
+				    sortorder: "asc", 
+				    sortname: "activityId", 
+				    colNames:["", 'Activity Name', 'Competences', 'Average Mark'],
+				    colModel:[
+				      {name:'activityId', width:10, index:'activityId', sortable:false, hidden:true},
+					  {name:'activityTitle', width:60, index:'activityTitle', sortable:false, editable: false},
+				      {name:'competences', width:250, index:'competences', sortable:false, editable: false},
+				      {name:'average',index:'average', sortable:false, editable:false}
+				    ],
+				    imgpath: '<lams:LAMSURL />includes/javascript/jqgrid/themes/basic/images',
+				    subGrid: true,
+					subGridRowExpanded: function(subgrid_id, row_id) {
+					   var subgrid_table_id;
+					   var activityID = jQuery("#activityView").getRowData(row_id)["activityId"];
+					   subgrid_table_id = subgrid_id+"_t";
+						 jQuery("#"+subgrid_id).html("<table id='"+subgrid_table_id+"' class='scroll'></table>");
+						   jQuery("#"+subgrid_table_id).jqGrid({
+						     datatype: "xml",
+						     url: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=getUserGradeBookActivitiesForActivityView&lessonID=${lessonDetails.lessonID}&activityID=" + activityID,
+						     height: "100%",
+						     width: 650,
+						     cellEdit:true,
+						     cellurl: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=updateUserActivityGradeBookData&lessonID=${lessonDetails.lessonID}&method=activityView&activityID=" + activityID,
+						     ExpandColumn: "Outputs",
+						     colNames: ['','Full Name','Status','Outputs', 'Activity Feedback', 'Mark'],
+						     colModel:[
+						     	{name:'login', index:'login', sortable:false, editable:false, hidden:true},
+						     	{name:'fullName',index:'fullName', sortable:true, editable:false},
+						      	{name:'status',index:'status', sortable:false, editable:false},
+						      	{name:'output', index:'output', sortable:false, editable: false},
+						     	{name:'feedback',index:'feedback', sortable:false, editable:true, edittype:'textarea', editoptions:{rows:'4',cols:'20'} },
+						     	{name:'mark',index:'mark', sortable:true, editable:true, editrules:{number:true}}
+						     ],
+						     afterSaveCell: function(rowid, cellname,value, iRow, iCol) {
+						     	
+						     	// update the activity average mark
+						     	if (cellname == "mark") {
+						     		var ids = jQuery("#"+subgrid_table_id).getDataIDs()
+							     	var sumMarks = 0.0;
+							     	var count = 0;
+							     	for (var i = 0; i < ids.length; i++) {
+							     		var rowData = jQuery("#"+subgrid_table_id).getRowData(ids[i]);
+							     		var activityMark = rowData["mark"];
+							     		
+							     		if (activityMark != "-") {
+							     			sumMarks += parseFloat(activityMark);
+							     			count ++;
+							     		}
+							     	}						     	
+							     	var average;
+							     	if (count>0) {
+							     		average = sumMarks / count;
+							     	} else {
+							     		average = value;
+							     	}
+
+							     	jQuery("#activityView").setCell(row_id, "average", average, "", "");
+						     	}
+						     },
+							 imgpath: '<lams:LAMSURL />includes/javascript/jqgrid/themes/basic/images'
+						 })
+					 }
 				})
+				
+				
+				
+				
 		});
 		
-		
 		function launchPopup(url,title) {
 			var wd = null;
 			if(wd && wd.open && !wd.closed){
@@ -111,8 +187,16 @@
 			<div style="width:707px; margin-left:auto; margin-right:auto;">
 			<br />
 			<div style="width:707px; margin-left:auto; margin-right:auto;">
-				<table id="users" class="scroll" ></table>
-				<div id="pager" class="scroll" ></div>
+				<table id="userView" class="scroll" ></table>
+				<div id="userViewPager" class="scroll" ></div>
+				
+				<br />
+				<br />
+				<br />
+				
+				<table id="activityView" class="scroll" ></table>
+				
+				
 			</div>
 		</div> <!-- Closes content -->
 	
Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/IGradeBookDAO.java
===================================================================
diff -u -ra8e4961c9f59aedf7bbc548462f658ecc539d0ca -rf4328ca969294c06bf12815f299236c17398c99c
--- lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/IGradeBookDAO.java	(.../IGradeBookDAO.java)	(revision a8e4961c9f59aedf7bbc548462f658ecc539d0ca)
+++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/IGradeBookDAO.java	(.../IGradeBookDAO.java)	(revision f4328ca969294c06bf12815f299236c17398c99c)
@@ -23,6 +23,8 @@
 /* $Id$ */ 
 package org.lamsfoundation.lams.gradebook.dao; 
 
+import java.util.List;
+
 import org.lamsfoundation.lams.dao.IBaseDAO;
 import org.lamsfoundation.lams.gradebook.GradeBookUserActivity;
 import org.lamsfoundation.lams.gradebook.GradeBookUserLesson;
@@ -34,6 +36,8 @@
     public GradeBookUserActivity getGradeBookUserDataForActivity(Long activityID, Integer userID);
     
     public Double getGradeBookUserActivityMarkSum(Long lessonID, Integer userID);
+    
+    public List<GradeBookUserActivity> getAllGradeBookUserActivitiesForActivity(Long activityID);
 
 }
  
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradeBookDAO.java
===================================================================
diff -u -ra8e4961c9f59aedf7bbc548462f658ecc539d0ca -rf4328ca969294c06bf12815f299236c17398c99c
--- lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradeBookDAO.java	(.../GradeBookDAO.java)	(revision a8e4961c9f59aedf7bbc548462f658ecc539d0ca)
+++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradeBookDAO.java	(.../GradeBookDAO.java)	(revision f4328ca969294c06bf12815f299236c17398c99c)
@@ -38,14 +38,13 @@
     private static final String GET_GRADEBOOK_USER_LESSON = "from GradeBookUserLesson gles where "
 	    + "gles.learner.userId=:userID and gles.lesson.lessonId=:lessonID";
 
-//    private static final String GET_GRADEBOOK_ACTIVITIES_FROM_LESSON = "select sum(gact.mark) from GradeBookUserActivity gact, Lesson lesson where "
-//	    + "gact.learner.userId=:userID and lesson.lessonId=:lessonID and gact.activity in lesson.learningDesign.activities";
-
-
-    private static final String GET_GRADEBOOK_ACTIVITIES_FROM_LESSON = "select sum(gact.mark) from GradeBookUserActivity gact, ToolSession tses where "
+    private static final String GET_GRADEBOOK_ACTIVITIES_FROM_LESSON_SUM = "select sum(gact.mark) from GradeBookUserActivity gact, ToolSession tses where "
 	    + "gact.learner.userId=:userID and tses.toolActivity=gact.activity and tses.lesson.lessonId=:lessonID";
 
+    private static final String GET_GRADEBOOK_USER_ACTIVITIES_FOR_ACTIVITY = "from GradeBookUserActivity gact where "
+	    + "gact.activity.activityId=:activityID";
     
+    
     @SuppressWarnings("unchecked")
     public GradeBookUserActivity getGradeBookUserDataForActivity(Long activityID, Integer userID) {
 	List result = getSession().createQuery(GET_GRADEBOOK_USER_ACTIVITY).setInteger("userID", userID.intValue())
@@ -72,7 +71,7 @@
 
     @SuppressWarnings("unchecked")
     public Double getGradeBookUserActivityMarkSum(Long lessonID, Integer userID) {
-	List result = getSession().createQuery(GET_GRADEBOOK_ACTIVITIES_FROM_LESSON).setInteger("userID",
+	List result = getSession().createQuery(GET_GRADEBOOK_ACTIVITIES_FROM_LESSON_SUM).setInteger("userID",
 		userID.intValue()).setLong("lessonID", lessonID.longValue()).list();
 	
 	if (result != null && result.size() > 0) {
@@ -82,4 +81,12 @@
 	}
 
     }
+    
+    @SuppressWarnings("unchecked")
+    public List<GradeBookUserActivity> getAllGradeBookUserActivitiesForActivity(Long activityID) {
+	List result = getSession().createQuery(GET_GRADEBOOK_USER_ACTIVITIES_FOR_ACTIVITY)
+		.setLong("activityID", activityID.longValue()).list();
+	
+	return (List<GradeBookUserActivity>)result;
+    }
 }
Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java	(revision f4328ca969294c06bf12815f299236c17398c99c)
@@ -0,0 +1,180 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */ 
+ 
+/* $Id$ */ 
+package org.lamsfoundation.lams.gradebook.dto; 
+
+import java.util.ArrayList;
+ 
+public class GBActivityGridRowDTO extends GradeBookGridRowDTO{
+    long activityId;
+    String activityTitle;
+    String competences;
+    //String toolString;
+    
+    // Properties for user view
+    String status;
+    String output;
+    String activityUrl;
+    //double timeTaken;
+    Double mark; 
+    String feedback;
+    
+    // Properties for activity view
+    Double average;	
+    
+      
+    public GBActivityGridRowDTO() {}
+    
+    @Override
+    public ArrayList<String> toMonitorUserViewStringArray() {
+	ArrayList<String> ret = new ArrayList<String>();
+	
+	ret.add("" + activityId);
+	
+	
+	if (activityUrl != null && activityUrl.length() != 0) {
+	    ret.add("<a href='javascript:launchPopup(\"" +activityUrl+ "\",\"" +activityTitle+ "\")'>" +activityTitle +"</a>");
+	} else {
+	    ret.add(activityTitle);
+	}
+	
+	
+	ret.add(status);
+	ret.add(output);
+	ret.add(competences);
+	
+	ret.add(feedback);
+	
+	if (mark != null) {
+	    ret.add(mark.toString());
+	} else {
+	    ret.add("-"); 
+	}
+	
+	
+	return ret;
+    }
+    
+    @Override
+    public ArrayList<String> toMonitorActViewStringArray() {
+	ArrayList<String> ret = new ArrayList<String>();
+	
+	ret.add("" + activityId);
+
+	ret.add(activityTitle);
+
+	ret.add(competences);
+	
+	if (average != null) {
+	    ret.add(average.toString());
+	} else {
+	    ret.add("-"); 
+	}
+	
+	return ret;
+    }
+    
+    @Override
+    public String getRowId() {
+	return "" + activityId;
+    }
+    
+    public int getId(){
+	return new Long(activityId).intValue();
+    }
+
+    public long getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(long activityId) {
+        this.activityId = activityId;
+    }
+
+    public String getActivityTitle() {
+        return activityTitle;
+    }
+
+    public void setActivityTitle(String activityTitle) {
+        this.activityTitle = activityTitle;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getOutput() {
+        return output;
+    }
+
+    public void setOutput(String output) {
+        this.output = output;
+    }
+
+    public Double getMark() {
+        return mark;
+    }
+
+    public void setMark(Double mark) {
+        this.mark = mark;
+    }
+
+    public String getCompetences() {
+        return competences;
+    }
+
+    public void setCompetences(String competences) {
+        this.competences = competences;
+    }
+
+    public String getActivityUrl() {
+        return activityUrl;
+    }
+
+    public void setActivityUrl(String activityUrl) {
+        this.activityUrl = activityUrl;
+    }
+
+    public String getFeedback() {
+        return feedback;
+    }
+
+    public void setFeedback(String feedback) {
+        this.feedback = feedback;
+    }
+
+    public Double getAverage() {
+        return average;
+    }
+
+    public void setAverage(Double average) {
+        this.average = average;
+    }
+    
+    
+}
+ 
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java	(revision f4328ca969294c06bf12815f299236c17398c99c)
@@ -0,0 +1,159 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.gradebook.dto;
+
+import java.util.ArrayList;
+
+public class GBUserGridRowDTO extends GradeBookGridRowDTO {
+    String login;
+    String firstName;
+    String lastName;
+    String status;
+    String feedback;
+    
+    // For user view, this represents total lesson mark in the grid
+    // For activity view, this represents an activity mark
+    Double mark;
+    
+    // For activity view
+    String output;
+    String activityUrl;
+    
+
+    public GBUserGridRowDTO() {
+    }
+    
+    @Override
+    public ArrayList<String> toMonitorUserViewStringArray() {
+	ArrayList<String> ret = new ArrayList<String>();
+
+	ret.add(login);
+	ret.add(lastName + " " + firstName);
+	ret.add(status);
+	ret.add(feedback);
+
+	if (mark != null) {
+	    ret.add(mark.toString());
+	} else {
+	    ret.add("-");
+	}
+
+	return ret;
+    }
+    
+    @Override
+    public ArrayList<String> toMonitorActViewStringArray() {
+	ArrayList<String> ret = new ArrayList<String>();
+	
+	ret.add(login);
+	
+	String fullName = lastName + " " + firstName;
+	if (activityUrl != null && activityUrl.length() != 0) {
+	    ret.add("<a href='javascript:launchPopup(\"" +activityUrl+ "\",\"" +fullName+ "\")'>" +fullName +"</a>");
+	} else {
+	    ret.add(login);
+	}
+	
+	ret.add(status);
+	ret.add(output);
+	ret.add(feedback);
+
+	if (mark != null) {
+	    ret.add(mark.toString());
+	} else {
+	    ret.add("-");
+	}
+
+	return ret;
+    }
+
+    @Override
+    public String getRowId() {
+	return login;
+    }
+
+    public Double getMark() {
+	return mark;
+    }
+
+    public void setMark(Double mark) {
+	this.mark = mark;
+    }
+
+    public String getLogin() {
+        return login;
+    }
+
+    public void setLogin(String login) {
+        this.login = login;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+    
+    public String getFeedback() {
+        return feedback;
+    }
+
+    public void setFeedback(String feedback) {
+        this.feedback = feedback;
+    }
+
+    public String getOutput() {
+        return output;
+    }
+
+    public void setOutput(String output) {
+        this.output = output;
+    }
+
+    public String getActivityUrl() {
+        return activityUrl;
+    }
+
+    public void setActivityUrl(String activityUrl) {
+        this.activityUrl = activityUrl;
+    }
+}
Fisheye: Tag f4328ca969294c06bf12815f299236c17398c99c refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GradeBookActivityDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f4328ca969294c06bf12815f299236c17398c99c refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GradeBookGridRow.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java	(revision f4328ca969294c06bf12815f299236c17398c99c)
@@ -0,0 +1,36 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */ 
+ 
+/* $Id$ */ 
+package org.lamsfoundation.lams.gradebook.dto; 
+
+import java.util.ArrayList;
+ 
+public abstract class GradeBookGridRowDTO{
+    
+    public abstract ArrayList<String> toMonitorUserViewStringArray();
+    
+    public abstract ArrayList<String> toMonitorActViewStringArray();
+    
+    public abstract String getRowId();
+}
+ 
\ No newline at end of file
Fisheye: Tag f4328ca969294c06bf12815f299236c17398c99c refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GradeBookUserDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBUserFullNameComparator.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBUserFullNameComparator.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBUserFullNameComparator.java	(revision f4328ca969294c06bf12815f299236c17398c99c)
@@ -0,0 +1,53 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.gradebook.dto.comparators;
+
+import java.util.Comparator;
+
+import org.lamsfoundation.lams.gradebook.dto.GBUserGridRowDTO;
+
+@SuppressWarnings("unchecked")
+public class GBUserFullNameComparator implements Comparator {
+
+    public int compare(Object gradeBookUserDTO, Object anotherGradeBookUserDTO) {
+
+	if (gradeBookUserDTO instanceof GBUserGridRowDTO && anotherGradeBookUserDTO instanceof GBUserGridRowDTO) {
+	    String lastName1 = ((GBUserGridRowDTO) gradeBookUserDTO).getLastName().toUpperCase();
+	    String lastName2 = ((GBUserGridRowDTO) anotherGradeBookUserDTO).getLastName().toUpperCase();
+
+	    int ret;
+	    if (lastName1.equals(lastName2)) {
+		String firstName1 = ((GBUserGridRowDTO) gradeBookUserDTO).getFirstName().toUpperCase();
+		String firstName2 = ((GBUserGridRowDTO) anotherGradeBookUserDTO).getFirstName().toUpperCase();
+		ret = firstName1.compareTo(firstName2);
+	    }
+	    else {
+		ret = lastName1.compareTo(lastName2);
+	    }
+	    return ret;
+	} else {
+	    return 0;
+	}
+    }
+}
Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBUserMarkComparator.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBUserMarkComparator.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBUserMarkComparator.java	(revision f4328ca969294c06bf12815f299236c17398c99c)
@@ -0,0 +1,47 @@
+/****************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+/* $Id$ */
+package org.lamsfoundation.lams.gradebook.dto.comparators;
+
+import java.util.Comparator;
+
+import org.lamsfoundation.lams.gradebook.dto.GBUserGridRowDTO;
+
+@SuppressWarnings("unchecked")
+public class GBUserMarkComparator implements Comparator {
+
+    public int compare(Object gradeBookUserDTO, Object anotherGradeBookUserDTO) {
+
+	if (gradeBookUserDTO instanceof GBUserGridRowDTO && anotherGradeBookUserDTO instanceof GBUserGridRowDTO) {
+	   
+	    Double mark1 = ((GBUserGridRowDTO) gradeBookUserDTO).getMark();
+	    Double mark2 = ((GBUserGridRowDTO) anotherGradeBookUserDTO).getMark();
+	    
+	    mark1 = (mark1 == null) ? 0.0 : mark1;
+	    mark2 = (mark2 == null) ? 0.0 : mark2;
+	    return new Double(mark1 - mark2).intValue();    
+	} else {
+	    return 0;
+	}
+    }
+}
Fisheye: Tag f4328ca969294c06bf12815f299236c17398c99c refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GradeBookUserFirstNameComparator.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f4328ca969294c06bf12815f299236c17398c99c refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GradeBookUserLastNameComparator.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag f4328ca969294c06bf12815f299236c17398c99c refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GradeBookUserMarkComparator.java'.
Fisheye: No comparison available.  Pass `N' to diff?