Index: lams_tool_daco/web/pages/learning/questionSummaries.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/learning/questionSummaries.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_daco/web/pages/learning/questionSummaries.jsp	31 Jul 2008 03:51:05 -0000	1.2
+++ lams_tool_daco/web/pages/learning/questionSummaries.jsp	8 Aug 2008 08:10:22 -0000	1.3
@@ -9,17 +9,18 @@
 <c:if test="${empty recordList}">
 	<c:set var="recordList" value="${sessionMap.recordList}" />
 </c:if>
-<c:if test="${empty learningMode}">
-	<c:set var="learningMode" value="true" />
+<c:if test="${empty includeMode}">
+	<c:set var="includeMode" value="learning" />
 </c:if>
 <c:set var="daco" value="${sessionMap.daco}" />
 <c:set var="questionSummaries" value="${sessionMap.questionSummaries}" />
 <c:set var="ordinal"><fmt:message key="label.authoring.basic.answeroption.ordinal"/></c:set>
 
 <c:set var="userRecordCount" value="${fn:length(recordList)}" />
-<c:set var="allRecordCount" value="${sessionMap.totalRecordCount}" />
+<c:set var="groupRecordCount" value="${sessionMap.totalRecordCount}" />
 
-<c:if test="${learningMode}">
+
+<c:if test='${includeMode=="learning"}'>
 	<table>
 		<tr>
 			<td>
@@ -31,184 +32,193 @@
 		</tr>
 	</table>
 </c:if>
-	<table cellspacing="0" class="alternative-color" id="summaryTable">
+<table cellspacing="0" class="alternative-color" id="summaryTable">
+	<tr>
+		<th><fmt:message key="label.learning.tableheader.questions" /></th>
+		<th colspan="2"><fmt:message key="label.learning.tableheader.summary" /></th>
+	</tr>
+	<tr>
+		<th></th>
+		<th>
+		<c:choose>
+			<c:when test="${empty userFullName}">
+				<fmt:message key="label.learning.tableheader.summary.learner" />
+			</c:when>
+			<c:otherwise>
+				${userFullName}
+			</c:otherwise>
+		</c:choose>
+		</th>
+		<th><fmt:message key="label.learning.tableheader.summary.group" /></th>
+	</tr>
+	<tr>
+		<td>
+			<fmt:message key="label.learning.heading.recordcount" />
+		</td>
+		<td class="singleSummaryCell">
+			${userRecordCount }
+		</td>
+		<td class="singleSummaryCell">
+			${groupRecordCount }
+		</td>
+	</tr>
+	<c:forEach var="question" items="${daco.dacoQuestions}" varStatus="questionStatus">
+		<c:set var="questionSummary" value="${questionSummaries[questionStatus.index]}" />
 		<tr>
-			<th><fmt:message key="label.learning.tableheader.questions" /></th>
-			<th colspan="2"><fmt:message key="label.learning.tableheader.summary" /></th>
-		</tr>
-		<tr>
-			<th></th>
-			<th><fmt:message key="label.learning.tableheader.summary.learner" /></th>
-			<th><fmt:message key="label.learning.tableheader.summary.all" /></th>
-		</tr>
-		<tr>
 			<td>
-				<fmt:message key="label.learning.heading.recordcount" />
+				<div class="bigNumber">${questionStatus.index+1}</div>
+				${question.description}
+				<div class="hint">
+					<c:choose>
+						<c:when test="${question.summary==1}">
+							<fmt:message key="label.common.summary.sum" /> 
+						</c:when>
+						<c:when test="${question.summary==2}">
+							<fmt:message key="label.common.summary.average" /> 
+						</c:when>
+						<c:when test="${question.summary==3}">
+							<fmt:message key="label.common.summary.count" /> 
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="label.common.summary.none" /> 
+						</c:otherwise>
+					</c:choose>
+				</div>
 			</td>
