Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
===================================================================
diff -u -r00df9ca2ddfb10b63d2260f8fa940108e13d72f2 -rf37c77ab01acdec60a9bd2f387e96ecdc30520c0
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 00df9ca2ddfb10b63d2260f8fa940108e13d72f2)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision f37c77ab01acdec60a9bd2f387e96ecdc30520c0)
@@ -145,7 +145,9 @@
logger.debug("setting sln to false");
}
+ mcAuthoringForm.setReflect(mcContent.isReflect()?"1":"0");
+ /*
if (mcContent.isReflect())
{
mcAuthoringForm.setReflect(ON);
@@ -154,6 +156,7 @@
{
mcAuthoringForm.setReflect(OFF);
}
+ */
}
@@ -1436,11 +1439,33 @@
if (mcAuthoringForm.getSln().equalsIgnoreCase(ON))
isSln=true;
+ /*
logger.debug("isReflect" + mcAuthoringForm.getReflect());
if (mcAuthoringForm.getReflect().equalsIgnoreCase(ON))
- isReflect=true;
+ isReflect=true;
+ */
+ /*
+ logger.debug("isReflect:" + mcAuthoringForm.getReflect());
+ if (mcAuthoringForm.getReflect() != null)
+ {
+ if (mcAuthoringForm.getReflect().equalsIgnoreCase("1"))
+ isReflect=true;
+ }
+ logger.debug("isReflect:" + isReflect);
+ */
+
+ String isReflectStr=request.getParameter("reflect");
+ logger.debug("isReflectStr:" + isReflectStr);
+ if (isReflectStr != null)
+ {
+ if (isReflectStr.equals("1"))
+ isReflect=true;
+ }
+
+
+
logger.debug("passmark: " + mcAuthoringForm.getPassmark());
if ((mcAuthoringForm.getPassmark() != null) && (mcAuthoringForm.getPassmark().length() > 0))
passmark= new Integer(mcAuthoringForm.getPassmark()).intValue();
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -r00df9ca2ddfb10b63d2260f8fa940108e13d72f2 -rf37c77ab01acdec60a9bd2f387e96ecdc30520c0
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision 00df9ca2ddfb10b63d2260f8fa940108e13d72f2)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision f37c77ab01acdec60a9bd2f387e96ecdc30520c0)
@@ -2056,13 +2056,22 @@
if (mcAuthoringForm.getSln().equalsIgnoreCase(ON))
isSln=true;
}
-
- logger.debug("isReflect" + mcAuthoringForm.getReflect());
+
+ /*
+ logger.debug("isReflect:" + mcAuthoringForm.getReflect());
if (mcAuthoringForm.getReflect() != null)
{
- if (mcAuthoringForm.getReflect().equalsIgnoreCase(ON))
+ if (mcAuthoringForm.getReflect().equalsIgnoreCase("1"))
isReflect=true;
}
+ */
+ String isReflectStr=request.getParameter("reflect");
+ logger.debug("isReflectStr:" + isReflectStr);
+ if (isReflectStr != null)
+ {
+ if (isReflectStr.equals("1"))
+ isReflect=true;
+ }
String reflectionSubject=request.getParameter(REFLECTION_SUBJECT);
@@ -2251,8 +2260,8 @@
if (mcAuthoringForm.getSln() != null)
mcContent.setShowReport(isSln);
- if (mcAuthoringForm.getReflect() != null)
- mcContent.setReflect(isReflect);
+ logger.debug("isReflect:" + isReflect);
+ mcContent.setReflect(isReflect);
mcContent.setPassMark(new Integer(passmark));
@@ -2349,6 +2358,7 @@
logger.debug("setting EDIT_OPTIONS_MODE to 0");
mcAuthoringForm.resetUserAction();
+ mcAuthoringForm.resetRadioBoxes();
int maxQuestionIndex=mapQuestionsContent.size();
request.getSession().setAttribute(MAX_QUESTION_INDEX, new Integer(maxQuestionIndex));
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java
===================================================================
diff -u -r3a998c9b8c2ba60c293759d9bd20c2ca71edb68a -rf37c77ab01acdec60a9bd2f387e96ecdc30520c0
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java (.../McAuthoringForm.java) (revision 3a998c9b8c2ba60c293759d9bd20c2ca71edb68a)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java (.../McAuthoringForm.java) (revision f37c77ab01acdec60a9bd2f387e96ecdc30520c0)
@@ -208,7 +208,7 @@
this.sln =OPTION_OFF;
this.showFeedback =OPTION_OFF;
this.usernameVisible =OPTION_OFF;
- this.reflect =OPTION_OFF;
+ this.reflect ="0";
}
Index: lams_tool_lamc/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r00df9ca2ddfb10b63d2260f8fa940108e13d72f2 -rf37c77ab01acdec60a9bd2f387e96ecdc30520c0
--- lams_tool_lamc/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision 00df9ca2ddfb10b63d2260f8fa940108e13d72f2)
+++ lams_tool_lamc/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision f37c77ab01acdec60a9bd2f387e96ecdc30520c0)
@@ -84,13 +84,10 @@