Index: lams_tool_vote/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.12 -r1.13
--- lams_tool_vote/conf/language/lams/ApplicationResources.properties 12 May 2008 06:57:57 -0000 1.12
+++ lams_tool_vote/conf/language/lams/ApplicationResources.properties 13 May 2008 07:23:20 -0000 1.13
@@ -154,5 +154,6 @@
message.activityLocked =The instructor has set this activity not to allow re-doing of votes after you have finished it.
label.attachments =Attachments
label.nominations.available =You have {0} votes, please choose your option(s)
+label.open.votes =Open Votes:
#======= End labels: Exported 147 labels for en AU =====
Index: lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.12 -r1.13
--- lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties 12 May 2008 06:57:57 -0000 1.12
+++ lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties 13 May 2008 07:23:20 -0000 1.13
@@ -154,5 +154,6 @@
message.activityLocked =The instructor has set this activity not to allow re-doing of votes after you have finished it.
label.attachments =Attachments
label.nominations.available =You have {0} votes, please choose your option(s)
+label.open.votes =Open Votes:
#======= End labels: Exported 147 labels for en AU =====
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java,v
diff -u -r1.45 -r1.46
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java 26 Mar 2008 03:57:40 -0000 1.45
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java 13 May 2008 07:23:20 -0000 1.46
@@ -176,6 +176,7 @@
public static final String MAP_STARTUP_GENERAL_SELECTED_OPTIONS_CONTENT ="mapStartupGeneralSelectedOptionsContent";
public static final String LIST_GENERAL_CHECKED_OPTIONS_CONTENT ="listGeneralCheckedOptionsContent";
public static final String MAP_STUDENTS_VOTED ="mapStudentsVoted";
+ public static final String LIST_USER_ENTRIES_CONTENT ="listUserEntriesContent";
public static final String QUESTIONS_WITHNO_OPTIONS ="questionsWithNoOptions";
public static final String VOTE_GENERAL_LEARNER_FLOW_DTO ="voteGeneralLearnerFlowDTO";
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.45 -r1.46
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java 13 May 2008 03:44:34 -0000 1.45
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java 13 May 2008 07:23:20 -0000 1.46
@@ -1047,7 +1047,6 @@
logger.debug("test1: mapStandardRatesContent: " + mapStandardRatesContent);
logger.debug("test1: mapStandardUserCount: " + mapStandardUserCount);
- Iterator itListQuestions = userEntries.iterator();
int mapVoteRatesSize=mapVoteRatesContent.size();
logger.debug("mapVoteRatesSize: " + mapVoteRatesSize);
mapIndex=new Long(mapVoteRatesSize+1);
@@ -1088,7 +1087,9 @@
mapStandardQuestionUid.put(mapIndex.toString(),"1");
mapStandardToolSessionUid.put(mapIndex.toString(),"1");
-
+ request.setAttribute(LIST_USER_ENTRIES_CONTENT, userEntries);
+ logger.debug("test2: mapUserEntriesContent: " + request.getSession().getAttribute(LIST_USER_ENTRIES_CONTENT));
+
request.getSession().setAttribute(MAP_STANDARD_NOMINATIONS_CONTENT, mapStandardNominationsContent);
logger.debug("test2: MAP_STANDARD_NOMINATIONS_CONTENT: " + request.getSession().getAttribute(MAP_STANDARD_NOMINATIONS_CONTENT));
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java,v
diff -u -r1.47 -r1.48
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java 13 May 2008 03:44:34 -0000 1.47
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java 13 May 2008 07:23:20 -0000 1.48
@@ -276,14 +276,16 @@
logger.debug("userAttempts: "+ userAttempts);
request.setAttribute(LIST_GENERAL_CHECKED_OPTIONS_CONTENT, userAttempts);
+ request.setAttribute(LIST_GENERAL_CHECKED_OPTIONS_CONTENT, userAttempts);
+ Set userEntries = voteService.getSessionUserEntriesSet(new Long(voteSession.getUid()));
+
logger.debug("voteSession uid:" + voteSession.getUid());
logger.debug("calling prepareChartData:" + voteContent.getVoteContentId() + " " + voteSession.getUid());
VoteGeneralMonitoringDTO voteGeneralMonitoringDTO=new VoteGeneralMonitoringDTO();
MonitoringUtil.prepareChartData(request, voteService, null, voteContent.getVoteContentId().toString(),
voteSession.getUid().toString(), voteGeneralLearnerFlowDTO, voteGeneralMonitoringDTO, getMessageService());
logger.debug("end of prepareChartData:" + voteContent.getVoteContentId() + " " + voteSession.getUid());
-
voteGeneralLearnerFlowDTO.setReflection(new Boolean(voteContent.isReflect()).toString());
String reflectionSubject=VoteUtils.replaceNewLines(voteContent.getReflectionSubject());
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v
diff -u -r1.39 -r1.40
--- lams_tool_vote/web/learning/AllNominations.jsp 12 May 2008 08:17:32 -0000 1.39
+++ lams_tool_vote/web/learning/AllNominations.jsp 13 May 2008 07:23:20 -0000 1.40
@@ -180,7 +180,18 @@
style="cursor: pointer;" height="30" border="0"
onclick="javascript:launchInstructionsPopup('')">
-
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_vote/web/learning/RevisitedDisplay.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/RevisitedDisplay.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_vote/web/learning/RevisitedDisplay.jsp 26 Mar 2008 04:09:09 -0000 1.1
+++ lams_tool_vote/web/learning/RevisitedDisplay.jsp 13 May 2008 07:23:20 -0000 1.2
@@ -126,6 +126,18 @@
onclick="javascript:launchInstructionsPopup('')"
height=30 border="0" style="cursor: pointer;">
+
+
+
+
+
+
+
+
+
+
+