Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml,v
diff -u -r1.3 -r1.3.12.1
--- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml	20 Sep 2006 15:08:34 -0000	1.3
+++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml	1 Nov 2010 10:25:17 -0000	1.3.12.1
@@ -54,6 +54,16 @@
             length="65535"
         />
 
+	    <property
+	        name="required"
+	        type="boolean"
+	        access="property"
+	        column="answer_required"
+	   >
+	   </property>
+
+
+
         <many-to-one
             name="qaContent"
             class="org.lamsfoundation.lams.tool.qa.QaContent"
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.52.6.2 -r1.52.6.2.4.1
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql	11 May 2009 10:01:57 -0000	1.52.6.2
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql	1 Nov 2010 10:24:52 -0000	1.52.6.2.4.1
@@ -56,6 +56,7 @@
      , feedback TEXT
      , display_order INT(5) DEFAULT 1
      , qa_content_id BIGINT(20)
+     , answer_required TINYINT(1) NOT NULL DEFAULT 0
      , PRIMARY KEY (uid)
      , INDEX (qa_content_id)
      , CONSTRAINT FK_tl_laqa11_que_content_1 FOREIGN KEY (qa_content_id)
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/db/sql/updatescripts/updateTo20101022.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralMonitoringDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/GeneralMonitoringDTO.java,v
diff -u -r1.3 -r1.3.12.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralMonitoringDTO.java	20 Sep 2006 15:15:44 -0000	1.3
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralMonitoringDTO.java	1 Nov 2010 10:31:04 -0000	1.3.12.1
@@ -53,8 +53,6 @@
     
     protected String editResponse;
     
-    
-    protected Map mapQuestionContent;
     protected String defaultQuestionContent;
     
     protected String onlineInstructions;
@@ -76,7 +74,6 @@
             .append("activityTitle: ", activityTitle)
             .append("activityInstructions: ", activityInstructions)
             .append("editResponse: ", editResponse)
-            .append("mapQuestionContent: ", mapQuestionContent)
             .append("defaultQuestionContent: ", defaultQuestionContent)
             .append("countAllUsers: ", countAllUsers)
             .append("countSessionComplete: ", countSessionComplete)
@@ -147,18 +144,6 @@
         this.editResponse = editResponse;
     }
     /**
-     * @return Returns the mapQuestionContent.
-     */
-    public Map getMapQuestionContent() {
-        return mapQuestionContent;
-    }
-    /**
-     * @param mapQuestionContent The mapQuestionContent to set.
-     */
-    public void setMapQuestionContent(Map mapQuestionContent) {
-        this.mapQuestionContent = mapQuestionContent;
-    }
-    /**
      * @return Returns the defaultQuestionContent.
      */
     public String getDefaultQuestionContent() {
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.82 -r1.82.10.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	4 Nov 2008 00:41:19 -0000	1.82
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	1 Nov 2010 10:30:52 -0000	1.82.10.1
@@ -34,7 +34,6 @@
     public static final long DEFAULT_QUE_CONTENT_ID = 1;
     public static final String ERROR_QAAPPLICATION = "error.exception.QaApplication";
     public static final String TOOL_CONTENT_ID = "toolContentID";
-    public static final String MAP_QUESTION_CONTENT_KEY = "mapQuestionContentKey";
     public static final String ATTACHMENT_LIST_KEY = "attachmentListKey";
     public static final String DELETED_ATTACHMENT_LIST_KEY = "deletedAttachmentListKey";
     public static final String ONLINE_INSTRUCTIONS_KEY = "onlineInstructionsKey";
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaConditionDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaConditionDTO.java,v
diff -u -r1.1 -r1.1.10.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaConditionDTO.java	31 Oct 2008 01:06:58 -0000	1.1
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaConditionDTO.java	1 Nov 2010 10:30:44 -0000	1.1.10.1
@@ -36,7 +36,7 @@
 	super(condition, toolActivityUIID);
 	for (QaQueContent question : condition.getQuestions()) {
 	    QaQueContent questionCopy = new QaQueContent(question.getQuestion(), question.getDisplayOrder(), null,
-		    null, null, null);
+		    question.isRequired(), null, null, null);
 	    getQuestions().add(questionCopy);
 	}
     }
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.6.4.1 -r1.6.4.1.4.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java	11 May 2009 04:36:36 -0000	1.6.4.1
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java	1 Nov 2010 10:30:36 -0000	1.6.4.1.4.1
@@ -66,7 +66,6 @@
     protected String httpSessionID;
     protected String requestedModule;
     protected String isDefineLater;
