Index: lams_tool_lamc/web/authoring/newQuestionBox.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/newQuestionBox.jsp,v
diff -u -r1.18.2.10 -r1.18.2.11
--- lams_tool_lamc/web/authoring/newQuestionBox.jsp	13 Nov 2016 13:42:17 -0000	1.18.2.10
+++ lams_tool_lamc/web/authoring/newQuestionBox.jsp	19 May 2017 23:54:36 -0000	1.18.2.11
@@ -1,26 +1,29 @@
 <!DOCTYPE html>
-        
-
 <%@ include file="/common/taglibs.jsp"%>
+<c:set var="sessionMap" value="${sessionScope[sessionMapId]}" />
+
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/header.jsp"%>
 		
 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.form.js"></script>
 
-		<script language="JavaScript" type="text/JavaScript">
+		<script type="text/JavaScript">
 		
 			function submitMethod(actionMethod) {
 				document.McAuthoringForm.dispatch.value=actionMethod;
-					$("textarea[name^=ca],textarea[name=feedback]").each(function() {
+				$("textarea[name^=ca],textarea[name=feedback]").each(function() {
 					var name = $(this).attr("name");
 					var value = CKEDITOR.instances[name].getData();
 					$(this).val(value);
 				});
 				
 				$.ajaxSetup({ cache: true });
 	    		$('#newQuestionForm').ajaxSubmit({
-	    			cache: true,
+	    			data: { 
+						sessionMapId: '${sessionMapId}'
+					},
+					cache: true,
     	    		target:  $('#candidateArea')
     		    });
 			}
@@ -36,6 +39,9 @@
 				
 				if (validateSingleCorrectAnswer()) { 
 					$('#newQuestionForm').ajaxSubmit({ 
+						data: { 
+							sessionMapId: '${sessionMapId}'
+						},
 	    	    		target:  parent.jQuery('#resourceListArea'), 
 	    	    		success: function() { 
 	    	    			self.parent.refreshThickbox();
@@ -149,22 +155,14 @@
 
 	<html:form action="/authoring?validate=false" styleId="newQuestionForm" enctype="multipart/form-data" method="POST">
 		<html:hidden property="dispatch" value="addSingleQuestion" />
-		<html:hidden property="currentField" />			
-		<html:hidden property="toolContentID" />
-		<html:hidden property="currentTab" styleId="currentTab" />
-		<html:hidden property="httpSessionID" />
-		<html:hidden property="contentFolderID" />
 		<html:hidden property="editQuestionBoxRequest" value="false" />
-		<html:hidden property="totalMarks" />
 
-		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
-
 		<c:set var="title"><fmt:message key="label.add.new.question"/></c:set>
 	 	<lams:Page title="${title}" type="learner">
 		
 			<lams:CKEditor id="newQuestion"
 				value="${mcGeneralAuthoringDTO.editableQuestionText}"
-				contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}">
+				contentFolderID="${sessionMap.contentFolderID}">
 			</lams:CKEditor>
 			
 			<%@ include file="/authoring/candidateAnswersAddList.jsp"%>
@@ -177,18 +175,16 @@
 			
 			<div id="questions-worth" class="form-group">
 				<fmt:message key="label.questions.worth"></fmt:message>&nbsp;
+				
 				<select name="mark" class="control-sm">
-					<c:forEach var="markEntry" items="${mcGeneralAuthoringDTO.marksMap}">
-						<c:set var="SELECTED_MARK" value="" />
-						<c:if test="${markEntry.value == mcGeneralAuthoringDTO.markValue}">
-							<c:set var="SELECTED_MARK" value="SELECTED" />
-						</c:if>
-
-						<option value="<c:out value="${markEntry.value}"/>" ${SELECTED_MARK}>
-							<c:out value="${markEntry.value}" />
+					<c:forEach var="i" begin="1" end="10">
+						<option value="${i}"
+								<c:if test="${i == mcGeneralAuthoringDTO.markValue}">SELECTED</c:if> >
+							${i}
 						</option>
 					</c:forEach>
 				</select>
+				
 				&nbsp;<fmt:message key="label.marks"></fmt:message>
 			</div>
 
@@ -197,11 +193,10 @@
 				<div id="feedbackDiv" class="panel-body collapse">
 					<lams:CKEditor id="feedback"
 						value="${feedback}"
-						contentFolderID="${mcGeneralAuthoringDTO.contentFolderID}">
+						contentFolderID="${sessionMap.contentFolderID}">
 					</lams:CKEditor>
 				</div>
 			</div>
-			
 				
 			<div id="actionButtons" class="pull-right">
 				<a href="#" onclick="javascript:self.parent.tb_remove();" onmousedown="self.focus();" class="btn btn-default btn-sm roffset5"> 
@@ -211,10 +206,8 @@
 					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.add.new.question" />
 				</a>
 			</div>
-		
 
 		</lams:Page>
-
 	</html:form>
 
 </body>
