Index: lams_tool_vote/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.33 -r1.34
--- lams_tool_vote/conf/language/ApplicationResources.properties	19 May 2006 07:18:57 -0000	1.33
+++ lams_tool_vote/conf/language/ApplicationResources.properties	19 May 2006 11:36:02 -0000	1.34
@@ -117,6 +117,7 @@
 label.hidden =hidden
 label.view.piechart  =View Pie Chart
 label.view.barchart  =View Bar Chart
+label.visible =Visible
 
 
 #======= End labels: Exported 96 labels for en AU =====
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java,v
diff -u -r1.13 -r1.14
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java	18 May 2006 17:52:11 -0000	1.13
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java	19 May 2006 11:36:03 -0000	1.14
@@ -65,7 +65,7 @@
 	
 	public int getAttemptsForQuestionContent(final Long voteQueContentId);
 	
-	public int getAttemptsForQuestionContentAndSessionUid(final Long voteQueContentId, final Long voteSessionUid);
+	public int getStandardAttemptsForQuestionContentAndSessionUid(final Long voteQueContentId, final Long voteSessionUid);
 	
 	public void removeAttemptsForUser(final Long queUsrId);
 	
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java,v
diff -u -r1.18 -r1.19
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java	18 May 2006 17:52:11 -0000	1.18
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java	19 May 2006 11:36:02 -0000	1.19
@@ -331,7 +331,7 @@
 	    }
 
 		
-		public int getAttemptsForQuestionContentAndSessionUid(final Long voteQueContentId, final Long voteSessionUid)
+		public int getStandardAttemptsForQuestionContentAndSessionUid(final Long voteQueContentId, final Long voteSessionUid)
 	    {
 	        HibernateTemplate templ = this.getHibernateTemplate();
 	        List list = getSession().createQuery(LOAD_ATTEMPT_FOR_QUESTION_CONTENT)
@@ -346,13 +346,18 @@
 		    	    VoteUsrAttempt attempt=(VoteUsrAttempt)listIterator.next();
 		    	    if (attempt.getVoteQueUsr().getVoteSession().getUid().toString().equals(voteSessionUid.toString()))
 		    	    {
-		    	        userEntries.add(attempt);
+		    	        if (!attempt.getVoteQueContentId().toString().equals("1"))
+		    	        {
+		    	            userEntries.add(attempt);    
+		    	        }
 		    	    }
 		    	}
 			}
 			return userEntries.size();
 
 	    }
+		
+        //
 
 		
 		public VoteUsrAttempt getAttemptsForUserAndQuestionContent(final Long queUsrId, final Long voteQueContentId)
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java,v
diff -u -r1.20 -r1.21
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java	18 May 2006 17:52:10 -0000	1.20
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java	19 May 2006 11:36:02 -0000	1.21
@@ -91,7 +91,7 @@
     
     public int getAttemptsForQuestionContent(final Long voteQueContentId) throws VoteApplicationException;
     
-    public int getAttemptsForQuestionContentAndSessionUid(final Long voteQueContentId, final Long voteSessionId) throws VoteApplicationException;
+    public int getStandardAttemptsForQuestionContentAndSessionUid(final Long voteQueContentId, final Long voteSessionId) throws VoteApplicationException;
     
 	public int getAllEntriesCount() throws VoteApplicationException;
 	
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java,v
diff -u -r1.20 -r1.21
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	18 May 2006 17:52:10 -0000	1.20
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	19 May 2006 11:36:02 -0000	1.21
@@ -605,11 +605,11 @@
         }        
     }
     
