Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java =================================================================== diff -u -r92d08c9a8ea2a0daedc623167fb5ae6bd2f707d9 -r36db941b897cc39fda9832b8b73b3b81a3c9faa9 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision 92d08c9a8ea2a0daedc623167fb5ae6bd2f707d9) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision 36db941b897cc39fda9832b8b73b3b81a3c9faa9) @@ -136,6 +136,19 @@ setContentInUse(request); IVoteService voteService =VoteUtils.getToolService(request); + Collection voteDisplayOrderIds = voteLearningForm.votesAsCollection(); + logger.debug("Checkbox votes "+voteDisplayOrderIds); + + Long toolContentId=(Long)request.getSession().getAttribute(TOOL_CONTENT_ID); + logger.debug("toolContentId:" + toolContentId); + + VoteContent voteContent=voteService.retrieveVote(toolContentId); + logger.debug("voteContent:" + voteContent); + + Map mapGeneralCheckedOptionsContent = LearningUtil.buildQuestionContentMap(request, voteContent, voteDisplayOrderIds); + logger.debug("mapGeneralCheckedOptionsContent: "+ mapGeneralCheckedOptionsContent); + request.setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent); + voteLearningForm.resetCommands(); return (mapping.findForward(ALL_NOMINATIONS)); } @@ -439,6 +452,7 @@ logger.debug("calling prepareChartData: " + toolContentId); MonitoringUtil.prepareChartData(request, voteService, null, toolContentId, toolSessionUid); + logger.debug("fwding to INDIVIDUAL_REPORT: " + INDIVIDUAL_REPORT); return (mapping.findForward(INDIVIDUAL_REPORT)); } @@ -477,14 +491,7 @@ String previewOnly=(String)request.getSession().getAttribute(PREVIEW_ONLY); logger.debug("previewOnly : " + previewOnly); - if (previewOnly != null) - { - if (previewOnly.equals("true")) - { - logger.debug("request is for previewOnly : " + previewOnly); - return (mapping.findForward(PREVIEW)); - } - } + logger.debug("fwd'ing to LOAD_LEARNER : " + LOAD_LEARNER); return (mapping.findForward(LOAD_LEARNER)); } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java =================================================================== diff -u -r1a2127c35c6a7f256566882a482336229dd77742 -r36db941b897cc39fda9832b8b73b3b81a3c9faa9 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java (.../VoteLearningStarterAction.java) (revision 1a2127c35c6a7f256566882a482336229dd77742) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java (.../VoteLearningStarterAction.java) (revision 36db941b897cc39fda9832b8b73b3b81a3c9faa9) @@ -136,7 +136,7 @@ voteLearningForm.setActivityRunOffline(new Boolean(false).toString()); /* - * persist time zone information to session scope. + * save time zone information to session scope. */ VoteUtils.persistInSessionTimeZone(request); ActionForward validateParameters=validateParameters(request, mapping); @@ -217,8 +217,7 @@ /* PREVIEW_ONLY for jsp*/ request.getSession().setAttribute(PREVIEW_ONLY, new Boolean(true).toString()); VoteLearningAction voteLearningAction= new VoteLearningAction(); - //return voteLearningAction.redoQuestions(mapping, form, request, response); - logger.debug("presenting standard learner screen forpreview mode..."); + logger.debug("presenting standard learner screen for preview mode..."); return (mapping.findForward(LOAD_LEARNER)); }