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.5 -r1.1.2.14.2.6
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	7 Jul 2011 21:10:09 -0000	1.1.2.14.2.5
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	8 Jul 2011 20:07:21 -0000	1.1.2.14.2.6
@@ -721,20 +721,22 @@
 	    ArrayList<GBUserGridRowDTO> userRows = getGBUserRowsForLesson(lesson);
 	    
 	    // Setting up the user marks table
-	    ExcelCell[] userTitleRow = new ExcelCell[4];
+	    ExcelCell[] userTitleRow = new ExcelCell[5];
 	    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);
+	    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.export.total.mark"), true);
 	    rowList.add(userTitleRow);
 	    
 	    for (GBUserGridRowDTO userRow : userRows) {
 		 // Adding the user data for the lesson
-		    ExcelCell[] userDataRow = new ExcelCell[4];
+		    ExcelCell[] userDataRow = new ExcelCell[5];
 		    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);
+		    userDataRow[2] = new ExcelCell(getProgressMessage(userRow), false);
+		    userDataRow[3] = new ExcelCell(userRow.getTimeTakenSeconds(), false);
+		    userDataRow[4] = new ExcelCell(userRow.getMark(), false);
 		    rowList.add(userDataRow);
 	    }
 	    //------------------------------------------------------------------
@@ -783,15 +785,7 @@
 		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");
-		} else if (userRow.getStatus().contains("cog.png")) {
-		    status = getMessage("gradebook.exportcourse.current.activity", new String[] { userRow.getCurrentActivity()});
-		} else {
-		    status = "-";
-		}
-		userDataRow[2] = new ExcelCell(status, false);
+		userDataRow[2] = new ExcelCell(getProgressMessage(userRow), false);
 		userDataRow[3] = new ExcelCell(userRow.getTimeTakenSeconds(), false);
 		userDataRow[4] = new ExcelCell(userRow.getFeedback(), false);
 		userDataRow[5] = new ExcelCell(userRow.getMark(), false);
@@ -848,6 +842,23 @@
 	String dateStr = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM, locale).format(date);
 	return dateStr;
     }
+    
+    /**
+     * Returns progress status as text message.
+     * @param userRow
+     * @return
+     */
+    private String getProgressMessage(GBUserGridRowDTO userRow) {
+	String status;
+	if (userRow.getStatus().contains("tick.png")) {
+	    status = getMessage("gradebook.exportcourse.ok");
+	} else if (userRow.getStatus().contains("cog.png")) {
+	    status = getMessage("gradebook.exportcourse.current.activity", new String[] { userRow.getCurrentActivity()});
+	} else {
+	    status = "-";
+	}
+	return status;
+    }
 
     /**
      * Adds a mark to the aggregated total and saves it