Index: lams_tool_lamc/db/sql/create_lams_tool_mc.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/create_lams_tool_mc.sql,v
diff -u -r1.19 -r1.20
--- lams_tool_lamc/db/sql/create_lams_tool_mc.sql 31 Oct 2006 12:43:08 -0000 1.19
+++ lams_tool_lamc/db/sql/create_lams_tool_mc.sql 14 Nov 2006 20:11:28 -0000 1.20
@@ -17,6 +17,7 @@
, pass_mark INTEGER
, show_report TINYINT(1) NOT NULL DEFAULT 0
, reflectionSubject TEXT
+ , showMarks TINYINT(1) NOT NULL DEFAULT 0
, UNIQUE UQ_tl_lamc11_content_1 (content_id)
, PRIMARY KEY (uid)
)TYPE=InnoDB;
Index: lams_tool_lamc/db/sql/tool_insert.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/tool_insert.sql,v
diff -u -r1.19 -r1.20
--- lams_tool_lamc/db/sql/tool_insert.sql 15 Oct 2006 11:08:52 -0000 1.19
+++ lams_tool_lamc/db/sql/tool_insert.sql 14 Nov 2006 20:11:27 -0000 1.20
@@ -34,7 +34,7 @@
'MCQ',
'Multiple Choice Questions',
'mc',
-'20061015',
+'20061113',
NULL,
NULL,
0,
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralAuthoringDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralAuthoringDTO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralAuthoringDTO.java 3 Oct 2006 21:53:57 -0000 1.2
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralAuthoringDTO.java 14 Nov 2006 20:11:27 -0000 1.3
@@ -59,6 +59,7 @@
protected String questionsSequenced;
protected String editActivityEditMode;
protected String reflectionSubject;
+ protected String showMarks;
protected String monitoredContentInUse;
@@ -624,4 +625,17 @@
public void setTotalMarks(String totalMarks) {
this.totalMarks = totalMarks;
}
+ /**
+ * @return Returns the showMarks.
+ */
+ public String getShowMarks() {
+ return showMarks;
+ }
+ /**
+ * @param showMarks The showMarks to set.
+ */
+ public void setShowMarks(String showMarks) {
+ this.showMarks = showMarks;
+ }
+
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java,v
diff -u -r1.13 -r1.14
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java 19 Oct 2006 13:19:15 -0000 1.13
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java 14 Nov 2006 20:11:27 -0000 1.14
@@ -86,6 +86,8 @@
protected String learnerProgressUserId;
+ protected String showMarks;
+
protected Map mapQueAttempts;
protected Map mapQueCorrectAttempts;
@@ -597,4 +599,16 @@
public void setTotalMarksPossible(String totalMarksPossible) {
this.totalMarksPossible = totalMarksPossible;
}
+ /**
+ * @return Returns the showMarks.
+ */
+ public String getShowMarks() {
+ return showMarks;
+ }
+ /**
+ * @param showMarks The showMarks to set.
+ */
+ public void setShowMarks(String showMarks) {
+ this.showMarks = showMarks;
+ }
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java,v
diff -u -r1.49 -r1.50
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java 10 Oct 2006 11:15:14 -0000 1.49
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java 14 Nov 2006 20:11:27 -0000 1.50
@@ -654,6 +654,12 @@
mcAuthoringForm.setQuestionsSequenced(questionsSequenced);
mcGeneralAuthoringDTO.setQuestionsSequenced(questionsSequenced);
+ String showMarks=request.getParameter("showMarks");
+ logger.debug("showMarks: " + questionsSequenced);
+ mcAuthoringForm.setShowMarks(showMarks);
+ mcGeneralAuthoringDTO.setShowMarks(showMarks);
+
+
String retries=request.getParameter("retries");
logger.debug("retries: " + retries);
mcAuthoringForm.setRetries(retries);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java,v
diff -u -r1.13 -r1.14
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java 2 Oct 2006 01:59:55 -0000 1.13
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java 14 Nov 2006 20:11:27 -0000 1.14
@@ -95,6 +95,8 @@
private boolean showReport;
+ private boolean showMarks;
+
/** nullable persistent field */
private Integer passMark;
@@ -112,7 +114,7 @@
/** full constructor */
public McContent(Long mcContentId, String content, String title, String instructions, boolean defineLater, boolean runOffline, Date creationDate,
Date updateDate, boolean questionsSequenced, long createdBy, boolean contentInUse, String offlineInstructions, String onlineInstructions,
- Integer passMark, boolean showReport, boolean retries, boolean reflect, String reflectionSubject, Set mcQueContents, Set mcSessions,
+ Integer passMark, boolean showReport, boolean showMarks, boolean retries, boolean reflect, String reflectionSubject, Set mcQueContents, Set mcSessions,
Set mcAttachments) {
logger.debug("copying properties");
@@ -134,6 +136,7 @@
this.reflect=reflect;
this.passMark = passMark;
this.showReport = showReport;
+ this.showMarks = showMarks;
this.mcQueContents = mcQueContents;
this.mcSessions = mcSessions;
this.mcAttachments = mcAttachments;
@@ -181,6 +184,7 @@
mc.getOnlineInstructions(),
mc.getPassMark(),
mc.isShowReport(),
+ mc.isShowMarks(),
mc.isRetries(),
mc.isReflect(),
mc.getReflectionSubject(),
@@ -459,4 +463,28 @@
public void setReflectionSubject(String reflectionSubject) {
this.reflectionSubject = reflectionSubject;
}
+ /**
+ * @return Returns the logger.
+ */
+ public static Logger getLogger() {
+ return logger;
+ }
+ /**
+ * @param logger The logger to set.
+ */
+ public static void setLogger(Logger logger) {
+ McContent.logger = logger;
+ }
+ /**
+ * @return Returns the showMarks.
+ */
+ public boolean isShowMarks() {
+ return showMarks;
+ }
+ /**
+ * @param showMarks The showMarks to set.
+ */
+ public void setShowMarks(boolean showMarks) {
+ this.showMarks = showMarks;
+ }
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java 18 Oct 2006 02:16:19 -0000 1.1
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java 14 Nov 2006 20:11:25 -0000 1.2
@@ -1,8 +1,10 @@
package org.lamsfoundation.lams.tool.mc.service;
import org.lamsfoundation.lams.learningdesign.service.ToolContentVersionFilter;
+import org.lamsfoundation.lams.tool.mc.pojos.McContent;
import org.lamsfoundation.lams.tool.mc.pojos.McQueContent;
import org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt;
+
/**
* Import filter class for different version of MC content.
* @author steven
@@ -17,5 +19,11 @@
public void up10To20061015(){
this.removeField(McQueContent.class, "weight");
this.removeField(McUsrAttempt.class, "timeZone");
+
}
+
+ public void up20061015To20061113(){
+ // Change name to suit the version you give the tool.
+ this.removeField(McContent.class, "showMarks");
+ }
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v
diff -u -r1.87 -r1.88
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 4 Nov 2006 00:33:36 -0000 1.87
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 14 Nov 2006 20:11:25 -0000 1.88
@@ -2539,6 +2539,7 @@
toolContentObj.setUpdateDate(now);
toolContentObj.setMcContentId(toolContentId);
toolContentObj.setQuestionsSequenced(false);
+ toolContentObj.setShowMarks(false);
// I can't find a use for setShowReport anywhere
toolContentObj.setShowReport(false);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java,v
diff -u -r1.59 -r1.60
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java 13 Nov 2006 00:31:22 -0000 1.59
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java 14 Nov 2006 20:11:26 -0000 1.60
@@ -66,6 +66,7 @@
protected static void setRadioboxes(McContent mcContent, McAuthoringForm mcAuthoringForm)
{
mcAuthoringForm.setQuestionsSequenced(mcContent.isQuestionsSequenced()?"1":"0");
+ mcAuthoringForm.setShowMarks(mcContent.isShowMarks()?"1":"0");
mcAuthoringForm.setRetries(mcContent.isRetries()?"1":"0");
mcAuthoringForm.setSln(mcContent.isShowReport()?"1":"0");
mcAuthoringForm.setReflect(mcContent.isReflect()?"1":"0");
@@ -1368,10 +1369,6 @@
logger.debug("doing saveOrUpdateMcContent, mapCandidatesList: " + mapCandidatesList);
UserDTO toolUser = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
- boolean isQuestionsSequenced=false;
- boolean isSynchInMonitor=false;
- boolean isUsernameVisible=false;
-
String richTextTitle = request.getParameter(TITLE);
String richTextInstructions = request.getParameter(INSTRUCTIONS);
@@ -1383,6 +1380,10 @@
String questionsSequenced=request.getParameter("questionsSequenced");
logger.debug("questionsSequenced: " + questionsSequenced);
+
+ String showMarks=request.getParameter("showMarks");
+ logger.debug("showMarks: " + showMarks);
+
String retries=request.getParameter("retries");
logger.debug("retries: " + retries);
@@ -1403,20 +1404,24 @@
boolean setCommonContent=true;
if ((sln == null) || (questionsSequenced == null) ||
- (retries == null) || (reflect == null))
+ (retries == null) || (reflect == null) || (showMarks == null))
{
setCommonContent=false;
}
logger.debug("setCommonContent: " + setCommonContent);
boolean questionsSequencedBoolean=false;
+ boolean showMarksBoolean=false;
boolean slnBoolean=false;
boolean retriesBoolean=false;
boolean reflectBoolean=false;
if ((questionsSequenced != null) && (questionsSequenced.equalsIgnoreCase("1")))
questionsSequencedBoolean=true;
-
+
+ if ((showMarks != null) && (showMarks.equalsIgnoreCase("1")))
+ showMarksBoolean=true;
+
if ((sln != null) && (sln.equalsIgnoreCase("1")))
slnBoolean=true;
@@ -1494,6 +1499,7 @@
mcContent.setOnlineInstructions(richTextOnlineInstructions);
mcContent.setOfflineInstructions(richTextOfflineInstructions);
mcContent.setQuestionsSequenced(questionsSequencedBoolean);
+ mcContent.setShowMarks(showMarksBoolean);
mcContent.setRetries(retriesBoolean);
mcContent.setShowReport(slnBoolean);
mcContent.setReflect(reflectBoolean);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java,v
diff -u -r1.40 -r1.41
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java 31 Oct 2006 23:58:17 -0000 1.40
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java 14 Nov 2006 20:11:26 -0000 1.41
@@ -46,6 +46,8 @@
protected String activeModule;
protected String editOptionsMode;
+ protected String showMarks;
+
protected String fileItem;
protected String uuid;
@@ -167,6 +169,8 @@
this.submitOfflineFile=null;
this.submitOnlineFile=null;
this.offlineFile=null;
+
+ this.showMarks=null;
this.dispatch=null;
@@ -998,4 +1002,16 @@
public void setCurrentField(String currentField) {
this.currentField = currentField;
}
+ /**
+ * @return Returns the showMarks.
+ */
+ public String getShowMarks() {
+ return showMarks;
+ }
+ /**
+ * @param showMarks The showMarks to set.
+ */
+ public void setShowMarks(String showMarks) {
+ this.showMarks = showMarks;
+ }
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java,v
diff -u -r1.52 -r1.53
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java 13 Nov 2006 15:20:11 -0000 1.52
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java 14 Nov 2006 20:11:26 -0000 1.53
@@ -976,6 +976,9 @@
mcGeneralLearnerFlowDTO.setLowestMark(new Integer(lowestMark).toString());
mcGeneralLearnerFlowDTO.setAverageMark(new Integer(averageMark).toString());
+ boolean showMarks=mcContent.isShowMarks();
+ logger.debug("showMarks: " + showMarks);
+ mcGeneralLearnerFlowDTO.setShowMarks(new Boolean(showMarks).toString());
request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " + request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
@@ -1550,10 +1553,12 @@
logger.debug("totalMarksPossible: " + totalMarksPossible);
mcGeneralLearnerFlowDTO.setTotalMarksPossible(totalMarksPossible);
-
+ boolean showMarks=mcContent.isShowMarks();
+ logger.debug("showMarks: " + showMarks);
+ mcGeneralLearnerFlowDTO.setShowMarks(new Boolean(showMarks).toString());
+
logger.debug("mcGeneralLearnerFlowDTO for jsp: " + mcGeneralLearnerFlowDTO);
-
request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " + request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO));
logger.debug("end of prepareViewAnswersData.");
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java,v
diff -u -r1.88 -r1.89
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java 3 Oct 2006 21:53:58 -0000 1.88
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java 14 Nov 2006 20:11:26 -0000 1.89
@@ -446,6 +446,8 @@
mcAuthoringForm.setSln(mcContent.isShowReport()?"1":"0");
mcAuthoringForm.setQuestionsSequenced(mcContent.isQuestionsSequenced()?"1":"0");
+ mcAuthoringForm.setShowMarks(mcContent.isShowMarks()?"1":"0");
+
mcAuthoringForm.setRetries(mcContent.isRetries()?"1":"0");
mcAuthoringForm.setReflect(mcContent.isReflect()?"1":"0");
mcAuthoringForm.setReflectionSubject(mcContent.getReflectionSubject());
Index: lams_tool_lamc/web/authoring/AdvancedContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/AdvancedContent.jsp,v
diff -u -r1.24 -r1.25
--- lams_tool_lamc/web/authoring/AdvancedContent.jsp 1 Nov 2006 22:13:43 -0000 1.24
+++ lams_tool_lamc/web/authoring/AdvancedContent.jsp 14 Nov 2006 20:11:25 -0000 1.25
@@ -29,6 +29,18 @@
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/BasicContent.jsp,v
diff -u -r1.38 -r1.39
--- lams_tool_lamc/web/authoring/BasicContent.jsp 3 Nov 2006 04:56:56 -0000 1.38
+++ lams_tool_lamc/web/authoring/BasicContent.jsp 14 Nov 2006 20:11:25 -0000 1.39
@@ -105,7 +105,7 @@
');"
+ href="javascript:showMessage('');"
class="button-add-item">
Index: lams_tool_lamc/web/authoring/InstructionsContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/Attic/InstructionsContent.jsp,v
diff -u -r1.16 -r1.17
--- lams_tool_lamc/web/authoring/InstructionsContent.jsp 19 Oct 2006 00:05:35 -0000 1.16
+++ lams_tool_lamc/web/authoring/InstructionsContent.jsp 14 Nov 2006 20:11:25 -0000 1.17
@@ -57,7 +57,7 @@
@@ -125,7 +125,7 @@
Index: lams_tool_lamc/web/authoring/itemlist.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/itemlist.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_lamc/web/authoring/itemlist.jsp 8 Nov 2006 01:33:14 -0000 1.6
+++ lams_tool_lamc/web/authoring/itemlist.jsp 14 Nov 2006 20:11:25 -0000 1.7
@@ -106,7 +106,7 @@
 images/edit.gif" border="0"
title=""
- onclick="javascript:showMessage('');">
+ onclick="javascript:showMessage('');">
|
Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/Attic/IndividualLearnerResults.jsp,v
diff -u -r1.40 -r1.41
--- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp 9 Nov 2006 05:45:57 -0000 1.40
+++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp 14 Nov 2006 20:11:27 -0000 1.41
@@ -142,41 +142,45 @@
-
-
-
+
+
+
+
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+
-
-
- |
-
- |
-
-
- |
-
-
- |
-
- |
-
-
- |
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v
diff -u -r1.39 -r1.40
--- lams_tool_lamc/web/learning/ViewAnswers.jsp 6 Nov 2006 22:20:39 -0000 1.39
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp 14 Nov 2006 20:11:27 -0000 1.40
@@ -170,9 +170,12 @@
-
-
-
+
+
+
+
+
+
|