-    public int getAttemptsForQuestionContentAndSessionUid(final Long voteQueContentId, final Long voteSessionUid) throws VoteApplicationException
+    public int getStandardAttemptsForQuestionContentAndSessionUid(final Long voteQueContentId, final Long voteSessionUid) throws VoteApplicationException
     {
         try
         {
-        	return voteUsrAttemptDAO.getAttemptsForQuestionContentAndSessionUid(voteQueContentId, voteSessionUid);
+        	return voteUsrAttemptDAO.getStandardAttemptsForQuestionContentAndSessionUid(voteQueContentId, voteSessionUid);
         }
         catch (DataAccessException e)
         {
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java,v
diff -u -r1.18 -r1.19
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java	18 May 2006 10:21:19 -0000	1.18
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java	19 May 2006 11:36:02 -0000	1.19
@@ -657,6 +657,7 @@
 		{
 		    logger.debug("process for session: " + toolSessionUid);
 		    entriesCount=voteService.getSessionEntriesCount(toolSessionUid);
+		    logger.debug("entriesCount: " + entriesCount);
 		    userEntries=voteService.getSessionUserEntries(toolSessionUid);
 		    logger.debug("sessionUserCount: " + userEntries.size());
 		    
@@ -703,6 +704,9 @@
 		Long mapIndex=new Long(1);
 		logger.debug("mapOptionsContent: " + mapOptionsContent);
 		int totalStandardVotesCount=0;
+		
+		logger.debug("using entriesCount: " + entriesCount);
+		
 		while (queIterator.hasNext())
 		{
 			VoteQueContent voteQueContent=(VoteQueContent) queIterator.next();
@@ -715,7 +719,7 @@
 				if (sessionLevelCharting == true)
 				{
 				    logger.debug("getting votesCount based on session: " + toolSessionUid);
-					votesCount=voteService.getAttemptsForQuestionContentAndSessionUid(voteQueContent.getUid(), toolSessionUid);
+					votesCount=voteService.getStandardAttemptsForQuestionContentAndSessionUid(voteQueContent.getUid(), toolSessionUid);
 					logger.debug("votesCount for questionContent uid: " + votesCount + " for" + voteQueContent.getUid());
 					mapStandardUserCount.put(mapIndex.toString(),new Integer(votesCount).toString());
 					totalStandardVotesCount=totalStandardVotesCount + votesCount;
@@ -761,20 +765,9 @@
 	    logger.debug("share: " + share);
 	    
 	    logger.debug("totalStandardVotesCount: " + totalStandardVotesCount);
+	    int userEnteredVotesCount=entriesCount - totalStandardVotesCount;
+        logger.debug("userEnteredVotesCount for this session: " + userEnteredVotesCount);
 	    
-	    logger.debug("distinctSessionUsers: " + distinctSessionUsers);
-	    int userEnteredVotesCount=0;
-        if (distinctSessionUsers != null)
-        {
-            userEnteredVotesCount=totalStandardVotesCount- distinctSessionUsers.size();    
-        }
-        else
-        {
-            userEnteredVotesCount=totalStandardVotesCount;
-        }
-        
-        logger.debug("userEnteredVotesCount: " + userEnteredVotesCount);
-	    
 	    mapStandardNominationsContent.put(mapIndex.toString(), "Open Vote");
 	    mapStandardRatesContent.put(mapIndex.toString(), new Double(share).toString());
 	    mapStandardUserCount.put(mapIndex.toString(), new Integer(userEnteredVotesCount).toString());
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/Attic/VoteChartGenerator.java,v
diff -u -r1.6 -r1.7
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java	19 May 2006 07:18:57 -0000	1.6
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java	19 May 2006 11:36:02 -0000	1.7
@@ -157,7 +157,7 @@
 		}
         
     	JFreeChart chart=null;
-   	    chart=ChartFactory.createBarChart3D("Session Votes Chart", "Open Response", "Percentage", 
+   	    chart=ChartFactory.createBarChart3D("Session Votes Chart", "Open Vote", "Percentage", 
    	    									data, PlotOrientation.VERTICAL, true, true, false);
    	    logger.debug("chart: " + chart) ;
    	    return chart;
Index: lams_tool_vote/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/SummaryContent.jsp,v
diff -u -r1.18 -r1.19
--- lams_tool_vote/web/monitoring/SummaryContent.jsp	19 May 2006 07:18:57 -0000	1.18
+++ lams_tool_vote/web/monitoring/SummaryContent.jsp	19 May 2006 11:36:02 -0000	1.19
@@ -91,22 +91,6 @@
 						<tr>
 					 		<td NOWRAP colspan=2> 
 		                            <c:out value="${activityInstructions}" escapeXml="false"/> &nbsp
-
-									<c:if test="${VoteMonitoringForm.showOpenVotesSection == 'false'}"> 										
-		                                <html:submit property="viewOpenVotes" 
-		                                             styleClass="linkbutton" 
-		                                             onclick="submitMethod('viewOpenVotes');">
-		                                    <bean:message key="label.view.openVotes"/>
-		                                </html:submit>
-									</c:if> 					                                
-		                                
-									<c:if test="${VoteMonitoringForm.showOpenVotesSection == 'true'}"> 										
-		                                <html:submit property="closeOpenVotes" 
-		                                             styleClass="linkbutton" 
-		                                             onclick="submitMethod('closeOpenVotes');">
-		                                    <bean:message key="label.view.closeVotes"/>
-		                                </html:submit>
-									</c:if> 					                                		                                
 							</td>
 						</tr>
 						
@@ -175,7 +159,6 @@
 							</td>
 						</tr>
 
-						<c:if test="${VoteMonitoringForm.showOpenVotesSection == 'true'}"> 										
 
 							<tr>
 						 		<td NOWRAP colspan=2 > &nbsp&nbsp </td>
@@ -200,35 +183,32 @@
 					 			
 									<c:forEach var="currentDto" items="${sessionScope.listUserEntries}">
 
-										<tr>			
-											<td NOWRAP valign=top align=left><b> <font size=2> <bean:message key="label.vote"/>: </b>
-												<c:out value="${currentDto.question}" escapeXml="false"/>
-											</font> 
-											</td>
-										</tr>	
-										
 										<tr> 
 											<td NOWRAP valign=top>
 												<table align=center>
 													<tr> 
-														 <td NOWRAP valign=top align=left>   &nbsp&nbsp&nbsp&nbsp&nbsp </td>  
+														 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.vote"/> </font> </b> </td>  														 
 														 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.user"/> </font> </b> </td>  
 								  						 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.attemptTime"/></font> </b></td>
-								  						 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.timezone"/> </font>	</b></td>
-								  						 <td NOWRAP valign=top align=left> <b> <font size=2>  &nbsp&nbsp&nbsp&nbsp&nbsp </td>								  						 
+								  						 <td NOWRAP valign=top align=left> <b> <font size=2>  <bean:message key="label.visible"/> </font> </b></td>								  						 
 										  			</tr>				 
 				
 						  							<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
 											  	 		<c:set var="userData" scope="request" value="${questionAttemptData.value}"/>
 	  	 									  	 		<c:set var="currentUid" scope="request" value="${userData.uid}"/>
 														<tr> 
-																 <td NOWRAP valign=top align=left>   &nbsp&nbsp&nbsp&nbsp&nbsp </td>  
+																<td NOWRAP valign=top align=left> 
+																	<c:out value="${currentDto.question}" escapeXml="false"/> 
+																	<c:if test="${userData.visible != 'true' }"> 			
+												                                <font size=2> <i><bean:message key="label.hidden"/> </i> </font>											                                
+																	</c:if> 								
+																</td>
+																 
 																 <td NOWRAP valign=top align=left>   <font size=2> <c:out value="${userData.userName}"/> </font>  </td>  
 																 <td NOWRAP valign=top align=left>   <font size=2> <c:out value="${userData.attemptTime}"/> </font> </td>
-																 <td NOWRAP valign=top align=left>   <font size=2> <c:out value="${userData.timeZone}"/> </font> </td>
-																 <td NOWRAP valign=top align=left>   <font size=2>
-
-																	<c:if test="${userData.visible == 'true' }"> 			
+																 
+																 <td NOWRAP valign=top align=left>
+											 						<c:if test="${userData.visible == 'true' }"> 			
 												                                <html:submit property="hideOpenVote" 
 												                                             styleClass="linkbutton" 
 										                                                     onclick="submitOpenVote(${currentUid}, 'hideOpenVote');">						                                             
@@ -242,10 +222,8 @@
 										                                                     onclick="submitOpenVote(${currentUid}, 'showOpenVote');">						                                             
 												                                    <bean:message key="label.show"/>
 												                                </html:submit>
-												                                <font size=2> <i><bean:message key="label.hidden"/> </i> </font>											                                
-																	</c:if> 								
-
-															</td>											
+																	</c:if> 						
+																</td>																			
 																 
 														</tr>		
 													</c:forEach>		  	
@@ -256,9 +234,6 @@
 								</table> 
 								</td>
 							</tr>
-							
-						</c:if> 			
-
 				</table>
 			</c:if> 	    	  
 		</c:if>