Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java =================================================================== diff -u -rebe7b8f43ffb5c0a69b930b307ff9eaf9baf8dc2 -r91dd1fe3e865ca0e68c7548367cecbd1d58d83b4 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision ebe7b8f43ffb5c0a69b930b307ff9eaf9baf8dc2) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 91dd1fe3e865ca0e68c7548367cecbd1d58d83b4) @@ -60,6 +60,8 @@ import org.lamsfoundation.lams.tool.assessment.util.AssessmentEscapeUtils; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.CommonConstants; +import org.lamsfoundation.lams.util.Configuration; +import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.DateUtil; import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.WebUtil; @@ -225,9 +227,17 @@ Long userId = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID); Long sessionId = WebUtil.readLongParam(request, AssessmentConstants.PARAM_SESSION_ID); Long contentId = (Long) sessionMap.get(AssessmentConstants.ATTR_TOOL_CONTENT_ID); - UserSummary userSummary = service.getUserSummary(contentId, userId, sessionId); + UserSummary userSummary = service.getUserSummary(contentId, userId, sessionId); request.setAttribute(AssessmentConstants.ATTR_USER_SUMMARY, userSummary); + + Assessment assessment = service.getAssessmentByContentId(contentId); + boolean questionEtherpadEnabled = assessment.isUseSelectLeaderToolOuput() + && assessment.isQuestionEtherpadEnabled() + && StringUtils.isNotBlank(Configuration.get(ConfigurationKeys.ETHERPAD_API_KEY)); + request.setAttribute(AssessmentConstants.ATTR_IS_QUESTION_ETHERPAD_ENABLED, questionEtherpadEnabled); + request.setAttribute(AssessmentConstants.ATTR_TOOL_SESSION_ID, sessionId); + return "pages/monitoring/parts/usersummary"; } Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp =================================================================== diff -u -r82166d9c82b6d5ef5fd3f22db5174bbee8a286f4 -r91dd1fe3e865ca0e68c7548367cecbd1d58d83b4 --- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp (.../usersummary.jsp) (revision 82166d9c82b6d5ef5fd3f22db5174bbee8a286f4) +++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp (.../usersummary.jsp) (revision 91dd1fe3e865ca0e68c7548367cecbd1d58d83b4) @@ -10,6 +10,15 @@ + @@ -213,6 +222,25 @@
+ + <%--Display Etherpad for each question --%> + +
+ + +
+
+ +
+
+
+