-    protected Map mapQuestionContent;
 
     protected List attachmentList;
     protected List deletedAttachmentList;
@@ -93,7 +92,7 @@
 		.append("editActivityEditMode: ", editActivityEditMode)
 		.append("reflectionSubject: ", reflectionSubject).append("requestedModule: ", requestedModule).append(
 			"isDefineLater: ", isDefineLater).append("monitoredContentInUse: ", monitoredContentInUse)
-		.append("mapQuestionContent: ", mapQuestionContent).append("attachmentList: ", attachmentList).append(
+		.append("attachmentList: ", attachmentList).append(
 			"deletedAttachmentList: ", deletedAttachmentList).append("sbmtSuccess: ", sbmtSuccess).append(
 			"userExceptionQuestionsDuplicate: ", userExceptionQuestionsDuplicate).toString();
     }
@@ -174,21 +173,6 @@
     }
 
     /**
-     * @return Returns the mapQuestionContent.
-     */
-    public Map getMapQuestionContent() {
-	return mapQuestionContent;
-    }
-
-    /**
-     * @param mapQuestionContent
-     *                The mapQuestionContent to set.
-     */
-    public void setMapQuestionContent(Map mapQuestionContent) {
-	this.mapQuestionContent = mapQuestionContent;
-    }
-
-    /**
      * @return Returns the isDefineLater.
      */
     public String getIsDefineLater() {
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQuestionContentDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaQuestionContentDTO.java,v
diff -u -r1.2 -r1.2.10.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQuestionContentDTO.java	30 Sep 2008 05:54:57 -0000	1.2
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQuestionContentDTO.java	1 Nov 2010 10:29:16 -0000	1.2.10.1
@@ -36,13 +36,28 @@
     private String question;
     private String displayOrder;
     private String feedback;
+    private boolean required;
 
     @Override
     public String toString() {
 	return new ToStringBuilder(this).append("question:", question).append("feedback:", feedback).append(
-		"displayOrder:", displayOrder).toString();
+		"displayOrder:", displayOrder).append("required:", Boolean.toString(required)).toString();
     }
 
+    public QaQuestionContentDTO(QaQueContent que) {
+	this.question = que.getQuestion();
+	this.displayOrder = new Integer(que.getDisplayOrder()).toString();
+	this.feedback = que.getFeedback() != null ? que.getFeedback() : " ";
+	this.required = que.isRequired();
+    }
+
+    public QaQuestionContentDTO(String question, String displayOrder, String feedback, boolean required) {
+	this.question = question;
+	this.displayOrder = displayOrder;
+	this.feedback = feedback;
+	this.required = required;
+    }
+
     public int compareTo(Object o) {
 	QaMonitoredUserDTO qaMonitoredUserDTO = (QaMonitoredUserDTO) o;
 
@@ -98,6 +113,22 @@
 	this.question = question;
     }
 
+    /**
+     * @return Is this question required?
+     */
+    public boolean isRequired() {
+	return required;
+    }
+
+    /**
+     * @param required
+     * Is this question required
+     */
+    public void setRequired(boolean required) {
+	this.required = required;
+    }
+
+
     @Override
     public boolean equals(Object o) {
 	if (o instanceof QaQuestionContentDTO) {
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java,v
diff -u -r1.4 -r1.4.8.1
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java	4 Feb 2009 20:46:15 -0000	1.4
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java	1 Nov 2010 10:34:10 -0000	1.4.8.1
@@ -116,7 +116,7 @@
 		    } else {
 			QaQueContent qaQueContent = new QaQueContent();
 			qaQueContent.setDisplayOrder(questionIndex + 1);
-			qaQueContent.setIsOptional(false);
+			qaQueContent.setRequired(false);
 			qaQueContent.setQaContent(qaContent);
 			qaQueContent.setQaContentId(qaContent.getQaContentId());
 			qaQueContent.setQuestion(question);