Index: lams_tool_lamc/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.9 -r1.10
--- lams_tool_lamc/conf/language/ApplicationResources.properties	19 Jun 2006 23:03:40 -0000	1.9
+++ lams_tool_lamc/conf/language/ApplicationResources.properties	21 Jun 2006 03:08:50 -0000	1.10
@@ -242,6 +242,8 @@
 label.mark.only  =Mark
 label.total =Total
 label.groupName =Group Name:
+label.yourAnswers =Your answers:
+label.learner= Learner
 
 error.system.mc  =<font color\="red">A system exception has occured. Please contact Lams International technical support at 95806666. The error to report is\: <br/> <b>{0}</b></font>
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java,v
diff -u -r1.78 -r1.79
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	17 Jun 2006 22:42:18 -0000	1.78
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	21 Jun 2006 03:08:50 -0000	1.79
@@ -250,6 +250,7 @@
     public static final String CURRENT_MONITORED_TOOL_SESSION 			="currentMonitoredToolSession";
     public static final String SELECTION_CASE							="selectionCase";
     public static final String LIST_MONITORED_ANSWERS_CONTAINER_DTO		="listMonitoredAnswersContainerDto";
+    public static final String LEARNER_NAME								="learnerName";
     public static final String LIST_MONITORED_MARKS_CONTAINER_DTO		="listMonitoredMarksContainerDto";
     public static final String TIMEZONE									="timeZone";
     
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java,v
diff -u -r1.5 -r1.6
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java	21 Jun 2006 01:44:54 -0000	1.5
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java	21 Jun 2006 03:08:50 -0000	1.6
@@ -117,9 +117,12 @@
 	    request.getSession().setAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO, listMonitoredAnswersContainerDTO);
 	    logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO));
 	    
-	    List listMonitoredMarksContainerDTO=MonitoringUtil.buildGroupsMarkData(request, content, mcService);
+	    
+	    List listMonitoredMarksContainerDTO=MonitoringUtil.buildGroupsMarkDataForExportLearner(request, content, mcService, mcSession, learner.getUid() );
 	    request.getSession().setAttribute(LIST_MONITORED_MARKS_CONTAINER_DTO, listMonitoredMarksContainerDTO);
 	    logger.debug("LIST_MONITORED_MARKS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_MARKS_CONTAINER_DTO));
+	    
+	    request.getSession().setAttribute(LEARNER_NAME,learner.getFullname() );
 
         
     	logger.debug("ending learner mode: ");
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.18 -r1.19
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java	21 Jun 2006 00:55:09 -0000	1.18
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java	21 Jun 2006 03:08:50 -0000	1.19
@@ -142,6 +142,66 @@
 	}
 
 	
+	public static List buildGroupsMarkDataForExportLearner(HttpServletRequest request, McContent mcContent, IMcService mcService, McSession mcSession, Long learnerUid)
+	{
+		logger.debug("will be building export learner groups mark data  for content:..." + mcContent);
+		
+		logger.debug("mcSession: " + mcSession);
+		logger.debug("learnerUid: " + learnerUid);
+    	List listMonitoredMarksContainerDTO= new LinkedList();
+
+    	
+	    McSessionMarkDTO mcSessionMarkDTO= new McSessionMarkDTO();
+	    mcSessionMarkDTO.setSessionId(mcSession.getMcSessionId().toString());
+	    mcSessionMarkDTO.setSessionName(mcSession.getSession_name().toString());
+	    
+	    
+	    LinkedList sessionUsersData= new LinkedList();
+	    Map mapSessionUsersData= new TreeMap(new McStringComparator());
+	    
+	    McUserMarkDTO mcUserMarkDTO= new McUserMarkDTO();
+	    mcUserMarkDTO.setSessionId(mcSession.getMcSessionId().toString());
+	    
+	    List listQuestions=mcService.getAllQuestionEntries(mcContent.getUid());
+    	logger.debug("listQuestions:..." + listQuestions);
+    	
+    	Iterator itListQuestions = listQuestions.iterator();
+	    LinkedList userMarks= new LinkedList();
+	    
+    	while (itListQuestions.hasNext())
+	    {
+	    	McQueContent mcQueContent =(McQueContent)itListQuestions.next();
+	    	logger.debug("mcQueContent:..." + mcQueContent);
+	    	if (mcQueContent != null)
+	    	{
+	    	    String learnerMark=getLearnerMarkForQuestionInSession(mcQueContent.getUid(), mcSession.getUid(),learnerUid, mcSession, mcService);
+	    	    logger.debug("learnerMark for queContent uid, mcSession uid, mcUser uid:..." + mcQueContent.getUid() + "--" + mcSession.getUid() 
+	    	            + "--"  +  "is: " + learnerMark);
+	    	    
+	    	    userMarks.add(learnerMark);
+	    	}
+	    }
+
+    	logger.debug("final userMarks:..." + userMarks);
+    	mcUserMarkDTO.setMarks(userMarks);
+    	
+    	String totalMark=getTotalUserMarkForQuestions(userMarks);
+    	logger.debug("totalMark: " + totalMark);
+    	mcUserMarkDTO.setTotalMark(totalMark);
+    	
+    	logger.debug("final mcUserMarkDTO:..." + mcUserMarkDTO);
+    	sessionUsersData.add(mcUserMarkDTO);
+    	logger.debug("final sessionUsersData: " + sessionUsersData);
+    	mapSessionUsersData=convertToMcUserMarkDTOMap(sessionUsersData);
+    	logger.debug("final mapSessionUsersData: " + mapSessionUsersData);
+    	mcSessionMarkDTO.setUserMarks(mapSessionUsersData);
+    	listMonitoredMarksContainerDTO.add(mcSessionMarkDTO);
+        	
+		logger.debug("final listMonitoredMarksContainerDTO:..." + listMonitoredMarksContainerDTO);
+		return listMonitoredMarksContainerDTO;
+	}
+
+	
 	public static List buildGroupsMarkData(HttpServletRequest request, McContent mcContent, IMcService mcService)
 	{
 		logger.debug("will be building groups mark data  for content:..." + mcContent);