Index: lams_gradebook/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/build.xml,v
diff -u -r1.1.2.2 -r1.1.2.2.4.1
--- lams_gradebook/build.xml	22 Apr 2009 06:39:06 -0000	1.1.2.2
+++ lams_gradebook/build.xml	5 Jul 2011 16:33:13 -0000	1.1.2.2.4.1
@@ -170,7 +170,6 @@
 				<exclude name="web.xml" />
 				<exclude name="classes/**" />
 			</webinf>
-			<classes dir="${build.classes.java}" />
 			<!-- front end programs like HTML, JSP, CSS etc. -->
 			<fileset dir="${conf.web.dir}">
 				<include name="**/*.jsp" />
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java,v
diff -u -r1.1.2.2 -r1.1.2.2.4.1
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java	21 Apr 2009 06:39:50 -0000	1.1.2.2
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java	5 Jul 2011 16:33:13 -0000	1.1.2.2.4.1
@@ -36,7 +36,11 @@
     String output;
     String activityUrl;
     
-
+    // For excel export
+    String firstName;
+    String lastName;
+    
+    
     public GBUserGridRowDTO() {
     }
 
@@ -114,5 +118,21 @@
     public void setActivityUrl(String activityUrl) {
 	this.activityUrl = activityUrl;
     }
+    
+    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;
+    }
+
 }
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java,v
diff -u -r1.1.2.14.2.2 -r1.1.2.14.2.3
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	5 Nov 2010 20:10:19 -0000	1.1.2.14.2.2
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	5 Jul 2011 16:33:13 -0000	1.1.2.14.2.3
@@ -249,6 +249,8 @@
 	    for (User learner : learners) {
 		GBUserGridRowDTO gUserDTO = new GBUserGridRowDTO();
 		gUserDTO.setRowName(learner.getLastName() + " " + learner.getFirstName());
+		gUserDTO.setFirstName(learner.getFirstName());
+		gUserDTO.setLastName(learner.getLastName());
 		gUserDTO.setId(learner.getUserId().toString());
 
 		gUserDTO.setMarksAvailable(getTotalMarksAvailable(activity));
@@ -307,6 +309,8 @@
 		    GBUserGridRowDTO gradebookUserDTO = new GBUserGridRowDTO();
 		    gradebookUserDTO.setId(learner.getUserId().toString());
 		    gradebookUserDTO.setRowName(learner.getLastName() + " " + learner.getFirstName());
+		    gradebookUserDTO.setFirstName(learner.getFirstName());
+		    gradebookUserDTO.setLastName(learner.getLastName());
 
 		    // Setting the status and time taken for the user's lesson
 		    LearnerProgress learnerProgress = getLearnerProgress(lesson, learner);
@@ -569,25 +573,27 @@
 
 	    for (Activity act : activityViewMap.keySet()) {
 
-		ExcelCell[] activityTitleRow = new ExcelCell[4];
+		ExcelCell[] activityTitleRow = new ExcelCell[5];
 		activityTitleRow[0] = new ExcelCell(act.getTitle(), true);
 		rowList.add(activityTitleRow);
-		ExcelCell[] titleRow = new ExcelCell[4];
-		titleRow[0] = new ExcelCell(getMessage("gradebook.export.user"), true);
-		titleRow[1] = new ExcelCell(getMessage("gradebook.export.time.taken.seconds"), true);
-		titleRow[2] = new ExcelCell(getMessage("gradebook.export.outputs"), true);
-		titleRow[3] = new ExcelCell(getMessage("gradebook.columntitle.mark"), true);
+		ExcelCell[] titleRow = new ExcelCell[5];
+		titleRow[0] = new ExcelCell(getMessage("gradebook.export.last.name"), true);
+		titleRow[1] = new ExcelCell(getMessage("gradebook.export.first.name"), true);
+		titleRow[2] = new ExcelCell(getMessage("gradebook.export.time.taken.seconds"), true);
+		titleRow[3] = new ExcelCell(getMessage("gradebook.export.outputs"), true);
+		titleRow[4] = new ExcelCell(getMessage("gradebook.columntitle.mark"), true);
 		rowList.add(titleRow);
 
 		// Get the rest of the data
 		List<GBUserGridRowDTO> userRows = activityViewMap.get(act);
 		for (GBUserGridRowDTO userRow : userRows) {
-		    ExcelCell[] userDataRow = new ExcelCell[4];
+		    ExcelCell[] userDataRow = new ExcelCell[5];
 
-		    userDataRow[0] = new ExcelCell(userRow.getRowName(), false);
-		    userDataRow[1] = new ExcelCell(userRow.getTimeTakenSeconds(), false);
-		    userDataRow[2] = new ExcelCell(userRow.getOutput(), false);
-		    userDataRow[3] = new ExcelCell(userRow.getMark(), false);
+		    userDataRow[0] = new ExcelCell(userRow.getLastName(), false);
+		    userDataRow[1] = new ExcelCell(userRow.getFirstName(), false);
+		    userDataRow[2] = new ExcelCell(userRow.getTimeTakenSeconds(), false);
+		    userDataRow[3] = new ExcelCell(userRow.getOutput(), false);
+		    userDataRow[4] = new ExcelCell(userRow.getMark(), false);
 		    rowList.add(userDataRow);
 		}
 
@@ -708,18 +714,20 @@
 	    ArrayList<GBUserGridRowDTO> userRows = getGBUserRowsForLesson(lesson);
 	    
 	    // Setting up the user marks table
-	    ExcelCell[] userTitleRow = new ExcelCell[3];
-	    userTitleRow[0] = new ExcelCell(getMessage("gradebook.export.user"), true);
-	    userTitleRow[1] = new ExcelCell(getMessage("gradebook.export.time.taken.seconds"), true);
-	    userTitleRow[2] = new ExcelCell(getMessage("gradebook.export.total.mark"), true);
+	    ExcelCell[] userTitleRow = new ExcelCell[4];
+	    userTitleRow[0] = new ExcelCell(getMessage("gradebook.export.last.name"), true);
+	    userTitleRow[1] = new ExcelCell(getMessage("gradebook.export.first.name"), true);
+	    userTitleRow[2] = new ExcelCell(getMessage("gradebook.export.time.taken.seconds"), true);
+	    userTitleRow[3] = new ExcelCell(getMessage("gradebook.export.total.mark"), true);
 	    rowList.add(userTitleRow);
 	    
 	    for (GBUserGridRowDTO userRow : userRows) {
 		 // Adding the user data for the lesson
-		    ExcelCell[] userDataRow = new ExcelCell[3];
-		    userDataRow[0] = new ExcelCell(userRow.getRowName(), false);
-		    userDataRow[1] = new ExcelCell(userRow.getTimeTakenSeconds(), false);
-		    userDataRow[2] = new ExcelCell(userRow.getMark(), false);
+		    ExcelCell[] userDataRow = new ExcelCell[4];
+		    userDataRow[0] = new ExcelCell(userRow.getLastName(), false);
+		    userDataRow[1] = new ExcelCell(userRow.getFirstName(), false);
+		    userDataRow[2] = new ExcelCell(userRow.getTimeTakenSeconds(), false);
+		    userDataRow[3] = new ExcelCell(userRow.getMark(), false);
 		    rowList.add(userDataRow);
 	    }
 	    //------------------------------------------------------------------