Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
diff -u -r94789b14d5f0b1d8bf8e680bb6ef66742e5a27ec -r84d364960525ae0d69e5ab5af327e2a3ce99a7c9
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java (.../McMonitoringAction.java) (revision 94789b14d5f0b1d8bf8e680bb6ef66742e5a27ec)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java (.../McMonitoringAction.java) (revision 84d364960525ae0d69e5ab5af327e2a3ce99a7c9)
@@ -318,17 +318,28 @@
logger.debug("retrieving mcService from cache: " + mcService);
}
request.getSession().setAttribute(TOOL_SERVICE, mcService);
+ request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity");
- request.getSession().setAttribute(CURRENT_MONITORING_TAB, "editActivity");
-
request.getSession().setAttribute(DEFINE_LATER_IN_EDIT_MODE, new Boolean(true));
McUtils.setDefineLater(request, true);
request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
logger.debug("setting EDIT_OPTIONS_MODE to 0");
- logger.debug("fwd ing to : " + LOAD_MONITORING_CONTENT);
+ Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID);
+ logger.debug("toolContentId: " + toolContentId);
+
+ McContent mcContent=mcService.retrieveMc(toolContentId);
+ logger.debug("mcContent:" + mcContent);
+
+ request.getSession().setAttribute(RICHTEXT_TITLE, mcContent.getTitle());
+ request.getSession().setAttribute(RICHTEXT_INSTRUCTIONS, mcContent.getInstructions());
+
+ logger.debug("Title is: " + mcContent.getTitle());
+ logger.debug("Instructions is: " + mcContent.getInstructions());
+
+ logger.debug("fwd ing to : " + LOAD_MONITORING_CONTENT);
return (mapping.findForward(LOAD_MONITORING_CONTENT));
}
Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r94789b14d5f0b1d8bf8e680bb6ef66742e5a27ec -r84d364960525ae0d69e5ab5af327e2a3ce99a7c9
--- lams_tool_lamc/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 94789b14d5f0b1d8bf8e680bb6ef66742e5a27ec)
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 84d364960525ae0d69e5ab5af327e2a3ce99a7c9)
@@ -199,7 +199,7 @@
type="org.lamsfoundation.lams.tool.mc.web.McLearningStarterAction"
name="McLearningForm"
scope="session"
- validate="false"
+ validate="true"
unknown="false"
input="/learningIndex.jsp">
@@ -222,37 +222,37 @@
@@ -265,7 +265,7 @@
input="/learning/AnswersContent.jsp"
parameter="method"
unknown="false"
- validate="false">
+ validate="true">
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
diff -u -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 -r84d364960525ae0d69e5ab5af327e2a3ce99a7c9
--- lams_tool_lamc/web/WEB-INF/web.xml (.../web.xml) (revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5)
+++ lams_tool_lamc/web/WEB-INF/web.xml (.../web.xml) (revision 84d364960525ae0d69e5ab5af327e2a3ce99a7c9)
@@ -257,116 +257,4 @@
/WEB-INF/lams.tld
-
-
-
-
- Secure Content
- *.jsp
- *.html
- /index.jsp
- /flashCrashDump
-
-
- LEARNER
- TEACHER
- STAFF
- AUTHOR
- ADMIN
- SYSADMIN
-
-
-
-
-
- Authoring Update
- /authoring.do
-
-
- AUTHOR
-
-
-
-
- Staff Content
- /monitoring.do
-
-
- STAFF
-
-
-
-
-
- Adminstrator Content
- /admin.do
-
-
- ADMIN
-
-
-
-
- LAMS System Adminstrator Content
- /sysadmin.do
-
-
- SYSADMIN
-
-
-
-
-
- Download Files
- /download/
-
-
- AUTHOR
- STAFF
- ADMIN
- SYSADMIN
-
-
-
-
-
- FORM
- LAMS
-
- /login.jsp
- /login.jsp?failed=y
-
-
-
-
-
-
- Student
- LEARNER
-
-
- Student
- TEACHER
-
-
-
- Can create/modify a learning design
- AUTHOR
-
-
-
- Can running and monitoring a learning session
- STAFF
-
-
-
- Can add/remove users to the system, set up classes of users for sessions
- ADMIN
-
-
-
- Can add/remove users to the system, set up classes of users for sessions
- SYSADMIN
-
-