Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -rf7d806b0ab4f783c2dd89e920d7f6edf370c04db -r96624ae172b4b193603927a3d39c54572e0d6b4c
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision f7d806b0ab4f783c2dd89e920d7f6edf370c04db)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 96624ae172b4b193603927a3d39c54572e0d6b4c)
@@ -1,23 +1,3 @@
-<%--
-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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-
-  http://www.gnu.org/licenses/gpl.txt
---%>
-
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
         "http://www.w3.org/TR/html4/strict.dtd">
 
@@ -37,17 +17,60 @@
 	<title><fmt:message key="activity.title" /></title>
 	
 	<lams:css />
-	<link rel="stylesheet" href="${lams}css/jquery.jRating.css" />
+	<link rel="stylesheet" href="${lams}css/jquery.jRating.css"/>
+	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme-blue.css">
+	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css">
+	<style media="screen,projection" type="text/css">
+		.rating-stars-div {margin-top: 8px;}
+		.user-answer {padding: 7px 2px;}
+		tr.odd:hover .jStar {background-image: url(${lams}images/css/jquery.jRating-stars-grey.png)!important;}
+		tr.even:hover .jStar {background-image: url(${lams}images/css/jquery.jRating-stars-light-grey.png)!important;}
+		tr.odd .jStar {background-image: url(${lams}images/css/jquery.jRating-stars-light-blue.png)!important;}
+		.tablesorter-blue {margin-bottom: 5px;}
+		.pager {padding-bottom: 20px;}
+	</style>
 
 	<script type="text/javascript"> 
 		//var for jquery.jRating.js
 		var pathToImageFolder = "${lams}images/css/"; 
 	</script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
+	<script src="${lams}includes/javascript/jquery.js" type="text/javascript"></script>
+	<script src="${lams}includes/javascript/jquery.jRating.js" type="text/javascript"></script>
+	<script src="${lams}includes/javascript/jquery.tablesorter.js" type="text/javascript"></script>
+	<script src="${lams}includes/javascript/jquery.tablesorter-pager.js" type="text/javascript"></script>
 	<script type="text/javascript">
 	
 	  	$(document).ready(function(){
+	  		
+			$(".tablesorter").tablesorter({
+				theme: 'blue',
+			    widthFixed: true,
+			    widgets: ['zebra']
+			});
+			
+			$(".tablesorter").each(function() {
+				$(this).tablesorterPager({
+				    container: $(this).next(".pager"),
+				    output: '{startRow} to {endRow} ({totalRows})',// possible variables: {page}, {totalPages}, {filteredPages}, {startRow}, {endRow}, {filteredRows} and {totalRows}
+				    // if true, the table will remain the same height no matter how many records are displayed. The space is made up by an empty
+				    // table row set to a height to compensate; default is false
+				    fixedHeight: true,
+				    // remove rows from the table to speed up the sort of large tables.
+				    // setting this to false, only hides the non-visible rows; needed if you plan to add/remove rows with the pager enabled.
+				    removeRows: false,
+				    // css class names of pager arrows
+				    cssNext: '.tablesorter-next', // next page arrow
+					cssPrev: '.tablesorter-prev', // previous page arrow
+					cssFirst: '.tablesorter-first', // go to first page arrow
+					cssLast: '.tablesorter-last', // go to last page arrow
+					cssGoto: '.gotoPage', // select dropdown to allow choosing a page
+					cssPageDisplay: '.pagedisplay', // location of where the "output" is displayed
+					cssPageSize: '.pagesize', // page size selector - select dropdown that sets the "size" option
+					// class added to arrows when at the extremes (i.e. prev/first arrows are "disabled" when on the first page)
+					cssDisabled: 'disabled' // Note there is no period "." in front of this class name
+				});
+			});
+	  		
 		    $(".rating-stars").jRating({
 		    	phpPath : "<c:url value='/learning.do'/>?method=rateResponse&toolSessionID=" + $("#toolSessionID").val(),
 		    	rateMax : 5,
@@ -66,17 +89,15 @@
 		    });
 		 });	
 	
