Index: lams_tool_laqa/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/conf/language/ApplicationResources.properties	16 May 2006 01:20:20 -0000	1.4
+++ lams_tool_laqa/conf/language/ApplicationResources.properties	6 Jun 2006 16:07:27 -0000	1.5
@@ -167,6 +167,8 @@
 label.content.notEditable  =The content can not be edited since it is being used by learners.
 error.system.qa  =<font color\="red">A system exception has occured. Please contact technical support. The error to report is\: <br/> <b>{0}</b></font>
 
+label.learning.reportMessage  =The following are your answers:
+label.allResponses  =All Responses
 
 #======= End labels: Exported 160 labels for en AU =====
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v
diff -u -r1.54 -r1.55
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	2 Jun 2006 07:55:32 -0000	1.54
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	6 Jun 2006 16:07:27 -0000	1.55
@@ -44,7 +44,9 @@
 	public static final String LOAD_LEARNER								="loadLearner";
 	public static final String LEARNING_STARTER							="learningStarter";
 	public static final String MONITORING_STARTER						="monitoringStarter";
-	public static final String EXPORT_PORTFOLIO 						= "exportPortfolio";
+	public static final String EXPORT_PORTFOLIO 						="exportPortfolio";
+	public static final String VIEW_ALL_RESULTS 						="viewAllResults";
+	public static final String INDIVIDUAL_LEARNER_RESULTS				="individualLearnerResults";
 	public static final String LOAD_MONITORING							="refreshMonitoring";
 	public static final String LOAD_VIEW_ONLY							="loadViewOnly";
 	public static final String EDIT_RESPONSE							="editResponse";
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaUtils.java,v
diff -u -r1.41 -r1.42
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	7 Apr 2006 00:44:22 -0000	1.41
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	6 Jun 2006 16:07:27 -0000	1.42
@@ -631,4 +631,41 @@
     	}
     }
 
