Index: lams_tool_vote/conf/language/ApplicationResources.properties
===================================================================
diff -u -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 -r4ca13e684e012f8917f07a4ea8121c5c35d0ac4e
--- lams_tool_vote/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6)
+++ lams_tool_vote/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 4ca13e684e012f8917f07a4ea8121c5c35d0ac4e)
@@ -128,6 +128,7 @@
label.individual.learnerVotes =Individual Learner Votes
label.all.learnerVotes =All Learner Votes
label.warning =Warning
+label.summary.sessionSeparator =------------------------------------------------------------------------------------
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAllSessionsDTO.java
===================================================================
diff -u -r6337b44d0387e4f1bb2c1a7511a483e3b2f6fb86 -r4ca13e684e012f8917f07a4ea8121c5c35d0ac4e
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAllSessionsDTO.java (.../VoteAllSessionsDTO.java) (revision 6337b44d0387e4f1bb2c1a7511a483e3b2f6fb86)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAllSessionsDTO.java (.../VoteAllSessionsDTO.java) (revision 4ca13e684e012f8917f07a4ea8121c5c35d0ac4e)
@@ -22,6 +22,7 @@
package org.lamsfoundation.lams.tool.vote;
+import java.util.List;
import java.util.Map;
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -41,8 +42,21 @@
private Map mapStandardNominationsContent;
private Map mapStandardUserCount;
private Map mapStandardRatesContent;
+ private List listUserEntries;
/**
+ * @return Returns the listUserEntries.
+ */
+ public List getListUserEntries() {
+ return listUserEntries;
+ }
+ /**
+ * @param listUserEntries The listUserEntries to set.
+ */
+ public void setListUserEntries(List listUserEntries) {
+ this.listUserEntries = listUserEntries;
+ }
+ /**
* @return Returns the mapStandardRatesContent.
*/
public Map getMapStandardRatesContent() {
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
===================================================================
diff -u -r6a4cc1cba568d6ed7af70248ad7f89b757e8f468 -r4ca13e684e012f8917f07a4ea8121c5c35d0ac4e
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 6a4cc1cba568d6ed7af70248ad7f89b757e8f468)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 4ca13e684e012f8917f07a4ea8121c5c35d0ac4e)
@@ -1551,6 +1551,16 @@
// TODO Auto-generated method stub
return null;
}
+
+ /**
+ * Export the XML fragment for the tool's content, along with any files needed
+ * for the content.
+ * @throws ToolException if any other error occurs
+ */
+ public String exportToolContent(List toolContentId) throws ToolException {
+ // TODO Auto-generated method stub
+ return null;
+ }
/**
* Import the XML fragment for the tool's content, along with any files needed
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java
===================================================================
diff -u -r6337b44d0387e4f1bb2c1a7511a483e3b2f6fb86 -r4ca13e684e012f8917f07a4ea8121c5c35d0ac4e
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 6337b44d0387e4f1bb2c1a7511a483e3b2f6fb86)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 4ca13e684e012f8917f07a4ea8121c5c35d0ac4e)
@@ -792,8 +792,12 @@
voteAllSessionsDTO.setMapStandardNominationsContent(mapStandardNominationsContent);
voteAllSessionsDTO.setMapStandardUserCount(mapStandardUserCount);
voteAllSessionsDTO.setMapStandardRatesContent(mapStandardRatesContent);
+
+ VoteMonitoringAction voteMonitoringAction= new VoteMonitoringAction();
+ List listUserEntries=voteMonitoringAction.processUserEnteredNominations(voteService, voteContent, voteSession.getVoteSessionId().toString(), true, null, false);
+ logger.debug("listUserEntries: " + listUserEntries);
+ voteAllSessionsDTO.setListUserEntries(listUserEntries);
-
listVoteAllSessionsDTO.add(voteAllSessionsDTO);
}
logger.debug("listVoteAllSessionsDTO: " + listVoteAllSessionsDTO);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java
===================================================================
diff -u -r6337b44d0387e4f1bb2c1a7511a483e3b2f6fb86 -r4ca13e684e012f8917f07a4ea8121c5c35d0ac4e
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java (.../VoteChartGenerator.java) (revision 6337b44d0387e4f1bb2c1a7511a483e3b2f6fb86)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java (.../VoteChartGenerator.java) (revision 4ca13e684e012f8917f07a4ea8121c5c35d0ac4e)
@@ -72,6 +72,7 @@
if (currentSessionId != null)
{
+ logger.debug("currentSessionId is specified, generating data for all sessions dto: ");
IVoteService voteService=null;
voteService = (IVoteService)request.getSession().getAttribute(TOOL_SERVICE);
logger.debug("voteService: " + voteService);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java
===================================================================
diff -u -r6337b44d0387e4f1bb2c1a7511a483e3b2f6fb86 -r4ca13e684e012f8917f07a4ea8121c5c35d0ac4e
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 6337b44d0387e4f1bb2c1a7511a483e3b2f6fb86)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 4ca13e684e012f8917f07a4ea8121c5c35d0ac4e)
@@ -155,6 +155,7 @@
logger.debug("generate DTO for All sessions: ");
List listVoteAllSessionsDTO=MonitoringUtil.prepareChartDTO(request, voteService, voteMonitoringForm, voteContent.getVoteContentId());
logger.debug("listVoteAllSessionsDTO: " + listVoteAllSessionsDTO);
+
request.getSession().setAttribute(LIST_VOTE_ALLSESSIONS_DTO, listVoteAllSessionsDTO);
}
else
@@ -929,7 +930,10 @@
request.getSession().setAttribute(CURRENT_MONITORED_TOOL_SESSION, currentMonitoredToolSession);
logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION));
- return (mapping.findForward(LOAD_MONITORING));
+ //return (mapping.findForward(LOAD_MONITORING));
+ logger.debug("submitting session to refresh the data from the database: ");
+ return submitSession(mapping, form, request, response);
+
}
public ActionForward showOpenVote(ActionMapping mapping,
@@ -982,8 +986,9 @@
request.getSession().setAttribute(CURRENT_MONITORED_TOOL_SESSION, currentMonitoredToolSession);
logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION));
-
- return (mapping.findForward(LOAD_MONITORING));
+ //return (mapping.findForward(LOAD_MONITORING));
+ logger.debug("submitting session to refresh the data from the database: ");
+ return submitSession(mapping, form, request, response);
}
Index: lams_tool_vote/web/monitoring/Stats.jsp
===================================================================
diff -u -r9d3b73b44f51fa4497afbc5a84a74dde79a25503 -r4ca13e684e012f8917f07a4ea8121c5c35d0ac4e
--- lams_tool_vote/web/monitoring/Stats.jsp (.../Stats.jsp) (revision 9d3b73b44f51fa4497afbc5a84a74dde79a25503)
+++ lams_tool_vote/web/monitoring/Stats.jsp (.../Stats.jsp) (revision 4ca13e684e012f8917f07a4ea8121c5c35d0ac4e)
@@ -44,20 +44,7 @@
-
-
-
-
-
-
Index: lams_tool_vote/web/monitoring/SummaryStatsCommon.jsp
===================================================================
diff -u -r6337b44d0387e4f1bb2c1a7511a483e3b2f6fb86 -r4ca13e684e012f8917f07a4ea8121c5c35d0ac4e
--- lams_tool_vote/web/monitoring/SummaryStatsCommon.jsp (.../SummaryStatsCommon.jsp) (revision 6337b44d0387e4f1bb2c1a7511a483e3b2f6fb86)
+++ lams_tool_vote/web/monitoring/SummaryStatsCommon.jsp (.../SummaryStatsCommon.jsp) (revision 4ca13e684e012f8917f07a4ea8121c5c35d0ac4e)
@@ -286,7 +286,6 @@
-
|
@@ -310,13 +309,8 @@
-
-
-
- |
-
+
-
|
|
@@ -348,13 +342,96 @@
-
-    |
-
+
+
+
+
+
+
+
+    |
+
+
+
+ |
+
+
+
+    |
+
+
+
+
+
+
+
+
+ |
+
+
+
+ |
+ |
+ |
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+ |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+ |
+
+