Index: lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml =================================================================== diff -u -rae28185f07883077586773f760d1bde953e2d9bf -r5399ff761841ef5f7a767b9df7828fdb4f783aa6 --- lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml (.../VoteContent.hbm.xml) (revision ae28185f07883077586773f760d1bde953e2d9bf) +++ lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml (.../VoteContent.hbm.xml) (revision 5399ff761841ef5f7a767b9df7828fdb4f783aa6) @@ -41,7 +41,17 @@ column="instructions" length="65535" /> + + + + + + URL is not complete. The Tool Activity requires a toolSession id. error.contentId.required =Tool Activity Error! Can't continue
URL is not complete. The Tool Activity requires a content id. @@ -140,7 +139,6 @@ label.tip.displayPieChart =Display pie chart of votes label.tip.displayBarChart =Display bar chart of votes label.refresh =Refresh -label.default.runOffline =Sorry this activity is set to be run offline, please ask your teacher for further instructions. label.continue =Continue label.reflect =Reflect on Voting Index: lams_tool_vote/db/model/lams_tool_vote.clay =================================================================== diff -u -r93c2c8a448c8530551612078fac7c7dd63401dfa -r5399ff761841ef5f7a767b9df7828fdb4f783aa6 --- lams_tool_vote/db/model/lams_tool_vote.clay (.../lams_tool_vote.clay) (revision 93c2c8a448c8530551612078fac7c7dd63401dfa) +++ lams_tool_vote/db/model/lams_tool_vote.clay (.../lams_tool_vote.clay) (revision 5399ff761841ef5f7a767b9df7828fdb4f783aa6) @@ -358,8 +358,8 @@ - + @@ -453,7 +453,7 @@ - + @@ -525,6 +525,19 @@ + + + + + + + + + + + + + @@ -628,6 +641,12 @@ + + + + + + Index: lams_tool_vote/db/sql/create_lams_tool_vote.sql =================================================================== diff -u -rf25b06d69a5570e0b90c4d82b8cff5e20adc0a39 -r5399ff761841ef5f7a767b9df7828fdb4f783aa6 --- lams_tool_vote/db/sql/create_lams_tool_vote.sql (.../create_lams_tool_vote.sql) (revision f25b06d69a5570e0b90c4d82b8cff5e20adc0a39) +++ lams_tool_vote/db/sql/create_lams_tool_vote.sql (.../create_lams_tool_vote.sql) (revision 5399ff761841ef5f7a767b9df7828fdb4f783aa6) @@ -7,6 +7,7 @@ , update_date DATETIME , maxNominationCount VARCHAR(20) NOT NULL DEFAULT '1' , allowText TINYINT(1) NOT NULL DEFAULT 0 + , reflect TINYINT(1) NOT NULL DEFAULT 0 , voteChangable TINYINT(1) NOT NULL DEFAULT 0 , created_by BIGINT(20) NOT NULL DEFAULT 0 , run_offline TINYINT(1) NOT NULL DEFAULT 0 @@ -16,6 +17,7 @@ , content_in_use TINYINT(1) NOT NULL DEFAULT 0 , lock_on_finish TINYINT(1) NOT NULL DEFAULT 0 , retries TINYINT(1) NOT NULL DEFAULT 0 + , reflectionSubject TEXT , PRIMARY KEY (uid) )TYPE=InnoDB; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java =================================================================== diff -u -r5c9c47d5e75fb6d0229862af0f08c84229b6056c -r5399ff761841ef5f7a767b9df7828fdb4f783aa6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision 5c9c47d5e75fb6d0229862af0f08c84229b6056c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision 5399ff761841ef5f7a767b9df7828fdb4f783aa6) @@ -121,6 +121,8 @@ public static final String REMOVE_TOOL_CONTENT = "removeToolContent"; public static final String OPT_INDEX = "optIndex"; + public static final String RUN_OFFLINE = "runOffline"; + /* * refers to number of questions presented initially, we have a single record for default content */ @@ -178,6 +180,7 @@ public static final String DEFINE_LATER ="defineLater"; public static final String VIEW_ANSWERS ="viewAnswers"; + public static final String REFLECT ="reflect"; public static final String ON ="ON"; public static final String OFF ="OFF"; public static final String RICHTEXT_FEEDBACK_CORRECT ="richTextFeedbackCorrect"; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java =================================================================== diff -u -rae28185f07883077586773f760d1bde953e2d9bf -r5399ff761841ef5f7a767b9df7828fdb4f783aa6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java (.../VoteContent.java) (revision ae28185f07883077586773f760d1bde953e2d9bf) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java (.../VoteContent.java) (revision 5399ff761841ef5f7a767b9df7828fdb4f783aa6) @@ -58,6 +58,8 @@ private String title; /** nullable persistent field */ + private String reflectionSubject; + private String instructions; /** nullable persistent field */ @@ -78,6 +80,8 @@ private boolean voteChangable; + private boolean reflect; + private boolean allowText; private String maxNominationCount; @@ -106,7 +110,7 @@ /** full constructor */ public VoteContent(Long voteContentId, String content, String title, String instructions, boolean defineLater, boolean runOffline, - Date creationDate, Date updateDate, boolean voteChangable, boolean allowText, String maxNominationCount, + Date creationDate, Date updateDate, boolean voteChangable, boolean allowText,boolean reflect, String maxNominationCount, long createdBy, boolean lockOnFinish, boolean contentInUse, String offlineInstructions, String onlineInstructions, Set voteQueContents, Set voteSessions, Set voteAttachments) { @@ -121,6 +125,7 @@ this.voteChangable=voteChangable; this.maxNominationCount=maxNominationCount; this.allowText=allowText; + this.reflect=reflect; this.createdBy = createdBy; this.lockOnFinish = lockOnFinish; this.contentInUse = contentInUse; @@ -168,6 +173,7 @@ vote.getUpdateDate(), vote.isVoteChangable(), vote.isAllowText(), + vote.isReflect(), vote.getMaxNominationCount(), vote.getCreatedBy(), vote.isLockOnFinish(), @@ -456,4 +462,28 @@ public void setMaxNominationCount(String maxNominationCount) { this.maxNominationCount = maxNominationCount; } + /** + * @return Returns the reflect. + */ + public boolean isReflect() { + return reflect; + } + /** + * @param reflect The reflect to set. + */ + public void setReflect(boolean reflect) { + this.reflect = reflect; + } + /** + * @return Returns the reflectionSubject. + */ + public String getReflectionSubject() { + return reflectionSubject; + } + /** + * @param reflectionSubject The reflectionSubject to set. + */ + public void setReflectionSubject(String reflectionSubject) { + this.reflectionSubject = reflectionSubject; + } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java =================================================================== diff -u -r1447dc2ae2077d18831a17b7c2f309390adb0687 -r5399ff761841ef5f7a767b9df7828fdb4f783aa6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java (.../VoteAuthoringForm.java) (revision 1447dc2ae2077d18831a17b7c2f309390adb0687) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java (.../VoteAuthoringForm.java) (revision 5399ff761841ef5f7a767b9df7828fdb4f783aa6) @@ -51,6 +51,9 @@ protected String lockOnFinish; protected String allowText; + protected String reflect; + protected String reflectionSubject; + protected String activeModule; protected String maxNominationCount; @@ -179,6 +182,7 @@ this.richTextOnlineInstructions=null; this.voteChangable=null; + this.reflect=null; this.lockOnFinish=null; this.allowText=null; this.maxNominationCount=null; @@ -198,6 +202,7 @@ this.voteChangable =OPTION_OFF; this.lockOnFinish =OPTION_OFF; this.allowText =OPTION_OFF; + this.reflect =OPTION_OFF; } @@ -884,6 +889,7 @@ .append("allowText: ", allowText) .append("voteChangable: ", voteChangable) .append("lockOnFinish: ", lockOnFinish) + .append("reflect: ", reflect) .append("defaultContentId: ", defaultContentId) .append("defaultContentIdStr: ", defaultContentIdStr) .append("maxNominationCount: ", maxNominationCount) @@ -897,4 +903,28 @@ .toString(); } + /** + * @return Returns the reflect. + */ + public String getReflect() { + return reflect; + } + /** + * @param reflect The reflect to set. + */ + public void setReflect(String reflect) { + this.reflect = reflect; + } + /** + * @return Returns the reflectionSubject. + */ + public String getReflectionSubject() { + return reflectionSubject; + } + /** + * @param reflectionSubject The reflectionSubject to set. + */ + public void setReflectionSubject(String reflectionSubject) { + this.reflectionSubject = reflectionSubject; + } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java =================================================================== diff -u -r93c2c8a448c8530551612078fac7c7dd63401dfa -r5399ff761841ef5f7a767b9df7828fdb4f783aa6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java (.../VoteLearningStarterAction.java) (revision 93c2c8a448c8530551612078fac7c7dd63401dfa) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java (.../VoteLearningStarterAction.java) (revision 5399ff761841ef5f7a767b9df7828fdb4f783aa6) @@ -352,11 +352,12 @@ logger.debug("warning to learner: the activity is offline."); voteLearningForm.setActivityRunOffline(new Boolean(true).toString()); voteGeneralLearnerFlowDTO.setActivityRunOffline(new Boolean(true).toString()); - persistInRequestError(request,"label.learning.runOffline"); logger.debug("runOffline voteGeneralLearnerFlowDTO: " + voteGeneralLearnerFlowDTO); request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO,voteGeneralLearnerFlowDTO); - return (mapping.findForward(ERROR_LIST)); + //return (mapping.findForward(ERROR_LIST)); + logger.debug("fwding to :" + RUN_OFFLINE); + return (mapping.findForward(RUN_OFFLINE)); } /* find out if the content is being modified at the moment. */ Index: lams_tool_vote/test/java/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml =================================================================== diff -u -rae28185f07883077586773f760d1bde953e2d9bf -r5399ff761841ef5f7a767b9df7828fdb4f783aa6 --- lams_tool_vote/test/java/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml (.../VoteContent.hbm.xml) (revision ae28185f07883077586773f760d1bde953e2d9bf) +++ lams_tool_vote/test/java/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml (.../VoteContent.hbm.xml) (revision 5399ff761841ef5f7a767b9df7828fdb4f783aa6) @@ -41,7 +41,17 @@ column="instructions" length="65535" /> + + + + + + Index: lams_tool_vote/web/WEB-INF/struts-config.xml =================================================================== diff -u -r369b6c2ca857c6b74ee143e081534f50b0b94106 -r5399ff761841ef5f7a767b9df7828fdb4f783aa6 --- lams_tool_vote/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 369b6c2ca857c6b74ee143e081534f50b0b94106) +++ lams_tool_vote/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 5399ff761841ef5f7a767b9df7828fdb4f783aa6) @@ -179,9 +179,14 @@ path="/learning/RedoQuestions.jsp" redirect="false" /> - + + + + + + + + + + + + +
- +
+ : + + + + + + + + +
+   + + +
Index: lams_tool_vote/web/learning/RunOffline.jsp =================================================================== diff -u --- lams_tool_vote/web/learning/RunOffline.jsp (revision 0) +++ lams_tool_vote/web/learning/RunOffline.jsp (revision 5399ff761841ef5f7a767b9df7828fdb4f783aa6) @@ -0,0 +1,65 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> + + + +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + + + <bean:message key="activity.title" /> + + + +
+ +

 

+ +
+ +
+       +
+ + + + +
+ +
+ + + + + + + +