Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeSessionDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeSessionDTO.java,v
diff -u -r1.4 -r1.5
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeSessionDTO.java	1 Oct 2006 06:44:18 -0000	1.4
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeSessionDTO.java	2 Oct 2006 04:54:13 -0000	1.5
@@ -41,7 +41,7 @@
 	
 	Set<ScribeUserDTO> userDTOs;
 	
-	int numberOfPosts;
+	int numberOfVotes;
 	
 	int numberOfLearners;
 	
@@ -116,12 +116,12 @@
 		this.numberOfLearners = numberOfLearners;
 	}
 
-	public int getNumberOfPosts() {
-		return numberOfPosts;
+	public int getNumberOfVotes() {
+		return numberOfVotes;
 	}
 
-	public void setNumberOfPosts(int numberOfPosts) {
-		this.numberOfPosts = numberOfPosts;
+	public void setNumberOfVotes(int numberOfVotes) {
+		this.numberOfVotes = numberOfVotes;
 	}
 
 	public Set<ScribeReportEntryDTO> getReportDTOs() {
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java,v
diff -u -r1.3 -r1.4
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java	25 Sep 2006 06:04:40 -0000	1.3
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java	2 Oct 2006 04:54:12 -0000	1.4
@@ -149,6 +149,4 @@
 
 	public NotebookEntry getEntry(Long id, Integer idType, String signature,
 			Integer userID);
-	
-//	public void saveOrUpdateScribeHeading(ScribeHeading heading);
 }
\ No newline at end of file
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java,v
diff -u -r1.4 -r1.5
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	30 Sep 2006 10:18:45 -0000	1.4
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	2 Oct 2006 04:54:12 -0000	1.5
@@ -98,8 +98,6 @@
 	private IScribeUserDAO scribeUserDAO = null;
 
 	private IScribeAttachmentDAO scribeAttachmentDAO = null;
-	
-	private IScribeHeadingDAO scribeHeadingDAO = null;
 
 	private ILearnerService learnerService;
 
@@ -415,10 +413,6 @@
 		scribeUserDAO.saveOrUpdate(scribeUser);
 	}
 
-//	public void saveOrUpdateScribeHeading(ScribeHeading heading) {
-//		scribeHeadingDAO.saveOrUpdate(heading);
-//	}
-	
 	public synchronized ScribeUser createScribeUser(UserDTO user,
 			ScribeSession scribeSession) {
 		ScribeUser scribeUser = new ScribeUser(user, scribeSession);
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java,v
diff -u -r1.3 -r1.4
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java	30 Sep 2006 10:18:45 -0000	1.3
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java	2 Oct 2006 04:54:13 -0000	1.4
@@ -71,6 +71,7 @@
  * @struts.action-forward name="runOffline" path="tiles:/learning/runOffline"
  * @struts.action-forward name="defineLater" path="tiles:/learning/defineLater"
  * @struts.action-forward name="notebook" path="tiles:/learning/notebook"
+ * @struts.action-forward name="voteCount" path="/pages/learning/voteCount.jsp"
  */
 public class LearningAction extends LamsDispatchAction {
 
@@ -130,27 +131,8 @@
 			
 		((LearningForm)form).setToolSessionID(scribeSession.getSessionId());
 		request.setAttribute("MODE", mode.toString());
-
-		ScribeDTO scribeDTO = new ScribeDTO(scribe);
-		request.setAttribute("scribeDTO", scribeDTO);
-
-		ScribeSessionDTO sessionDTO = new ScribeSessionDTO(scribeSession);
-		request.setAttribute("scribeSessionDTO", sessionDTO);
+		setupDTOs(request, scribeSession, scribeUser);
 		
-		ScribeUserDTO scribeUserDTO = new ScribeUserDTO(scribeUser);
-		request.setAttribute("scribeUserDTO", scribeUserDTO);
-		
-		if (scribeUser.isFinishedActivity()) {
-			// get the notebook entry.
-			NotebookEntry notebookEntry = scribeService.getEntry(toolSessionID,
-					CoreNotebookConstants.NOTEBOOK_TOOL,
-					ScribeConstants.TOOL_SIGNATURE, scribeUser.getUserId()
-							.intValue());
-			if (notebookEntry != null) {
-				scribeUserDTO.notebookEntry = notebookEntry.getEntry();
-			}
-		}
-
 		// Ensure that the content is use flag is set.
 		if (!scribe.isContentInUse()) {
 			scribe.setContentInUse(new Boolean(true));
@@ -292,17 +274,8 @@
 		scribeService.saveOrUpdateScribeSession(session);
 		
 		request.setAttribute("MODE", lrnForm.getMode());
-		
-		// build dto's
-		ScribeDTO scribeDTO = new ScribeDTO(session.getScribe());
-		request.setAttribute("scribeDTO", scribeDTO);
+		setupDTOs(request, session, scribeUser);
 
-		ScribeSessionDTO sessionDTO = new ScribeSessionDTO(session);
-		request.setAttribute("scribeSessionDTO", sessionDTO);
-		
-		ScribeUserDTO scribeUserDTO = new ScribeUserDTO(scribeUser);
-		request.setAttribute("scribeUserDTO", scribeUserDTO);
-
 		return mapping.findForward("scribe");
 	}
 
@@ -319,20 +292,69 @@
 		scribeUser.setReportApproved(true);
 		
 		request.setAttribute("MODE", lrnForm.getMode());
+		setupDTOs(request, session, scribeUser);
 		
-		// build dto's
-		// TODO the following code is being reused over and over, need to refactor
-		ScribeDTO scribeDTO = new ScribeDTO(session.getScribe());
+		scribeService.saveOrUpdateScribeUser(scribeUser);
+
+		return mapping.findForward("learning");
+	}
+	
+	public ActionForward getVoteCount(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response) {
+		
+		Long toolSessionID = WebUtil.readLongParam(request, "toolSessionID");
+		
+		ScribeSession session = scribeService.getSessionBySessionId(toolSessionID);
+		
+		int voteCount = 0;
+		
+		for (Iterator iter = session.getScribeUsers().iterator(); iter.hasNext();) {
+			ScribeUser user = (ScribeUser) iter.next();
+			
+			if (user.isReportApproved()) {
+				voteCount++;			
+			}
+		}
+		
+		request.setAttribute("voteCount", voteCount);
+		
+		return mapping.findForward("voteCount");
+	}
+
+	
+	// Private methods.
+	
+	private void setupDTOs(HttpServletRequest request, ScribeSession scribeSession, ScribeUser scribeUser) {
+		
+		ScribeDTO scribeDTO = new ScribeDTO(scribeSession.getScribe());
 		request.setAttribute("scribeDTO", scribeDTO);
 
-		ScribeSessionDTO sessionDTO = new ScribeSessionDTO(session);
+		ScribeSessionDTO sessionDTO = new ScribeSessionDTO(scribeSession);
+			
+		int numberOfVotes = 0;
+		for (Iterator iter = scribeSession.getScribeUsers().iterator(); iter.hasNext();) {
+			ScribeUser user = (ScribeUser) iter.next();
+			if (user.isReportApproved()) {
+				numberOfVotes++;
+			}
+		}
+		
+		// TODO
+		sessionDTO.setNumberOfVotes(numberOfVotes);
+		sessionDTO.setNumberOfLearners(scribeSession.getScribeUsers().size());
 		request.setAttribute("scribeSessionDTO", sessionDTO);
 		
 		ScribeUserDTO scribeUserDTO = new ScribeUserDTO(scribeUser);
+		if (scribeUser.isFinishedActivity()) {
+			// get the notebook entry.
+			NotebookEntry notebookEntry = scribeService.getEntry(scribeSession.getSessionId(),
+					CoreNotebookConstants.NOTEBOOK_TOOL,
+					ScribeConstants.TOOL_SIGNATURE, scribeUser.getUserId()
+							.intValue());
+			if (notebookEntry != null) {
+				scribeUserDTO.notebookEntry = notebookEntry.getEntry();
+			}
+		}		
 		request.setAttribute("scribeUserDTO", scribeUserDTO);
-		
-		scribeService.saveOrUpdateScribeUser(scribeUser);
-
-		return mapping.findForward("learning");
 	}
 }
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java,v
diff -u -r1.3 -r1.4
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java	1 Oct 2006 06:44:19 -0000	1.3
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java	2 Oct 2006 04:54:13 -0000	1.4
@@ -132,6 +132,7 @@
 			ScribeSession session = (ScribeSession) sessIter.next();
 
 			ScribeSessionDTO sessionDTO = new ScribeSessionDTO(session);
+			int numberOfVotes = 0;
 			
 			for (Iterator userIter = session.getScribeUsers().iterator(); userIter
 					.hasNext();) {
@@ -147,11 +148,16 @@
 					userDTO.finishedReflection = true;
 				} else {
 					userDTO.finishedReflection = false;
-				}			
+				}
 				
