Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java =================================================================== diff -u -r0b845931db55d90f0dcabc0b33cce5c7df688153 -re9f9ac4d0bb609a9c1bb7d966e4162456b5f4b40 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java (.../LearningController.java) (revision 0b845931db55d90f0dcabc0b33cce5c7df688153) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java (.../LearningController.java) (revision e9f9ac4d0bb609a9c1bb7d966e4162456b5f4b40) @@ -100,6 +100,7 @@ Long toolSessionId = WebUtil.readLongParam(request, DokumaranConstants.PARAM_TOOL_SESSION_ID); Dokumaran dokumaran = dokumaranService.getDokumaranBySessionId(toolSessionId); DokumaranSession session = dokumaranService.getDokumaranSessionBySessionId(toolSessionId); + sessionMap.put(DokumaranConstants.ATTR_TOOL_CONTENT_ID, dokumaran.getContentId()); // get back the dokumaran and item list and display them on page DokumaranUser user = null; @@ -125,8 +126,7 @@ // support for leader select feature List leaders = dokumaran.isUseSelectLeaderToolOuput() - ? dokumaranService.checkLeaderSelectToolForSessionLeader(user, toolSessionId, - isFirstTimeAccess) + ? dokumaranService.checkLeaderSelectToolForSessionLeader(user, toolSessionId, isFirstTimeAccess) : new ArrayList<>(); // forwards to the leaderSelection page if (dokumaran.isUseSelectLeaderToolOuput() && leaders.isEmpty() && !mode.isTeacher()) { @@ -153,7 +153,6 @@ || dokumaran.isUseSelectLeaderToolOuput() && isUserLeader; sessionMap.put(DokumaranConstants.ATTR_HAS_EDIT_RIGHT, hasEditRight); sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId); - sessionMap.put(DokumaranConstants.ATTR_TOOL_CONTENT_ID, dokumaran.getContentId()); sessionMap.put(DokumaranConstants.ATTR_REFLECTION_ON, dokumaran.isReflectOnActivity()); sessionMap.put(AttributeNames.ATTR_IS_LAST_ACTIVITY, dokumaranService.isLastActivity(toolSessionId)); sessionMap.put(DokumaranConstants.ATTR_DOKUMARAN, dokumaran); Index: lams_tool_doku/web/pages/learning/waitForTimeLimitLaunch.jsp =================================================================== diff -u -r1ad946fb218ec5d1bfe16900aa8cf2cdc1a63da7 -re9f9ac4d0bb609a9c1bb7d966e4162456b5f4b40 --- lams_tool_doku/web/pages/learning/waitForTimeLimitLaunch.jsp (.../waitForTimeLimitLaunch.jsp) (revision 1ad946fb218ec5d1bfe16900aa8cf2cdc1a63da7) +++ lams_tool_doku/web/pages/learning/waitForTimeLimitLaunch.jsp (.../waitForTimeLimitLaunch.jsp) (revision e9f9ac4d0bb609a9c1bb7d966e4162456b5f4b40) @@ -1,6 +1,9 @@ <%@ include file="/common/taglibs.jsp"%> + + + <fmt:message key="label.learning.title" /> @@ -17,7 +20,7 @@
-