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.48 -r1.49
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java 5 Sep 2006 21:50:23 -0000 1.48
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java 7 Sep 2006 11:07:21 -0000 1.49
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java,v
diff -u -r1.118 -r1.119
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 5 Sep 2006 21:50:23 -0000 1.118
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 7 Sep 2006 11:07:20 -0000 1.119
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java,v
diff -u -r1.33 -r1.34
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java 31 Aug 2006 10:32:08 -0000 1.33
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java 7 Sep 2006 11:07:20 -0000 1.34
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/AdvancedContent.jsp,v
diff -u -r1.14 -r1.15
--- lams_tool_lamc/web/authoring/AdvancedContent.jsp 5 Sep 2006 21:50:22 -0000 1.14
+++ lams_tool_lamc/web/authoring/AdvancedContent.jsp 7 Sep 2006 11:07:12 -0000 1.15
@@ -84,13 +84,10 @@
:
|
-
-
-
+
+
-
-
-
|
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java,v
diff -u -r1.36 -r1.37
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java 4 Sep 2006 15:40:14 -0000 1.36
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java 7 Sep 2006 11:09:02 -0000 1.37
@@ -230,7 +230,7 @@
if (usernameVisible.equalsIgnoreCase(ON))
usernameVisibleBoolean=true;
- if (reflect.equalsIgnoreCase(ON))
+ if ((reflect != null) && (reflect.equalsIgnoreCase("1")))
reflectBoolean=true;
}
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java,v
diff -u -r1.54 -r1.55
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 4 Sep 2006 15:40:14 -0000 1.54
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 7 Sep 2006 11:09:03 -0000 1.55
@@ -412,8 +412,10 @@
qaAuthoringForm.setUsernameVisible(qaContent.isUsernameVisible()?ON:OFF);
qaAuthoringForm.setSynchInMonitor(qaContent.isSynchInMonitor()?ON:OFF);
qaAuthoringForm.setQuestionsSequenced(qaContent.isQuestionsSequenced()?ON:OFF);
- qaAuthoringForm.setReflect(qaContent.isReflect()?ON:OFF);
+ logger.debug("QaContent isReflect: " + qaContent.isReflect());
+ qaAuthoringForm.setReflect(qaContent.isReflect()?"1":"0");
+
qaAuthoringForm.setReflectionSubject(qaContent.getReflectionSubject());
List attachmentList = qaService.retrieveQaUploadedFiles(qaContent);
Index: lams_tool_laqa/web/authoring/AdvancedContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/AdvancedContent.jsp,v
diff -u -r1.14 -r1.15
--- lams_tool_laqa/web/authoring/AdvancedContent.jsp 4 Sep 2006 15:40:15 -0000 1.14
+++ lams_tool_laqa/web/authoring/AdvancedContent.jsp 7 Sep 2006 11:09:02 -0000 1.15
@@ -64,13 +64,9 @@
:
-
-
-
-
-
-
-
+
+
|