+    
+	public static UserDTO getToolUser()
+	{
+		/*obtain user object from the session*/
+	    HttpSession ss = SessionManager.getSession();
+	    /* get back login user DTO */
+	    UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		logger.debug("retrieving toolUser: " + toolUser);
+		return 	toolUser;
+	}
+	
+	
+	public static Long getUserId()
+	{
+		UserDTO toolUser=getToolUser();
+		long userId=toolUser.getUserID().longValue();
+		logger.debug("userId: " + userId);
+		return new Long(userId);
+	}
+	
+	public static String getUserName()
+	{
+		/* double check if username and login is the same */
+		UserDTO toolUser=getToolUser();
+		String userName=toolUser.getLogin();
+		logger.debug("userName: " + userName);
+		return userName;
+	}
+	
+	public static String getUserFullName()
+	{
+		UserDTO toolUser=getToolUser();
+		String fullName=toolUser.getFirstName() + " " + toolUser.getLastName();  
+		logger.debug("fullName: " + fullName);
+		return fullName;
+	}
+
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java,v
diff -u -r1.31 -r1.32
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	7 Apr 2006 00:44:22 -0000	1.31
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	6 Jun 2006 16:07:27 -0000	1.32
@@ -286,7 +286,7 @@
         if ((!activeModule.equals(DEFINE_LATER)) && (setCommonContent))
 		{
         	logger.debug("setting other content values...");
-         	qaContent.setUsernameVisible(isUsernameVisible);
+         	//qaContent.setUsernameVisible(isUsernameVisible);
          	qaContent.setQuestionsSequenced(isQuestionsSequenced); /**the default question listing in learner mode will be all in the same page*/
          	qaContent.setSynchInMonitor(isSynchInMonitor);
          	qaContent.setOnlineInstructions(richTextOnlineInstructions);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java,v
diff -u -r1.23 -r1.24
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	7 Apr 2006 00:44:22 -0000	1.23
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	6 Jun 2006 16:07:27 -0000	1.24
@@ -37,6 +37,7 @@
 import org.lamsfoundation.lams.tool.qa.QaQueUsr;
 import org.lamsfoundation.lams.tool.qa.QaSession;
 import org.lamsfoundation.lams.tool.qa.QaUsrResp;
+import org.lamsfoundation.lams.tool.qa.QaUtils;
 import org.lamsfoundation.lams.tool.qa.service.IQaService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -106,14 +107,16 @@
 						    	
     	logger.debug("createQaQueUsr - qaQueUsr: " + qaQueUsr);
     	
+    	logger.debug("session uid: " + qaSession.getUid());
     	/*note that it is possible for a user to already exist from another tool session. In this case don't add any more user record*/
-    	QaQueUsr qaQueUsrLocal=qaService.getQaQueUsrById(userId.longValue());
+    	QaQueUsr qaQueUsrLocal=qaService.getQaUserBySession(userId, qaSession.getUid());
     	logger.debug("qaQueUsrLocal: " + qaQueUsrLocal);
     	
     	if ((qaQueUsr != null) && (qaQueUsrLocal == null)) 
         {
-        	qaService.createQaQueUsr(qaQueUsr);
-            logger.debug("createUsers-qaQueUsr created in the db: " + qaQueUsr);	
+        	//qaService.createQaQueUsr(qaQueUsr);
+    	    qaQueUsr=createUser(request);
+            logger.debug("created qaQueUsr: " + qaQueUsr);	
         }
     	else
     	{
@@ -156,6 +159,31 @@
     }
 
     
+    public static QaQueUsr createUser(HttpServletRequest request)
+	{
+        logger.debug("creating a new user in the tool db");
+		IQaService qaService =QaUtils.getToolService(request);
+	    Long queUsrId=QaUtils.getUserId();
+		String username=QaUtils.getUserName();
+		String fullname=QaUtils.getUserFullName();
+		Long toolSessionId=(Long) request.getSession().getAttribute(TOOL_SESSION_ID);
+		
+		QaSession qaSession=qaService.retrieveQaSessionOrNullById(toolSessionId.longValue());
+		logger.debug("qaSession: " + qaSession);
+		
+		QaQueUsr qaQueUsr= new QaQueUsr(queUsrId,
+		        username,
+		        fullname,
+				null, 
+				qaSession, 
+				new TreeSet());
+
+		qaService.createQaQueUsr(qaQueUsr);
+		logger.debug("created qaQueUsr in the db: " + qaQueUsr);
+		return qaQueUsr;
+	}
+
+    
     /**
 	 * feedBackAnswersProgress(HttpServletRequest request, int currentQuestionIndex)
 	 * give user feedback on the remaining questions
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/MonitoringUtil.java,v
diff -u -r1.27 -r1.28
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java	7 Apr 2006 00:44:22 -0000	1.27
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java	6 Jun 2006 16:07:27 -0000	1.28
@@ -309,7 +309,7 @@
                     	if (qaSession != null)
                     	{
                     		List listUsers=qaService.getUserBySessionOnly(qaSession);	
-                    		logger.debug("listMcUsers for session id:"  + qaSession.getQaSessionId() +  " = " + listUsers);
+                    		logger.debug("listQaUsers for session id:"  + qaSession.getQaSessionId() +  " = " + listUsers);
                     		Map sessionUsersAttempts=populateSessionUsersAttempts(request,qaSession.getQaSessionId(), listUsers, questionUid, 
                     				isUserNamesVisible, isLearnerRequest, userId);
                     		listMonitoredAttemptsContainerDTO.add(sessionUsersAttempts);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v
diff -u -r1.6 -r1.7
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	24 May 2006 15:43:47 -0000	1.6
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	6 Jun 2006 16:07:27 -0000	1.7
@@ -237,9 +237,66 @@
     	qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, currentSessionId, userID);
     	
 		request.getSession().setAttribute(REQUEST_LEARNING_REPORT, new Boolean(true).toString());
-		logger.debug("fwd'ing to." + LEARNER_REPORT);
+		logger.debug("fwd'ing to." + INDIVIDUAL_LEARNER_RESULTS);
+		return (mapping.findForward(INDIVIDUAL_LEARNER_RESULTS));
+	}
+    
+	
+    /**
+	 * returns Learner Report for a session
+	 * ActionForward viewAllResults(ActionMapping mapping,
+            ActionForm form,
+            HttpServletRequest request,
+            HttpServletResponse response) throws IOException,
+                                         ServletException)
+	 * 
+	 * @param mapping
+	 * @param form
+	 * @param request
+	 * @param response
+	 * @return
+	 * @throws IOException
+	 * @throws ServletException
+	 */
+    public ActionForward viewAllResults(ActionMapping mapping,
+            ActionForm form,
+            HttpServletRequest request,
+            HttpServletResponse response) throws IOException,
+                                         ServletException
+	{
+    	logger.debug("dispatching viewAllResults...");
+    	QaLearningForm qaLearningForm = (QaLearningForm) form;
+
+    	IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE);
+		logger.debug("qaService: " + qaService);
+		if (qaService == null)
+		{
+			logger.debug("will retrieve qaService");
+			qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
+			logger.debug("retrieving qaService from session: " + qaService);
+		}
+
+	    Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID);
+	    logger.debug("toolContentId: " + toolContentId);
+	    
+	    QaContent qaContent=qaService.loadQa(toolContentId.longValue());
+		logger.debug("existing qaContent:" + qaContent);
+
+		Long toolSessionId=(Long)request.getSession().getAttribute(AttributeNames.PARAM_TOOL_SESSION_ID);
+		
+		Boolean isUserNamesVisibleBoolean=(Boolean)request.getSession().getAttribute(IS_USERNAME_VISIBLE);
+    	boolean isUserNamesVisible=isUserNamesVisibleBoolean.booleanValue();
+    	logger.debug("isUserNamesVisible: " + isUserNamesVisible);
+    	
+    	QaMonitoringAction qaMonitoringAction= new QaMonitoringAction();
+    	qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, toolSessionId.toString(), null);
+    	
+		request.getSession().setAttribute(REQUEST_LEARNING_REPORT, new Boolean(true).toString());
+		request.getSession().setAttribute(REQUEST_LEARNING_REPORT_PROGRESS, new Boolean(false).toString());
+		logger.debug("fwd'ing to for learner progress" + LEARNER_REPORT);
 		return (mapping.findForward(LEARNER_REPORT));
 	}
