+
Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/db/sql/create_lams_tool_qa.sql,v
diff -u -r1.44 -r1.45
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql 11 Nov 2006 14:58:38 -0000 1.44
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql 13 Nov 2006 19:38:47 -0000 1.45
@@ -1,26 +1,3 @@
--- 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.0 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301-- USA
---
--- http://www.gnu.org/licenses/gpl.txt
--- ****************************************************************
---
--- $Id$
-
-
CREATE TABLE tl_laqa11_content (
uid BIGINT(20) NOT NULL AUTO_INCREMENT
, qa_content_id BIGINT(20) NOT NULL
@@ -40,6 +17,7 @@
, content_inUse TINYINT(1) DEFAULT 0
, reflectionSubject TEXT
, lockWhenFinished TINYINT(1) NOT NULL DEFAULT 1
+ , showOtherAnswers TINYINT(1) NOT NULL DEFAULT 1
, PRIMARY KEY (uid)
)TYPE=InnoDB;
@@ -113,6 +91,7 @@
REFERENCES tl_laqa11_content (uid)
)TYPE=InnoDB;
+
-- data for content table
INSERT INTO tl_laqa11_content (qa_content_id, title, instructions, creation_date, lockWhenFinished) VALUES (${default_content_id}, 'Q&A', 'Instructions', NOW() , 1);
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.14 -r1.15
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java 11 Nov 2006 15:00:55 -0000 1.14
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java 13 Nov 2006 19:38:45 -0000 1.15
@@ -81,6 +81,8 @@
protected String userNameVisible;
+ protected String showOtherAnswers;
+
protected String requestLearningReport;
protected String requestLearningReportProgress;
@@ -569,4 +571,16 @@
public void setLockWhenFinished(String lockWhenFinished) {
this.lockWhenFinished = lockWhenFinished;
}
+ /**
+ * @return Returns the showOtherAnswers.
+ */
+ public String getShowOtherAnswers() {
+ return showOtherAnswers;
+ }
+ /**
+ * @param showOtherAnswers The showOtherAnswers to set.
+ */
+ public void setShowOtherAnswers(String showOtherAnswers) {
+ this.showOtherAnswers = showOtherAnswers;
+ }
}
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.16 -r1.17
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java 11 Nov 2006 15:00:55 -0000 1.16
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java 13 Nov 2006 19:38:45 -0000 1.17
@@ -101,6 +101,8 @@
private boolean lockWhenFinished;
+ private boolean showOtherAnswers;
+
/** nullable persistent field */
private boolean usernameVisible;
@@ -145,6 +147,7 @@
boolean synchInMonitor,
boolean lockWhenFinished,
boolean contentLocked,
+ boolean showOtherAnswers,
boolean reflect,
String reflectionSubject,
Date creationDate,
@@ -169,6 +172,7 @@
this.synchInMonitor = synchInMonitor;
this.lockWhenFinished = lockWhenFinished;
this.contentLocked = contentLocked;
+ this.showOtherAnswers = showOtherAnswers;
this.reflect = reflect;
this.reflectionSubject =reflectionSubject;
this.creationDate = creationDate;
@@ -207,14 +211,15 @@
qa.isSynchInMonitor(),
qa.isLockWhenFinished(),
qa.isContentLocked(),
+ qa.isShowOtherAnswers(),
qa.isReflect(),
qa.getReflectionSubject(),
qa.getCreationDate(),
qa.getUpdateDate(),
new TreeSet(),
new TreeSet(),
new TreeSet());
- logger.debug(logger + " " + "QaContent" + " " + "before doing deepCopyQaQueContent");
+
newContent.setQaQueContents(qa.deepCopyQaQueContent(newContent));
logger.debug(logger + " " + "QaContent" + " " + "after doing deepCopyQaQueContent");
@@ -607,4 +612,18 @@
public void setLockWhenFinished(boolean lockWhenFinished) {
this.lockWhenFinished = lockWhenFinished;
}
+
+ /**
+ * @return Returns the showOtherAnswers.
+ */
+ public boolean isShowOtherAnswers() {
+ return showOtherAnswers;
+ }
+ /**
+ * @param showOtherAnswers The showOtherAnswers to set.
+ */
+ public void setShowOtherAnswers(boolean showOtherAnswers) {
+ this.showOtherAnswers = showOtherAnswers;
+ }
+
}
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.4 -r1.5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java 11 Nov 2006 15:00:54 -0000 1.4
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java 13 Nov 2006 19:38:45 -0000 1.5
@@ -54,6 +54,7 @@
protected String onlineInstructions;
protected String offlineInstructions;
protected String usernameVisible;
+ protected String showOtherAnswers;
protected String reflect;
protected String synchInMonitor;
protected String questionsSequenced;
@@ -99,6 +100,7 @@
.append("onlineInstructions: ", onlineInstructions)
.append("offlineInstructions: ", offlineInstructions)
.append("usernameVisible: ", usernameVisible)
+ .append("showOtherAnswers: ", showOtherAnswers)
.append("synchInMonitor: ", synchInMonitor)
.append("questionsSequenced: ", questionsSequenced)
.append("lockWhenFinished: ", lockWhenFinished)
@@ -527,4 +529,16 @@
public void setLockWhenFinished(String lockWhenFinished) {
this.lockWhenFinished = lockWhenFinished;
}
+ /**
+ * @return Returns the showOtherAnswers.
+ */
+ public String getShowOtherAnswers() {
+ return showOtherAnswers;
+ }
+ /**
+ * @param showOtherAnswers The showOtherAnswers to set.
+ */
+ public void setShowOtherAnswers(String showOtherAnswers) {
+ this.showOtherAnswers = showOtherAnswers;
+ }
}
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.55 -r1.56
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java 11 Nov 2006 15:00:55 -0000 1.55
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java 13 Nov 2006 19:38:45 -0000 1.56
@@ -115,6 +115,13 @@
qaAuthoringForm.setUsernameVisible(usernameVisible);
qaGeneralAuthoringDTO.setUsernameVisible(usernameVisible);
+
+ String showOtherAnswers=request.getParameter("showOtherAnswers");
+ logger.debug("showOtherAnswers: " + showOtherAnswers);
+ qaAuthoringForm.setShowOtherAnswers(showOtherAnswers);
+ qaGeneralAuthoringDTO.setShowOtherAnswers(showOtherAnswers);
+
+
String questionsSequenced=request.getParameter(QUESTIONS_SEQUENCED);
logger.debug("questionsSequenced: " + questionsSequenced);
qaAuthoringForm.setQuestionsSequenced(questionsSequenced);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java,v
diff -u -r1.43 -r1.44
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java 11 Nov 2006 14:58:34 -0000 1.43
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java 13 Nov 2006 19:38:46 -0000 1.44
@@ -450,6 +450,9 @@
String usernameVisible=request.getParameter(USERNAME_VISIBLE);
logger.debug("usernameVisible: " + usernameVisible);
+ String showOtherAnswers=request.getParameter("showOtherAnswers");
+ logger.debug("showOtherAnswers: " + showOtherAnswers);
+
String questionsSequenced=request.getParameter(QUESTIONS_SEQUENCED);
logger.debug("questionsSequenced: " + questionsSequenced);
@@ -471,7 +474,7 @@
boolean setCommonContent=true;
if ((questionsSequenced == null) || (synchInMonitor == null) || (lockWhenFinished == null) ||
- (usernameVisible == null) || (reflect == null))
+ (usernameVisible == null) || (reflect == null) || (showOtherAnswers == null))
{
setCommonContent=false;
}
@@ -481,6 +484,7 @@
boolean synchInMonitorBoolean=false;
boolean lockWhenFinishedBoolean=false;
boolean usernameVisibleBoolean=false;
+ boolean showOtherAnswersBoolean=false;
boolean reflectBoolean=false;
if ((questionsSequenced != null) && (questionsSequenced.equalsIgnoreCase("1")))
@@ -495,6 +499,10 @@
if ((usernameVisible != null) && (usernameVisible.equalsIgnoreCase("1")))
usernameVisibleBoolean=true;
+ if ((showOtherAnswers != null) && (showOtherAnswers.equalsIgnoreCase("1")))
+ showOtherAnswersBoolean=true;
+
+
if ((reflect != null) && (reflect.equalsIgnoreCase("1")))
reflectBoolean=true;
@@ -503,6 +511,7 @@
logger.debug("synchInMonitorBoolean: " + synchInMonitorBoolean);
logger.debug("lockWhenFinishedBoolean: " + lockWhenFinishedBoolean);
logger.debug("usernameVisibleBoolean: " + usernameVisibleBoolean);
+ logger.debug("showOtherAnswersBoolean: " + showOtherAnswersBoolean);
logger.debug("reflectBoolean: " + reflectBoolean);
long userId=0;
@@ -555,6 +564,7 @@
qaContent.setOnlineInstructions(richTextOnlineInstructions);
qaContent.setOfflineInstructions(richTextOfflineInstructions);
qaContent.setUsernameVisible(usernameVisibleBoolean);
+ qaContent.setShowOtherAnswers(showOtherAnswersBoolean);
qaContent.setQuestionsSequenced(questionsSequencedBoolean);
qaContent.setLockWhenFinished(lockWhenFinishedBoolean);
qaContent.setSynchInMonitor(synchInMonitorBoolean);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java,v
diff -u -r1.38 -r1.39
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java 11 Nov 2006 14:58:36 -0000 1.38
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java 13 Nov 2006 19:38:46 -0000 1.39
@@ -94,7 +94,8 @@
generalLearnerFlowDTO.setQuestionListingMode(QUESTION_LISTING_MODE_COMBINED);
- generalLearnerFlowDTO.setUserNameVisible(new Boolean(qaContent.isUsernameVisible()).toString());
+ generalLearnerFlowDTO.setUserNameVisible(new Boolean(qaContent.isUsernameVisible()).toString());
+ generalLearnerFlowDTO.setShowOtherAnswers(new Boolean(qaContent.isShowOtherAnswers()).toString());
generalLearnerFlowDTO.setActivityOffline(new Boolean(qaContent.isRunOffline()).toString());
logger.debug("continue buildGeneralLearnerFlowDTO: " + qaContent);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QaAuthoringForm.java,v
diff -u -r1.23 -r1.24
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java 11 Nov 2006 14:58:35 -0000 1.23
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java 13 Nov 2006 19:38:46 -0000 1.24
@@ -74,6 +74,7 @@
protected String monitoringReportTitle;
protected String endLearningMessage;
protected String usernameVisible;
+ protected String showOtherAnswers;
protected String questionsSequenced;
protected String lockWhenFinished;
protected String reflect;
@@ -180,6 +181,7 @@
.append("onlineInstructions: ", onlineInstructions)
.append("offlineInstructions: ", offlineInstructions)
.append("usernameVisible: ", usernameVisible)
+ .append("showOtherAnswers: ", showOtherAnswers)
.append("synchInMonitor: ", synchInMonitor)
.append("questionsSequenced: ", questionsSequenced)
.append("lockWhenFinished: ", lockWhenFinished)
@@ -760,4 +762,16 @@
public void setLockWhenFinished(String lockWhenFinished) {
this.lockWhenFinished = lockWhenFinished;
}
+ /**
+ * @return Returns the showOtherAnswers.
+ */
+ public String getShowOtherAnswers() {
+ return showOtherAnswers;
+ }
+ /**
+ * @param showOtherAnswers The showOtherAnswers to set.
+ */
+ public void setShowOtherAnswers(String showOtherAnswers) {
+ this.showOtherAnswers = showOtherAnswers;
+ }
}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v
diff -u -r1.29 -r1.30
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 13 Nov 2006 09:39:00 -0000 1.29
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java 13 Nov 2006 19:38:46 -0000 1.30
@@ -273,6 +273,12 @@
logger.debug("lockWhenFinished: " + lockWhenFinished);
generalLearnerFlowDTO.setLockWhenFinished(new Boolean(lockWhenFinished).toString());
+ boolean showOtherAnswers=qaContent.isShowOtherAnswers();
+ logger.debug("showOtherAnswers: " + showOtherAnswers);
+ generalLearnerFlowDTO.setShowOtherAnswers(new Boolean(showOtherAnswers).toString());
+
+ generalLearnerFlowDTO.setReflection(new Boolean(qaContent.isReflect()).toString());
+
request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
qaLearningForm.resetAll();
@@ -373,6 +379,7 @@
logger.debug("IS_USERNAME_VISIBLE: " + qaContent.isUsernameVisible());
generalLearnerFlowDTO.setUserNameVisible(new Boolean(qaContent.isUsernameVisible()).toString());
+ generalLearnerFlowDTO.setShowOtherAnswers(new Boolean(qaContent.isShowOtherAnswers()).toString());
/*
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v
diff -u -r1.64 -r1.65
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 11 Nov 2006 14:58:35 -0000 1.64
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 13 Nov 2006 19:38:46 -0000 1.65
@@ -328,8 +328,8 @@
logger.debug("IS_USERNAME_VISIBLE: " + qaContent.isUsernameVisible());
generalLearnerFlowDTO.setUserNameVisible(new Boolean(qaContent.isUsernameVisible()).toString());
+ generalLearnerFlowDTO.setShowOtherAnswers(new Boolean(qaContent.isShowOtherAnswers()).toString());
-
/*
* Is the tool activity been checked as Define Later in the property inspector?
*/
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java,v
diff -u -r1.60 -r1.61
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 11 Nov 2006 14:58:36 -0000 1.60
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 13 Nov 2006 19:38:46 -0000 1.61
@@ -418,6 +418,7 @@
QaUtils.populateAuthoringDTO(request, qaContent, qaGeneralAuthoringDTO);
qaAuthoringForm.setUsernameVisible(qaContent.isUsernameVisible()?"1":"0");
+ qaAuthoringForm.setShowOtherAnswers(qaContent.isShowOtherAnswers()?"1":"0");
qaAuthoringForm.setSynchInMonitor(qaContent.isSynchInMonitor()?"1":"0");
qaAuthoringForm.setQuestionsSequenced(qaContent.isQuestionsSequenced()?"1":"0");
qaAuthoringForm.setLockWhenFinished(qaContent.isLockWhenFinished()?"1":"0");
Index: lams_tool_laqa/web/authoring/AdvancedContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/AdvancedContent.jsp,v
diff -u -r1.24 -r1.25
--- lams_tool_laqa/web/authoring/AdvancedContent.jsp 11 Nov 2006 14:58:39 -0000 1.24
+++ lams_tool_laqa/web/authoring/AdvancedContent.jsp 13 Nov 2006 19:38:46 -0000 1.25
@@ -21,14 +21,23 @@
<%@ include file="/common/taglibs.jsp"%>
-
+
+
+
+
+
+
Index: lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp,v
diff -u -r1.26 -r1.27
--- lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp 26 Oct 2006 02:31:34 -0000 1.26
+++ lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp 13 Nov 2006 19:38:45 -0000 1.27
@@ -95,6 +95,16 @@
document.QaAuthoringForm.dispatch.value=method;
document.QaAuthoringForm.submit();
}
+
+
+ function updateUsernameVisible(clickedObj){
+ if(clickedObj.checked){
+ document.QaAuthoringForm.usernameVisible.checked=true;
+ }else{
+ document.QaAuthoringForm.usernameVisible.checked=false;
+ }
+ }
+
Index: lams_tool_laqa/web/authoring/BasicContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/BasicContent.jsp,v
diff -u -r1.33 -r1.34
--- lams_tool_laqa/web/authoring/BasicContent.jsp 11 Nov 2006 14:58:39 -0000 1.33
+++ lams_tool_laqa/web/authoring/BasicContent.jsp 13 Nov 2006 19:38:46 -0000 1.34
@@ -107,7 +107,7 @@
');"
+ href="javascript:showMessage('');"
class="button-add-item">
Index: lams_tool_laqa/web/authoring/InstructionsContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/Attic/InstructionsContent.jsp,v
diff -u -r1.20 -r1.21
--- lams_tool_laqa/web/authoring/InstructionsContent.jsp 11 Nov 2006 14:58:39 -0000 1.20
+++ lams_tool_laqa/web/authoring/InstructionsContent.jsp 13 Nov 2006 19:38:46 -0000 1.21
@@ -54,7 +54,7 @@
@@ -119,7 +119,7 @@
Index: lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/IndividualLearnerResults.jsp,v
diff -u -r1.22 -r1.23
--- lams_tool_laqa/web/learning/IndividualLearnerResults.jsp 13 Nov 2006 09:39:00 -0000 1.22
+++ lams_tool_laqa/web/learning/IndividualLearnerResults.jsp 13 Nov 2006 19:38:47 -0000 1.23
@@ -124,7 +124,7 @@
-
+
@@ -139,13 +139,34 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+