Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java =================================================================== diff -u -rc8f1ea88d18b9b6b1ee0002d299ac9bfb1431d84 -r50ad2be9f7ba75c8a0d7a47b84f7b9b0e0b2114e --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java (.../VoteChartGenerator.java) (revision c8f1ea88d18b9b6b1ee0002d299ac9bfb1431d84) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java (.../VoteChartGenerator.java) (revision 50ad2be9f7ba75c8a0d7a47b84f7b9b0e0b2114e) @@ -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 =================================================================== diff -u -rbeea90636c10488ed392e5b6e6030b46c727ca66 -r50ad2be9f7ba75c8a0d7a47b84f7b9b0e0b2114e --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision beea90636c10488ed392e5b6e6030b46c727ca66) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 50ad2be9f7ba75c8a0d7a47b84f7b9b0e0b2114e) @@ -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 =================================================================== diff -u -rbc445cd305b92a8737e721c1ab90ed6138dc1715 -r50ad2be9f7ba75c8a0d7a47b84f7b9b0e0b2114e --- lams_tool_vote/web/monitoring/Stats.jsp (.../Stats.jsp) (revision bc445cd305b92a8737e721c1ab90ed6138dc1715) +++ lams_tool_vote/web/monitoring/Stats.jsp (.../Stats.jsp) (revision 50ad2be9f7ba75c8a0d7a47b84f7b9b0e0b2114e) @@ -30,31 +30,3 @@ - - - - -
- - - - - - - - - - - -
- - - -
- - - -
-
- - Index: lams_tool_vote/web/monitoring/SummaryContent.jsp =================================================================== diff -u -rbeea90636c10488ed392e5b6e6030b46c727ca66 -r50ad2be9f7ba75c8a0d7a47b84f7b9b0e0b2114e --- lams_tool_vote/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision beea90636c10488ed392e5b6e6030b46c727ca66) +++ lams_tool_vote/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 50ad2be9f7ba75c8a0d7a47b84f7b9b0e0b2114e) @@ -216,22 +216,23 @@ - - - - - - - - - - - - + + + + + + + + + + + + +