-		function submitLearningMethod(actionMethod) 
-		{
+		function submitLearningMethod(actionMethod) {
 			if (actionMethod == 'endLearning') {
 				$("#finishButton").attr("disabled", true);
 			}
 			document.QaLearningForm.method.value=actionMethod; 
 			document.QaLearningForm.submit();
 		}
 		
-		function submitMethod(actionMethod) 
-		{
+		function submitMethod(actionMethod) {
 			submitLearningMethod(actionMethod);
 		}
 	</script>
@@ -98,334 +119,172 @@
 			</div>
 		</c:if>			
 
-		<c:if
-			test="${generalLearnerFlowDTO.requestLearningReportProgress != 'true'}">
+		<h2>
+			<fmt:message key="label.learnerReport" />
+		</h2>
 
+		<c:forEach var="currentDto" items="${generalLearnerFlowDTO.listMonitoredAnswersContainerDTO}">
+			<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}" />
 
-			<h2>This is revisited
-				<fmt:message key="label.other.answers" />
-			</h2>
+			<div class="shading-bg">
+				<p>
+					<strong> <fmt:message key="label.question" /> : </strong>
+					<c:out value="${currentDto.question}" escapeXml="false" />
+				</p>
 
-			<html:form action="/learning?validate=false"
-				enctype="multipart/form-data" method="POST" target="_self">
-				<html:hidden property="method" />
-				<html:hidden property="toolSessionID" styleId="toolSessionID"/>
-				<html:hidden property="userID" />
-				<html:hidden property="httpSessionID" />
-				<html:hidden property="totalQuestionCount" />
+				<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:forEach var="currentDto"
-					items="${generalLearnerFlowDTO.listMonitoredAnswersContainerDTO}">
-					<c:set var="currentQuestionId" scope="request"
-						value="${currentDto.questionUid}" />
-
-					<div class="shading-bg">
-						<p>
-							<strong> <fmt:message key="label.question" /> : </strong>
-							<c:out value="${currentDto.question}" escapeXml="false" />
-						</p>
-
-						<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="${generalLearnerFlowDTO.userUid == userData.queUsrId}">
+						<c:if test="${generalLearnerFlowDTO.userUid == userData.queUsrId}">
 		
-										<c:if test="${currentQuestionId == userData.questionUid}">
-											<p>
-												<span class="field-name"> <c:out
-														value="${userData.userName}" /> </span> -
-												<lams:Date value="${userData.attemptTime}" />
-											</p>
-											<p>
-												<c:out value="${userData.responsePresentable}"
-													escapeXml="false" />
-											</p>
-											<jsp:include page="parts/ratingStarsDisabled.jsp" />
-										</c:if>
-								</c:if>								
-							</c:forEach>
-						</c:forEach>
-					</div>
+							<c:if test="${currentQuestionId == userData.questionUid}">
+								<p>
+									<span class="field-name"> 
+										<c:out value="${userData.userName}" /> 
+									</span> -
+									<lams:Date value="${userData.attemptTime}" />
+								</p>
+								<p>
+									<c:out value="${userData.responsePresentable}" escapeXml="false" />
+								</p>
+								<jsp:include page="parts/ratingStarsDisabled.jsp" />
+							</c:if>
+						</c:if>								
+					</c:forEach>
 				</c:forEach>
+			</div>
+		</c:forEach>
 				
+		<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
+			<c:if test="${generalLearnerFlowDTO.lockWhenFinished != 'true'}">
+				<br>
+				<html:button property="redoQuestions" styleClass="button" onclick="submitMethod('redoQuestions');">
+					<fmt:message key="label.redo" />
+				</html:button>
+			</c:if>						
+		</c:if>
 				
-				<c:if test="${generalLearnerFlowDTO.existMultipleUserResponses == 'true'}">				
-					<h2>
-						<fmt:message key="label.other.answers" />
-					</h2>
-					
+		<c:if test="${generalLearnerFlowDTO.existMultipleUserResponses == 'true'}">				
+			<h2>
+				<fmt:message key="label.other.answers" />
+			</h2>
 	
-					<c:forEach var="currentDto"
-								items="${generalLearnerFlowDTO.listMonitoredAnswersContainerDTO}">
-								<c:set var="currentQuestionId" scope="request"
-									value="${currentDto.questionUid}" />
+			<c:forEach var="currentDto" items="${generalLearnerFlowDTO.listMonitoredAnswersContainerDTO}">
+				<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}" />
 			
