Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUserMarkDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUserMarkDTO.java,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUserMarkDTO.java	15 Aug 2007 03:54:49 -0000	1.4
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUserMarkDTO.java	16 May 2008 01:59:44 -0000	1.5
@@ -40,6 +40,7 @@
     private String sessionName;
     private String queUsrId;
     private String userName;
+    private String fullName;
     private Integer[] marks; 
     private Long totalMark;
 
@@ -49,6 +50,7 @@
             .append("sessionId", sessionId)
             .append("queUsrId", queUsrId)
             .append("userName", userName)
+            .append("fullName", fullName)
             .append("marks", marks)            
             .append("totalMark", totalMark)            
             .toString();
@@ -73,25 +75,42 @@
     public String getQueUsrId() {
         return queUsrId;
     }
+    
     /**
      * @param queUsrId The queUsrId to set.
      */
     public void setQueUsrId(String queUsrId) {
         this.queUsrId = queUsrId;
     }
+    
     /**
      * @return Returns the userName.
      */
     public String getUserName() {
         return userName;
     }
+    
     /**
      * @param userName The userName to set.
      */
     public void setUserName(String userName) {
         this.userName = userName;
     }
-	
+    
+    /**
+     * @return Returns the userName.
+     */
+    public String getFullName() {
+        return fullName;
+    }
+    
+    /**
+     * @param userName The userName to set.
+     */
+    public void setFullName(String fullName) {
+        this.fullName = fullName;
+    }
+    
 	public int compareTo(Object o)
     {
 	    McUserMarkDTO mcUserMarkDTO = (McUserMarkDTO) o;
@@ -101,7 +120,6 @@
 		else
 			return (int) (new Long(queUsrId).longValue() - new Long(mcUserMarkDTO.queUsrId).longValue());
     }
-	
   
     /**
      * @return Returns the sessionId.
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java,v
diff -u -r1.39 -r1.40
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	15 May 2008 05:40:13 -0000	1.39
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	16 May 2008 01:59:44 -0000	1.40
@@ -4747,13 +4747,20 @@
 							cell.setCellValue(currentSessionName);
 							
 							idx++;
+							int count = 0;
+							
 							row = sheet.createRow(idx++);
-							cell = row.createCell((short) 0);
+							
+							cell = row.createCell((short) count++);
 							cell.setEncoding(HSSFCell.ENCODING_UTF_16);
-							cell.setCellValue(messageService.getMessage("label.user"));
+							cell.setCellValue(messageService.getMessage("label.learner"));
 							
+							cell = row.createCell((short) count++);
+							cell.setEncoding(HSSFCell.ENCODING_UTF_16);
+							cell.setCellValue(messageService.getMessage("label.monitoring.downloadMarks.username"));
+							
 							Iterator answersIterator = listMonitoredAnswersContainerDTO.iterator();
-							int count = 1;
+							
 							while(answersIterator.hasNext()) {
 								McMonitoredAnswersDTO mcMonitoredAnswersDTO = (McMonitoredAnswersDTO) answersIterator.next();
 								
@@ -4774,11 +4781,16 @@
 								
 								McUserMarkDTO userMark = (McUserMarkDTO) userMarkIterator.next();
 								String currentUserSessionId = userMark.getSessionId();
+
+								cell = row.createCell((short) count++);
+								cell.setEncoding(HSSFCell.ENCODING_UTF_16);
+								cell.setCellValue(userMark.getFullName());
 								
 								cell = row.createCell((short) count++);
 								cell.setEncoding(HSSFCell.ENCODING_UTF_16);
 								cell.setCellValue(userMark.getUserName());
-										
+								
+								
 								Integer[] marks = userMark.getMarks();
 								for(int i=0; i<marks.length; i++) {
 									cell = row.createCell((short) count++);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java,v
diff -u -r1.32 -r1.33
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java	17 Aug 2007 03:32:06 -0000	1.32
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java	16 May 2008 01:59:44 -0000	1.33
@@ -206,7 +206,8 @@
         	    McUserMarkDTO mcUserMarkDTO= new McUserMarkDTO();
         	    mcUserMarkDTO.setSessionId(mcSession.getMcSessionId().toString());
         	    mcUserMarkDTO.setSessionName(mcSession.getSession_name().toString());
-        	    mcUserMarkDTO.setUserName(mcQueUsr.getFullname());
+        	    mcUserMarkDTO.setFullName(mcQueUsr.getFullname());
+        	    mcUserMarkDTO.setUserName(mcQueUsr.getUsername());
         	    mcUserMarkDTO.setQueUsrId(mcQueUsr.getUid().toString());
         	    
             	// The marks for the user must be listed in the display order of the question.
Index: lams_tool_lamc/web/export/class.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/export/class.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/web/export/class.jsp	17 Oct 2007 02:52:17 -0000	1.3
+++ lams_tool_lamc/web/export/class.jsp	16 May 2008 01:59:44 -0000	1.4
@@ -83,7 +83,7 @@
 								<c:if test="${currentUserSessionId == currentSessionId}"> 	
 									<tr>									  	 		
 					  	 				<td NOWRAP valign=top class="align-left"> 
-												<c:out value="${data.userName}"/> 
+												<c:out value="${data.fullName}"/> 
 										</td>	
 	
 										<c:forEach var="mark" items="${data.marks}">
Index: lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/AllSessionsSummary.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp	22 Nov 2006 06:30:08 -0000	1.3
+++ lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp	16 May 2008 01:59:44 -0000	1.4
@@ -55,7 +55,7 @@
 										<c:if test="${currentUserSessionId == currentSessionId}"> 	
 											<tr>									  	 		
 							  	 				<td NOWRAP valign=top class="align-left"> 
-														<c:out value="${data.userName}"/> 
+														<c:out value="${data.fullName}"/> 
 												</td>	
 			
 												<c:forEach var="mark" items="${data.marks}">
@@ -81,7 +81,7 @@
 											<c:if test="${currentUserSessionId == currentSessionId}"> 									
 											<tr>			
 												<td NOWRAP valign=top class="align-left"> 
-														<c:out value="${data.userName}"/> 
+														<c:out value="${data.fullName}"/> 
 												</td>	
 			
 												<c:forEach var="mark" items="${data.marks}">
Index: lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/IndividualSessionSummary.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp	22 Nov 2006 06:30:08 -0000	1.3
+++ lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp	16 May 2008 01:59:44 -0000	1.4
@@ -66,7 +66,7 @@
 										<c:if test="${currentUserSessionId == currentSessionId}"> 	
 											<tr>									  	 		
 							  	 				<td NOWRAP valign=top class="align-left"> 
-														<c:out value="${data.userName}"/> 
+														<c:out value="${data.fullName}"/> 
 												</td>	
 			
 												<c:forEach var="mark" items="${data.marks}">
@@ -92,7 +92,7 @@
 											<c:if test="${currentUserSessionId == currentSessionId}"> 									
 											<tr>			
 												<td NOWRAP valign=top class="align-left"> 
-														<c:out value="${data.userName}"/> 
+														<c:out value="${data.fullName}"/> 
 												</td>	
 			
 												<c:forEach var="mark" items="${data.marks}">