+
     
     
     /**
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QaLearningForm.java,v
diff -u -r1.10 -r1.11
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningForm.java	7 Apr 2006 00:44:22 -0000	1.10
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningForm.java	6 Jun 2006 16:07:27 -0000	1.11
@@ -41,6 +41,7 @@
 	protected String getPreviousQuestion;
 	protected String endLearning;
 	
+	protected String viewAllResults;
 	protected String responseId;
 	
 	
@@ -154,4 +155,17 @@
 	public void setMethod(String method) {
 		this.method = method;
 	}
+	
+    /**
+     * @return Returns the viewAllResults.
+     */
+    public String getViewAllResults() {
+        return viewAllResults;
+    }
+    /**
+     * @param viewAllResults The viewAllResults to set.
+     */
+    public void setViewAllResults(String viewAllResults) {
+        this.viewAllResults = viewAllResults;
+    }	
 }
Index: lams_tool_laqa/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/struts-config.xml,v
diff -u -r1.27 -r1.28
--- lams_tool_laqa/web/WEB-INF/struts-config.xml	16 May 2006 01:20:20 -0000	1.27
+++ lams_tool_laqa/web/WEB-INF/struts-config.xml	6 Jun 2006 16:07:27 -0000	1.28
@@ -280,7 +280,20 @@
 	        path="/monitoring/LearnerRep.jsp"
 		    redirect="false"
 	      />
