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.7.10.1 -r1.7.10.2 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java 10 Mar 2010 15:02:10 -0000 1.7.10.1 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java 10 May 2011 01:53:16 -0000 1.7.10.2 @@ -22,6 +22,7 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.vote; +import java.util.Date; import java.util.List; import java.util.Map; @@ -93,8 +94,10 @@ protected String nominationsSubmited; - protected Map mapGeneralCheckedOptionsContent; + protected Date submissionDeadline; + protected Map mapGeneralCheckedOptionsContent; + protected Map mapStandardNominationsContent; protected Map mapStandardNominationsHTMLedContent; @@ -308,6 +311,19 @@ } /** + * @return the submissionDeadline + */ + public Date getSubmissionDeadline() { + return submissionDeadline; + } + /** + * @param submissionDeadline the submissionDeadline to set + */ + public void setSubmissionDeadline(Date submissionDeadline) { + this.submissionDeadline = submissionDeadline; + } + + /** * @return Returns the previewOnly. */ public String getPreviewOnly() { 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.46.10.2 -r1.46.10.3 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java 9 May 2011 12:09:58 -0000 1.46.10.2 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java 10 May 2011 01:53:16 -0000 1.46.10.3 @@ -306,8 +306,7 @@ voteGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject); logger.debug("is vote lockOnFinish: " + voteContent.isLockOnFinish()); - - + /* Is the request for a preview by the author? Preview The tool must be able to show the specified content as if it was running in a lesson. It will be the learner url with tool access mode set to ToolAccessMode.AUTHOR @@ -413,6 +412,7 @@ // check if there is submission deadline Date submissionDeadline = voteContent.getSubmissionDeadline(); + if (submissionDeadline != null) { request.setAttribute(VoteAppConstants.ATTR_SUBMISSION_DEADLINE, submissionDeadline); @@ -421,6 +421,7 @@ TimeZone learnerTimeZone = learnerDto.getTimeZone(); Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline); Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date()); + voteGeneralLearnerFlowDTO.setSubmissionDeadline(tzSubmissionDeadline); //calculate whether deadline has passed, and if so forward to "runOffline" if (currentLearnerDate.after(tzSubmissionDeadline)) { Index: lams_tool_vote/web/learning/AnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AnswersContent.jsp,v diff -u -r1.32.10.3 -r1.32.10.4 --- lams_tool_vote/web/learning/AnswersContent.jsp 18 Mar 2010 23:44:09 -0000 1.32.10.3 +++ lams_tool_vote/web/learning/AnswersContent.jsp 10 May 2011 01:53:16 -0000 1.32.10.4 @@ -108,7 +108,8 @@

+ escapeXml="false" /> +

+ + + +
+ + + +
+