Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/LearnerRep.jsp,v
diff -u -r1.37.8.4 -r1.37.8.5
--- lams_tool_laqa/web/learning/LearnerRep.jsp	3 Mar 2011 20:34:50 -0000	1.37.8.4
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	13 Apr 2011 16:57:51 -0000	1.37.8.5
@@ -29,6 +29,7 @@
 <c:set var="tool">
 	<lams:WebAppURL />
 </c:set>
+<c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.httpSessionID]}" />
 
 <lams:html>
 <lams:head>
@@ -84,16 +85,20 @@
 
 	<div id="content">
 		<h1>
-			<c:out value="${generalLearnerFlowDTO.activityTitle}"
-				escapeXml="false" />
+			<c:out value="${generalLearnerFlowDTO.activityTitle}" escapeXml="false" />
 		</h1>
+		
+		<c:if test="${not empty sessionMap.submissionDeadline}">
+			<div class="info">
+				<fmt:message key="authoring.info.teacher.set.restriction" >
+					<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
+				</fmt:message>
+			</div>
+		</c:if>
 
-		<c:if
-			test="${generalLearnerFlowDTO.requestLearningReportProgress != 'true'}">
+		<c:if test="${generalLearnerFlowDTO.requestLearningReportProgress != 'true'}">
 
-
-			<html:form action="/learning?validate=false"
-				enctype="multipart/form-data" method="POST" target="_self">
+			<html:form action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">
 				<c:choose>
 				<c:when test="${generalLearnerFlowDTO.reflection != 'true'}">
 					<html:hidden property="method" value="endLearning"/>
@@ -108,36 +113,32 @@
 				<html:hidden property="httpSessionID" />
 				<html:hidden property="totalQuestionCount"/>
 
-				<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" /> : </strong>
 							<c:out value="${currentDto.question}" escapeXml="false" />
 						</p>
 
-						<c:forEach var="questionAttemptData"
-							items="${currentDto.questionAttempts}">
+						<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 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>
@@ -149,22 +150,17 @@
 					<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" /> : </strong>
-							<c:out value="${currentDto.question}" escapeXml="false" />
-						</p>
-
+						<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="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}" />
@@ -203,8 +199,7 @@
 
 						
 
-				<c:if
-					test="${generalLearnerFlowDTO.requestLearningReportViewOnly != 'true' }">
+				<c:if test="${generalLearnerFlowDTO.requestLearningReportViewOnly != 'true' }">
 					<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
 
 						<html:button property="refreshAnswers" styleClass="button"
@@ -244,34 +239,29 @@
 
 
 
-		<c:if
-			test="${generalLearnerFlowDTO.requestLearningReportProgress == 'true'}">
+		<c:if test="${generalLearnerFlowDTO.requestLearningReportProgress == 'true'}">
 
 			<h2>
 				<fmt:message key="label.learnerReport" />
 			</h2>
 
-			<html:form action="/learning?validate=false"
-				enctype="multipart/form-data" method="POST" target="_self">
+			<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="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" /> : </strong>
 							<c:out value="${currentDto.question}" escapeXml="false" />
 						</p>
 
-						<c:forEach var="questionAttemptData"
-							items="${currentDto.questionAttempts}">
+						<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}" />
@@ -303,21 +293,17 @@
 						<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" /> : </strong>
-							<c:out value="${currentDto.question}" escapeXml="false" />
-						</p>
+						<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="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}" />
@@ -357,19 +343,16 @@
 
 					
 
-				<c:if
-					test="${generalLearnerFlowDTO.requestLearningReportViewOnly != 'true' }">
+				<c:if test="${generalLearnerFlowDTO.requestLearningReportViewOnly != 'true' }">
 					<c:if test="${generalLearnerFlowDTO.teacherViewOnly != 'true' }">
 
-						<html:button property="refreshAnswers" styleClass="button"
-							onclick="submitMethod('refreshAllResults');">
+						<html:button property="refreshAnswers" styleClass="button" onclick="submitMethod('refreshAllResults');">
 							<fmt:message key="label.refresh" />
 						</html:button>
 
 
 						<c:if test="${generalLearnerFlowDTO.lockWhenFinished != 'true'}">
-							<html:button property="redoQuestions" styleClass="button"
-								onclick="submitMethod('redoQuestions');">
+							<html:button property="redoQuestions" styleClass="button" onclick="submitMethod('redoQuestions');">
 								<fmt:message key="label.redo" />
 							</html:button>
 						</c:if>