Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
===================================================================
diff -u -rf37c77ab01acdec60a9bd2f387e96ecdc30520c0 -ra314b1f3fb3820613f8bad30e7b2fee0fe4d34b9
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision f37c77ab01acdec60a9bd2f387e96ecdc30520c0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision a314b1f3fb3820613f8bad30e7b2fee0fe4d34b9)
@@ -111,52 +111,10 @@
*/
protected static void setRadioboxes(McContent mcContent, McAuthoringForm mcAuthoringForm)
{
- if (mcContent.isQuestionsSequenced())
- {
- mcAuthoringForm.setQuestionsSequenced(ON);
- logger.debug("setting questionsSequenced to true");
- }
- else
- {
- mcAuthoringForm.setQuestionsSequenced(OFF);
- logger.debug("setting questionsSequenced to false");
- }
-
- if (mcContent.isRetries())
- {
- mcAuthoringForm.setRetries(ON);
- logger.debug("setting retries to true");
- }
- else
- {
- mcAuthoringForm.setRetries(OFF);
- logger.debug("setting retries to false");
- }
-
-
- if (mcContent.isShowReport())
- {
- mcAuthoringForm.setSln(ON);
- logger.debug("setting sln to true");
- }
- else
- {
- mcAuthoringForm.setSln(OFF);
- logger.debug("setting sln to false");
- }
-
+ mcAuthoringForm.setQuestionsSequenced(mcContent.isQuestionsSequenced()?"1":"0");
+ mcAuthoringForm.setRetries(mcContent.isRetries()?"1":"0");
+ mcAuthoringForm.setSln(mcContent.isShowReport()?"1":"0");
mcAuthoringForm.setReflect(mcContent.isReflect()?"1":"0");
-
- /*
- if (mcContent.isReflect())
- {
- mcAuthoringForm.setReflect(ON);
- }
- else
- {
- mcAuthoringForm.setReflect(OFF);
- }
- */
}
@@ -1419,43 +1377,23 @@
boolean isSln=false;
boolean isReflect=false;
- logger.debug("isQuestionsSequenced: " + mcAuthoringForm.getQuestionsSequenced());
- if (mcAuthoringForm.getQuestionsSequenced().equalsIgnoreCase(ON))
- isQuestionsSequenced=true;
-
- logger.debug("isSynchInMonitor: " + mcAuthoringForm.getSynchInMonitor());
- if (mcAuthoringForm.getSynchInMonitor().equalsIgnoreCase(ON))
- isSynchInMonitor=true;
-
- logger.debug("isUsernameVisible: " + mcAuthoringForm.getUsernameVisible());
- if (mcAuthoringForm.getUsernameVisible().equalsIgnoreCase(ON))
- isUsernameVisible=true;
-
- logger.debug("isRetries: " + mcAuthoringForm.getRetries());
- if (mcAuthoringForm.getRetries().equalsIgnoreCase(ON))
- isRetries=true;
-
- logger.debug("isSln" + mcAuthoringForm.getSln());
- if (mcAuthoringForm.getSln().equalsIgnoreCase(ON))
- isSln=true;
-
- /*
- logger.debug("isReflect" + mcAuthoringForm.getReflect());
- if (mcAuthoringForm.getReflect().equalsIgnoreCase(ON))
- isReflect=true;
- */
+ String questionsSequenced=request.getParameter("questionsSequenced");
+ logger.debug("questionsSequenced: " + questionsSequenced);
+ if ((questionsSequenced != null) && (questionsSequenced.equalsIgnoreCase("1")))
+ isQuestionsSequenced=true;
+
+
+ String retries=request.getParameter("retries");
+ logger.debug("retries: " + retries);
+ if ((retries != null) && (retries.equalsIgnoreCase("1")))
+ isRetries=true;
+
+ String sln=request.getParameter("sln");
+ logger.debug("sln: " + sln);
+ if ((sln != null) && (sln.equalsIgnoreCase("1")))
+ isSln=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)
@@ -1464,8 +1402,6 @@
isReflect=true;
}
-
-
logger.debug("passmark: " + mcAuthoringForm.getPassmark());
if ((mcAuthoringForm.getPassmark() != null) && (mcAuthoringForm.getPassmark().length() > 0))
passmark= new Integer(mcAuthoringForm.getPassmark()).intValue();
@@ -1478,18 +1414,6 @@
logger.debug("reflectionSubject: " + reflectionSubject);
- /*
- String richTextTitle="";
- richTextTitle = (String)request.getSession().getAttribute(RICHTEXT_TITLE);
- logger.debug("createContent richTextTitle from session: " + richTextTitle);
- if (richTextTitle == null) richTextTitle="";
-
- String richTextInstructions="";
- richTextInstructions = (String)request.getSession().getAttribute(RICHTEXT_INSTRUCTIONS);
- logger.debug("createContent richTextInstructions from session: " + richTextInstructions);
- if (richTextInstructions == null) richTextInstructions="";
- */
-
String richTextTitle=request.getParameter(RICHTEXT_TITLE);
logger.debug("richTextTitle: " + richTextTitle);
@@ -1510,9 +1434,6 @@
String richTextReportTitle=(String)request.getSession().getAttribute(RICHTEXT_REPORT_TITLE);
logger.debug("richTextReportTitle: " + richTextReportTitle);
-
- //String richTextEndLearningMessage=(String)request.getSession().getAttribute(RICHTEXT_END_LEARNING_MSG);
- ///logger.debug("richTextEndLearningMessage: " + richTextEndLearningMessage);
creationDate=(Date)request.getSession().getAttribute(CREATION_DATE);
if (creationDate == null)
@@ -1547,11 +1468,9 @@
mc.setDefineLater(false);
mc.setSynchInMonitor(isSynchInMonitor);
mc.setContentInUse(isContentInUse);
- //mc.setEndLearningMessage("Thanks");
mc.setRunOffline(isRunOffline);
mc.setReportTitle(richTextReportTitle);
mc.setMonitoringReportTitle(monitoringReportTitle);
- //mc.setEndLearningMessage(richTextEndLearningMessage);
mc.setRetries(isRetries);
mc.setPassMark(new Integer(passmark));
mc.setShowReport(isSln);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -rf37c77ab01acdec60a9bd2f387e96ecdc30520c0 -ra314b1f3fb3820613f8bad30e7b2fee0fe4d34b9
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision f37c77ab01acdec60a9bd2f387e96ecdc30520c0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision a314b1f3fb3820613f8bad30e7b2fee0fe4d34b9)
@@ -2020,51 +2020,25 @@
String endLearningMessage="";
int passmark=0;
- logger.debug("isQuestionsSequenced: " + mcAuthoringForm.getQuestionsSequenced());
- if (mcAuthoringForm.getQuestionsSequenced() != null)
- {
- if (mcAuthoringForm.getQuestionsSequenced().equalsIgnoreCase(ON))
- isQuestionsSequenced=true;
- }
+ String questionsSequenced=request.getParameter("questionsSequenced");
+ logger.debug("questionsSequenced: " + questionsSequenced);
+ if ((questionsSequenced != null) && (questionsSequenced.equalsIgnoreCase("1")))
+ isQuestionsSequenced=true;
- logger.debug("isSynchInMonitor: " + mcAuthoringForm.getSynchInMonitor());
- if (mcAuthoringForm.getSynchInMonitor() != null)
- {
- if (mcAuthoringForm.getSynchInMonitor().equalsIgnoreCase(ON))
- isSynchInMonitor=true;
- }
+ String retries=request.getParameter("retries");
+ logger.debug("retries: " + retries);
+ if ((retries != null) && (retries.equalsIgnoreCase("1")))
+ isRetries=true;
- logger.debug("isUsernameVisible: " + mcAuthoringForm.getUsernameVisible());
- if (mcAuthoringForm.getUsernameVisible() != null)
- {
- if (mcAuthoringForm.getUsernameVisible().equalsIgnoreCase(ON))
- isUsernameVisible=true;
- }
-
- logger.debug("isRetries: " + mcAuthoringForm.getRetries());
- if (mcAuthoringForm.getRetries() != null)
- {
- if (mcAuthoringForm.getRetries().equalsIgnoreCase(ON))
- isRetries=true;
- }
-
- logger.debug("isSln" + mcAuthoringForm.getSln());
- if (mcAuthoringForm.getSln() != null)
- {
- if (mcAuthoringForm.getSln().equalsIgnoreCase(ON))
- isSln=true;
- }
- /*
- logger.debug("isReflect:" + mcAuthoringForm.getReflect());
- if (mcAuthoringForm.getReflect() != null)
- {
- if (mcAuthoringForm.getReflect().equalsIgnoreCase("1"))
- isReflect=true;
- }
- */
+ String sln=request.getParameter("sln");
+ logger.debug("sln: " + sln);
+ if ((sln != null) && (sln.equalsIgnoreCase("1")))
+ isSln=true;
+
+
String isReflectStr=request.getParameter("reflect");
logger.debug("isReflectStr:" + isReflectStr);
if (isReflectStr != null)
@@ -2163,46 +2137,15 @@
return (mapping.findForward(destination));
}
request.getSession().setAttribute(PASSMARK, new Integer(passmark).toString());
-
- logger.debug("isShowFeedback: " + mcAuthoringForm.getShowFeedback());
- if (mcAuthoringForm.getShowFeedback() != null)
- {
- if (mcAuthoringForm.getShowFeedback().equalsIgnoreCase(ON))
- isShowFeedback=true;
- }
- /*
- String richTextTitle=(String) request.getSession().getAttribute(RICHTEXT_TITLE);
- logger.debug("richTextTitle: " + richTextTitle);
-
- String richTextInstructions=(String) request.getSession().getAttribute(RICHTEXT_INSTRUCTIONS);
- logger.debug("richTextInstructions: " + richTextInstructions);
- */
-
String richTextTitle=request.getParameter(RICHTEXT_TITLE);
logger.debug("richTextTitle: " + richTextTitle);
String richTextInstructions=request.getParameter(RICHTEXT_INSTRUCTIONS);
logger.debug("richTextInstructions: " + richTextInstructions);
-
-
- /*
- if ((richTextTitle == null) || (richTextTitle.length() == 0) || richTextTitle.equalsIgnoreCase(RICHTEXT_BLANK))
- {
- errors.add(Globals.ERROR_KEY,new ActionMessage("error.title"));
- logger.debug("add title to ActionMessages");
- }
- if ((richTextInstructions == null) || (richTextInstructions.length() == 0) || richTextInstructions.equalsIgnoreCase(RICHTEXT_BLANK))
- {
- errors.add(Globals.ERROR_KEY, new ActionMessage("error.instructions"));
- logger.debug("add instructions to ActionMessages: ");
- }
- */
-
if (errors.size() > 0)
{
- //logger.debug("either title or instructions or both is missing. Returning back to from to fix errors:");
mcAuthoringForm.setEditOptionsMode(new Integer(0).toString());
request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
logger.debug("setting EDIT_OPTIONS_MODE to 0");
@@ -2227,9 +2170,6 @@
String richTextReportTitle=(String)request.getSession().getAttribute(RICHTEXT_REPORT_TITLE);
logger.debug("richTextReportTitle: " + richTextReportTitle);
- //String richTextEndLearningMessage=(String)request.getSession().getAttribute(RICHTEXT_END_LEARNING_MSG);
- //logger.debug("richTextEndLearningMessage: " + richTextEndLearningMessage);
-
logger.debug("existing mcContent:" + mcContent);
String activeModule=(String)request.getSession().getAttribute(ACTIVE_MODULE);
@@ -2241,38 +2181,19 @@
logger.debug("updating mcContent title and instructions:" + mcContent);
mcContent.setTitle(richTextTitle);
mcContent.setInstructions(richTextInstructions);
-
- if (mcAuthoringForm.getQuestionsSequenced() != null)
- mcContent.setQuestionsSequenced(isQuestionsSequenced);
-
- if (mcAuthoringForm.getSynchInMonitor() != null)
- mcContent.setSynchInMonitor(isSynchInMonitor);
-
- if (mcAuthoringForm.getUsernameVisible() != null)
- mcContent.setUsernameVisible(isUsernameVisible);
-
- if (mcAuthoringForm.getRetries() != null)
- mcContent.setRetries(isRetries);
-
- if (mcAuthoringForm.getShowFeedback() != null)
- mcContent.setShowFeedback(isShowFeedback);
-
- if (mcAuthoringForm.getSln() != null)
- mcContent.setShowReport(isSln);
-
- logger.debug("isReflect:" + isReflect);
- mcContent.setReflect(isReflect);
-
-
mcContent.setPassMark(new Integer(passmark));
- mcContent.setReflectionSubject(reflectionSubject);
+
if (activeModule.equals(AUTHORING))
{
+ mcContent.setQuestionsSequenced(isQuestionsSequenced);
+ mcContent.setRetries(isRetries);
+ mcContent.setShowReport(isSln);
+ mcContent.setReflect(isReflect);
+ mcContent.setReflectionSubject(reflectionSubject);
mcContent.setOfflineInstructions(richTextOfflineInstructions);
mcContent.setOnlineInstructions(richTextOnlineInstructions);
mcContent.setReportTitle(richTextReportTitle);
mcContent.setMonitoringReportTitle("Monitoring Report");
- //mcContent.setEndLearningMessage(richTextEndLearningMessage);
}
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
diff -u -r00df9ca2ddfb10b63d2260f8fa940108e13d72f2 -ra314b1f3fb3820613f8bad30e7b2fee0fe4d34b9
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java (.../McStarterAction.java) (revision 00df9ca2ddfb10b63d2260f8fa940108e13d72f2)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java (.../McStarterAction.java) (revision a314b1f3fb3820613f8bad30e7b2fee0fe4d34b9)
@@ -696,14 +696,13 @@
logger.debug("RICHTEXT_TITLE:" + request.getSession().getAttribute(RICHTEXT_TITLE));
logger.debug("getting default content");
- /* this is already done in mcAuthoringForm.resetRadioBoxes()*/
- mcAuthoringForm.setUsernameVisible(OFF);
- mcAuthoringForm.setQuestionsSequenced(OFF);
- mcAuthoringForm.setSynchInMonitor(OFF);
- mcAuthoringForm.setRetries(OFF);
- mcAuthoringForm.setShowFeedback(OFF);
- mcAuthoringForm.setSln(OFF);
- mcAuthoringForm.setReflect(OFF);
+ mcAuthoringForm.setUsernameVisible("0");
+ mcAuthoringForm.setQuestionsSequenced("0");
+ mcAuthoringForm.setSynchInMonitor("0");
+ mcAuthoringForm.setRetries("0");
+ mcAuthoringForm.setShowFeedback("0");
+ mcAuthoringForm.setSln("0");
+ mcAuthoringForm.setReflect("0");
/* collect options for the default question content into a Map*/
McQueContent mcQueContent=mcService.getToolDefaultQuestionContent(mcContent.getUid().longValue());
Index: lams_tool_lamc/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -rf37c77ab01acdec60a9bd2f387e96ecdc30520c0 -ra314b1f3fb3820613f8bad30e7b2fee0fe4d34b9
--- lams_tool_lamc/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision f37c77ab01acdec60a9bd2f387e96ecdc30520c0)
+++ lams_tool_lamc/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision a314b1f3fb3820613f8bad30e7b2fee0fe4d34b9)
@@ -38,13 +38,9 @@
:
|
-
-
-
-
-
-
-
+
+
|
@@ -53,13 +49,9 @@
:
-
-
-
-
-
-
-
+
+
|
@@ -68,13 +60,9 @@
:
-
-
-
-
-
-
-
+
+
|
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -ree02a0db59fc540812423b629c5e2e7b6162e743 -ra314b1f3fb3820613f8bad30e7b2fee0fe4d34b9
--- lams_tool_lamc/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision ee02a0db59fc540812423b629c5e2e7b6162e743)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision a314b1f3fb3820613f8bad30e7b2fee0fe4d34b9)
@@ -31,10 +31,6 @@
-
-
-
-