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.38 -r1.39
--- lams_tool_vote/conf/language/ApplicationResources.properties 23 May 2006 12:48:53 -0000 1.38
+++ lams_tool_vote/conf/language/ApplicationResources.properties 26 May 2006 23:06:45 -0000 1.39
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/Attic/VoteAllSessionsDTO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAllSessionsDTO.java 26 May 2006 15:28:33 -0000 1.1
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAllSessionsDTO.java 26 May 2006 23:06:46 -0000 1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java,v
diff -u -r1.30 -r1.31
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 26 May 2006 04:28:23 -0000 1.30
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 26 May 2006 23:06:45 -0000 1.31
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java,v
diff -u -r1.25 -r1.26
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java 26 May 2006 15:28:33 -0000 1.25
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java 26 May 2006 23:06:45 -0000 1.26
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/Attic/VoteChartGenerator.java,v
diff -u -r1.9 -r1.10
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java 26 May 2006 15:28:33 -0000 1.9
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java 26 May 2006 23:06:45 -0000 1.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java,v
diff -u -r1.23 -r1.24
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java 26 May 2006 15:28:33 -0000 1.23
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java 26 May 2006 23:06:45 -0000 1.24
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Stats.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_vote/web/monitoring/Stats.jsp 19 May 2006 20:23:44 -0000 1.4
+++ lams_tool_vote/web/monitoring/Stats.jsp 26 May 2006 23:06:45 -0000 1.5
@@ -44,20 +44,7 @@
-
-
-
-
-
-
Index: lams_tool_vote/web/monitoring/SummaryStatsCommon.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/SummaryStatsCommon.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_vote/web/monitoring/SummaryStatsCommon.jsp 26 May 2006 15:28:33 -0000 1.6
+++ lams_tool_vote/web/monitoring/SummaryStatsCommon.jsp 26 May 2006 23:06:45 -0000 1.7
@@ -286,7 +286,6 @@
-
| |
@@ -310,13 +309,8 @@
-
-
-
- |
-
+
-
| |
|
@@ -348,13 +342,96 @@
-
- | |
-
+
+
+
+
+
+
+
+ | |
+
+
+
+
|
+
+
+
+ | |
+
+
+
+
+
+
+ |
+
+ |
+
+
+
+ | |
+ |
+ |
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+ |
+
+ |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+ | |
+
+