+				if (user.isReportApproved()) {
+					numberOfVotes++;
+				}
+				
 				sessionDTO.getUserDTOs().add(userDTO);
 			}
-
+			sessionDTO.setNumberOfLearners(session.getScribeUsers().size());
+			sessionDTO.setNumberOfVotes(numberOfVotes);
 			scribeDTO.getSessionDTOs().add(sessionDTO);
 		}
 		
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java,v
diff -u -r1.4 -r1.5
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java	2 Oct 2006 00:50:52 -0000	1.4
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java	2 Oct 2006 04:54:13 -0000	1.5
@@ -65,7 +65,8 @@
 			HttpServletResponse response, String directoryName, Cookie[] cookies) {
 
 		if (scribeService == null) {
-			scribeService = ScribeServiceProxy.getScribeService(getServletContext());
+			scribeService = ScribeServiceProxy
+					.getScribeService(getServletContext());
 		}
 
 		try {
@@ -110,10 +111,10 @@
 		// get the scribe user
 		UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(
 				AttributeNames.USER);
-		
-		ScribeUser scribeUser = scribeService.getUserByUserIdAndSessionId(new Long(
-				user.getUserID()), toolSessionID);
 
+		ScribeUser scribeUser = scribeService.getUserByUserIdAndSessionId(
+				new Long(user.getUserID()), toolSessionID);
+
 		// construct session DTO.
 		ScribeSessionDTO sessionDTO = new ScribeSessionDTO(scribeSession);
 
@@ -157,20 +158,29 @@
 
 		Scribe scribe = scribeService.getScribeByContentId(toolContentID);
 		ScribeDTO scribeDTO = new ScribeDTO(scribe);
-		for (Iterator iter = scribe.getScribeSessions().iterator(); iter.hasNext();) {
+		for (Iterator iter = scribe.getScribeSessions().iterator(); iter
+				.hasNext();) {
 
 			ScribeSession session = (ScribeSession) iter.next();
 			ScribeSessionDTO sessionDTO = new ScribeSessionDTO(session);
+			
+			int numberOfVotes = 0;
+			for (Iterator iterator = session.getScribeUsers().iterator(); iterator
+					.hasNext();) {
+				ScribeUser user = (ScribeUser) iterator.next();
+				
+				// count the votes
+				if (user.isReportApproved()) {
+					numberOfVotes++;
+				}
+				
+				// if reflectOnActivity is enabled add all userDTO.
+				if (session.getScribe().isReflectOnActivity()) {
 
-			// if reflectOnActivity is enabled add all userDTO.
-			if (session.getScribe().isReflectOnActivity()) {
-
-				for (Iterator iterator = session.getScribeUsers().iterator(); iterator
-						.hasNext();) {
-					ScribeUser user = (ScribeUser) iterator.next();
 					ScribeUserDTO userDTO = new ScribeUserDTO(user);
 					// get the entry.
-					NotebookEntry entry = scribeService.getEntry(session.getSessionId(),
+					NotebookEntry entry = scribeService.getEntry(session
+							.getSessionId(),
 							CoreNotebookConstants.NOTEBOOK_TOOL,
 							ScribeConstants.TOOL_SIGNATURE, user.getUserId()
 									.intValue());
@@ -183,6 +193,9 @@
 					sessionDTO.getUserDTOs().add(userDTO);
 				}
 			}
+			
+			sessionDTO.setNumberOfLearners(session.getScribeUsers().size());
+			sessionDTO.setNumberOfVotes(numberOfVotes);
 			scribeDTO.getSessionDTOs().add(sessionDTO);
 		}
 		request.getSession().setAttribute("scribeDTO", scribeDTO);
Index: lams_tool_scribe/web/pages/export/exportPortfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/export/exportPortfolio.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_scribe/web/pages/export/exportPortfolio.jsp	2 Oct 2006 00:50:52 -0000	1.3
+++ lams_tool_scribe/web/pages/export/exportPortfolio.jsp	2 Oct 2006 04:54:13 -0000	1.4
@@ -55,6 +55,23 @@
 						</p>
 
 						<div class="field-name" style="text-align: left">
+							?Total Number of Learners?
+						</div>
+												
+						<p>
+							${session.numberOfLearners}
+						</p>						
+						
+						<div class="field-name" style="text-align: left">
+							?Number of Votes?
+						</div>
+												
+						<p>
+							${session.numberOfVotes}
+						</p>
+						
+
+						<div class="field-name" style="text-align: left">
 							?Report?
 						</div>
 						<hr />
Index: lams_tool_scribe/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/learning.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_scribe/web/pages/learning/learning.jsp	30 Sep 2006 10:19:02 -0000	1.3
+++ lams_tool_scribe/web/pages/learning/learning.jsp	2 Oct 2006 04:54:13 -0000	1.4
@@ -12,7 +12,6 @@
 	}
 </script>
 
-
 <div id="content">
 	
 	<h1>
@@ -22,16 +21,28 @@
 	<p>
 		${scribeDTO.instructions}
 	</p>
+	
+	<div class="field-name" style="text-align: left">
+		?Number of Votes?
+	</div>
+	
+	<p>
+		${scribeSessionDTO.numberOfVotes}
+	</p>
 
+
+	<div class="field-name" style="text-align: left">
+		?Headings?
+	</div>
 	<html:form action="learning">
 		<html:hidden property="dispatch" value="submitApproval"></html:hidden>
 		<html:hidden property="toolSessionID"></html:hidden>
 		<html:hidden property="mode"></html:hidden>
 
 		<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
-			<h2>
+			<p>
 				${reportDTO.headingDTO.headingText}
-			</h2>
+			</p>
 
 			<p>
 				<lams:out value="${reportDTO.entryText}" />
Index: lams_tool_scribe/web/pages/learning/scribe.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/scribe.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_scribe/web/pages/learning/scribe.jsp	1 Oct 2006 06:44:18 -0000	1.2
+++ lams_tool_scribe/web/pages/learning/scribe.jsp	2 Oct 2006 04:54:13 -0000	1.3
@@ -1,5 +1,34 @@
 <%@ include file="/common/taglibs.jsp"%>
 
+<c:set var="lams">
+	<lams:LAMSURL/>
+</c:set>
+<c:set var="tool">
+	<lams:WebAppURL/>
+</c:set>
+
+<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
+
+<script type="text/javascript">
+	setTimeout("refreshPage()",5000)
+
+	function refreshPage() {
+		
+		var url = '${tool}learning.do';
+		var params = 'dispatch=getVoteCount&toolSessionID=${scribeSessionDTO.sessionID}';
+		
+		var myAjax = new Ajax.Updater(
+			'voteDisplay',
+			url,
+			{
+				method: 'get',
+				parameters: params
+			});
+				
+		setTimeout("refreshPage()",5000)		
+	}
+</script>
+
 <div id="content">
 
 	<h1>
@@ -15,10 +44,21 @@
 		<html:hidden property="toolSessionID"></html:hidden>
 		<html:hidden property="mode"></html:hidden>
 
+		<div class="field-name" style="text-align: left">
+			?Number of Votes?
+		</div>
+
+		<p id="voteDisplay">
+			${scribeSessionDTO.numberOfVotes}
+		</p>
+
+		<div class="field-name" style="text-align: left">
+			?Headings?
+		</div>
 		<c:forEach var="reportDTO" items="${scribeSessionDTO.reportDTOs}">
-			<h3>
+			<p>
 				${reportDTO.headingDTO.headingText}
-			</h3>
+			</p>
 
 			<p>
 				<lams:out value="${reportDTO.entryText}" />
Index: lams_tool_scribe/web/pages/learning/voteCount.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/learning/Attic/voteCount.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_scribe/web/pages/learning/voteCount.jsp	2 Oct 2006 04:54:13 -0000	1.1
@@ -0,0 +1 @@
+${voteCount}
\ No newline at end of file
Index: lams_tool_scribe/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/pages/monitoring/summary.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_scribe/web/pages/monitoring/summary.jsp	1 Oct 2006 06:44:19 -0000	1.2
+++ lams_tool_scribe/web/pages/monitoring/summary.jsp	2 Oct 2006 04:54:14 -0000	1.3
@@ -60,6 +60,22 @@
 						</p>
 
 						<div class="field-name" style="text-align: left">
+							?Total Number of Learners?
+						</div>
+												
+						<p>
+							${session.numberOfLearners}
+						</p>						
+						
+						<div class="field-name" style="text-align: left">
+							?Number of Votes?
+						</div>
+												
+						<p>
+							${session.numberOfVotes}
+						</p>
+
+						<div class="field-name" style="text-align: left">
 							?Report?
 						</div>
 						<hr />