Index: lams_tool_lamc/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/build.xml,v
diff -u -r1.25 -r1.26
--- lams_tool_lamc/build.xml	14 Apr 2006 10:04:55 -0000	1.25
+++ lams_tool_lamc/build.xml	14 Jun 2006 14:26:57 -0000	1.26
@@ -237,6 +237,7 @@
 	   					<include name="author_page/**"/>
 						<include name="authoring/*"/>
 						<include name="learning/*"/>
+						<include name="export/*"/>
 						<include name="sharing/*"/>	   				
 						<include name="css/*"/>	   					   				
 						<include name="includes/*"/>	   					   				
Index: lams_tool_lamc/db/sql/tool_insert.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/tool_insert.sql,v
diff -u -r1.16 -r1.17
--- lams_tool_lamc/db/sql/tool_insert.sql	10 Apr 2006 11:10:26 -0000	1.16
+++ lams_tool_lamc/db/sql/tool_insert.sql	14 Jun 2006 14:26:18 -0000	1.17
@@ -45,8 +45,8 @@
 'tool/lamc11/authoringStarter.do',
 'tool/lamc11/monitoringStarter.do',
 'tool/lamc11/defineLaterStarter.do',
-'tool/lamc11/portfolioExport?mode=learner',
-'tool/lamc11/portfolioExport?mode=teacher',
+'tool/lamc11/exportPortfolio?mode=learner',
+'tool/lamc11/exportPortfolio?mode=teacher',
 'tool/lamc11/monitoringStarter.do',
 'tool/lamc11/monitoringStarter.do',
 'org.lamsfoundation.lams.tool.mc.ApplicationResources',
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.2 -r1.3
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java	5 Jun 2006 07:49:19 -0000	1.2
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java	14 Jun 2006 14:26:18 -0000	1.3
@@ -24,6 +24,8 @@
 
 package org.lamsfoundation.lams.tool.mc.web;
 
+import java.util.List;
+
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -47,7 +49,7 @@
 
 public class ExportServlet  extends AbstractExportPortfolioServlet implements McAppConstants{
 	static Logger logger = Logger.getLogger(ExportServlet.class.getName());
-	private static final long serialVersionUID = -4529093489007108143L;
+	private static final long serialVersionUID = -4119093489007108143L;
 	private final String FILENAME = "mc_main.html";
 	
 	
@@ -108,12 +110,22 @@
             throw new McApplicationException(error);
         }
 
+    	
         logger.debug("calling learning mode toolSessionID:" + toolSessionID + " userID: " + userID );
     	McMonitoringAction mcMonitoringAction= new McMonitoringAction();
-    	//mcMonitoringAction.refreshSummaryData(request, content, mcService, true, true, toolSessionID.toString(), userID.toString() , true);
+    	logger.debug("start refreshSummaryData for learner mode.");
+    	//mcMonitoringAction.refreshSummaryData(request, content, mcService, true, true, toolSessionID.toString(), userID.toString());
+    	/*
+	    List listMonitoredAnswersContainerDTO=MonitoringUtil.buildGroupsQuestionData(request, content);
+	    request.getSession().setAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO, listMonitoredAnswersContainerDTO);
+	    logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO));
+	    */
+
     	
+    	logger.debug("end refreshSummaryData for learner mode.");
     	logger.debug("ending learner mode: ");
     }
+	
     
     public void teacher(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies)
     {
@@ -139,10 +151,11 @@
             throw new McApplicationException(error);
         }
 		
+        logger.debug("starting teacher mode: ");
         McMonitoringAction mcMonitoringAction= new McMonitoringAction();
