Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java
===================================================================
diff -u -r37950716e56b09ffe235c9b4b82619555e492d0e -rc9ab620bc529d50039985fe9f823eda3b099edde
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 37950716e56b09ffe235c9b4b82619555e492d0e)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision c9ab620bc529d50039985fe9f823eda3b099edde)
@@ -1054,7 +1054,7 @@
double total=MonitoringUtil.calculateTotal(mapVoteRatesContent);
logger.debug("updated mapIndex: " + mapIndex);
- double share=100d-total ;
+ double share=100-total ;
logger.debug("share: " + share);
logger.debug("totalStandardVotesCount: " + totalStandardVotesCount);
@@ -1075,10 +1075,14 @@
}
logger.debug("final share: " + share);
- mapStandardNominationsContent.put(mapIndex.toString(), "Open Vote");
- mapStandardNominationsHTMLedContent.put(mapIndex.toString(), "Open Vote");
- mapStandardRatesContent.put(mapIndex.toString(), new Double(share).toString());
- mapStandardUserCount.put(mapIndex.toString(), new Integer(userEnteredVotesCount).toString());
+ if(voteContent.isAllowText()) {
+ mapStandardNominationsContent.put(mapIndex.toString(), "Open Vote");
+ mapStandardNominationsHTMLedContent.put(mapIndex.toString(), "Open Vote");
+ }
+
+ mapStandardRatesContent.put(mapIndex.toString(), new Double(share).toString());
+ mapStandardUserCount.put(mapIndex.toString(), new Integer(userEnteredVotesCount).toString());
+
/**following are needed just for proper iteration in the summary jsp*/
mapStandardQuestionUid.put(mapIndex.toString(),"1");
mapStandardToolSessionUid.put(mapIndex.toString(),"1");
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java
===================================================================
diff -u -r7e4c0870acdbc0f8835aae86d648796392d0e62c -rc9ab620bc529d50039985fe9f823eda3b099edde
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision 7e4c0870acdbc0f8835aae86d648796392d0e62c)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision c9ab620bc529d50039985fe9f823eda3b099edde)
@@ -812,7 +812,7 @@
IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext());
logger.debug("retrieving voteService from session: " + voteService);
- repopulateRequestParameters(request,voteLearningForm);
+ repopulateRequestParameters(request, voteLearningForm);
String toolSessionID=request.getParameter(TOOL_SESSION_ID);
logger.debug("toolSessionID: " + toolSessionID);
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
diff -u -r286ccd273acc1798a1a932748df9f71b00e02f6e -rc9ab620bc529d50039985fe9f823eda3b099edde
--- lams_tool_vote/web/learning/AllNominations.jsp (.../AllNominations.jsp) (revision 286ccd273acc1798a1a932748df9f71b00e02f6e)
+++ lams_tool_vote/web/learning/AllNominations.jsp (.../AllNominations.jsp) (revision c9ab620bc529d50039985fe9f823eda3b099edde)
@@ -75,7 +75,7 @@