Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeSessionDTO.java
===================================================================
diff -u -r7d8d96ba15203a9f3f8898c4a0fc4a4406b9475b -rc6b8ac8a336ac260986c41a3049a5d1bc0a743c0
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeSessionDTO.java	(.../ScribeSessionDTO.java)	(revision 7d8d96ba15203a9f3f8898c4a0fc4a4406b9475b)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/dto/ScribeSessionDTO.java	(.../ScribeSessionDTO.java)	(revision c6b8ac8a336ac260986c41a3049a5d1bc0a743c0)
@@ -45,6 +45,8 @@
 	
 	int numberOfLearners;
 	
+	int VotePercentage;
+	
 	String appointedScribe;
 	
 	Set<ScribeReportEntryDTO> reportDTOs;
@@ -139,4 +141,12 @@
 	public void setAppointedScribe(String appointedScribe) {
 		this.appointedScribe = appointedScribe;
 	}
+
+	public int getVotePercentage() {
+		return VotePercentage;
+	}
+
+	public void setVotePercentage(int votePercentage) {
+		VotePercentage = votePercentage;
+	}
 }
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
===================================================================
diff -u -r6a37d0aeb848e1c3e2fd5039e8d3f40df91c064a -rc6b8ac8a336ac260986c41a3049a5d1bc0a743c0
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	(.../ScribeService.java)	(revision 6a37d0aeb848e1c3e2fd5039e8d3f40df91c064a)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java	(.../ScribeService.java)	(revision c6b8ac8a336ac260986c41a3049a5d1bc0a743c0)
@@ -63,7 +63,6 @@
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.scribe.dao.IScribeAttachmentDAO;
 import org.lamsfoundation.lams.tool.scribe.dao.IScribeDAO;
-import org.lamsfoundation.lams.tool.scribe.dao.IScribeHeadingDAO;
 import org.lamsfoundation.lams.tool.scribe.dao.IScribeSessionDAO;
 import org.lamsfoundation.lams.tool.scribe.dao.IScribeUserDAO;
 import org.lamsfoundation.lams.tool.scribe.model.Scribe;
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/util/ScribeUtils.java
===================================================================
diff -u
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/util/ScribeUtils.java	(revision 0)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/util/ScribeUtils.java	(revision c6b8ac8a336ac260986c41a3049a5d1bc0a743c0)
@@ -0,0 +1,15 @@
+package org.lamsfoundation.lams.tool.scribe.util;
+
+public class ScribeUtils {
+	
+	public static int calculateVotePercentage(int numberOfVotes, int numberOfLearners) {
+		
+		Float v = new Float(numberOfVotes);
+		Float l = new Float(numberOfLearners);
+		
+		Float result = v/l*100;
+		
+		return result.intValue();
+	}
+	
+}
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
===================================================================
diff -u -r3a34b1940e23fadb7937c45e8020704d95c8af14 -rc6b8ac8a336ac260986c41a3049a5d1bc0a743c0
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 3a34b1940e23fadb7937c45e8020704d95c8af14)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java	(.../LearningAction.java)	(revision c6b8ac8a336ac260986c41a3049a5d1bc0a743c0)
@@ -60,6 +60,8 @@
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
+import org.lamsfoundation.lams.tool.scribe.util.ScribeUtils;
+
 /**
  * @author
  * @version
@@ -71,8 +73,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/parts/voteCount.jsp"
- * @struts.action-forward name="voteConfirmation" path="/pages/learning/parts/voteConfirmation.jsp"
+ * @struts.action-forward name="voteDisplay" path="/pages/parts/voteDisplay.jsp"
  */
 public class LearningAction extends LamsDispatchAction {
 
@@ -298,34 +299,42 @@
 		scribeService.saveOrUpdateScribeUser(scribeUser);
 		
 		if (session.getAppointedScribe().equals(scribeUser)) {
-			// send updated voteCount
-			return getVoteCount(mapping, form, request, response);
+			// send updated voteDisplay
+			return getVoteDisplay(mapping, form, request, response);
 		} else {
 			// load learning page.
 			return mapping.findForward("learning");
 		}
 	}
 	
-	public ActionForward getVoteCount(ActionMapping mapping, ActionForm form,
+	public ActionForward getVoteDisplay(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response) {
 		
 		Long toolSessionID = WebUtil.readLongParam(request, "toolSessionID");
 		
 		ScribeSession session = scribeService.getSessionBySessionId(toolSessionID);
 		
-		int voteCount = 0;
+		int numberOfVotes = 0;
 		
 		for (Iterator iter = session.getScribeUsers().iterator(); iter.hasNext();) {
 			ScribeUser user = (ScribeUser) iter.next();
 			
 			if (user.isReportApproved()) {
-				voteCount++;			
+				numberOfVotes++;			
 			}
 		}
 		
-		request.setAttribute("voteCount", voteCount);
+		int numberOfLearners = session.getScribeUsers().size();
+		int votePercentage = ScribeUtils.calculateVotePercentage(numberOfVotes, numberOfLearners);
+					
+		ScribeSessionDTO sessionDTO = new ScribeSessionDTO();
+		sessionDTO.setNumberOfVotes(numberOfVotes);
+		sessionDTO.setNumberOfLearners(numberOfLearners);
+		sessionDTO.setVotePercentage(votePercentage);
 		
-		return mapping.findForward("voteCount");
+		request.setAttribute("scribeSessionDTO", sessionDTO);
+		
+		return mapping.findForward("voteDisplay");
 	}
 
 	
@@ -346,9 +355,12 @@
 			}
 		}
 		