-								<div class="shading-bg">
-						<p>
-							<strong> <fmt:message key="label.question" /> : Here -revisited </strong>
-							<c:out value="${currentDto.question}" escapeXml="false" />
-						</p>
+				<p>
+					<strong> <fmt:message key="label.question" /> : </strong>
+					<c:out value="${currentDto.question}" escapeXml="false" />
+				</p>
+						
+				<table class="tablesorter">
+					<thead>
+						<tr>
+							<th><fmt:message key="label.learning.answer" /></th>
+							<c:if test="${generalLearnerFlowDTO.allowRateAnswers == 'true'}">
+								<th><fmt:message key="label.learning.rating" /></th>
+							</c:if>
+						</tr>
+					</thead>
+					<tbody>
 			
-									<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: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="${generalLearnerFlowDTO.userUid != userData.queUsrId}">	
-											<c:if test="${currentQuestionId == userData.questionUid}">
-												<p>
-													<span class="field-name"> <c:out
-															value="${userData.userName}" /> </span>
+								<c:if test="${generalLearnerFlowDTO.userUid != userData.queUsrId}">	
+									<c:if test="${currentQuestionId == userData.questionUid}">
+										<tr>
+											<td>									
+												<div>
+													<span class="field-name"> <c:out value="${userData.userName}" /> </span>
 															
 													<c:if test="${generalLearnerFlowDTO.userNameVisible == 'true'}">																			
 																 -
 														<lams:Date value="${userData.attemptTime}" />
 													</c:if>																						
-												</p>
-												<p>
-																									<c:choose>
+												</div>
+												<div class="user-answer">
+													<c:choose>
 													<c:when test="${userData.visible == 'true'}">
-														<c:out value="${userData.responsePresentable}"
-															escapeXml="false" />
-														<jsp:include page="parts/ratingStars.jsp" />	
+														<c:out value="${userData.responsePresentable}" escapeXml="false" />
 													</c:when>
 													<c:otherwise>
 														<i><fmt:message key="label.hidden"/></i>
 													</c:otherwise>
-													</c:choose>
-													<hr size=1> 												
-												</p>
+													</c:choose>												
+												</div>
+											</td>
+											
+											<c:if test="${generalLearnerFlowDTO.allowRateAnswers == 'true'}">
+												<td style="width:50px;">
+													<c:if test="${userData.visible == 'true'}">	
+														<jsp:include page="parts/ratingStars.jsp" />
+													</c:if>	
+												</td>
 											</c:if>
