-
+
Index: lams_tool_vote/db/sql/create_lams_tool_vote.sql
===================================================================
diff -u -r6a2afdb7a462716ffbbc0664ae482d32da38747d -ra1f83079a0fedc3d6982fde779286d0246847339
--- lams_tool_vote/db/sql/create_lams_tool_vote.sql (.../create_lams_tool_vote.sql) (revision 6a2afdb7a462716ffbbc0664ae482d32da38747d)
+++ lams_tool_vote/db/sql/create_lams_tool_vote.sql (.../create_lams_tool_vote.sql) (revision a1f83079a0fedc3d6982fde779286d0246847339)
@@ -8,7 +8,6 @@
, 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
, define_later TINYINT(1) NOT NULL DEFAULT 0
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
===================================================================
diff -u -r6a2afdb7a462716ffbbc0664ae482d32da38747d -ra1f83079a0fedc3d6982fde779286d0246847339
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision 6a2afdb7a462716ffbbc0664ae482d32da38747d)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision a1f83079a0fedc3d6982fde779286d0246847339)
@@ -65,7 +65,6 @@
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 VOTE_CHANGABLE ="voteChangable";
public static final String LOCK_ON_FINISH ="lockOnFinish";
public static final String REPORT_VIEW_ONLY ="reportViewOnly";
public static final String USER_ENTRY ="userEntry";
@@ -80,6 +79,7 @@
public static final String VOTE_STATS_DTO ="voteStatsDTO";
public static final String LIST_ALL_GROUPS_DTO ="listAllGroupsDTO";
public static final String CURRENT_SESSION_NAME ="currentSessionName";
+ public static final String REVISITED_ALL_NOMINATIONS ="revisitedAllNominations";
public static final String ATTACHMENT_LIST_KEY = "attachmentListKey";
public static final String DELETED_ATTACHMENT_LIST_KEY = "deletedAttachmentListKey";
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralAuthoringDTO.java
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -ra1f83079a0fedc3d6982fde779286d0246847339
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralAuthoringDTO.java (.../VoteGeneralAuthoringDTO.java) (revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralAuthoringDTO.java (.../VoteGeneralAuthoringDTO.java) (revision a1f83079a0fedc3d6982fde779286d0246847339)
@@ -62,7 +62,6 @@
protected String offlineInstructions;
protected String allowText;
- protected String voteChangable;
protected String lockOnFinish;
protected String maxNominationCount;
@@ -414,19 +413,8 @@
public void setLockOnFinish(String lockOnFinish) {
this.lockOnFinish = lockOnFinish;
}
+
/**
- * @return Returns the voteChangable.
- */
- public String getVoteChangable() {
- return voteChangable;
- }
- /**
- * @param voteChangable The voteChangable to set.
- */
- public void setVoteChangable(String voteChangable) {
- this.voteChangable = voteChangable;
- }
- /**
* @return Returns the mapOptionsContent.
*/
public Map getMapOptionsContent() {
@@ -544,7 +532,6 @@
.append("reflect: ", reflect)
.append("isDefineLater: ", isDefineLater)
.append("allowText: ", allowText)
- .append("voteChangable: ", voteChangable)
.append("lockOnFinish: ", lockOnFinish)
.append("maxNominationCount: ", maxNominationCount)
.append("activityTitle: ", activityTitle)
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -ra1f83079a0fedc3d6982fde779286d0246847339
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java (.../VoteGeneralLearnerFlowDTO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java (.../VoteGeneralLearnerFlowDTO.java) (revision a1f83079a0fedc3d6982fde779286d0246847339)
@@ -67,8 +67,6 @@
protected String lockOnFinish;
- protected String voteChangable;
-
protected String notebookEntriesVisible;
protected String reflection;
@@ -253,18 +251,6 @@
public void setMaxNominationCount(String maxNominationCount) {
this.maxNominationCount = maxNominationCount;
}
- /**
- * @return Returns the voteChangable.
- */
- public String getVoteChangable() {
- return voteChangable;
- }
- /**
- * @param voteChangable The voteChangable to set.
- */
- public void setVoteChangable(String voteChangable) {
- this.voteChangable = voteChangable;
- }
/**
* @return Returns the toolContentID.
@@ -353,7 +339,6 @@
.append("maxNominationCount: ", maxNominationCount)
.append("allowTextEntry: ", allowTextEntry)
.append("lockOnFinish: ", lockOnFinish)
- .append("voteChangable: ", voteChangable)
.append("toolContentID: ", toolContentID)
.append("toolContentUID: ", toolContentUID)
.append("totalQuestionCount: ", totalQuestionCount)
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -ra1f83079a0fedc3d6982fde779286d0246847339
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java (.../VoteUtils.java) (revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java (.../VoteUtils.java) (revision a1f83079a0fedc3d6982fde779286d0246847339)
@@ -212,7 +212,7 @@
voteAuthoringForm.setAllowText(defaultVoteContent.isAllowText()?"1":"0");
voteAuthoringForm.setAllowTextEntry(defaultVoteContent.isAllowText()?"1":"0");
- voteAuthoringForm.setVoteChangable(defaultVoteContent.isVoteChangable()?"1":"0");
+
voteAuthoringForm.setLockOnFinish(defaultVoteContent.isLockOnFinish()?"1":"0");
voteAuthoringForm.setReflect(defaultVoteContent.isReflect()?"1":"0");
@@ -221,7 +221,6 @@
voteGeneralAuthoringDTO.setAllowText(defaultVoteContent.isAllowText()?"1":"0");
- voteGeneralAuthoringDTO.setVoteChangable(defaultVoteContent.isVoteChangable()?"1":"0");
voteGeneralAuthoringDTO.setLockOnFinish(defaultVoteContent.isLockOnFinish()?"1":"0");
voteAuthoringForm.setReflect(defaultVoteContent.isReflect()?"1":"0");
@@ -584,11 +583,6 @@
voteAuthoringForm.setActiveModule(activeModule);
voteGeneralAuthoringDTO.setActiveModule(activeModule);
- String voteChangable=request.getParameter("voteChangable");
- logger.debug("voteChangable: " + voteChangable);
- voteAuthoringForm.setVoteChangable(voteChangable);
- voteGeneralAuthoringDTO.setVoteChangable(voteChangable);
-
String lockOnFinish=request.getParameter("lockOnFinish");
logger.debug("lockOnFinish: " + lockOnFinish);
voteAuthoringForm.setLockOnFinish(lockOnFinish);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
===================================================================
diff -u -r40632908af1b31e1af4f1607b0ee4031ab098a84 -ra1f83079a0fedc3d6982fde779286d0246847339
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 40632908af1b31e1af4f1607b0ee4031ab098a84)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision a1f83079a0fedc3d6982fde779286d0246847339)
@@ -2202,22 +2202,22 @@
{
Date now = new Date();
VoteContent toolContentObj = new VoteContent();
- toolContentObj.setContentInUse(Boolean.FALSE);
+ toolContentObj.setContentInUse(Boolean.FALSE.booleanValue());
toolContentObj.setCreatedBy(user.getUserID().longValue());
toolContentObj.setCreationDate(now);
- toolContentObj.setDefineLater(Boolean.FALSE);
+ toolContentObj.setDefineLater(Boolean.FALSE.booleanValue());
toolContentObj.setInstructions(WebUtil.convertNewlines((String)importValues.get(ToolContentImport102Manager.CONTENT_BODY)));
toolContentObj.setOfflineInstructions(null);
toolContentObj.setOnlineInstructions(null);
toolContentObj.setReflectionSubject(null);
- toolContentObj.setReflect(Boolean.FALSE);
- toolContentObj.setRunOffline(Boolean.FALSE);
+ toolContentObj.setReflect(Boolean.FALSE.booleanValue());
+ toolContentObj.setRunOffline(Boolean.FALSE.booleanValue());
toolContentObj.setTitle((String)importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
toolContentObj.setContent(null);
toolContentObj.setUpdateDate(now);
toolContentObj.setVoteContentId(toolContentId);
- toolContentObj.setVoteChangable(Boolean.FALSE);
+ toolContentObj.setLockOnFinish(Boolean.FALSE.booleanValue());
try {
Boolean bool = WDDXProcessor.convertToBoolean(importValues, ToolContentImport102Manager.CONTENT_VOTE_ALLOW_POLL_NOMINATIONS);
@@ -2268,7 +2268,7 @@
+" as the tool content does not exist.");
}
- toolContentObj.setReflect(Boolean.TRUE);
+ toolContentObj.setReflect(Boolean.TRUE.booleanValue());
toolContentObj.setReflectionSubject(description);
}
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -ra1f83079a0fedc3d6982fde779286d0246847339
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision a1f83079a0fedc3d6982fde779286d0246847339)
@@ -717,9 +717,6 @@
logger.debug("richTextTitle: " + richTextTitle);
logger.debug("richTextInstructions: " + richTextInstructions);
- String voteChangable = request.getParameter("voteChangable");
- logger.debug("voteChangable: " + voteChangable);
-
String lockOnFinish = request.getParameter("lockOnFinish");
logger.debug("lockOnFinish: " + lockOnFinish);
@@ -742,7 +739,7 @@
logger.debug("richTextOnlineInstructions: " + richTextOnlineInstructions);
boolean setCommonContent=true;
- if ((lockOnFinish == null) || (voteChangable == null))
+ if (lockOnFinish == null)
{
setCommonContent=false;
}
@@ -751,15 +748,11 @@
String activeModule=voteAuthoringForm.getActiveModule();
logger.debug("activeModule: " + activeModule);
- boolean voteChangableBoolean=false;
boolean lockedOnFinishBoolean=false;
boolean allowTextBoolean=false;
boolean reflectBoolean=false;
- if ((voteChangable != null) && (voteChangable.equalsIgnoreCase("1")))
- voteChangableBoolean=true;
-
if ((lockOnFinish != null) && (lockOnFinish.equalsIgnoreCase("1")))
lockedOnFinishBoolean=true;
@@ -822,7 +815,6 @@
if (activeModule.equals(AUTHORING))
{
logger.debug("setting other content values...");
- voteContent.setVoteChangable(voteChangableBoolean);
voteContent.setLockOnFinish(lockedOnFinishBoolean);
voteContent.setAllowText(allowTextBoolean);
voteContent.setReflect(reflectBoolean);
@@ -1342,7 +1334,6 @@
{
UserDTO toolUser = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
- boolean isVoteChangable=false;
boolean isLockOnFinish=false;
boolean isAllowTextEntry=false;
boolean isReflect=false;
@@ -1353,9 +1344,6 @@
logger.debug("richTextTitle: " + richTextTitle);
logger.debug("richTextInstructions: " + richTextInstructions);
-
- String voteChangable = request.getParameter("voteChangable");
- logger.debug("voteChangable: " + voteChangable);
String lockOnFinish = request.getParameter("lockOnFinish");
logger.debug("lockOnFinish: " + lockOnFinish);
@@ -1382,7 +1370,7 @@
boolean setCommonContent=true;
- if ((voteChangable == null) || (lockOnFinish == null) ||
+ if ( (lockOnFinish == null) ||
(allowTextEntry == null) || (reflect == null) ||
(reflectionSubject == null) || (maxNomcount == null))
@@ -1391,13 +1379,10 @@
}
logger.debug("setCommonContent: " + setCommonContent);
- boolean voteChangableBoolean=false;
boolean lockOnFinishBoolean=false;
boolean allowTextEntryBoolean=false;
boolean reflectBoolean=false;
- if ((voteChangable != null) && (voteChangable.equalsIgnoreCase("1")))
- voteChangableBoolean=true;
if ((lockOnFinish != null) && (lockOnFinish.equalsIgnoreCase("1")))
lockOnFinishBoolean=true;
@@ -1409,7 +1394,6 @@
reflectBoolean=true;
- logger.debug("voteChangableBoolean: " + voteChangableBoolean);
logger.debug("lockOnFinishBoolean: " + lockOnFinishBoolean);
logger.debug("allowTextEntryBoolean: " + allowTextEntryBoolean);
logger.debug("reflectBoolean: " + reflectBoolean);
@@ -1461,7 +1445,6 @@
if (activeModule.equals(AUTHORING))
{
logger.debug("setting other content values...");
- voteContent.setVoteChangable(voteChangableBoolean);
voteContent.setLockOnFinish(lockOnFinishBoolean);
voteContent.setAllowText(allowTextEntryBoolean);
voteContent.setReflect(reflectBoolean);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -ra1f83079a0fedc3d6982fde779286d0246847339
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java (.../VoteAction.java) (revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java (.../VoteAction.java) (revision a1f83079a0fedc3d6982fde779286d0246847339)
@@ -756,11 +756,6 @@
voteAuthoringForm.setDefineLaterInEditMode(defineLaterInEditMode);
voteGeneralAuthoringDTO.setDefineLaterInEditMode(defineLaterInEditMode);
- String voteChangable=request.getParameter(VOTE_CHANGABLE);
- logger.debug("voteChangable: " + voteChangable);
- voteAuthoringForm.setVoteChangable(voteChangable);
- voteGeneralAuthoringDTO.setVoteChangable(voteChangable);
-
String lockOnFinish=request.getParameter(LOCK_ON_FINISH);
logger.debug("lockOnFinish: " + lockOnFinish);
voteAuthoringForm.setLockOnFinish(lockOnFinish);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -ra1f83079a0fedc3d6982fde779286d0246847339
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java (.../VoteAuthoringForm.java) (revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java (.../VoteAuthoringForm.java) (revision a1f83079a0fedc3d6982fde779286d0246847339)
@@ -47,7 +47,6 @@
protected String editDefaultQuestion;
protected String removeOptionContent;
- protected String voteChangable;
protected String lockOnFinish;
protected String allowText;
@@ -189,7 +188,6 @@
this.richTextOfflineInstructions=null;
this.richTextOnlineInstructions=null;
- this.voteChangable=null;
this.reflect=null;
this.lockOnFinish=null;
this.allowText=null;
@@ -207,7 +205,6 @@
public void resetRadioBoxes()
{
- this.voteChangable ="0";
this.lockOnFinish ="0";
this.allowText ="0";
this.reflect ="0";
@@ -721,18 +718,6 @@
this.optIndex = optIndex;
}
- /**
- * @return Returns the voteChangable.
- */
- public String getVoteChangable() {
- return voteChangable;
- }
- /**
- * @param voteChangable The voteChangable to set.
- */
- public void setVoteChangable(String voteChangable) {
- this.voteChangable = voteChangable;
- }
/**
* @return Returns the lockOnFinish.
@@ -900,7 +885,6 @@
.append("isDefineLater: ", isDefineLater)
.append("toolContentID: ", toolContentID)
.append("allowText: ", allowText)
- .append("voteChangable: ", voteChangable)
.append("lockOnFinish: ", lockOnFinish)
.append("reflect: ", reflect)
.append("defaultContentId: ", defaultContentId)
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -ra1f83079a0fedc3d6982fde779286d0246847339
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision a1f83079a0fedc3d6982fde779286d0246847339)
@@ -1025,10 +1025,6 @@
logger.debug("allowTextEntry: " + allowTextEntry);
voteLearningForm.setAllowTextEntry(allowTextEntry);
- String voteChangable=request.getParameter(VOTE_CHANGABLE);
- logger.debug("voteChangable: " + voteChangable);
- voteLearningForm.setVoteChangable(voteChangable);
-
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
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -ra1f83079a0fedc3d6982fde779286d0246847339
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java (.../VoteLearningForm.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java (.../VoteLearningForm.java) (revision a1f83079a0fedc3d6982fde779286d0246847339)
@@ -54,7 +54,6 @@
protected String maxNominationCount;
protected String allowTextEntry;
protected String lockOnFinish;
- protected String voteChangable;
protected String activityRunOffline;
protected String activityRetries;
protected String activityTitle;
@@ -540,19 +539,8 @@
public void setActivityRunOffline(String activityRunOffline) {
this.activityRunOffline = activityRunOffline;
}
+
/**
- * @return Returns the voteChangable.
- */
- public String getVoteChangable() {
- return voteChangable;
- }
- /**
- * @param voteChangable The voteChangable to set.
- */
- public void setVoteChangable(String voteChangable) {
- this.voteChangable = voteChangable;
- }
- /**
* @return Returns the lockOnFinish.
*/
public String getLockOnFinish() {
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -ra1f83079a0fedc3d6982fde779286d0246847339
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java (.../VoteLearningStarterAction.java) (revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java (.../VoteLearningStarterAction.java) (revision a1f83079a0fedc3d6982fde779286d0246847339)
@@ -548,6 +548,14 @@
logger.debug("view-only voteGeneralLearnerFlowDTO: " + voteGeneralLearnerFlowDTO);
request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO,voteGeneralLearnerFlowDTO);
+ if ((isContentLockOnFinish.equals(new Boolean(false).toString()) && (isResponseFinalised == true)))
+ {
+ logger.debug("isContentLockOnFinish is false, enable redo of votes : ");
+ logger.debug("fwd'ing to: " + REVISITED_ALL_NOMINATIONS);
+ return (mapping.findForward(REVISITED_ALL_NOMINATIONS));
+ }
+
+
logger.debug("fwd'ing to: " + ALL_NOMINATIONS);
return (mapping.findForward(ALL_NOMINATIONS));
}
@@ -606,7 +614,6 @@
logger.debug("advanced properties maxNominationCount: " + voteContent.getMaxNominationCount());
logger.debug("advanced properties isAllowText(): " + new Boolean(voteContent.isAllowText()).toString());
- logger.debug("advanced properties isVoteChangable(): " + new Boolean(voteContent.isVoteChangable()).toString());
logger.debug("advanced properties isRunOffline(): " + new Boolean(voteContent.isRunOffline()).toString());
logger.debug("advanced properties isLockOnFinish(): " + new Boolean(voteContent.isLockOnFinish()).toString());
@@ -618,15 +625,13 @@
voteLearningForm.setAllowTextEntry(new Boolean(voteContent.isAllowText()).toString());
logger.debug("allow text entry is: " + voteLearningForm.getAllowTextEntry());
voteLearningForm.setLockOnFinish(new Boolean(voteContent.isLockOnFinish()).toString());
- voteLearningForm.setVoteChangable(new Boolean(voteContent.isVoteChangable()).toString());
voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle());
voteGeneralLearnerFlowDTO.setActivityInstructions(voteContent.getInstructions());
voteGeneralLearnerFlowDTO.setActivityRunOffline(new Boolean(voteContent.isRunOffline()).toString());
voteGeneralLearnerFlowDTO.setMaxNominationCount(voteContent.getMaxNominationCount());
voteGeneralLearnerFlowDTO.setAllowTextEntry(new Boolean(voteContent.isAllowText()).toString());
voteGeneralLearnerFlowDTO.setLockOnFinish(new Boolean(voteContent.isLockOnFinish()).toString());
- voteGeneralLearnerFlowDTO.setVoteChangable(new Boolean(voteContent.isVoteChangable()).toString());
voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle());
voteGeneralLearnerFlowDTO.setActivityInstructions(voteContent.getInstructions());
}
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java
===================================================================
diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -ra1f83079a0fedc3d6982fde779286d0246847339
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java (.../VoteStarterAction.java) (revision 00759d7592ccc90e8769763524afb69546f641d4)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java (.../VoteStarterAction.java) (revision a1f83079a0fedc3d6982fde779286d0246847339)
@@ -182,7 +182,6 @@
voteAction.repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO);
-
logger.debug("getting voteService now: servlet is: " + getServlet());
IVoteService voteService=null;
if (getServlet() != null)
@@ -317,6 +316,8 @@
retrieveContent(request, voteService, voteAuthoringForm, voteGeneralAuthoringDTO, mapOptionsContent,
new Long(defaultContentIdStr).longValue(), sessionMap);
+ voteAuthoringForm.setLockOnFinish("1");
+ voteGeneralAuthoringDTO.setLockOnFinish("1");
}
else
{
Index: lams_tool_vote/test/java/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml
===================================================================
diff -u -r5399ff761841ef5f7a767b9df7828fdb4f783aa6 -ra1f83079a0fedc3d6982fde779286d0246847339
--- lams_tool_vote/test/java/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml (.../VoteContent.hbm.xml) (revision 5399ff761841ef5f7a767b9df7828fdb4f783aa6)
+++ lams_tool_vote/test/java/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml (.../VoteContent.hbm.xml) (revision a1f83079a0fedc3d6982fde779286d0246847339)
@@ -70,14 +70,6 @@
/>
-
-
+
+
+
-
-
-
-
-
-
Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
diff -u -rdce733c3ba2918b8f6f7a5c0bf2b0db48826e39a -ra1f83079a0fedc3d6982fde779286d0246847339
--- lams_tool_vote/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision dce733c3ba2918b8f6f7a5c0bf2b0db48826e39a)
+++ lams_tool_vote/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision a1f83079a0fedc3d6982fde779286d0246847339)
@@ -116,14 +116,14 @@
');"
+ href="javascript:showMessage('');"
class="button-add-item">
');"
+ href="javascript:showMessage('');"
class="button-add-item">
Index: lams_tool_vote/web/authoring/InstructionsContent.jsp
===================================================================
diff -u -ra9773be7db63dc88d6068238d8c9a9537c775530 -ra1f83079a0fedc3d6982fde779286d0246847339
--- lams_tool_vote/web/authoring/InstructionsContent.jsp (.../InstructionsContent.jsp) (revision a9773be7db63dc88d6068238d8c9a9537c775530)
+++ lams_tool_vote/web/authoring/InstructionsContent.jsp (.../InstructionsContent.jsp) (revision a1f83079a0fedc3d6982fde779286d0246847339)
@@ -56,7 +56,7 @@
@@ -119,7 +119,7 @@
Index: lams_tool_vote/web/authoring/itemlist.jsp
===================================================================
diff -u -r9e6280891ba5582e4a95a6060b175a1635a0aed8 -ra1f83079a0fedc3d6982fde779286d0246847339
--- lams_tool_vote/web/authoring/itemlist.jsp (.../itemlist.jsp) (revision 9e6280891ba5582e4a95a6060b175a1635a0aed8)
+++ lams_tool_vote/web/authoring/itemlist.jsp (.../itemlist.jsp) (revision a1f83079a0fedc3d6982fde779286d0246847339)
@@ -29,8 +29,7 @@
+ value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
@@ -88,7 +87,7 @@
 images/edit.gif" border="0"
title=""
- onclick="javascript:showMessage('');">
+ onclick="javascript:showMessage('');">
|
Index: lams_tool_vote/web/monitoring/itemlist.jsp
===================================================================
diff -u -r05f0776f9ed9f80ad24452e9d1718e8a24ed8e62 -ra1f83079a0fedc3d6982fde779286d0246847339
--- lams_tool_vote/web/monitoring/itemlist.jsp (.../itemlist.jsp) (revision 05f0776f9ed9f80ad24452e9d1718e8a24ed8e62)
+++ lams_tool_vote/web/monitoring/itemlist.jsp (.../itemlist.jsp) (revision a1f83079a0fedc3d6982fde779286d0246847339)
@@ -77,7 +77,7 @@
|
- ');">
+ ');">
images/edit.gif" border="0">
|