-		// TODO
+		int numberOfLearners = scribeSession.getScribeUsers().size();
+		
 		sessionDTO.setNumberOfVotes(numberOfVotes);
-		sessionDTO.setNumberOfLearners(scribeSession.getScribeUsers().size());
+		sessionDTO.setNumberOfLearners(numberOfLearners);
+		sessionDTO.setVotePercentage(ScribeUtils.calculateVotePercentage(numberOfVotes, numberOfLearners));
+		
 		request.setAttribute("scribeSessionDTO", sessionDTO);
 		
 		ScribeUserDTO scribeUserDTO = new ScribeUserDTO(scribeUser);
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java
===================================================================
diff -u -r7d8d96ba15203a9f3f8898c4a0fc4a4406b9475b -rc6b8ac8a336ac260986c41a3049a5d1bc0a743c0
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision 7d8d96ba15203a9f3f8898c4a0fc4a4406b9475b)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision c6b8ac8a336ac260986c41a3049a5d1bc0a743c0)
@@ -44,6 +44,7 @@
 import org.lamsfoundation.lams.tool.scribe.service.IScribeService;
 import org.lamsfoundation.lams.tool.scribe.service.ScribeServiceProxy;
 import org.lamsfoundation.lams.tool.scribe.util.ScribeConstants;
+import org.lamsfoundation.lams.tool.scribe.util.ScribeUtils;
 import org.lamsfoundation.lams.tool.scribe.web.forms.MonitoringForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -156,8 +157,11 @@
 				
 				sessionDTO.getUserDTOs().add(userDTO);
 			}
-			sessionDTO.setNumberOfLearners(session.getScribeUsers().size());
+			int numberOfLearners = session.getScribeUsers().size();
+			
 			sessionDTO.setNumberOfVotes(numberOfVotes);
+			sessionDTO.setNumberOfLearners(numberOfLearners);
+			sessionDTO.setVotePercentage(ScribeUtils.calculateVotePercentage(numberOfVotes, numberOfLearners));
 			scribeDTO.getSessionDTOs().add(sessionDTO);
 		}
 		
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java
===================================================================
diff -u -r7d8d96ba15203a9f3f8898c4a0fc4a4406b9475b -rc6b8ac8a336ac260986c41a3049a5d1bc0a743c0
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision 7d8d96ba15203a9f3f8898c4a0fc4a4406b9475b)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision c6b8ac8a336ac260986c41a3049a5d1bc0a743c0)
@@ -46,6 +46,7 @@
 import org.lamsfoundation.lams.tool.scribe.service.ScribeServiceProxy;
 import org.lamsfoundation.lams.tool.scribe.util.ScribeConstants;
 import org.lamsfoundation.lams.tool.scribe.util.ScribeException;
+import org.lamsfoundation.lams.tool.scribe.util.ScribeUtils;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -194,8 +195,11 @@
 				}
 			}
 			
-			sessionDTO.setNumberOfLearners(session.getScribeUsers().size());
+			int numberOfLearners = session.getScribeUsers().size();
+			
 			sessionDTO.setNumberOfVotes(numberOfVotes);
+			sessionDTO.setNumberOfLearners(numberOfLearners);
+			sessionDTO.setVotePercentage(ScribeUtils.calculateVotePercentage(numberOfVotes, numberOfLearners));
 			scribeDTO.getSessionDTOs().add(sessionDTO);
 		}
 		request.getSession().setAttribute("scribeDTO", scribeDTO);
Index: lams_tool_scribe/web/images/bar1.gif
===================================================================
diff -u
Binary files differ
Index: lams_tool_scribe/web/pages/export/exportPortfolio.jsp
===================================================================
diff -u -rd10d62db02c9d97d771b912d83e221c96b52cad0 -rc6b8ac8a336ac260986c41a3049a5d1bc0a743c0
--- lams_tool_scribe/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision d10d62db02c9d97d771b912d83e221c96b52cad0)
+++ lams_tool_scribe/web/pages/export/exportPortfolio.jsp	(.../exportPortfolio.jsp)	(revision c6b8ac8a336ac260986c41a3049a5d1bc0a743c0)
@@ -54,22 +54,8 @@
 							${session.appointedScribe}
 						</p>
 
-						<div class="field-name" style="text-align: left">
-							<fmt:message key="heading.totalLearners" />							
-						</div>
-												
-						<p>
-							${session.numberOfLearners}
-						</p>						
-						
-						<div class="field-name" style="text-align: left">
-							<fmt:message key="heading.numberOfVotes" />
-						</div>
-												
-						<p>
-							${session.numberOfVotes}
-						</p>
-						
+						<c:set var="scribeSessionDTO" value="${session}" scope="request"> </c:set>
+						<%@include file="/pages/parts/voteDisplay.jsp" %>						
 
 						<div class="field-name" style="text-align: left">
 							<fmt:message key="heading.report" />