-										</c:if>									
-										</c:forEach>
-									</c:forEach>
-								</div>
-					</c:forEach>
-
-				</c:if>				
-
-
-
-			<c:if test="${generalLearnerFlowDTO.reflection == 'true' }">					
-					<h2>
-							<c:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeXml="false" />												
-					</h2>
-
-					<c:out value="${QaLearningForm.entryText}" escapeXml="false" />
-					
-						<c:if test="${generalLearnerFlowDTO.lockWhenFinished == 'true' }">					
-						<br>
-								<html:button property="forwardtoReflection" styleClass="button"
-									onclick="submitMethod('forwardtoReflection');"> 
-									<fmt:message key="label.edit" />
-								</html:button>
-						</c:if>													
-			</c:if>																			
-
-
-				<c:if
-					test="${generalLearnerFlowDTO.requestLearningReportViewOnly != 'true' }">
-					<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
-
-						<c:if test="${generalLearnerFlowDTO.lockWhenFinished != 'true'}">
-							<br>						
-							<html:button property="redoQuestions" styleClass="button"
-								onclick="submitMethod('redoQuestions');">
-								<fmt:message key="label.redo" />
-							</html:button>
-						</c:if>						
-
-						<div class="space-bottom-top" align="right">
-								<html:link href="#nogo" property="endLearning" styleId="finishButton"
-									onclick="javascript:submitMethod('endLearning');"
-									styleClass="button">
-									<span class="nextActivity"><fmt:message key="button.endLearning" /></span>
-								</html:link>
-						</div>
-					</c:if>
-				</c:if>
+										</tr>
+									</c:if>
+								</c:if>									
+							</c:forEach>
+						</c:forEach>
+					</tbody>
+				</table>
 				
-				<c:if
-					test="${generalLearnerFlowDTO.requestLearningReportViewOnly == 'true' }">
-					<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
-
-
-						<div class="space-bottom-top" align="right">
-								<html:button property="endLearning" styleId="finishButton"
-									onclick="javascript:submitMethod('endLearning');"
-									styleClass="button">
-									<fmt:message key="button.endLearning" />
-								</html:button>
-						</div>
-					</c:if>
-				</c:if>
-
+				<!-- pager -->
+				<div class="pager">
+					<form>
+					   	<img class="tablesorter-first"/>
+				    	<img class="tablesorter-prev"/>
+				    	<span class="pagedisplay"></span> <!-- this can be any element, including an input -->
+				   		<img class="tablesorter-next"/>
+				    	<img class="tablesorter-last"/>
+				    	<select class="pagesize">
+				      		<option selected="selected" value="10">10</option>
+				      		<option value="20">20</option>
+				      		<option value="30">30</option>
+				      		<option value="40">40</option>
+				      		<option value="50">50</option>
+				      		<option value="100">100</option>
+				    	</select>
+				  </form>
+				</div>
 				
-			</html:form>
+			</c:forEach>
 		</c:if>
 
-
-		<c:if
-			test="${generalLearnerFlowDTO.requestLearningReportProgress == 'true'}">
-
+		<c:if test="${generalLearnerFlowDTO.reflection == 'true' }">					
 			<h2>
-				<fmt:message key="label.learnerReport" />
+				<c:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeXml="false" />						
 			</h2>
 
-			<html:form action="/learning?validate=false"
-				enctype="multipart/form-data" method="POST" target="_self">
-				<html:hidden property="method" />
-				<html:hidden property="toolSessionID" styleId="toolSessionID"/>
-				<html:hidden property="userID" />
-				<html:hidden property="httpSessionID" />
-				<html:hidden property="totalQuestionCount" />
+			<p><c:out value="${QaLearningForm.entryText}" escapeXml="false" /></p>
 
-				<c:forEach var="currentDto"
-					items="${generalLearnerFlowDTO.listMonitoredAnswersContainerDTO}">
-					<c:set var="currentQuestionId" scope="request"
-						value="${currentDto.questionUid}" />
-
-					<div class="shading-bg">
-						<p>
-							<strong> <fmt:message key="label.question" /> : </strong>
-							<c:out value="${currentDto.question}" escapeXml="false" />
-						</p>
-
-						<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="${generalLearnerFlowDTO.userUid == userData.queUsrId}">
-		
-										<c:if test="${currentQuestionId == userData.questionUid}">
-											<p>
-												<span class="field-name"> <c:out
-														value="${userData.userName}" /> </span> -
-												<lams:Date value="${userData.attemptTime}" />
-											</p>
-											<p>
-												<c:out value="${userData.responsePresentable}"
-													escapeXml="false" />
-											</p>
-											<jsp:include page="parts/ratingStarsDisabled.jsp" />
-										</c:if>
-								</c:if>								
-							</c:forEach>
-						</c:forEach>
-					</div>
-				</c:forEach>
+			<html:button property="forwardtoReflection" styleClass="button" onclick="submitMethod('forwardtoReflection');"> 
+				<fmt:message key="label.edit" />
+			</html:button>
+		</c:if>													
 				
