Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
diff -u -r6aae05a339038bca1bc67564026097be3cf9cfd5 -r17032ee407bc324b8b3a6121cb291b66cab7293a
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision 6aae05a339038bca1bc67564026097be3cf9cfd5)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision 17032ee407bc324b8b3a6121cb291b66cab7293a)
@@ -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_PROGRESS ="requestLearningReportProgress";
public static final String REQUEST_PREVIEW ="requestPreview";
public static final String REQUEST_LEARNING_REPORT_VIEWONLY ="requestLearningReportViewOnly";
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties
===================================================================
diff -u -r6aae05a339038bca1bc67564026097be3cf9cfd5 -r17032ee407bc324b8b3a6121cb291b66cab7293a
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties (.../QaResources.properties) (revision 6aae05a339038bca1bc67564026097be3cf9cfd5)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties (.../QaResources.properties) (revision 17032ee407bc324b8b3a6121cb291b66cab7293a)
@@ -148,6 +148,7 @@
label.learning.report =Learning Report
label.learning.viewOnly =Previous Responses Report
+label.learner.progress =Learner Progress Report
label.preview =Preview Learner Screen
label.openEditor =Open Richtext Editor
label.user =User
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
===================================================================
diff -u -r6aae05a339038bca1bc67564026097be3cf9cfd5 -r17032ee407bc324b8b3a6121cb291b66cab7293a
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java (.../QaUtils.java) (revision 6aae05a339038bca1bc67564026097be3cf9cfd5)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java (.../QaUtils.java) (revision 17032ee407bc324b8b3a6121cb291b66cab7293a)
@@ -552,8 +552,8 @@
request.getSession().removeAttribute(REQUEST_LEARNING_REPORT);
request.getSession().removeAttribute(REQUEST_LEARNING_REPORT_VIEWONLY);
request.getSession().removeAttribute(REQUEST_PREVIEW);
+ request.getSession().removeAttribute(REQUEST_LEARNING_REPORT_PROGRESS);
-
request.getSession().removeAttribute(USER_EXCEPTION_WRONG_FORMAT);
request.getSession().removeAttribute(USER_EXCEPTION_UNCOMPATIBLE_IDS);
request.getSession().removeAttribute(USER_EXCEPTION_NUMBERFORMAT);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java
===================================================================
diff -u -r17227fcaca4173406ed5a9251ea10d2353e919f7 -r17032ee407bc324b8b3a6121cb291b66cab7293a
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 17227fcaca4173406ed5a9251ea10d2353e919f7)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 17032ee407bc324b8b3a6121cb291b66cab7293a)
@@ -213,10 +213,11 @@
* @return List
*/
public static List buildGroupsQuestionData(HttpServletRequest request, QaContent qaContent,
- boolean isUserNamesVisible, boolean isLearnerRequest, String currentSessionId)
+ boolean isUserNamesVisible, boolean isLearnerRequest, String currentSessionId, String userId)
{
logger.debug("isUserNamesVisible: " + isUserNamesVisible);
logger.debug("isLearnerRequest: " + isLearnerRequest);
+ logger.debug("userId: " + userId);
IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE);
logger.debug("qaService: " + qaService);
@@ -241,7 +242,7 @@
logger.debug("using allUsersData to retrieve users data: " + isUserNamesVisible);
Map questionAttemptData= buildGroupsAttemptData(request, qaContent, qaQueContent, qaQueContent.getUid().toString(),
- isUserNamesVisible,isLearnerRequest, currentSessionId);
+ isUserNamesVisible,isLearnerRequest, currentSessionId, userId);
logger.debug("questionAttemptData:..." + questionAttemptData);
qaMonitoredAnswersDTO.setQuestionAttempts(questionAttemptData);
listMonitoredAnswersContainerDTO.add(qaMonitoredAnswersDTO);
@@ -254,11 +255,12 @@
public static Map buildGroupsAttemptData(HttpServletRequest request, QaContent qaContent, QaQueContent qaQueContent, String questionUid,
- boolean isUserNamesVisible, boolean isLearnerRequest, String currentSessionId)
+ boolean isUserNamesVisible, boolean isLearnerRequest, String currentSessionId, String userId)
{
logger.debug("isUserNamesVisible: " + isUserNamesVisible);
logger.debug("isLearnerRequest: " + isLearnerRequest);
logger.debug("currentSessionId: " + currentSessionId);
+ logger.debug("userId: " + userId);
logger.debug("doing buildGroupsAttemptData...");
IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE);
@@ -291,7 +293,7 @@
List listUsers=qaService.getUserBySessionOnly(qaSession);
logger.debug("listMcUsers for session id:" + qaSession.getQaSessionId() + " = " + listUsers);
Map sessionUsersAttempts=populateSessionUsersAttempts(request,qaSession.getQaSessionId(), listUsers, questionUid,
- isUserNamesVisible, isLearnerRequest);
+ isUserNamesVisible, isLearnerRequest, userId);
listMonitoredAttemptsContainerDTO.add(sessionUsersAttempts);
}
}
@@ -320,7 +322,7 @@
List listUsers=qaService.getUserBySessionOnly(qaSession);
logger.debug("listMcUsers for session id:" + qaSession.getQaSessionId() + " = " + listUsers);
Map sessionUsersAttempts=populateSessionUsersAttempts(request,qaSession.getQaSessionId(), listUsers, questionUid,
- isUserNamesVisible, isLearnerRequest);
+ isUserNamesVisible, isLearnerRequest, userId);
listMonitoredAttemptsContainerDTO.add(sessionUsersAttempts);
}
}
@@ -344,70 +346,31 @@
* @return List
*/
public static Map populateSessionUsersAttempts(HttpServletRequest request,Long sessionId, List listUsers, String questionUid,
- boolean isUserNamesVisible, boolean isLearnerRequest)
+ boolean isUserNamesVisible, boolean isLearnerRequest, String userId)
{
logger.debug("isUserNamesVisible: " + isUserNamesVisible);
logger.debug("isLearnerRequest: " + isLearnerRequest);
+ logger.debug("userId: " + userId);
logger.debug("doing populateSessionUsersAttempts...");
IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE);
logger.debug("qaService: " + qaService);
Map mapMonitoredUserContainerDTO= new TreeMap(new QaStringComparator());
List listMonitoredUserContainerDTO= new LinkedList();
-
Iterator itUsers=listUsers.iterator();
- if ((isUserNamesVisible) && (!isLearnerRequest))
+
+ if (userId == null)
{
- logger.debug("isUserNamesVisible true, isLearnerRequest false" );
- logger.debug("getting alll the user' data");
- while (itUsers.hasNext())
+ logger.debug("request is not for learner progress report");
+ if ((isUserNamesVisible) && (!isLearnerRequest))
{
- QaQueUsr qaQueUsr=(QaQueUsr)itUsers.next();
- logger.debug("qaQueUsr: " + qaQueUsr);
-
- if (qaQueUsr != null)
- {
- logger.debug("getting listUserAttempts for user id: " + qaQueUsr.getUid() + " and que content id: " + questionUid);
- List listUserAttempts=qaService.getAttemptsForUserAndQuestionContent(qaQueUsr.getUid(), new Long(questionUid));
- logger.debug("listUserAttempts: " + listUserAttempts);
-
- Iterator itAttempts=listUserAttempts.iterator();
- while (itAttempts.hasNext())
- {
- QaUsrResp qaUsrResp=(QaUsrResp)itAttempts.next();
- logger.debug("qaUsrResp: " + qaUsrResp);
-
- if (qaUsrResp != null)
- {
- QaMonitoredUserDTO qaMonitoredUserDTO = new QaMonitoredUserDTO();
- qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime().toString());
- qaMonitoredUserDTO.setTimeZone(qaUsrResp.getTimezone());
- qaMonitoredUserDTO.setUid(qaUsrResp.getResponseId().toString());
- qaMonitoredUserDTO.setUserName(qaQueUsr.getUsername());
- qaMonitoredUserDTO.setQueUsrId(qaQueUsr.getUid().toString());
- qaMonitoredUserDTO.setSessionId(sessionId.toString());
- qaMonitoredUserDTO.setResponse(qaUsrResp.getAnswer());
- qaMonitoredUserDTO.setQuestionUid(questionUid);
- listMonitoredUserContainerDTO.add(qaMonitoredUserDTO);
- }
- }
- }
- }
- }
- else if ((isUserNamesVisible) && (isLearnerRequest))
- {
- logger.debug("just populating data normally just like monitoring summary, except that the data is ony for a specific session" );
- logger.debug("isUserNamesVisible true, isLearnerRequest true" );
- String userID= (String)request.getSession().getAttribute(USER_ID);
- logger.debug("userID: " + userID);
- QaQueUsr qaQueUsr=qaService.getQaQueUsrById(new Long(userID).longValue());
- logger.debug("the current user qaQueUsr " + qaQueUsr + " and username: " + qaQueUsr.getUsername());
-
+ logger.debug("isUserNamesVisible true, isLearnerRequest false" );
+ logger.debug("getting alll the user' data");
while (itUsers.hasNext())
{
- qaQueUsr=(QaQueUsr)itUsers.next();
+ QaQueUsr qaQueUsr=(QaQueUsr)itUsers.next();
logger.debug("qaQueUsr: " + qaQueUsr);
if (qaQueUsr != null)
@@ -439,25 +402,26 @@
}
}
}
- else if ((!isUserNamesVisible) && (isLearnerRequest))
+ else if ((isUserNamesVisible) && (isLearnerRequest))
{
- logger.debug("populating data normally exception are for a specific session and other user names are not visible.");
- logger.debug("isUserNamesVisible false, isLearnerRequest true" );
- logger.debug("getting only current user's data" );
+ logger.debug("just populating data normally just like monitoring summary, except that the data is ony for a specific session" );
+ logger.debug("isUserNamesVisible true, isLearnerRequest true" );
String userID= (String)request.getSession().getAttribute(USER_ID);
logger.debug("userID: " + userID);
+ QaQueUsr qaQueUsr=qaService.getQaQueUsrById(new Long(userID).longValue());
+ logger.debug("the current user qaQueUsr " + qaQueUsr + " and username: " + qaQueUsr.getUsername());
while (itUsers.hasNext())
{
- QaQueUsr qaQueUsr=(QaQueUsr)itUsers.next();
+ qaQueUsr=(QaQueUsr)itUsers.next();
logger.debug("qaQueUsr: " + qaQueUsr);
if (qaQueUsr != null)
{
logger.debug("getting listUserAttempts for user id: " + qaQueUsr.getUid() + " and que content id: " + questionUid);
List listUserAttempts=qaService.getAttemptsForUserAndQuestionContent(qaQueUsr.getUid(), new Long(questionUid));
logger.debug("listUserAttempts: " + listUserAttempts);
-
+
Iterator itAttempts=listUserAttempts.iterator();
while (itAttempts.hasNext())
{
@@ -470,19 +434,7 @@
qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime().toString());
qaMonitoredUserDTO.setTimeZone(qaUsrResp.getTimezone());
qaMonitoredUserDTO.setUid(qaUsrResp.getResponseId().toString());
-
- logger.debug("userID versus queUsrId: " + userID + "-" + qaQueUsr.getQueUsrId());
- if (userID.equals(qaQueUsr.getQueUsrId().toString()))
- {
- logger.debug("this is current user, put his name normally.");
- qaMonitoredUserDTO.setUserName(qaQueUsr.getUsername());
- }
- else
- {
- logger.debug("this is not current user, put his name as blank.");
- qaMonitoredUserDTO.setUserName("[ ]");
- }
-
+ qaMonitoredUserDTO.setUserName(qaQueUsr.getUsername());
qaMonitoredUserDTO.setQueUsrId(qaQueUsr.getUid().toString());
qaMonitoredUserDTO.setSessionId(sessionId.toString());
qaMonitoredUserDTO.setResponse(qaUsrResp.getAnswer());
@@ -491,10 +443,108 @@
}
}
}
+ }
}
+ else if ((!isUserNamesVisible) && (isLearnerRequest))
+ {
+ logger.debug("populating data normally exception are for a specific session and other user names are not visible.");
+ logger.debug("isUserNamesVisible false, isLearnerRequest true" );
+ logger.debug("getting only current user's data" );
+ String userID= (String)request.getSession().getAttribute(USER_ID);
+ logger.debug("userID: " + userID);
+
+ while (itUsers.hasNext())
+ {
+ QaQueUsr qaQueUsr=(QaQueUsr)itUsers.next();
+ logger.debug("qaQueUsr: " + qaQueUsr);
+
+ if (qaQueUsr != null)
+ {
+ logger.debug("getting listUserAttempts for user id: " + qaQueUsr.getUid() + " and que content id: " + questionUid);
+ List listUserAttempts=qaService.getAttemptsForUserAndQuestionContent(qaQueUsr.getUid(), new Long(questionUid));
+ logger.debug("listUserAttempts: " + listUserAttempts);
+
+ Iterator itAttempts=listUserAttempts.iterator();
+ while (itAttempts.hasNext())
+ {
+ QaUsrResp qaUsrResp=(QaUsrResp)itAttempts.next();
+ logger.debug("qaUsrResp: " + qaUsrResp);
+
+ if (qaUsrResp != null)
+ {
+ QaMonitoredUserDTO qaMonitoredUserDTO = new QaMonitoredUserDTO();
+ qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime().toString());
+ qaMonitoredUserDTO.setTimeZone(qaUsrResp.getTimezone());
+ qaMonitoredUserDTO.setUid(qaUsrResp.getResponseId().toString());
+
+ logger.debug("userID versus queUsrId: " + userID + "-" + qaQueUsr.getQueUsrId());
+ if (userID.equals(qaQueUsr.getQueUsrId().toString()))
+ {
+ logger.debug("this is current user, put his name normally.");
+ qaMonitoredUserDTO.setUserName(qaQueUsr.getUsername());
+ }
+ else
+ {
+ logger.debug("this is not current user, put his name as blank.");
+ qaMonitoredUserDTO.setUserName("[ ]");
+ }
+
+ qaMonitoredUserDTO.setQueUsrId(qaQueUsr.getUid().toString());
+ qaMonitoredUserDTO.setSessionId(sessionId.toString());
+ qaMonitoredUserDTO.setResponse(qaUsrResp.getAnswer());
+ qaMonitoredUserDTO.setQuestionUid(questionUid);
+ listMonitoredUserContainerDTO.add(qaMonitoredUserDTO);
+ }
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ logger.debug("request is for learner progress report: " + userId);
+ while (itUsers.hasNext())
+ {
+ QaQueUsr qaQueUsr=(QaQueUsr)itUsers.next();
+ logger.debug("qaQueUsr: " + qaQueUsr);
+
+ if (qaQueUsr != null)
+ {
+ logger.debug("getting listUserAttempts for user id: " + qaQueUsr.getUid() + " and que content id: " + questionUid);
+ List listUserAttempts=qaService.getAttemptsForUserAndQuestionContent(qaQueUsr.getUid(), new Long(questionUid));
+ logger.debug("listUserAttempts: " + listUserAttempts);
+
+ Iterator itAttempts=listUserAttempts.iterator();
+ while (itAttempts.hasNext())
+ {
+ QaUsrResp qaUsrResp=(QaUsrResp)itAttempts.next();
+ logger.debug("qaUsrResp: " + qaUsrResp);
+
+ if (qaUsrResp != null)
+ {
+ logger.debug("userID versus queUsrId: " + userId + "-" + qaQueUsr.getQueUsrId());
+ if (userId.equals(qaQueUsr.getQueUsrId().toString()))
+ {
+ logger.debug("this is the user requested , include his name for learner progress.");
+ QaMonitoredUserDTO qaMonitoredUserDTO = new QaMonitoredUserDTO();
+ qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime().toString());
+ qaMonitoredUserDTO.setTimeZone(qaUsrResp.getTimezone());
+ qaMonitoredUserDTO.setUid(qaUsrResp.getResponseId().toString());
+ qaMonitoredUserDTO.setUserName(qaQueUsr.getUsername());
+ qaMonitoredUserDTO.setQueUsrId(qaQueUsr.getUid().toString());
+ qaMonitoredUserDTO.setSessionId(sessionId.toString());
+ qaMonitoredUserDTO.setResponse(qaUsrResp.getAnswer());
+ qaMonitoredUserDTO.setQuestionUid(questionUid);
+ listMonitoredUserContainerDTO.add(qaMonitoredUserDTO);
+ }
+ }
+ }
+ }
+ }
}
+
logger.debug("final listMonitoredUserContainerDTO: " + listMonitoredUserContainerDTO);
mapMonitoredUserContainerDTO=convertToMcMonitoredUserDTOMap(listMonitoredUserContainerDTO);
logger.debug("final mapMonitoredUserContainerDTO:..." + mapMonitoredUserContainerDTO);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java
===================================================================
diff -u -r17227fcaca4173406ed5a9251ea10d2353e919f7 -r17032ee407bc324b8b3a6121cb291b66cab7293a
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java (.../QAction.java) (revision 17227fcaca4173406ed5a9251ea10d2353e919f7)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java (.../QAction.java) (revision 17032ee407bc324b8b3a6121cb291b66cab7293a)
@@ -586,7 +586,7 @@
QaMonitoringAction qaMonitoringAction= new QaMonitoringAction();
/*the report should have all the users' entries OR
* the report should have only the current session's entries*/
- qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, currentSessionId);
+ qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, currentSessionId, null);
request.getSession().setAttribute(REQUEST_LEARNING_REPORT, new Boolean(true).toString());
logger.debug("fwd'ing to." + LEARNER_REPORT);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
diff -u -r6aae05a339038bca1bc67564026097be3cf9cfd5 -r17032ee407bc324b8b3a6121cb291b66cab7293a
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision 6aae05a339038bca1bc67564026097be3cf9cfd5)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision 17032ee407bc324b8b3a6121cb291b66cab7293a)
@@ -343,12 +343,11 @@
*/
/* ? CHECK THIS: how do we determine whether preview is requested? Mode is not enough on its own.*/
- /*handle PREVIEW mode*/
+ /*handling PREVIEW mode*/
String mode=(String) request.getSession().getAttribute(LEARNING_MODE);
logger.debug("mode: " + mode);
if ((mode != null) && (mode.equals("author")))
{
- /*complete this section */
logger.debug("Author requests for a preview of the content.");
logger.debug("existing qaContent:" + qaContent);
@@ -364,10 +363,18 @@
logger.debug("userId: " + userId);
if ((userId != null) && (mode.equals("teacher")))
{
- /*complete this section */
- logger.debug("request is for learner progress");
- return (mapping.findForward(LEARNING_STARTER));
- }
+ logger.debug("start generating learner progress report.");
+ Long currentToolSessionId=(Long)request.getSession().getAttribute(TOOL_SESSION_ID);
+ logger.debug("currentToolSessionId: " + currentToolSessionId);
+
+ /* the report should have only this user's entries(with userId)*/
+ QaMonitoringAction qaMonitoringAction= new QaMonitoringAction();
+ qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, true, true, currentToolSessionId.toString(), userId);
+
+ request.getSession().setAttribute(REQUEST_LEARNING_REPORT, new Boolean(true).toString());
+ request.getSession().setAttribute(REQUEST_LEARNING_REPORT_PROGRESS, new Boolean(true).toString());
+ logger.debug("fwd'ing to for learner progress" + LEARNER_REPORT);
+ return (mapping.findForward(LEARNER_REPORT)); }
/* by now, we know that the mode is learner*/
/* find out if the content is set to run offline or online. If it is set to run offline , the learners are informed about that. */
@@ -407,7 +414,7 @@
/*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());
+ qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, currentToolSessionId.toString(), null);
request.getSession().setAttribute(REQUEST_LEARNING_REPORT, new Boolean(true).toString());
logger.debug("fwd'ing to." + LEARNER_REPORT);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
===================================================================
diff -u -rade8f831292a12702670cf78c88345efc3572956 -r17032ee407bc324b8b3a6121cb291b66cab7293a
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision ade8f831292a12702670cf78c88345efc3572956)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision 17032ee407bc324b8b3a6121cb291b66cab7293a)
@@ -388,7 +388,7 @@
QaContent qaContent=qaService.loadQa(toolContentId.longValue());
logger.debug("existing qaContent:" + qaContent);
- List listMonitoredAnswersContainerDTO=MonitoringUtil.buildGroupsQuestionData(request, qaContent, true, false, null);
+ List listMonitoredAnswersContainerDTO=MonitoringUtil.buildGroupsQuestionData(request, qaContent, true, false, null, null);
request.getSession().setAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO, listMonitoredAnswersContainerDTO);
logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO));
}
@@ -482,7 +482,7 @@
}
public void refreshSummaryData(HttpServletRequest request, QaContent qaContent, IQaService qaService,
- boolean isUserNamesVisible, boolean isLearnerRequest, String currentSessionId)
+ boolean isUserNamesVisible, boolean isLearnerRequest, String currentSessionId, String userId)
{
if (qaService == null)
{
@@ -527,7 +527,7 @@
logger.debug("using allUsersData to retrieve data: " + isUserNamesVisible);
List listMonitoredAnswersContainerDTO=MonitoringUtil.buildGroupsQuestionData(request, qaContent,
- isUserNamesVisible, isLearnerRequest, currentSessionId);
+ isUserNamesVisible, isLearnerRequest, currentSessionId, userId);
request.getSession().setAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO, listMonitoredAnswersContainerDTO);
logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO));
/* ends here. */
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java
===================================================================
diff -u -r17227fcaca4173406ed5a9251ea10d2353e919f7 -r17032ee407bc324b8b3a6121cb291b66cab7293a
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java (.../QaMonitoringStarterAction.java) (revision 17227fcaca4173406ed5a9251ea10d2353e919f7)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java (.../QaMonitoringStarterAction.java) (revision 17032ee407bc324b8b3a6121cb291b66cab7293a)
@@ -106,7 +106,7 @@
QaMonitoringAction qaMonitoringAction= new QaMonitoringAction();
logger.debug("refreshing summary data...");
- qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, true, false, null);
+ qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, true, false, null, null);
logger.debug("refreshing stats data...");
qaMonitoringAction.refreshStatsData(request);
Index: lams_tool_laqa/web/learning/answersContent.jsp
===================================================================
diff -u -r6aae05a339038bca1bc67564026097be3cf9cfd5 -r17032ee407bc324b8b3a6121cb291b66cab7293a
--- lams_tool_laqa/web/learning/answersContent.jsp (.../answersContent.jsp) (revision 6aae05a339038bca1bc67564026097be3cf9cfd5)
+++ lams_tool_laqa/web/learning/answersContent.jsp (.../answersContent.jsp) (revision 17032ee407bc324b8b3a6121cb291b66cab7293a)
@@ -36,9 +36,10 @@
+
|
-
+
|
Index: lams_tool_laqa/web/monitoring/LearnerRep.jsp
===================================================================
diff -u -r404cdcb0a5907ebb660bbc4f5da45b4a8de4ecd4 -r17032ee407bc324b8b3a6121cb291b66cab7293a
--- lams_tool_laqa/web/monitoring/LearnerRep.jsp (.../LearnerRep.jsp) (revision 404cdcb0a5907ebb660bbc4f5da45b4a8de4ecd4)
+++ lams_tool_laqa/web/monitoring/LearnerRep.jsp (.../LearnerRep.jsp) (revision 17032ee407bc324b8b3a6121cb291b66cab7293a)
@@ -72,6 +72,7 @@
+
@@ -106,7 +107,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+