Index: lams_tool_scribe/web/pages/learning/learning.jsp
===================================================================
diff -u -r3a34b1940e23fadb7937c45e8020704d95c8af14 -rc6b8ac8a336ac260986c41a3049a5d1bc0a743c0
--- lams_tool_scribe/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 3a34b1940e23fadb7937c45e8020704d95c8af14)
+++ lams_tool_scribe/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c6b8ac8a336ac260986c41a3049a5d1bc0a743c0)
@@ -22,15 +22,8 @@
 		${scribeDTO.instructions}
 	</p>
 	
-	<div class="field-name" style="text-align: left">
-		<fmt:message key="heading.numberOfVotes" />
-	</div>
-	
-	<p>
-		${scribeSessionDTO.numberOfVotes}
-	</p>
+	<%@include file="/pages/parts/voteDisplay.jsp" %>
 
-
 	<div class="field-name" style="text-align: left">
 		<fmt:message key="heading.report" />
 	</div>
Fisheye: Tag c6b8ac8a336ac260986c41a3049a5d1bc0a743c0 refers to a dead (removed) revision in file `lams_tool_scribe/web/pages/learning/parts/voteCount.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scribe/web/pages/learning/scribe.jsp
===================================================================
diff -u -r3a34b1940e23fadb7937c45e8020704d95c8af14 -rc6b8ac8a336ac260986c41a3049a5d1bc0a743c0
--- lams_tool_scribe/web/pages/learning/scribe.jsp	(.../scribe.jsp)	(revision 3a34b1940e23fadb7937c45e8020704d95c8af14)
+++ lams_tool_scribe/web/pages/learning/scribe.jsp	(.../scribe.jsp)	(revision c6b8ac8a336ac260986c41a3049a5d1bc0a743c0)
@@ -16,7 +16,7 @@
 	function refreshPage() {
 		
 		var url = '${tool}learning.do';
-		var params = 'dispatch=getVoteCount&toolSessionID=${scribeSessionDTO.sessionID}';
+		var params = 'dispatch=getVoteDisplay&toolSessionID=${scribeSessionDTO.sessionID}';
 		
 		var myAjax = new Ajax.Updater(
 			'voteDisplay',
@@ -60,15 +60,11 @@
 		<html:hidden property="dispatch" value="submitReport"></html:hidden>
 		<html:hidden property="toolSessionID"></html:hidden>
 		<html:hidden property="mode"></html:hidden>
-
-		<div class="field-name" style="text-align: left">
-			<fmt:message key="heading.numberOfVotes" />
+		
+		<div id="voteDisplay">
+			<%@include file="/pages/parts/voteDisplay.jsp" %>
 		</div>
 
-		<p id="voteDisplay">
-			${scribeSessionDTO.numberOfVotes}
-		</p>
-
 		<div class="field-name" style="text-align: left">
 			<fmt:message key="heading.report" />
 		</div>
Index: lams_tool_scribe/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r1bb707a570a18172e2e2864e8fe9add832eceab4 -rc6b8ac8a336ac260986c41a3049a5d1bc0a743c0
--- lams_tool_scribe/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 1bb707a570a18172e2e2864e8fe9add832eceab4)
+++ lams_tool_scribe/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision c6b8ac8a336ac260986c41a3049a5d1bc0a743c0)
@@ -60,23 +60,10 @@
 							${session.appointedScribe}
 						</p>
 
-						<div class="field-name" style="text-align: left">
-							<fmt:message key="heading.totalLearners" />
-						</div>
+						<c:set var="scribeSessionDTO" value="${session}" scope="request"> </c:set>
+						<%@include file="/pages/parts/voteDisplay.jsp" %>
 
-						<p>
-							${session.numberOfLearners}
-						</p>
-
 						<div class="field-name" style="text-align: left">
-							<fmt:message key="heading.numberOfVotes" />
-						</div>
-
-						<p>
-							${session.numberOfVotes}
-						</p>
-
-						<div class="field-name" style="text-align: left">
 							<fmt:message key="heading.report" />
 						</div>
 						<hr />
Index: lams_tool_scribe/web/pages/parts/voteDisplay.jsp
===================================================================
diff -u
--- lams_tool_scribe/web/pages/parts/voteDisplay.jsp	(revision 0)
+++ lams_tool_scribe/web/pages/parts/voteDisplay.jsp	(revision c6b8ac8a336ac260986c41a3049a5d1bc0a743c0)
@@ -0,0 +1,16 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+
+<div style="background-color: silver; width: 100%; height: 10px;">	
+	<span>
+		<img src="${tool}images/bar1.gif" width="${scribeSessionDTO.votePercentage}%" height="10" alt="progress bar">
+	</span>
+</div>
+
+<p>	
+	${scribeSessionDTO.numberOfVotes} out of
+	${scribeSessionDTO.numberOfLearners} agree (${scribeSessionDTO.votePercentage}%)
+</p>