-			<td class="singleSummaryCell">
-				${userRecordCount }
-			</td>
-			<td class="singleSummaryCell">
-				${allRecordCount }
-			</td>
-		</tr>
-		<c:forEach var="question" items="${daco.dacoQuestions}" varStatus="questionStatus">
-			<c:set var="questionSummary" value="${questionSummaries[questionStatus.index]}" />
-			<tr>
-				<td>
-					<div class="bigNumber">${questionStatus.index+1}</div>
-					${question.description}
-					<div class="hint">
-						<c:choose>
-							<c:when test="${question.summary==1}">
-								<fmt:message key="label.common.summary.sum" /> 
-							</c:when>
-							<c:when test="${question.summary==2}">
-								<fmt:message key="label.common.summary.average" /> 
-							</c:when>
-							<c:when test="${question.summary==3}">
-								<fmt:message key="label.common.summary.count" /> 
-							</c:when>
-							<c:otherwise>
-								<fmt:message key="label.common.summary.none" /> 
-							</c:otherwise>
-						</c:choose>
-					</div>
-				</td>
-				<c:choose>
-					<c:when test="${question.type==3 && not empty question.summary}">
-						<c:choose>
-							<c:when test="${question.summary==1 || question.summary==2}">
-								<c:choose>
-									<c:when test="${(question.summary==1 && empty questionSummary.userSummary[0].sum) 
-												 || (question.summary==2 && empty questionSummary.userSummary[0].average)}">
-										<td class="singleSummaryCell hint">
-											<fmt:message key="label.learning.heading.norecords" />
-										</td>
-										<td class="singleSummaryCell hint">
-											<fmt:message key="label.learning.heading.norecords" />
-										</td>
-									</c:when>
-									<c:otherwise>
-										<td class="singleSummaryCell">
+			<c:choose>
+				<c:when test="${question.type==3 && not empty question.summary}">
+					<c:choose>
+						<c:when test="${question.summary==1 || question.summary==2}">
+							<c:choose>
+								<c:when test="${(question.summary==1 && empty questionSummary.userSummary[0].sum) 
+											 || (question.summary==2 && empty questionSummary.userSummary[0].average)}">
+									<td class="singleSummaryCell hint">
+										<fmt:message key="label.learning.heading.norecords" />
+									</td>
+									<td class="singleSummaryCell hint">
+										<fmt:message key="label.learning.heading.norecords" />
+									</td>
+								</c:when>
+								<c:otherwise>
+									<td class="singleSummaryCell">
+										<c:choose>
+											<c:when test="${question.summary==1}">
+												${questionSummary.userSummary[0].sum}
+											</c:when>
+											<c:otherwise>
+												${questionSummary.userSummary[0].average}
+											</c:otherwise>
+										</c:choose>
+									</td>
+									<td class="singleSummaryCell">
+										<c:choose>
+											<c:when test="${question.summary==1}">
+												${questionSummary.groupSummary[0].sum}
+											</c:when>
+											<c:otherwise>
+												${questionSummary.groupSummary[0].average}
+											</c:otherwise>
+										</c:choose>
+									</td>
+								</c:otherwise>
+							</c:choose>
+						</c:when>
+						<c:when test="${question.summary==3}">
+							<td>
+								<table class="alternative-color-inner-table">
+									<c:forEach var="singleAnswer" items="${questionSummary.userSummary}" begin="1">	
+										<tr>
 											<c:choose>
-												<c:when test="${question.summary==1}">
-													${questionSummary.userSummary[0].sum}
+												<c:when test="${empty singleAnswer.answer}">
+													<td class="hint">
+														<fmt:message key="label.learning.summary.emptyanswer" />
+													</td>
 												</c:when>
 												<c:otherwise>
-													${questionSummary.userSummary[0].average}
+													<td>
+														${singleAnswer.answer}
+													</td>
 												</c:otherwise>
 											</c:choose>
