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.4 -r1.5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java	17 May 2006 13:32:25 -0000	1.4
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java	18 May 2006 22:11:08 -0000	1.5
@@ -37,6 +37,7 @@
 import org.jfree.chart.ChartUtilities;
 import org.jfree.chart.JFreeChart;
 import org.jfree.data.general.DefaultPieDataset;
+import org.jfree.data.general.Series;
 import org.lamsfoundation.lams.tool.vote.VoteAppConstants;
 
 /**
@@ -62,22 +63,14 @@
             logger.debug("type: " + type);
             JFreeChart chart=null;
             
-            if (type.equals("pie"))
-            {
-                logger.debug("creating pie chart");
-                chart=createPieChart(request);
-            }
-            else if (type.equals("bar"))
-            {
-                logger.debug("creating bar chart");
-                chart=createBarChart();
-            }
+            logger.debug("creating pie chart" + type);
+            chart=createPieChart(request, type);
             
             logger.debug("chart:" + chart);
             if (chart != null)
             {
                 response.setContentType("image/png");
-                ChartUtilities.writeChartAsPNG(out, chart, 400, 300);
+                ChartUtilities.writeChartAsPNG(out, chart, 300, 200);
             }
                     
         }
@@ -91,8 +84,10 @@
         }
     }
     
-    private JFreeChart createPieChart(HttpServletRequest request)
+    private JFreeChart createPieChart(HttpServletRequest request, String chartType)
     {
+        logger.debug("chartType: " + chartType);
+        
         logger.debug("starting createPieChart...");
         DefaultPieDataset data= new DefaultPieDataset();
         
@@ -113,15 +108,21 @@
             data.setValue(pairs.getValue().toString(), new Double(voteRate));
 		}
         
-        JFreeChart chart=ChartFactory.createPieChart("Session Votes Chart", data, true, true, false);
+    	JFreeChart chart=null;
+    	if (chartType.equals("pie"))
+    	{
+    	    chart=ChartFactory.createPieChart3D("Session Votes Chart", data, true, true, false);    
+    	}
+    	else
+    	{
+    	    String series1="Votes";
+    	    
+    	    String category="Votes";
+    	    
+    	    //chart=ChartFactory.createBarChart3D("Session Votes Chart", data, true, true, false);
+    	}
         return chart;
         
     }
-
-
-    private JFreeChart createBarChart()
-    {
-        return null;
-    }
 	
 }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java,v
diff -u -r1.18 -r1.19
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	18 May 2006 17:52:10 -0000	1.18
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	18 May 2006 22:11:08 -0000	1.19
@@ -846,8 +846,7 @@
     	VoteMonitoringForm voteMonitoringForm = (VoteMonitoringForm) form;
     	voteMonitoringForm.setShowOpenVotesSection(new Boolean(false).toString());
     	
-    	logger.debug("showOpen votes set to true: ");
-
+    	logger.debug("showOpen votes set to false: ");
         
     	return (mapping.findForward(LOAD_MONITORING));
      }
Index: lams_tool_vote/web/monitoring/Stats.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Stats.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_vote/web/monitoring/Stats.jsp	20 Apr 2006 12:23:29 -0000	1.1
+++ lams_tool_vote/web/monitoring/Stats.jsp	18 May 2006 22:11:21 -0000	1.2
@@ -30,31 +30,3 @@
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
-		<table class="forms">
-			<tr>
-				<td>
-				<table align="center">
-						<tr> 
-							<td NOWRAP align="right" valign=top>
-				  				<b> <font size=2> <bean:message key="count.total.user" /> </font></b>
-				  			</td>
-							<td NOWRAP valign=top>
-							  	 <font size=2> <c:out value="${sessionScope.countAllUsers}"/>
-							</td> 
-						</tr>
-						
-						<tr> 
-							<td NOWRAP align="right" valign=top>
-				  				<b> <font size=2> <bean:message key="count.finished.user" /> </font></b>
-				  			</td>
-							<td NOWRAP valign=top>
-							  	 <font size=2> <c:out value="${sessionScope.countSessionComplete}"/></font>
-							</td> 
-						</tr>
-						
-				</table>
-				</td>
-			</tr>
-		</table>
-
-
Index: lams_tool_vote/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/SummaryContent.jsp,v
diff -u -r1.16 -r1.17
--- lams_tool_vote/web/monitoring/SummaryContent.jsp	18 May 2006 17:52:11 -0000	1.16
+++ lams_tool_vote/web/monitoring/SummaryContent.jsp	18 May 2006 22:11:21 -0000	1.17
@@ -216,22 +216,23 @@
 																 <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' }"> 			
-											                                <html:submit property="hideOpenVote" 
-											                                             styleClass="linkbutton" 
-									                                                     onclick="submitOpenVote(${currentUid}, 'hideOpenVote');">						                                             
-											                                    <bean:message key="label.hide"/>
-											                                </html:submit>
-																</c:if> 													
-					
-																<c:if test="${userData.visible != 'true' }"> 			
-											                                <html:submit property="showOpenVote" 
-											                                             styleClass="linkbutton" 
-									                                                     onclick="submitOpenVote(${currentUid}, 'showOpenVote');">						                                             
-											                                    <bean:message key="label.show"/>
-											                                </html:submit>
-											                                <font size=2> <i><bean:message key="label.hidden"/> </i> </font>											                                
-																</c:if> 													
+																	<c:if test="${userData.visible == 'true' }"> 			
+												                                <html:submit property="hideOpenVote" 
+												                                             styleClass="linkbutton" 
+										                                                     onclick="submitOpenVote(${currentUid}, 'hideOpenVote');">						                                             
+												                                    <bean:message key="label.hide"/>
+												                                </html:submit>
+																	</c:if> 													
+						
+																	<c:if test="${userData.visible != 'true' }"> 			
+												                                <html:submit property="showOpenVote" 
+												                                             styleClass="linkbutton" 
+										                                                     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>											
 																 
 														</tr>