-	      
+
+	     <forward
+	        name="individualLearnerResults"
+	        path="/learning/IndividualLearnerResults.jsp"
+		    redirect="false"
+	      />
+
+
+	     <forward
+	        name="viewAllResults"
+	        path="/learning/AllResults.jsp"
+		    redirect="false"
+	      />
+
 	      <forward
 		    name="errorListLearner"
 		    path="/QaErrorBox.jsp"
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/IndividualLearnerResults.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp	6 Jun 2006 16:07:27 -0000	1.1
@@ -0,0 +1,101 @@
+<%-- 
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+License Information: http://lamsfoundation.org/licensing/lams/2.0/
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License version 2 as 
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+  USA
+
+  http://www.gnu.org/licenses/gpl.txt
+--%>
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-bean" prefix="bean"%> 
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-logic" prefix="logic" %>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="fck-editor" prefix="FCK" %>
+<%@ taglib uri="tags-lams" prefix="lams" %>
+
+<c:set var="lams"><lams:LAMSURL/></c:set>
+<c:set var="tool"><lams:WebAppURL/></c:set>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html:html locale="true">
+<head>
+	<jsp:include page="/learning/learningHeader.jsp" />
+	
+	<script language="JavaScript" type="text/JavaScript">
+		function submitLearningMethod(actionMethod) 
+		{
+			document.QaLearningForm.method.value=actionMethod; 
+			document.QaLearningForm.submit();
+		}
+		
+		function submitMethod(actionMethod) 
+		{
+			submitLearningMethod(actionMethod);
+		}
+	</script>	
+</head>
+<body>
+	  <html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
+  		<html:hidden property="method"/>	 
+
+				<table width="80%" cellspacing="8" align="CENTER" class="forms">
+				  <tr><th scope="col">
+					  	 <bean:message key="label.learning.reportMessage"/> 
+		    	  	</th>
+				  </tr>
+
+					<tr>
+						<td NOWRAP align=right class="input" valign=top colspan=2> 
+							<hr>
+						</td> 
+					</tr>
+					
+			  		<c:forEach var="entry" items="${sessionScope.mapAnswers}">
+						  <tr>
+						  	<td NOWRAP align=center valign=top colspan=2> 
+								  <c:out value="${entry.value}" escapeXml="false" />						  																	
+						  	</td>
+						  </tr>
+					</c:forEach>
+			  	   	<tr> 
+				 		<td NOWRAP colspan=2 class="input" valign=top> 
+				 		&nbsp
+				 		</td>
+			  	   </tr>
+
+			  	   
+		  	   		  <tr>
+					  	<td NOWRAP colspan=2 align=center class="input" valign=top> 
+						  	<font size=2>
+
+                                <html:submit property="viewAllResults" 
+                                             styleClass="linkbutton" 
+                                             onclick="submitMethod('viewAllResults');">
+                                    <bean:message key="label.allResponses"/>
+                                </html:submit>
+							</font>
+					  	 </td>
+					  </tr>
+					
+				</table>
+	</html:form>
+	
+</body>
+</html:html>
+
+	
+					
\ No newline at end of file
Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/SummaryContent.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	24 May 2006 15:43:24 -0000	1.13
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	6 Jun 2006 16:07:27 -0000	1.14
@@ -101,7 +101,6 @@
 									<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.timezone"/> </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}">
Index: lams_tool_laqa/web/monitoring/UserResponses.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/UserResponses.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_laqa/web/monitoring/UserResponses.jsp	7 Apr 2006 00:44:22 -0000	1.4
+++ lams_tool_laqa/web/monitoring/UserResponses.jsp	6 Jun 2006 16:07:27 -0000	1.5
@@ -35,7 +35,6 @@
 		<c:if test="${editResponse != 'true'}">	  	 									 			
 			 <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.timeZone}"/> </font> </td>
 			 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.response}"/> </font> </td>
 	
 			<c:if test="${(requestLearningReport != 'true')}"> 	
@@ -48,7 +47,6 @@
 			<c:if test="${editableResponseId == responseUid}">	  	 									 			
 				 <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.timeZone}"/> </font> </td>
 				 <td NOWRAP valign=top>  <font size=2> <input type="text" name="updatedResponse" value='<c:out value="${userData.response}"/>'> </font> </td>
 		
 				<c:if test="${(requestLearningReport != 'true')}"> 				 
@@ -60,7 +58,6 @@
 		<c:if test="${editableResponseId != responseUid}">	  	 									 			
 				 <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.timeZone}"/> </font> </td>
 				 <td NOWRAP valign=top>  <font size=2> <c:out value="${userData.response}"/> </font> </td>
 		
 				<c:if test="${(requestLearningReport != 'true')}">