-				<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
-					<c:if test="${generalLearnerFlowDTO.lockWhenFinished != 'true'}">
-						<br>
-						<html:button property="redoQuestions" styleClass="button"
-							onclick="submitMethod('redoQuestions');">
-							<fmt:message key="label.redo" />
-						</html:button>
-					</c:if>						
-				</c:if>
-
-				
-				<c:if test="${generalLearnerFlowDTO.existMultipleUserResponses == 'true'}">				
-					<h2>
-						<fmt:message key="label.other.answers" />
-					</h2>
-					
-	
-					<c:forEach var="currentDto"
-								items="${generalLearnerFlowDTO.listMonitoredAnswersContainerDTO}">
-								<c:set var="currentQuestionId" scope="request"
-									value="${currentDto.questionUid}" />
+		<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
+			<div class="space-bottom-top align-right">
+				<html:button property="endLearning" styleId="finishButton" onclick="javascript:submitMethod('endLearning');" styleClass="button">
+					<fmt:message key="button.endLearning" />
+				</html:button>
+			</div>
+		</c:if>
 			
-								<div class="shading-bg">
-						<p>
-							<strong> <fmt:message key="label.question" /> : </strong>
-							<c:out value="${currentDto.question}" escapeXml="false" />
-						</p>
-			
-									<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}" />
+		<html:form action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">
+			<html:hidden property="method" />
+			<html:hidden property="toolSessionID" styleId="toolSessionID"/>
+			<html:hidden property="userID" />
+			<html:hidden property="httpSessionID" />
+			<html:hidden property="totalQuestionCount" />						
+		</html:form>
 		
-										<c:if test="${generalLearnerFlowDTO.userUid != userData.queUsrId}">	
-											<c:if test="${currentQuestionId == userData.questionUid}">
-												<p>
-													<span class="field-name"> <c:out
-															value="${userData.userName}" /> </span>
-															
-													<c:if test="${generalLearnerFlowDTO.userNameVisible == 'true'}">																			
-																 -
-														<lams:Date value="${userData.attemptTime}" />
-													</c:if>																						
-												</p>
-												<p>
-													<c:choose>
-													<c:when test="${userData.visible == 'true'}">
-														<c:out value="${userData.responsePresentable}"
-															escapeXml="false" />
-														<jsp:include page="parts/ratingStars.jsp" />	
-													</c:when>
-													<c:otherwise>
-														<i><fmt:message key="label.hidden"/></i>
-													</c:otherwise>
-													</c:choose>
-													<hr size=1> 												
-												</p>
-											</c:if>
-										</c:if>									
-										</c:forEach>
-									</c:forEach>
-								</div>
-					</c:forEach>
-				</c:if>				
-
-
-			<c:if test="${generalLearnerFlowDTO.reflection == 'true' }">					
-					<h2>
-							<c:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeXml="false" />						
-					</h2>
-
-					<p><c:out value="${QaLearningForm.entryText}" escapeXml="false" /></p>
-
-					<html:button property="forwardtoReflection" styleClass="button"
-						onclick="submitMethod('forwardtoReflection');"> 
-						<fmt:message key="label.edit" />
-					</html:button>
-			</c:if>													
-				
-			<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
-
-				<div class="space-bottom-top align-right">
-						<html:button property="endLearning" styleId="finishButton"
-							onclick="javascript:submitMethod('endLearning');"
-							styleClass="button">
-							<fmt:message key="button.endLearning" />
-						</html:button>
-				</div>
-			</c:if>
-						
-			</html:form>
-		</c:if>
 	</div>
 	<div id="footer"></div>
 </body>
 </lams:html>
-
-
-
-
-
-
-
-
-
-
-
