Index: lams_tool_vote/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rf02fe914733a7033cc9c9f56f7c9f0ec6d1ed254 -r9c4cf38aadd15baa1d9729353a2b76221334bb44
--- lams_tool_vote/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision f02fe914733a7033cc9c9f56f7c9f0ec6d1ed254)
+++ lams_tool_vote/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 9c4cf38aadd15baa1d9729353a2b76221334bb44)
@@ -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
===================================================================
diff -u -rf02fe914733a7033cc9c9f56f7c9f0ec6d1ed254 -r9c4cf38aadd15baa1d9729353a2b76221334bb44
--- lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision f02fe914733a7033cc9c9f56f7c9f0ec6d1ed254)
+++ lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 9c4cf38aadd15baa1d9729353a2b76221334bb44)
@@ -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
===================================================================
diff -u -r7e4c0870acdbc0f8835aae86d648796392d0e62c -r9c4cf38aadd15baa1d9729353a2b76221334bb44
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision 7e4c0870acdbc0f8835aae86d648796392d0e62c)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision 9c4cf38aadd15baa1d9729353a2b76221334bb44)
@@ -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
===================================================================
diff -u -rf9356efe2fe0d2e08e10c52543c5ea80822196c9 -r9c4cf38aadd15baa1d9729353a2b76221334bb44
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision f9356efe2fe0d2e08e10c52543c5ea80822196c9)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 9c4cf38aadd15baa1d9729353a2b76221334bb44)
@@ -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
===================================================================
diff -u -rf9356efe2fe0d2e08e10c52543c5ea80822196c9 -r9c4cf38aadd15baa1d9729353a2b76221334bb44
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision f9356efe2fe0d2e08e10c52543c5ea80822196c9)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision 9c4cf38aadd15baa1d9729353a2b76221334bb44)
@@ -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
===================================================================
diff -u -rc9ab620bc529d50039985fe9f823eda3b099edde -r9c4cf38aadd15baa1d9729353a2b76221334bb44
--- lams_tool_vote/web/learning/AllNominations.jsp (.../AllNominations.jsp) (revision c9ab620bc529d50039985fe9f823eda3b099edde)
+++ lams_tool_vote/web/learning/AllNominations.jsp (.../AllNominations.jsp) (revision 9c4cf38aadd15baa1d9729353a2b76221334bb44)
@@ -180,7 +180,18 @@
style="cursor: pointer;" height="30" border="0"
onclick="javascript:launchInstructionsPopup('')">
-
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_vote/web/learning/RevisitedDisplay.jsp
===================================================================
diff -u -r2e9dc3798ab786dc455c429b78330b253ce8fe49 -r9c4cf38aadd15baa1d9729353a2b76221334bb44
--- lams_tool_vote/web/learning/RevisitedDisplay.jsp (.../RevisitedDisplay.jsp) (revision 2e9dc3798ab786dc455c429b78330b253ce8fe49)
+++ lams_tool_vote/web/learning/RevisitedDisplay.jsp (.../RevisitedDisplay.jsp) (revision 9c4cf38aadd15baa1d9729353a2b76221334bb44)
@@ -126,6 +126,18 @@
onclick="javascript:launchInstructionsPopup('')"
height=30 border="0" style="cursor: pointer;">
+
+
+
+
+
+
+
+
+
+
+