Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.java
===================================================================
diff -u -rbeea90636c10488ed392e5b6e6030b46c727ca66 -r7271b17e27d55c5a50ce986d22cc603064fd16b7
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.java (.../VoteUsrAttempt.java) (revision beea90636c10488ed392e5b6e6030b46c727ca66)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.java (.../VoteUsrAttempt.java) (revision 7271b17e27d55c5a50ce986d22cc603064fd16b7)
@@ -172,7 +172,8 @@
public String toString() {
return new ToStringBuilder(this)
- .append("uid", getUid())
+ .append("nomination:", voteQueContent.getQuestion())
+ .append("userEntry:", userEntry)
.toString();
}
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
===================================================================
diff -u -r35f1843c3f562fb2e648e7b2c55565cc38ea990a -r7271b17e27d55c5a50ce986d22cc603064fd16b7
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 35f1843c3f562fb2e648e7b2c55565cc38ea990a)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 7271b17e27d55c5a50ce986d22cc603064fd16b7)
@@ -1154,14 +1154,19 @@
}
}
-
+ /**
+ * logs hiding of a user entered vote
+ */
public void hideOpenVote(VoteUsrAttempt voteUsrAttempt) throws VoteApplicationException
{
logger.debug("hiding user entry: " + voteUsrAttempt.getUserEntry());
auditService.logHideEntry(MY_SIGNATURE, voteUsrAttempt.getQueUsrId(),
voteUsrAttempt.getVoteQueUsr().getUsername(), voteUsrAttempt.getUserEntry());
}
-
+
+ /**
+ * logs showing of a user entered vote
+ */
public void showOpenVote(VoteUsrAttempt voteUsrAttempt) throws VoteApplicationException
{
logger.debug("showing user entry: " + voteUsrAttempt.getUserEntry());
@@ -1174,9 +1179,6 @@
{
try
{
- //auditService.logShowEntry(MY_SIGNATURE, voteQueUsr.getQueUsrId(),
- // voteQueUsr.getUsername(), voteQueUsr.toString());
-
voteUserDAO.removeVoteUser(voteQueUsr);
}
catch(DataAccessException e)
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java
===================================================================
diff -u -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 -r7271b17e27d55c5a50ce986d22cc603064fd16b7
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java (.../ExportServlet.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java (.../ExportServlet.java) (revision 7271b17e27d55c5a50ce986d22cc603064fd16b7)
@@ -24,12 +24,20 @@
package org.lamsfoundation.lams.tool.vote.web;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
+import org.jfree.chart.ChartUtilities;
+import org.jfree.chart.JFreeChart;
import org.lamsfoundation.lams.tool.ToolAccessMode;
import org.lamsfoundation.lams.tool.vote.VoteAppConstants;
import org.lamsfoundation.lams.tool.vote.VoteApplicationException;
@@ -62,7 +70,10 @@
}else if (StringUtils.equals(mode,ToolAccessMode.TEACHER.toString())){
teacher(request,response,directoryName,cookies);
}
-
+
+ logger.debug("writing out chart to directoryName: " + directoryName);
+ writeOutChart(request, "pie", directoryName);
+ writeOutChart(request, "bar", directoryName);
logger.debug("basePath: " + basePath);
writeResponseToFile(basePath+"/export/exportportfolio.jsp",directoryName,FILENAME,cookies);
@@ -158,4 +169,42 @@
logger.debug("ending teacher mode: ");
}
+
+ /**
+ * creates JFreeCharts for offline visibility
+ * @param request
+ * @param chartType
+ * @param directoryName
+ */
+ public void writeOutChart(HttpServletRequest request, String chartType, String directoryName) {
+ logger.debug("File.separator: " + File.separator) ;
+ String fileName=chartType + ".png";
+ logger.debug("output image fileName: " + fileName) ;
+ logger.debug("full folder name:" + directoryName + File.separator + fileName);
+
+ try{
+ OutputStream out = new FileOutputStream(directoryName + File.separator + fileName);
+ VoteChartGenerator voteChartGenerator= new VoteChartGenerator();
+ JFreeChart chart=null;
+ if (chartType.equals("pie"))
+ {
+ chart = voteChartGenerator.createChart(request, "pie");
+ }
+ else
+ {
+ chart = voteChartGenerator.createChart(request, "bar");
+ }
+ logger.debug("chart:" + chart);
+
+ ChartUtilities.writeChartAsPNG(out, chart, 400, 300);
+ }
+ catch(FileNotFoundException e)
+ {
+ logger.debug("exception creating chart: " + e) ;
+ }
+ catch(IOException e)
+ {
+ logger.debug("exception creating chart: " + e) ;
+ }
+ }
}
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java
===================================================================
diff -u -r4ca13e684e012f8917f07a4ea8121c5c35d0ac4e -r7271b17e27d55c5a50ce986d22cc603064fd16b7
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java (.../VoteChartGenerator.java) (revision 4ca13e684e012f8917f07a4ea8121c5c35d0ac4e)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java (.../VoteChartGenerator.java) (revision 7271b17e27d55c5a50ce986d22cc603064fd16b7)
@@ -115,25 +115,24 @@
}
- private JFreeChart createChart(HttpServletRequest request, String type)
+ public JFreeChart createChart(HttpServletRequest request, String type)
{
logger.debug("chartType: " + type);
if (type.equals("pie"))
{
- return createPieChart (request, type);
+ return createPieChart (request);
}
else if (type.equals("bar"))
{
- return createBarChart (request, type);
+ return createBarChart (request);
}
return null;
}
- private JFreeChart createPieChart(HttpServletRequest request, String chartType)
+ public JFreeChart createPieChart(HttpServletRequest request)
{
- logger.debug("chartType: " + chartType);
-
+
logger.debug("starting createPieChart...");
DefaultPieDataset data= new DefaultPieDataset();
@@ -161,10 +160,8 @@
return chart;
}
- private JFreeChart createBarChart(HttpServletRequest request, String chartType)
+ public JFreeChart createBarChart(HttpServletRequest request)
{
- logger.debug("chartType: " + chartType);
-
logger.debug("starting createBarChart...");
DefaultCategoryDataset data= new DefaultCategoryDataset();
Index: lams_tool_vote/web/export/ExportContent.jsp
===================================================================
diff -u -r192e812bc372965e505ea849d55537547fae74bd -r7271b17e27d55c5a50ce986d22cc603064fd16b7
--- lams_tool_vote/web/export/ExportContent.jsp (.../ExportContent.jsp) (revision 192e812bc372965e505ea849d55537547fae74bd)
+++ lams_tool_vote/web/export/ExportContent.jsp (.../ExportContent.jsp) (revision 7271b17e27d55c5a50ce986d22cc603064fd16b7)
@@ -126,20 +126,20 @@
-
- |
-
- Pie Chart
- |
-
+
+
+ 
+ |
+
+
+
+
+ 
+ |
+
+
-
- |
- Bar Chart
- |
-
-
| |