Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v
diff -u -r1.42 -r1.43
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 6 Mar 2006 21:25:24 -0000 1.42
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java 7 Mar 2006 13:19:39 -0000 1.43
@@ -195,6 +195,7 @@
public static final String TO_TOOL_CONTENT_ID ="toToolContentId";
public static final String LEARNER_REPORT ="learnerRep";
public static final String REQUEST_LEARNING_REPORT ="requestLearningReport";
+ public static final String REQUEST_LEARNING_REPORT_VIEWONLY ="requestLearningReportViewOnly";
/*
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaResources.properties,v
diff -u -r1.24 -r1.25
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties 6 Mar 2006 21:25:24 -0000 1.24
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties 7 Mar 2006 13:19:39 -0000 1.25
@@ -147,6 +147,7 @@
label.content.notEditable =The content can not be edited since it is being used by learners.
label.learning.report =Learning Report
+label.learning.viewOnly =Responses Report
label.openEditor =Open Richtext Editor
label.user =User
label.question.col =Question:
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaUtils.java,v
diff -u -r1.31 -r1.32
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java 6 Mar 2006 21:25:24 -0000 1.31
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java 7 Mar 2006 13:19:39 -0000 1.32
@@ -549,6 +549,7 @@
request.getSession().removeAttribute(LOAD_MONITORING_CONTENT_EDITACTIVITY);
request.getSession().removeAttribute(MONITORING_ORIGINATED_DEFINELATER);
request.getSession().removeAttribute(REQUEST_LEARNING_REPORT);
+ request.getSession().removeAttribute(REQUEST_LEARNING_REPORT_VIEWONLY);
request.getSession().removeAttribute(USER_EXCEPTION_WRONG_FORMAT);
request.getSession().removeAttribute(USER_EXCEPTION_UNCOMPATIBLE_IDS);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v
diff -u -r1.23 -r1.24
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 6 Mar 2006 21:25:45 -0000 1.23
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 7 Mar 2006 13:19:39 -0000 1.24
@@ -134,6 +134,7 @@
IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
logger.debug("retrieving qaService: " + qaService);
+ request.getSession().setAttribute(TOOL_SERVICE, qaService);
/*mark the http session as a learning activity */
request.getSession().setAttribute(TARGET_MODE,TARGET_MODE_LEARNING);
@@ -392,19 +393,25 @@
logger.debug("QaQueUsr:" + qaQueUsr);
if (qaQueUsr != null)
{
- String localToolSession=qaQueUsr.getQaSessionId().toString();
- logger.debug("localToolSession: " + localToolSession);
-
- Long incomingToolSessionId=(Long)request.getSession().getAttribute(AttributeNames.PARAM_TOOL_SESSION_ID);
- logger.debug("incomingToolSessionId: " + incomingToolSessionId);
-
- /* now we know that this user has already responsed before*/
- if (localToolSession.equals(incomingToolSessionId.toString()))
- {
logger.debug("the learner has already responsed to this content, just generate a read-only report.");
- return (mapping.findForward(LEARNER_REPORT));
- }
+ Boolean isUserNamesVisibleBoolean=(Boolean)request.getSession().getAttribute(IS_USERNAME_VISIBLE);
+ boolean isUserNamesVisible=isUserNamesVisibleBoolean.booleanValue();
+ logger.debug("isUserNamesVisible: " + isUserNamesVisible);
+
+ Long currentToolSessionId=(Long)request.getSession().getAttribute(TOOL_SESSION_ID);
+ logger.debug("currentToolSessionId: " + currentToolSessionId);
+
+ QaMonitoringAction qaMonitoringAction= new QaMonitoringAction();
+ /*the report should have all the users' entries OR
+ * the report should have only the current session's entries*/
+ request.getSession().setAttribute(REQUEST_LEARNING_REPORT_VIEWONLY, new Boolean(true).toString());
+ qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, currentToolSessionId.toString());
+
+ request.getSession().setAttribute(REQUEST_LEARNING_REPORT, new Boolean(true).toString());
+ logger.debug("fwd'ing to." + LEARNER_REPORT);
+ return (mapping.findForward(LEARNER_REPORT));
+
}
/*
* present user with the questions.
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java,v
diff -u -r1.22 -r1.23
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 7 Mar 2006 09:46:32 -0000 1.22
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 7 Mar 2006 13:19:39 -0000 1.23
@@ -484,6 +484,19 @@
public void refreshSummaryData(HttpServletRequest request, QaContent qaContent, IQaService qaService,
boolean isUserNamesVisible, boolean isLearnerRequest, String currentSessionId)
{
+ if (qaService == null)
+ {
+ logger.debug("will retrieve qaService");
+ qaService = QaServiceProxy.getQaService(getServlet().getServletContext());
+ logger.debug("retrieving qaService from session: " + qaService);
+ }
+ if (qaService == null)
+ {
+ qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE);
+ logger.debug("qaService: " + qaService);
+ }
+
+
logger.debug("isUserNamesVisible: " + isUserNamesVisible);
logger.debug("isLearnerRequest: " + isLearnerRequest);
Index: lams_tool_laqa/web/monitoring/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/LearnerRep.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_laqa/web/monitoring/LearnerRep.jsp 6 Mar 2006 22:51:46 -0000 1.2
+++ lams_tool_laqa/web/monitoring/LearnerRep.jsp 7 Mar 2006 13:19:39 -0000 1.3
@@ -71,7 +71,14 @@
-
+
+
+
+
+
+
+
+
@@ -82,19 +89,23 @@
-
+
+
+
+
+