Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/LearningController.java
===================================================================
diff -u -r3ee06bc1b00b1673399c1871a73cfa1d8ec2c0db -r171a3ee50e4de2d6d3f3029011241bfe6b0db362
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/LearningController.java (.../LearningController.java) (revision 3ee06bc1b00b1673399c1871a73cfa1d8ec2c0db)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/LearningController.java (.../LearningController.java) (revision 171a3ee50e4de2d6d3f3029011241bfe6b0db362)
@@ -60,7 +60,7 @@
@Controller
@RequestMapping("/learning")
public class LearningController {
-
+
@Autowired
private IChatService chatService;
@Autowired
@@ -179,6 +179,7 @@
Long toolSessionId = chatUser.getChatSession().getSessionId();
request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId);
request.setAttribute(AttributeNames.ATTR_IS_LAST_ACTIVITY, chatService.isLastActivity(toolSessionId));
+ request.setAttribute("userId", chatUser.getUserId());
return "pages/learning/notebook";
}
@@ -215,8 +216,7 @@
UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
// attempt to retrieve user using userId and toolSessionId
- ChatUser chatUser = chatService.getUserByUserIdAndSessionId(user.getUserID().longValue(),
- toolSessionId);
+ ChatUser chatUser = chatService.getUserByUserIdAndSessionId(user.getUserID().longValue(), toolSessionId);
if (chatUser == null) {
ChatSession chatSession = chatService.getSessionBySessionId(toolSessionId);
Index: lams_tool_chat/web/pages/learning/notebook.jsp
===================================================================
diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -r171a3ee50e4de2d6d3f3029011241bfe6b0db362
--- lams_tool_chat/web/pages/learning/notebook.jsp (.../notebook.jsp) (revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61)
+++ lams_tool_chat/web/pages/learning/notebook.jsp (.../notebook.jsp) (revision 171a3ee50e4de2d6d3f3029011241bfe6b0db362)
@@ -16,11 +16,16 @@
+