Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java 17 Aug 2007 03:32:06 -0000 1.2
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralMonitoringDTO.java 15 Oct 2007 05:01:48 -0000 1.3
@@ -68,6 +68,7 @@
protected String isToolSessionChanged;
protected String responseId;
protected String currentUid;
+ protected String displayAnswers;
protected String toolContentID;
protected Map mapOptionsContent;
@@ -569,6 +570,18 @@
this.currentUid = currentUid;
}
/**
+ * @return Returns the displayAnswers.
+ */
+ public String getDisplayAnswers() {
+ return displayAnswers;
+ }
+ /**
+ * @param displayAnswers The displayAnswers to set.
+ */
+ public void setDisplayAnswers(String displayAnswers) {
+ this.displayAnswers = displayAnswers;
+ }
+ /**
* @return Returns the isToolSessionChanged.
*/
public String getIsToolSessionChanged() {
@@ -683,6 +696,7 @@
.append("mapStudentsMcd: ", mapStudentsMcd)
.append("responseId: ", responseId)
.append("currentUid: ", currentUid)
+ .append("displayAnswers: ", displayAnswers)
.append("sessionUserCount: ", sessionUserCount)
.append("completedSessionUserCount: ", completedSessionUserCount)
.append("completedSessionUserPercent: ", completedSessionUserPercent)
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java,v
diff -u -r1.36 -r1.37
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java 17 Aug 2007 03:32:06 -0000 1.36
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java 15 Oct 2007 05:01:48 -0000 1.37
@@ -216,8 +216,7 @@
McContent mcContent=mcService.retrieveMc(new Long(toolContentID));
logger.debug("existing mcContent:" + mcContent);
-
-
+
if (currentMonitoredToolSession.equals("All"))
{
List listMcAllSessionsDTO = new LinkedList();
@@ -250,7 +249,10 @@
mcGeneralMonitoringDTO.setRequestLearningReport(new Boolean(false).toString());
mcGeneralMonitoringDTO.setSummaryToolSessions(populateToolSessions(mcContent));
+ mcGeneralMonitoringDTO.setDisplayAnswers(new Boolean(mcContent.isDisplayAnswers()).toString());
+ logger.debug("existing mcContent:" + mcContent);
+
/*setting editable screen properties*/
McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
mcGeneralAuthoringDTO.setActivityTitle(mcContent.getTitle());
@@ -417,9 +419,45 @@
{
logger.debug("dispatching submitSession..");
IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+ String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+ McContent mcContent=mcService.retrieveMc(new Long(strToolContentID));
+ mcContent.setDisplayAnswers(new Boolean(true));
+ logger.debug("mcContent: " + mcContent);
return commonSubmitSessionCode((McMonitoringForm) form, request, mapping, mcService, new McGeneralMonitoringDTO() );
}
+ /**
+ * ActionForward displayAnswers(ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ *
+ * displayAnswers
+ *
+ * @param mapping
+ * @param form
+ * @param request
+ * @param response
+ * @return
+ * @throws IOException
+ * @throws ServletException
+ */
+ public ActionForward displayAnswers(ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws IOException,ServletException
+ {
+ logger.debug("dispatching displayAnswers..");
+ IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+ String strToolContentID=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
+ McContent mcContent=mcService.retrieveMc(new Long(strToolContentID));
+ mcContent.setDisplayAnswers(new Boolean(true));
+ logger.debug("mcContent: " + mcContent);
+ return commonSubmitSessionCode((McMonitoringForm) form, request, mapping, mcService, new McGeneralMonitoringDTO() );
+ }
+
+
/**
* editActivityQuestions
Index: lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp,v
diff -u -r1.42 -r1.43
--- lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp 8 Jun 2007 01:38:23 -0000 1.42
+++ lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp 15 Oct 2007 05:01:48 -0000 1.43
@@ -92,8 +92,12 @@
document.McMonitoringForm.questionIndex.value=questionIndexValue;
submitMethod(actionMethod);
}
+
+ function submitChangeDisplayAnswers(displayAnswers, actionMethod) {
+ document.McMonitoringForm.displayAnswers.value=displayAnswers;
+ submitMonitoringMethod(actionMethod);
+ }
-
function submitEditResponse(responseId, actionMethod)
{
document.McMonitoringForm.responseId.value=responseId;
Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/SummaryContent.jsp,v
diff -u -r1.23 -r1.24
--- lams_tool_lamc/web/monitoring/SummaryContent.jsp 17 Aug 2007 03:54:30 -0000 1.23
+++ lams_tool_lamc/web/monitoring/SummaryContent.jsp 15 Oct 2007 05:01:47 -0000 1.24
@@ -32,6 +32,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+