Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/ExportPortfolioDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/Attic/ExportPortfolioDTO.java,v diff -u -r1.3 -r1.4 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/ExportPortfolioDTO.java 18 Mar 2008 06:45:16 -0000 1.3 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/ExportPortfolioDTO.java 26 Mar 2008 03:57:40 -0000 1.4 @@ -39,6 +39,7 @@ { protected String portfolioExportMode; protected String userExceptionNoToolSessions; + protected String showResults; protected Map mapStandardNominationsHTMLedContent; protected Map mapStandardNominationsContent; @@ -167,4 +168,12 @@ public void setMapStandardNominationsContent(Map mapStandardNominationsContent) { this.mapStandardNominationsContent = mapStandardNominationsContent; } + + public String getShowResults() { + return showResults; + } + + public void setShowResults(String showResults) { + this.showResults = showResults; + } } 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.44 -r1.45 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java 9 Feb 2007 06:56:33 -0000 1.44 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java 26 Mar 2008 03:57:40 -0000 1.45 @@ -65,6 +65,7 @@ public static final String MAX_NOMINATION_COUNT ="maxNominationCount"; public static final String ALLOW_TEXT ="allowText"; public static final String ALLOW_TEXT_ENTRY ="allowTextEntry"; + public static final String SHOW_RESULTS ="showResults"; public static final String LOCK_ON_FINISH ="lockOnFinish"; public static final String REPORT_VIEW_ONLY ="reportViewOnly"; public static final String USER_ENTRY ="userEntry"; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralAuthoringDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/Attic/VoteGeneralAuthoringDTO.java,v diff -u -r1.4 -r1.5 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralAuthoringDTO.java 8 Nov 2006 22:07:05 -0000 1.4 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralAuthoringDTO.java 26 Mar 2008 03:57:40 -0000 1.5 @@ -62,6 +62,7 @@ protected String offlineInstructions; protected String allowText; + protected String showResults; protected String lockOnFinish; protected String maxNominationCount; @@ -532,6 +533,7 @@ .append("reflect: ", reflect) .append("isDefineLater: ", isDefineLater) .append("allowText: ", allowText) + .append("showResults: ", showResults) .append("lockOnFinish: ", lockOnFinish) .append("maxNominationCount: ", maxNominationCount) .append("activityTitle: ", activityTitle) @@ -715,4 +717,10 @@ public void setResponseId(String responseId) { this.responseId = responseId; } + public String getShowResults() { + return showResults; + } + public void setShowResults(String showResults) { + this.showResults = showResults; + } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/Attic/VoteGeneralLearnerFlowDTO.java,v diff -u -r1.6 -r1.7 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java 8 Nov 2006 22:07:04 -0000 1.6 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java 26 Mar 2008 03:57:40 -0000 1.7 @@ -65,6 +65,8 @@ protected String allowTextEntry; + protected String showResults; + protected String lockOnFinish; protected String notebookEntriesVisible; @@ -338,6 +340,7 @@ .append("learningMode: ", learningMode) .append("maxNominationCount: ", maxNominationCount) .append("allowTextEntry: ", allowTextEntry) + .append("showResults: ", showResults) .append("lockOnFinish: ", lockOnFinish) .append("toolContentID: ", toolContentID) .append("toolContentUID: ", toolContentUID) @@ -570,5 +573,11 @@ public void setUserName(String userName) { this.userName = userName; } + public String getShowResults() { + return showResults; + } + public void setShowResults(String showResults) { + this.showResults = showResults; + } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/Attic/VoteUtils.java,v diff -u -r1.25 -r1.26 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java 27 Nov 2006 09:57:15 -0000 1.25 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java 26 Mar 2008 03:57:40 -0000 1.26 @@ -216,6 +216,8 @@ voteAuthoringForm.setAllowText(defaultVoteContent.isAllowText()?"1":"0"); voteAuthoringForm.setAllowTextEntry(defaultVoteContent.isAllowText()?"1":"0"); + + voteAuthoringForm.setShowResults(defaultVoteContent.isShowResults()?"1":"0"); voteAuthoringForm.setLockOnFinish(defaultVoteContent.isLockOnFinish()?"1":"0"); voteAuthoringForm.setReflect(defaultVoteContent.isReflect()?"1":"0"); @@ -597,6 +599,10 @@ voteAuthoringForm.setAllowText(allowText); voteGeneralAuthoringDTO.setAllowText(allowText); + String showResults=request.getParameter("showResults"); + voteAuthoringForm.setShowResults(showResults); + voteGeneralAuthoringDTO.setShowResults(showResults); + String maxNominationCount=request.getParameter("maxNominationCount"); logger.debug("maxNominationCount: " + maxNominationCount); voteAuthoringForm.setMaxNominationCount(maxNominationCount); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java,v diff -u -r1.11 -r1.12 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java 8 Nov 2006 22:07:58 -0000 1.11 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java 26 Mar 2008 03:57:40 -0000 1.12 @@ -96,6 +96,7 @@ /** nullable persistent field */ private String onlineInstructions; + private boolean showResults; /** persistent field */ private Set voteQueContents; @@ -109,8 +110,8 @@ /** full constructor */ public VoteContent(Long voteContentId, String content, String title, String instructions, boolean defineLater, boolean runOffline, Date creationDate, Date updateDate, boolean allowText,boolean reflect, String reflectionSubject, - String maxNominationCount, long createdBy, boolean lockOnFinish, boolean contentInUse, String offlineInstructions, - String onlineInstructions, Set voteQueContents, Set voteSessions, + String maxNominationCount, long createdBy, boolean lockOnFinish, boolean contentInUse, String offlineInstructions, + String onlineInstructions, boolean showResults, Set voteQueContents, Set voteSessions, Set voteAttachments) { this.voteContentId = voteContentId; this.content=content; @@ -129,6 +130,7 @@ this.contentInUse = contentInUse; this.offlineInstructions = offlineInstructions; this.onlineInstructions = onlineInstructions; + this.showResults = showResults; this.voteQueContents = voteQueContents; this.voteSessions = voteSessions; this.voteAttachments = voteAttachments; @@ -178,6 +180,7 @@ vote.isContentInUse(), vote.getOfflineInstructions(), vote.getOnlineInstructions(), + vote.isShowResults(), new TreeSet(), new TreeSet(), new TreeSet() @@ -475,4 +478,12 @@ public void setReflectionSubject(String reflectionSubject) { this.reflectionSubject = reflectionSubject; } + + public boolean isShowResults() { + return showResults; + } + + public void setShowResults(boolean showResults) { + this.showResults = showResults; + } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteImportContentVersionFilter.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteImportContentVersionFilter.java,v diff -u -r1.2 -r1.3 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteImportContentVersionFilter.java 13 Nov 2006 21:00:33 -0000 1.2 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteImportContentVersionFilter.java 26 Mar 2008 03:57:40 -0000 1.3 @@ -34,9 +34,14 @@ * Import 2.0RC1 version content to 2.0RC2 version. Added lock on finish * field. */ - public void up20061102To20061113(){ - // Change name to suit the version you give the tool. this.removeField(VoteContent.class, "voteChangable"); } + + /** Version 2.1 added a showResults column and this should default to true. 20080108 was an pre-release version + * of 2.1, but using 20080108 will cover the prerelease 2.1 + 2.0.4 created import files. */ + public void up20080108To20080326(){ + this.addField(VoteContent.class, "showResults", true); + } + } 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.59 -r1.60 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 20 Mar 2008 04:29:24 -0000 1.59 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 26 Mar 2008 03:57:40 -0000 1.60 @@ -2231,28 +2231,29 @@ /** - * Import the data for a 1.0.2 Chat + * Import the data for a 1.0.2 Vote */ public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) { Date now = new Date(); VoteContent toolContentObj = new VoteContent(); - toolContentObj.setContentInUse(Boolean.FALSE.booleanValue()); + toolContentObj.setContentInUse(false); toolContentObj.setCreatedBy(user.getUserID().longValue()); toolContentObj.setCreationDate(now); - toolContentObj.setDefineLater(Boolean.FALSE.booleanValue()); + toolContentObj.setDefineLater(false); toolContentObj.setInstructions(WebUtil.convertNewlines((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY))); toolContentObj.setOfflineInstructions(null); toolContentObj.setOnlineInstructions(null); toolContentObj.setReflectionSubject(null); - toolContentObj.setReflect(Boolean.FALSE.booleanValue()); - toolContentObj.setRunOffline(Boolean.FALSE.booleanValue()); + toolContentObj.setReflect(false); + toolContentObj.setRunOffline(false); toolContentObj.setTitle((String)importValues.get(ToolContentImport102Manager.CONTENT_TITLE)); toolContentObj.setContent(null); toolContentObj.setUpdateDate(now); toolContentObj.setVoteContentId(toolContentId); - toolContentObj.setLockOnFinish(Boolean.FALSE.booleanValue()); + toolContentObj.setLockOnFinish(false); + toolContentObj.setShowResults(true); try { Boolean bool = WDDXProcessor.convertToBoolean(importValues, ToolContentImport102Manager.CONTENT_VOTE_ALLOW_POLL_NOMINATIONS); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java,v diff -u -r1.20 -r1.21 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java 8 Nov 2006 22:07:03 -0000 1.20 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java 26 Mar 2008 03:57:40 -0000 1.21 @@ -723,6 +723,8 @@ String allowTextEntry = request.getParameter("allowText"); logger.debug("allowTextEntry: " + allowTextEntry); + String showResults = request.getParameter("showResults"); + String reflect=request.getParameter(REFLECT); logger.debug("reflect: " + reflect); @@ -751,7 +753,7 @@ boolean lockedOnFinishBoolean=false; boolean allowTextBoolean=false; boolean reflectBoolean=false; - + boolean showResultsBoolean=false; if ((lockOnFinish != null) && (lockOnFinish.equalsIgnoreCase("1"))) lockedOnFinishBoolean=true; @@ -762,6 +764,8 @@ if ((reflect != null) && (reflect.equalsIgnoreCase("1"))) reflectBoolean=true; + if ( showResults != null && showResults.equalsIgnoreCase("1")) + showResultsBoolean=true; long userId=0; if (toolUser != null) @@ -817,6 +821,7 @@ logger.debug("setting other content values..."); voteContent.setLockOnFinish(lockedOnFinishBoolean); voteContent.setAllowText(allowTextBoolean); + voteContent.setShowResults(showResultsBoolean); voteContent.setReflect(reflectBoolean); voteContent.setReflectionSubject(reflectionSubject); voteContent.setMaxNominationCount(maxNomcount); @@ -1351,7 +1356,9 @@ String allowTextEntry = request.getParameter("allowText"); logger.debug("allowTextEntry: " + allowTextEntry); - String reflect=request.getParameter(REFLECT); + String showResults = request.getParameter("showResults"); + + String reflect=request.getParameter(REFLECT); logger.debug("reflect: " + reflect); String reflectionSubject=voteAuthoringForm.getReflectionSubject(); @@ -1371,7 +1378,7 @@ boolean setCommonContent=true; if ( (lockOnFinish == null) || - (allowTextEntry == null) || (reflect == null) || + (allowTextEntry == null) || (showResults == null) || (reflect == null) || (reflectionSubject == null) || (maxNomcount == null)) { @@ -1382,7 +1389,7 @@ boolean lockOnFinishBoolean=false; boolean allowTextEntryBoolean=false; boolean reflectBoolean=false; - + boolean showResultsBoolean=false; if ((lockOnFinish != null) && (lockOnFinish.equalsIgnoreCase("1"))) lockOnFinishBoolean=true; @@ -1393,7 +1400,9 @@ if ((reflect != null) && (reflect.equalsIgnoreCase("1"))) reflectBoolean=true; - + if ( showResults != null && showResults.equalsIgnoreCase("1")) + showResultsBoolean=true; + logger.debug("lockOnFinishBoolean: " + lockOnFinishBoolean); logger.debug("allowTextEntryBoolean: " + allowTextEntryBoolean); logger.debug("reflectBoolean: " + reflectBoolean); @@ -1447,6 +1456,7 @@ logger.debug("setting other content values..."); voteContent.setLockOnFinish(lockOnFinishBoolean); voteContent.setAllowText(allowTextEntryBoolean); + voteContent.setShowResults(showResultsBoolean); voteContent.setReflect(reflectBoolean); voteContent.setMaxNominationCount(maxNomcount); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java,v diff -u -r1.22 -r1.23 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java 18 Mar 2008 06:21:00 -0000 1.22 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java 26 Mar 2008 03:57:40 -0000 1.23 @@ -126,7 +126,6 @@ VoteQueUsr learner = voteService.getVoteUserBySession(userID,voteSession.getUid()); if ( learner != null && learner.isFinalScreenRequested() ) { - generateCharts = true; VoteContent content=voteSession.getVoteContent(); @@ -148,8 +147,14 @@ voteSession.getUid(), exportPortfolioDTO); // VoteChartGenerator.create{Pie|Bar}Chart expects these to be session attributes - request.getSession().setAttribute(MAP_STANDARD_NOMINATIONS_CONTENT, exportPortfolioDTO.getMapStandardNominationsContent()); - request.getSession().setAttribute(MAP_STANDARD_RATES_CONTENT, exportPortfolioDTO.getMapStandardRatesContent()); + if ( voteSession.getVoteContent().isShowResults() ) { + generateCharts = true; + request.getSession().setAttribute(MAP_STANDARD_NOMINATIONS_CONTENT, exportPortfolioDTO.getMapStandardNominationsContent()); + request.getSession().setAttribute(MAP_STANDARD_RATES_CONTENT, exportPortfolioDTO.getMapStandardRatesContent()); + exportPortfolioDTO.setShowResults(Boolean.TRUE.toString()); + } else { + exportPortfolioDTO.setShowResults(Boolean.FALSE.toString()); + } // voteMonitoringAction.prepareReflectionData(request, content, voteService, userID.toString(),true); } else { @@ -194,6 +199,7 @@ // VoteChartGenerator.create{Pie|Bar}Chart expects these to be session attributes request.getSession().setAttribute(MAP_STANDARD_NOMINATIONS_CONTENT, exportPortfolioDTO.getMapStandardNominationsContent()); request.getSession().setAttribute(MAP_STANDARD_RATES_CONTENT, exportPortfolioDTO.getMapStandardRatesContent()); + exportPortfolioDTO.setShowResults(Boolean.TRUE.toString()); request.getSession().setAttribute(EXPORT_PORTFOLIO_DTO, exportPortfolioDTO); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java,v diff -u -r1.37 -r1.38 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java 5 Feb 2008 05:30:29 -0000 1.37 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java 26 Mar 2008 03:57:40 -0000 1.38 @@ -767,6 +767,11 @@ voteAuthoringForm.setAllowText(allowText); voteGeneralAuthoringDTO.setAllowText(allowText); + String showResults=request.getParameter(SHOW_RESULTS); + logger.debug("showResults: " + showResults); + voteAuthoringForm.setShowResults(showResults); + voteGeneralAuthoringDTO.setShowResults(showResults); + String maxNominationCount=request.getParameter(MAX_NOMINATION_COUNT); logger.debug("maxNominationCount: " + maxNominationCount); voteAuthoringForm.setMaxNominationCount(maxNominationCount); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/Attic/VoteAuthoringForm.java,v diff -u -r1.19 -r1.20 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java 8 Nov 2006 22:07:03 -0000 1.19 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java 26 Mar 2008 03:57:40 -0000 1.20 @@ -49,6 +49,7 @@ protected String lockOnFinish; protected String allowText; + protected String showResults; protected String reflect; protected String reflectionSubject; @@ -191,6 +192,7 @@ this.reflect=null; this.lockOnFinish=null; this.allowText=null; + this.showResults=null; this.maxNominationCount=null; this.summaryMonitoring=null; @@ -207,6 +209,7 @@ { this.lockOnFinish ="0"; this.allowText ="0"; + this.showResults ="0"; this.reflect ="0"; } @@ -885,6 +888,7 @@ .append("isDefineLater: ", isDefineLater) .append("toolContentID: ", toolContentID) .append("allowText: ", allowText) + .append("showResults: ", showResults) .append("lockOnFinish: ", lockOnFinish) .append("reflect: ", reflect) .append("defaultContentId: ", defaultContentId) @@ -999,4 +1003,12 @@ public void setEditableNominationIndex(String editableNominationIndex) { this.editableNominationIndex = editableNominationIndex; } + + public String getShowResults() { + return showResults; + } + + public void setShowResults(String showResults) { + this.showResults = showResults; + } } 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.44 -r1.45 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java 27 Nov 2006 09:57:12 -0000 1.44 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java 26 Mar 2008 03:57:40 -0000 1.45 @@ -455,14 +455,13 @@ return redoQuestions(mapping, form, request, response); } - public ActionForward learnerFinished(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - logger.debug("dispatching learnerFinished"); + logger.debug("dispatching learnerFinished"); logger.debug("requested learner finished, the learner should be directed to next activity."); VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO= new VoteGeneralLearnerFlowDTO(); @@ -525,6 +524,10 @@ voteQueUsr.setResponseFinalised(true); + if ( ! voteSession.getVoteContent().isShowResults() ) { + // if not isShowResults then we will have skipped the final screen. + voteQueUsr.setFinalScreenRequested(true); + } voteService.updateVoteUser(voteQueUsr); logger.debug("user's response is finalised:" + voteQueUsr); @@ -1050,6 +1053,9 @@ logger.debug("allowTextEntry: " + allowTextEntry); voteLearningForm.setAllowTextEntry(allowTextEntry); + String showResults=request.getParameter(SHOW_RESULTS); + voteLearningForm.setShowResults(showResults); + String lockOnFinish=request.getParameter(LOCK_ON_FINISH); logger.debug("lockOnFinish: " + lockOnFinish); voteLearningForm.setLockOnFinish(lockOnFinish); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/Attic/VoteLearningForm.java,v diff -u -r1.23 -r1.24 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java 8 Nov 2006 22:07:03 -0000 1.23 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java 26 Mar 2008 03:57:40 -0000 1.24 @@ -53,6 +53,7 @@ protected String maxNominationCount; protected String allowTextEntry; + protected String showResults; protected String lockOnFinish; protected String activityRunOffline; protected String activityRetries; @@ -821,4 +822,10 @@ public void setReflection(String reflection) { this.reflection = reflection; } + public String getShowResults() { + return showResults; + } + public void setShowResults(String showResults) { + this.showResults = showResults; + } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java,v diff -u -r1.44 -r1.45 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java 9 Feb 2007 06:56:33 -0000 1.44 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java 26 Mar 2008 03:57:40 -0000 1.45 @@ -637,7 +637,7 @@ voteLearningForm.setActivityRunOffline(new Boolean(voteContent.isRunOffline()).toString()); voteLearningForm.setMaxNominationCount(voteContent.getMaxNominationCount()); voteLearningForm.setAllowTextEntry(new Boolean(voteContent.isAllowText()).toString()); - logger.debug("allow text entry is: " + voteLearningForm.getAllowTextEntry()); + voteLearningForm.setShowResults(new Boolean(voteContent.isShowResults()).toString()); voteLearningForm.setLockOnFinish(new Boolean(voteContent.isLockOnFinish()).toString()); voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle());