Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
===================================================================
diff -u -r3b12480474c839c58c38c6a9616ee6102713f25f -r176148cb89d309b36c840ababb3ccdf182897ada
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 3b12480474c839c58c38c6a9616ee6102713f25f)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 176148cb89d309b36c840ababb3ccdf182897ada)
@@ -63,6 +63,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;
@@ -216,9 +218,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 -re6dc4db4137cfd6b07a4aa79711b9d12b39fb78e -r176148cb89d309b36c840ababb3ccdf182897ada
--- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp (.../usersummary.jsp) (revision e6dc4db4137cfd6b07a4aa79711b9d12b39fb78e)
+++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp (.../usersummary.jsp) (revision 176148cb89d309b36c840ababb3ccdf182897ada)
@@ -10,7 +10,16 @@
-
+
+