Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java =================================================================== diff -u -ra94de5ff6e0fa1bf65e068d94c81ccdd232c06df -re0199e8b0dbd219ba24fba75105238ea3c12145e --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java (.../McContent.java) (revision a94de5ff6e0fa1bf65e068d94c81ccdd232c06df) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java (.../McContent.java) (revision e0199e8b0dbd219ba24fba75105238ea3c12145e) @@ -30,6 +30,7 @@ import java.util.TreeSet; import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.log4j.Logger; /** *

Persistent object/bean that defines the content for the MCQ tool. @@ -40,6 +41,7 @@ * @author Ozgur Demirtas */ public class McContent implements Serializable { + static Logger logger = Logger.getLogger(McContent.class.getName()); /** identifier field */ private Long uid; @@ -118,7 +120,11 @@ private Set mcAttachments; /** full constructor */ - public McContent(Long mcContentId, String title, String instructions, boolean defineLater, boolean runOffline, String creationDate, Date updateDate, boolean questionsSequenced, boolean usernameVisible, String reportTitle, String monitoringReportTitle, long createdBy, boolean synchInMonitor, boolean contentInUse, String offlineInstructions, String onlineInstructions, String endLearningMessage, Integer passMark, boolean showFeedback, boolean retries, Set mcQueContents, Set mcSessions, Set mcAttachments) { + public McContent(Long mcContentId, String title, String instructions, boolean defineLater, boolean runOffline, String creationDate, + Date updateDate, boolean questionsSequenced, boolean usernameVisible, String reportTitle, String monitoringReportTitle, + long createdBy, boolean synchInMonitor, boolean contentInUse, String offlineInstructions, String onlineInstructions, + String endLearningMessage, Integer passMark, boolean showReport, boolean showFeedback, boolean retries, Set mcQueContents, Set mcSessions, + Set mcAttachments) { this.mcContentId = mcContentId; this.title = title; this.instructions = instructions; @@ -137,6 +143,7 @@ this.onlineInstructions = onlineInstructions; this.endLearningMessage = endLearningMessage; this.passMark = passMark; + this.showReport = showReport; this.retries=retries; this.showFeedback = showFeedback; this.mcQueContents = mcQueContents; @@ -170,7 +177,7 @@ Long newContentId) { McContent newContent = new McContent( - newContentId, + newContentId, mc.getTitle(), mc.getInstructions(), mc.isDefineLater(), @@ -188,6 +195,7 @@ mc.getOnlineInstructions(), mc.getEndLearningMessage(), mc.getPassMark(), + mc.isShowReport(), mc.isRetries(), mc.isShowFeedback(), new TreeSet(), @@ -202,17 +210,20 @@ * gets called as part of the copyToolContent * * @param newQaContent - * @return + * @return Set */ - public Set deepCopyMcQueContent(McContent newQaContent) + public Set deepCopyMcQueContent(McContent newMcContent) { Set newMcQueContent = new TreeSet(); for (Iterator i = this.getMcQueContents().iterator(); i.hasNext();) { McQueContent queContent = (McQueContent) i.next(); - newMcQueContent.add(McQueContent.newInstance(queContent, - newQaContent, - null)); + if (queContent.getMcContent() != null) + { + McQueContent mcQueContent=McQueContent.newInstance(queContent, + newMcContent); + newMcQueContent.add(mcQueContent); + } } return newMcQueContent; }