Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/GeneralLearnerFlowDTO.java,v diff -u -r1.13 -r1.14 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java 10 Oct 2006 16:16:51 -0000 1.13 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java 11 Nov 2006 15:00:55 -0000 1.14 @@ -103,7 +103,9 @@ protected String initialScreen; + protected String lockWhenFinished; + /** * @return Returns the currentMonitoredToolSession. */ @@ -237,6 +239,7 @@ .append("totalQuestionCount : ", totalQuestionCount) .append("activityInstructions: ", activityInstructions) .append("teacherViewOnly: ", teacherViewOnly) + .append("lockWhenFinished: ", lockWhenFinished) .append("activityTitle: ", activityTitle) .append("countSessionComplete: ", countSessionComplete) .append("toolSessionID: ", toolSessionID) @@ -553,4 +556,17 @@ public void setInitialScreen(String initialScreen) { this.initialScreen = initialScreen; } + + /** + * @return Returns the lockWhenFinished. + */ + public String getLockWhenFinished() { + return lockWhenFinished; + } + /** + * @param lockWhenFinished The lockWhenFinished to set. + */ + public void setLockWhenFinished(String lockWhenFinished) { + this.lockWhenFinished = lockWhenFinished; + } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v diff -u -r1.76 -r1.77 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 2 Nov 2006 20:49:10 -0000 1.76 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 11 Nov 2006 15:00:54 -0000 1.77 @@ -243,7 +243,8 @@ public static final String REQUEST_LEARNING_REPORT ="requestLearningReport"; public static final String REQUEST_LEARNING_REPORT_PROGRESS ="requestLearningReportProgress"; public static final String REQUEST_PREVIEW ="requestPreview"; - public static final String REQUEST_LEARNING_REPORT_VIEWONLY ="requestLearningReportViewOnly"; + public static final String REQUEST_LEARNING_REPORT_VIEWONLY ="requestLearningReportViewOnly"; + public static final String REVISITED_LEARNER_REP ="revisitedLearnerRep"; /* Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java,v diff -u -r1.15 -r1.16 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java 20 Sep 2006 15:15:44 -0000 1.15 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java 11 Nov 2006 15:00:55 -0000 1.16 @@ -99,6 +99,8 @@ private boolean questionsSequenced; + private boolean lockWhenFinished; + /** nullable persistent field */ private boolean usernameVisible; @@ -141,6 +143,7 @@ boolean questionsSequenced, boolean usernameVisible, boolean synchInMonitor, + boolean lockWhenFinished, boolean contentLocked, boolean reflect, String reflectionSubject, @@ -164,6 +167,7 @@ this.questionsSequenced = questionsSequenced; this.usernameVisible = usernameVisible; this.synchInMonitor = synchInMonitor; + this.lockWhenFinished = lockWhenFinished; this.contentLocked = contentLocked; this.reflect = reflect; this.reflectionSubject =reflectionSubject; @@ -201,6 +205,7 @@ qa.isQuestionsSequenced(), qa.isUsernameVisible(), qa.isSynchInMonitor(), + qa.isLockWhenFinished(), qa.isContentLocked(), qa.isReflect(), qa.getReflectionSubject(), @@ -590,4 +595,16 @@ public void setReflectionSubject(String reflectionSubject) { this.reflectionSubject = reflectionSubject; } + /** + * @return Returns the lockWhenFinished. + */ + public boolean isLockWhenFinished() { + return lockWhenFinished; + } + /** + * @param lockWhenFinished The lockWhenFinished to set. + */ + public void setLockWhenFinished(boolean lockWhenFinished) { + this.lockWhenFinished = lockWhenFinished; + } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaGeneralAuthoringDTO.java,v diff -u -r1.3 -r1.4 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java 20 Sep 2006 15:15:44 -0000 1.3 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java 11 Nov 2006 15:00:54 -0000 1.4 @@ -57,6 +57,7 @@ protected String reflect; protected String synchInMonitor; protected String questionsSequenced; + protected String lockWhenFinished; protected String editActivityEditMode; protected String reflectionSubject; @@ -100,6 +101,7 @@ .append("usernameVisible: ", usernameVisible) .append("synchInMonitor: ", synchInMonitor) .append("questionsSequenced: ", questionsSequenced) + .append("lockWhenFinished: ", lockWhenFinished) .append("editActivityEditMode: ", editActivityEditMode) .append("reflectionSubject: ", reflectionSubject) .append("requestedModule: ", requestedModule) @@ -513,4 +515,16 @@ public void setReflectionSubject(String reflectionSubject) { this.reflectionSubject = reflectionSubject; } + /** + * @return Returns the lockWhenFinished. + */ + public String getLockWhenFinished() { + return lockWhenFinished; + } + /** + * @param lockWhenFinished The lockWhenFinished to set. + */ + public void setLockWhenFinished(String lockWhenFinished) { + this.lockWhenFinished = lockWhenFinished; + } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaUtils.java,v diff -u -r1.54 -r1.55 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java 2 Nov 2006 20:49:10 -0000 1.54 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java 11 Nov 2006 15:00:55 -0000 1.55 @@ -70,14 +70,6 @@ qaGeneralAuthoringDTO.setOnlineInstructions(defaultQaContent.getOnlineInstructions()); qaGeneralAuthoringDTO.setOfflineInstructions(defaultQaContent.getOfflineInstructions()); - - /* set the status of radio boxes */ - /* - qaGeneralAuthoringDTO.setUsernameVisible(defaultQaContent.isUsernameVisible()?ON:OFF); - qaGeneralAuthoringDTO.setSynchInMonitor(defaultQaContent.isSynchInMonitor()?ON:OFF); - qaGeneralAuthoringDTO.setQuestionsSequenced(defaultQaContent.isQuestionsSequenced()?ON:OFF); - qaGeneralAuthoringDTO.setReflect(defaultQaContent.isReflect()?ON:OFF); - */ } @@ -128,6 +120,13 @@ qaAuthoringForm.setQuestionsSequenced(questionsSequenced); qaGeneralAuthoringDTO.setQuestionsSequenced(questionsSequenced); + + String lockWhenFinished=request.getParameter("lockWhenFinished"); + logger.debug("lockWhenFinished: " + lockWhenFinished); + qaAuthoringForm.setLockWhenFinished(lockWhenFinished); + qaGeneralAuthoringDTO.setLockWhenFinished(lockWhenFinished); + + String offlineInstructions=request.getParameter(OFFLINE_INSTRUCTIONS); logger.debug("offlineInstructions: " + offlineInstructions); qaAuthoringForm.setOfflineInstructions(offlineInstructions); Index: lams_tool_laqa/web/authoring/itemlist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/itemlist.jsp,v diff -u -r1.4 -r1.5 --- lams_tool_laqa/web/authoring/itemlist.jsp 9 Nov 2006 05:45:59 -0000 1.4 +++ lams_tool_laqa/web/authoring/itemlist.jsp 11 Nov 2006 15:03:08 -0000 1.5 @@ -32,7 +32,7 @@ value="<%=request .getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" /> - +
images/edit.gif" border="0" title="" - onclick="javascript:showMessage('');"> + onclick="javascript:showMessage('');">