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.4 -r1.1.2.14.2.5
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	7 Jul 2011 17:21:01 -0000	1.1.2.14.2.4
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	7 Jul 2011 21:10:09 -0000	1.1.2.14.2.5
@@ -769,18 +769,20 @@
 	    ArrayList<GBUserGridRowDTO> userRows = getGBUserRowsForLesson(lesson);
 
 	    // Setting up the user marks table
-	    ExcelCell[] userTitleRow = new ExcelCell[5];
-	    userTitleRow[0] = new ExcelCell(getMessage("gradebook.exportcourse.learner.name"), true);
-	    userTitleRow[1] = new ExcelCell(getMessage("gradebook.exportcourse.progress"), true);
-	    userTitleRow[2] = new ExcelCell(getMessage("gradebook.export.time.taken.seconds"), true);
-	    userTitleRow[3] = new ExcelCell(getMessage("gradebook.exportcourse.lessonFeedback"), true);
-	    userTitleRow[4] = new ExcelCell(getMessage("gradebook.exportcourse.mark"), true);
+	    ExcelCell[] userTitleRow = new ExcelCell[6];
+	    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.exportcourse.progress"), true);
+	    userTitleRow[3] = new ExcelCell(getMessage("gradebook.export.time.taken.seconds"), true);
+	    userTitleRow[4] = new ExcelCell(getMessage("gradebook.exportcourse.lessonFeedback"), true);
+	    userTitleRow[5] = 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[5];
-		userDataRow[0] = new ExcelCell(userRow.getRowName(), false);
+		ExcelCell[] userDataRow = new ExcelCell[6];
+		userDataRow[0] = new ExcelCell(userRow.getLastName(), false);
+		userDataRow[1] = new ExcelCell(userRow.getFirstName(), false);
 		String status;
 		if (userRow.getStatus().contains("tick.png")) {
 		    status = getMessage("gradebook.exportcourse.ok");
@@ -789,10 +791,10 @@
 		} else {
 		    status = "-";
 		}
-		userDataRow[1] = new ExcelCell(status, false);
-		userDataRow[2] = new ExcelCell(userRow.getTimeTakenSeconds(), false);
-		userDataRow[3] = new ExcelCell(userRow.getFeedback(), false);
-		userDataRow[4] = new ExcelCell(userRow.getMark(), false);
+		userDataRow[2] = new ExcelCell(status, false);
+		userDataRow[3] = new ExcelCell(userRow.getTimeTakenSeconds(), false);
+		userDataRow[4] = new ExcelCell(userRow.getFeedback(), false);
+		userDataRow[5] = new ExcelCell(userRow.getMark(), false);
 		rowList.add(userDataRow);
 	    }