-        logger.debug("starting refreshSummaryData.");
-        //mcMonitoringAction.refreshSummaryData(request, content, mcService, true, false, null, null, false);
-        
+        List listMonitoredAnswersContainerDTO=MonitoringUtil.buildGroupsQuestionData(request, content);
+	    request.getSession().setAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO, listMonitoredAnswersContainerDTO);
+	    logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO));
         logger.debug("ending teacher 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.11 -r1.12
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java	3 Apr 2006 13:31:03 -0000	1.11
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java	14 Jun 2006 14:26:18 -0000	1.12
@@ -223,7 +223,6 @@
     		if (mcQueUsr != null)
     		{
     			logger.debug("getting listUserAttempts for user id: " + mcQueUsr.getUid() + " and que content id: " + questionUid);
-    			//List listUserAttempts=mcService.getAttemptsForUser(mcQueUsr.getUid());
     			List listUserAttempts=mcService.getAttemptsForUserAndQuestionContent(mcQueUsr.getUid(), new Long(questionUid));
     			logger.debug("listUserAttempts: " + listUserAttempts);
 
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/web.xml,v
diff -u -r1.18 -r1.19
--- lams_tool_lamc/web/WEB-INF/web.xml	16 May 2006 05:15:49 -0000	1.18
+++ lams_tool_lamc/web/WEB-INF/web.xml	14 Jun 2006 14:26:46 -0000	1.19
@@ -110,7 +110,7 @@
 	
 	<servlet>
 		<servlet-name>exportPortfolio</servlet-name>
-		<servlet-class>org.lamsfoundation.lams.tool.mc.web.McExportServlet</servlet-class>
+		<servlet-class>org.lamsfoundation.lams.tool.mc.web.ExportServlet</servlet-class>
 	</servlet>
 
 <!--  FCKEditor Connector Configuration -->
@@ -140,7 +140,7 @@
 
   	<servlet-mapping>
 		<servlet-name>exportPortfolio</servlet-name>
-		<url-pattern>/portfolioExport</url-pattern>
+		<url-pattern>/exportPortfolio/*</url-pattern>
   	</servlet-mapping>
 
 	<servlet-mapping>
Index: lams_tool_lamc/web/export/ExportContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/export/Attic/ExportContent.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/web/export/ExportContent.jsp	2 Jun 2006 08:01:31 -0000	1.1
+++ lams_tool_lamc/web/export/ExportContent.jsp	14 Jun 2006 14:26:33 -0000	1.2
@@ -32,4 +32,67 @@
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
  				
-Export Content goes here
\ No newline at end of file
+		<c:if test="${(userExceptionNoToolSessions == 'true')}"> 	
+				<table class="forms" align="center">
+					<tr> 
+						<td NOWRAP valign=top align=center> 
+							<b> <font size=2> <bean:message key="error.noLearnerActivity"/> </font></b>
+						</td> 
+					<tr>
+				</table>
+		</c:if>			
+
+		<c:if test="${(userExceptionNoToolSessions != 'true') }"> 	
+			<table width="80%" cellspacing="8" align="CENTER" class="forms">
+			
+					<c:forEach var="currentDto" items="${sessionScope.listMonitoredAnswersContainerDto}">
+			  	 		<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}"/>
+			  	 		<tr>
+			  	 			<td> &nbsp&nbsp&nbsp</td>
+			  	 		</tr>
+						<tr>			
+							<td NOWRAP valign=top align=left><b> <font size=2> <bean:message key="label.question"/> : </b> </font>
+								<c:out value="${currentDto.question}" escapeXml="false"/>
+							 </td>
+						</tr>	
+						
+						<tr> 
+							<td NOWRAP class="formlabel" valign=top>
+								<table align=center>
+									<tr> 
+										 <td NOWRAP valign=top> <b> <font size=2> <bean:message key="label.user"/> </font> </b> </td>  
+				  						 <td NOWRAP valign=top> <b> <font size=2> <bean:message key="label.attemptTime"/></font> </b></td>
+				  						 <td NOWRAP valign=top> <b> <font size=2> <bean:message key="label.response"/> </font> 	</b></td>
+						  			</tr>				 
+		  							<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
+										<c:forEach var="sData" items="${questionAttemptData.value}">
+								  	 		<c:set var="userData" scope="request" value="${sData.value}"/>
+								  	 		<c:set var="responseUid" scope="request" value="${userData.uid}"/>
+
+	  	 									<c:if test="${currentQuestionId == userData.questionUid}"> 			
+		  	 									<c:if test="${sessionScope.currentMonitoredToolSession == 'All'}"> 			
+			  	 									<tr>
+														 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.userName}"/> </font>  </td>  
+														 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.attemptTime}"/> </font> </td>
+														 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.response}"/> </font> </td>
+													</tr>
+												</c:if>														  					 									  			
+												
+		  	 									<c:if test="${sessionScope.currentMonitoredToolSession != 'All'}"> 			
+		  	 										<c:if test="${sessionScope.currentMonitoredToolSession == userData.sessionId}"> 			
+		  	 										<tr>
+														 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.userName}"/> </font>  </td>  
+														 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.attemptTime}"/> </font> </td>
+														 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.response}"/> </font> </td>
+													</tr>
+													</c:if>														  					 									  													  			
+												</c:if>														  					 									  													  			
+											</c:if>														  					 
+	 									</c:forEach>		  	
+									</c:forEach>		  	
+								</table>
+							</td>  
+			  			</tr>
+					</c:forEach>		  	
+			</table>			
+		</c:if>							
\ No newline at end of file
Index: lams_tool_lamc/web/export/exportportfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/export/exportportfolio.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_lamc/web/export/exportportfolio.jsp	5 Jun 2006 07:57:31 -0000	1.3
+++ lams_tool_lamc/web/export/exportportfolio.jsp	14 Jun 2006 14:26:33 -0000	1.4
@@ -78,14 +78,14 @@
 					<c:if test="${(portfolioExportMode == 'learner')}">
 						<tr> 
 							<td NOWRAP valign=top align=center> 
-								<h1>  </h1>
+								<h1> <bean:message key="label.export.learner"/>   </h1>
 							</td> 
 						<tr>
 					</c:if>			
 					<c:if test="${(portfolioExportMode != 'learner')}">
 						<tr> 
 							<td NOWRAP valign=top align=center> 
-								<h1>  </h1>
+								<h1> <bean:message key="label.export.teacher"/> </h1>
 							</td> 
 						<tr>
 					</c:if>