Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/learning/learning.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_scratchie/web/pages/learning/learning.jsp	4 Oct 2012 11:43:56 -0000	1.7
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	16 Oct 2012 13:56:20 -0000	1.8
@@ -10,6 +10,8 @@
 	<c:set var="mode" value="${sessionMap.mode}" />
 	<c:set var="toolSessionID" value="${sessionMap.toolSessionID}" />
 	<c:set var="scratchie" value="${sessionMap.scratchie}" />
+	<c:set var="isUserLeader" value="${sessionMap.user.leader}" />
+	<c:set var="isScratchingFinished" value="${sessionMap.isScratchingFinished}" />
 
 <lams:html>
 <lams:head>
@@ -74,6 +76,25 @@
 		function continueReflect(){
 			document.location.href='<c:url value="/learning/newReflection.do?sessionMapID=${sessionMapID}"/>';
 		}
+		
+		if (${!isUserLeader && mode != "teacher"}) {
+			setInterval("refreshQuestionList();",10000);// Auto-Refresh every 30 seconds
+		}
+		
+		function refreshQuestionList() {
+			var url = "<c:url value="/learning/refreshQuestionList.do"/>";
+			$("#questionListArea").load(
+				url,
+				{
+					sessionMapID: "${sessionMapID}"
+				},
+				function(){
+					//reinitializePassingMarkSelect(false);
+					//refreshThickbox();
+				}
+			);
+		}
+		
 	-->        
     </script>
 </lams:head>
@@ -83,112 +104,23 @@
 		<h1>
 			${scratchie.title}
 		</h1>
+		
+		<h4>
+			<fmt:message key="label.group.leader" >
+				<fmt:param>${sessionMap.groupLeader.firstName} ${sessionMap.groupLeader.lastName}</fmt:param>
+			</fmt:message>
+		</h4>
 
-		<p>
+		<p style="font-style: italic;">
 			${scratchie.instructions}
 		</p>
 
 		<%@ include file="/common/messages.jsp"%>
 
-		<c:forEach var="item" items="${sessionMap.itemList}" varStatus="status">
-			<h3>${item.title}</h3>
-			<i>${item.description}</i>
-	
-			<table id="scratches" class="alternative-color">
-				<c:forEach var="answer" items="${item.answers}" varStatus="status">
-					<tr id="tr${answer.uid}">
-						<td style="width: 40px;">
-							<c:choose>
-								<c:when test="${answer.scratched && answer.correct}">
-									<img src="<html:rewrite page='/includes/images/scratchie-correct.png'/>" class="scartchie-image">
-								</c:when>
-								<c:when test="${answer.scratched && !answer.correct}">
-									<img src="<html:rewrite page='/includes/images/scratchie-wrong.png'/>" id="image-${item.uid}-${answer.uid}" class="scartchie-image">
-								</c:when>
-								<c:when test="${sessionMap.userFinished || item.unraveled || (mode == 'teacher')}">
-									<img src="<html:rewrite page='/includes/images/answer-${status.index + 1}.png'/>" class="scartchie-image">
-								</c:when>
-								<c:otherwise>
-									<a href="#nogo" onclick="scratchItem(${item.uid}, ${answer.uid}); return false;" id="imageLink-${item.uid}-${answer.uid}">
-										<img src="<html:rewrite page='/includes/images/answer-${status.index + 1}.png'/>" class="scartchie-image" id="image-${item.uid}-${answer.uid}" />
-									</a>
-								</c:otherwise>
-							</c:choose>
-							
-							<c:if test="${(mode == 'teacher') && (answer.attemptOrder != -1)}">
-								<div style="text-align: center; margin-top: 2px;">
-									<fmt:message key="label.choice.number" >
-										<fmt:param>${answer.attemptOrder}</fmt:param>
-									</fmt:message>
-								</div>
-							</c:if>
-						</td>
-						
-						<td style="vertical-align: middle;">
-							${answer.description} 
-						</td>
-					</tr>
-				</c:forEach>
-			</table>
-					
-		</c:forEach>
+		<div id="questionListArea">
+			<%@ include file="questionlist.jsp"%>
+		</div>
 
-
-		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn and !sessionMap.isShowResultsPage}">
-			<div class="small-space-top">
-				<h2>
-					${sessionMap.reflectInstructions}
-				</h2>
-
-				<c:choose>
-					<c:when test="${empty sessionMap.reflectEntry}">
-						<p>
-							<em> <fmt:message key="message.no.reflection.available" />
-							</em>
-						</p>
-					</c:when>
-					<c:otherwise>
-						<p>
-							<lams:out escapeHtml="true" value="${sessionMap.reflectEntry}" />
-						</p>
-					</c:otherwise>
-				</c:choose>
-
-				<c:if test="${mode != 'teacher'}">
-					<html:button property="finishButton" onclick="return continueReflect()" styleClass="button">
-						<fmt:message key="label.edit" />
-					</html:button>
-				</c:if>
-			</div>
-		</c:if>
-
-		<c:if test="${mode != 'teacher'}">
-			<div class="space-bottom-top align-right">
-				<c:choose>
-					<c:when test="${sessionMap.reflectOn && !sessionMap.userFinished and !sessionMap.isShowResultsPage}">
-						<html:button property="finishButton" styleId="finishButton" onclick="return continueReflect()" styleClass="button">
-							<fmt:message key="label.continue" />
-						</html:button>
-					</c:when>
-					<c:otherwise>
-						<c:choose>
-							<c:when test="${sessionMap.isShowResultsPage}">
-								<html:button property="finishButton" styleId="finishButton" onclick="return finish(true)" styleClass="button">
-									<fmt:message key="label.submit" />
-								</html:button>
-							</c:when>
-							<c:otherwise>
-								<html:link href="#nogo" property="finishButton" styleId="finishButton" onclick="return finish(false)" styleClass="button">
-									<span class="nextActivity"><fmt:message key="label.finished" /></span>
-								</html:link>
-							</c:otherwise>
-						</c:choose>
-
-					</c:otherwise>
-				</c:choose>
-			</div>
-		</c:if>
-
 	</div>
 	<!--closes content-->