-										</td>
-										<td class="singleSummaryCell">
-											<c:choose>
-												<c:when test="${question.summary==1}">
-													${questionSummary.allSummary[0].sum}
-												</c:when>
-												<c:otherwise>
-													${questionSummary.allSummary[0].average}
-												</c:otherwise>
-											</c:choose>
-										</td>
-									</c:otherwise>
-								</c:choose>
-							</c:when>
-							<c:when test="${question.summary==3}">
-								<td>
-									<table class="alternative-color-inner-table">
-										<c:forEach var="singleAnswer" items="${questionSummary.userSummary}" begin="1">	
-											<tr>
-												<c:choose>
-													<c:when test="${empty singleAnswer.answer}">
-														<td class="hint">
-															<fmt:message key="label.learning.summary.emptyanswer" />
-														</td>
-													</c:when>
-													<c:otherwise>
-														<td>
-															${singleAnswer.answer}
-														</td>
-													</c:otherwise>
-												</c:choose>
-												<td>
-													${singleAnswer.count}
-												</td>
-											</tr>
-										</c:forEach>
-									</table>
-								</td>
-								<td>
-									<table class="alternative-color-inner-table">
-										<c:forEach var="singleAnswer" items="${questionSummary.allSummary}" begin="1">	
-											<tr>
-												<td>
-													${singleAnswer.answer}
-												</td>
-												<td>
-													${singleAnswer.count}
-												</td>
-											</tr>
-										</c:forEach>
-									</table>
-								</td>
-							</c:when>
-						</c:choose>
-					</c:when>
-					<c:when test="${(question.type==7 || question.type==8 || question.type==9)  && not empty question.summary}">
-						<td>
-							<table class="alternative-color-inner-table">
-								<c:forEach var="singleAnswer" items="${questionSummary.userSummary}">
-									<tr>
-										<td>
-											${fn:substring(ordinal,singleAnswer.answer-1,singleAnswer.answer)})
-										</td>
-										<td>
-											<c:choose>
-												<c:when test="${question.summary==1}">
-													${singleAnswer.sum}
-												</c:when>
-												<c:otherwise>
-													${singleAnswer.average}
-												</c:otherwise>
-											</c:choose>
-										</td>
-									</tr>
-								</c:forEach>
-							</table>
-						</td>
-						<td>
-							<table class="alternative-color-inner-table">
-								<c:forEach var="singleAnswer" items="${questionSummary.allSummary}">
-									<tr>
-										<td>
-											${fn:substring(ordinal,singleAnswer.answer-1,singleAnswer.answer)})
-										</td>
-										<td>
-											<c:choose>
-												<c:when test="${question.summary==1}">
-													${singleAnswer.sum}
-												</c:when>
-												<c:otherwise>
-													${singleAnswer.average}
-												</c:otherwise>
-											</c:choose>
-										</td>
-									</tr>
-								</c:forEach>
-							</table>
-						</td>
-					</c:when>
-					<c:otherwise>
-					<td class="singleSummaryCell">-</td>
-					<td class="singleSummaryCell">-</td>
-					</c:otherwise>
-				</c:choose>
-			</tr>
-		</c:forEach>
-	</table>
-	<c:if test="${learningMode}">
-		<p>
-			<a href="#" class="button" onclick="javascript:refreshQuestionSummaries('${sessionMapID}')"><fmt:message key="label.common.summary.refresh" /></a>
-		</p>
-	</c:if>
+											<td>
+												${singleAnswer.count}
+											</td>
+										</tr>
+									</c:forEach>
+								</table>
+							</td>
+							<td>
+								<table class="alternative-color-inner-table">
+									<c:forEach var="singleAnswer" items="${questionSummary.groupSummary}" begin="1">	
+										<tr>
+											<td>
+												${singleAnswer.answer}
+											</td>
+											<td>
+												${singleAnswer.count}
+											</td>
+										</tr>
+									</c:forEach>
+								</table>
+							</td>
+						</c:when>
+					</c:choose>
+				</c:when>
+				<c:when test="${(question.type==7 || question.type==8 || question.type==9)  && not empty question.summary}">
+					<td>
+						<table class="alternative-color-inner-table">
+							<c:forEach var="singleAnswer" items="${questionSummary.userSummary}">
+								<tr>
+									<td>
+										${fn:substring(ordinal,singleAnswer.answer-1,singleAnswer.answer)})
+									</td>
+									<td>
+										<c:choose>
+											<c:when test="${question.summary==1}">
+												${singleAnswer.sum}
+											</c:when>
+											<c:otherwise>
+												${singleAnswer.average}
+											</c:otherwise>
+										</c:choose>
+									</td>
+								</tr>
+							</c:forEach>
+						</table>
+					</td>
+					<td>
+						<table class="alternative-color-inner-table">
+							<c:forEach var="singleAnswer" items="${questionSummary.groupSummary}">
+								<tr>
+									<td>
+										${fn:substring(ordinal,singleAnswer.answer-1,singleAnswer.answer)})
+									</td>
+									<td>
+										<c:choose>
+											<c:when test="${question.summary==1}">
+												${singleAnswer.sum}
+											</c:when>
+											<c:otherwise>
+												${singleAnswer.average}
+											</c:otherwise>
+										</c:choose>
+									</td>
+								</tr>
+							</c:forEach>
+						</table>
+					</td>
+				</c:when>
+				<c:otherwise>
+				<td class="singleSummaryCell">-</td>
+				<td class="singleSummaryCell">-</td>
+				</c:otherwise>
+			</c:choose>
+		</tr>
+	</c:forEach>
+</table>
+<c:if test='${includeMode=="learning"}'>
+	<p>
+		<a href="#" class="button" onclick="javascript:refreshQuestionSummaries('${sessionMapID}')"><fmt:message key="label.common.summary.refresh" /></a>
+	</p>
+</c:if>
 </div>
\ No newline at end of file