Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/MindmapUserDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/MindmapUserDTO.java,v diff -u -r1.1 -r1.2 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/MindmapUserDTO.java 3 Apr 2009 00:00:31 -0000 1.1 +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dto/MindmapUserDTO.java 18 May 2009 08:07:18 -0000 1.2 @@ -104,4 +104,12 @@ public void setFinishedActivity(boolean finishedActivity) { this.finishedActivity = finishedActivity; } + + public void setEntryDTO(NotebookEntryDTO entryDTO) { + this.entryDTO = entryDTO; + } + + public NotebookEntryDTO getEntryDTO() { + return entryDTO; + } } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/servlets/ExportServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/servlets/ExportServlet.java,v diff -u -r1.3 -r1.4 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/servlets/ExportServlet.java 13 May 2009 08:35:43 -0000 1.3 +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/servlets/ExportServlet.java 18 May 2009 08:07:30 -0000 1.4 @@ -38,10 +38,12 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; +import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.mindmap.dto.MindmapDTO; import org.lamsfoundation.lams.tool.mindmap.dto.MindmapSessionDTO; import org.lamsfoundation.lams.tool.mindmap.dto.MindmapUserDTO; +import org.lamsfoundation.lams.tool.mindmap.dto.NotebookEntryDTO; import org.lamsfoundation.lams.tool.mindmap.model.Mindmap; import org.lamsfoundation.lams.tool.mindmap.model.MindmapNode; import org.lamsfoundation.lams.tool.mindmap.model.MindmapSession; @@ -95,26 +97,35 @@ if (StringUtils.equals(mode, ToolAccessMode.LEARNER.toString())) { request.getSession().setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.LEARNER); doLearnerExport(request, response, directoryName, cookies); - writeResponseToFile(basePath + "/pages/export/exportPortfolio.jsp", directoryName, FILENAME, cookies); + writeResponseToFile(basePath + "/pages/export/exportPortfolioSinglemode.jsp", directoryName, FILENAME, cookies); return FILENAME; } else if (StringUtils.equals(mode, ToolAccessMode.TEACHER.toString())) { request.getSession().setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER); Mindmap mindmap = mindmapService.getMindmapByContentId(toolContentID); + MindmapDTO mindmapDTO = new MindmapDTO(mindmap); + mindmapDTO.setTitle(mindmap.getTitle()); + mindmapDTO.setInstructions(mindmap.getInstructions()); if (mindmap.isMultiUserMode()) { - doTeacherMultiModeExport(request, response, directoryName, cookies); - writeResponseToFile(basePath + "/pages/export/exportPortfolioMultimode.jsp", directoryName, FILENAME, cookies); + Set sessionDTOs = mindmapDTO.getSessionDTOs(); + for (Iterator iterator = sessionDTOs.iterator(); iterator.hasNext();) { + MindmapSessionDTO mindmapSessionDTO = (MindmapSessionDTO) iterator.next(); + + String filename = mindmapSessionDTO.getSessionName() + "_" + mindmapSessionDTO.getSessionID() + ".html"; + + doTeacherMultiModeExport(request, response, directoryName, cookies, mindmap, mindmapSessionDTO); + writeResponseToFile(basePath + "/pages/export/exportPortfolioMultimode.jsp", directoryName, filename, cookies); + } + request.getSession().setAttribute("mindmapDTO", mindmapDTO); + + writeResponseToFile(basePath + "/pages/export/exportPortfolioMultimodeLinks.jsp", directoryName, FILENAME, cookies); return FILENAME; } else { - MindmapDTO mindmapDTO = new MindmapDTO(mindmap); - mindmapDTO.setTitle(mindmap.getTitle()); - mindmapDTO.setInstructions(mindmap.getInstructions()); - Set sessionDTOs = mindmapDTO.getSessionDTOs(); for (Iterator iterator = sessionDTOs.iterator(); iterator.hasNext();) { MindmapSessionDTO mindmapSessionDTO = (MindmapSessionDTO) iterator.next(); @@ -127,13 +138,13 @@ "_" + mindmapUser.getUid() + ".html"; doTeacherSingleModeExport(request, response, directoryName, cookies, mindmap, mindmapUser); - writeResponseToFile(basePath + "/pages/export/exportPortfolioMultimode.jsp", directoryName, filename, cookies); + writeResponseToFile(basePath + "/pages/export/exportPortfolioSinglemode.jsp", directoryName, filename, cookies); } } request.getSession().setAttribute("mindmapDTO", mindmapDTO); - writeResponseToFile(basePath + "/pages/export/exportPortfolioMultimodeLinks.jsp", directoryName, FILENAME, cookies); + writeResponseToFile(basePath + "/pages/export/exportPortfolioSinglemodeLinks.jsp", directoryName, FILENAME, cookies); return FILENAME; } @@ -199,7 +210,6 @@ } } } - private void doLearnerExport(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) throws MindmapException { @@ -228,13 +238,21 @@ sessionDTO.setSessionID(mindmapSession.getSessionId()); MindmapUserDTO userDTO = new MindmapUserDTO(mindmapUser); - + + if (mindmap.isReflectOnActivity()) { + NotebookEntry notebookEntry = mindmapService.getEntry(mindmapUser.getEntryUID()); + NotebookEntryDTO notebookEntryDTO = new NotebookEntryDTO(notebookEntry); + userDTO.setEntryDTO(notebookEntryDTO); + } + sessionDTO.getUserDTOs().add(userDTO); mindmapDTO.getSessionDTOs().add(sessionDTO); // adding Mindmap files to archive + request.getSession().setAttribute("mindmapContentPath", "mindmap.xml"); request.getSession().setAttribute("localizationPath", "locale.xml"); + request.getSession().setAttribute("mindmapUserDTO", userDTO); String currentMindmapUser = mindmapUser.getFirstName() + " " + mindmapUser.getLastName(); request.getSession().setAttribute("currentMindmapUser", currentMindmapUser); @@ -258,6 +276,14 @@ String filename = mindmapUser.getFirstName() + "_" + mindmapUser.getLastName() + "_" + mindmapUser.getUid(); + if (mindmap.isReflectOnActivity()) { + MindmapUserDTO userDTO = new MindmapUserDTO(mindmapUser); + NotebookEntry notebookEntry = mindmapService.getEntry(mindmapUser.getEntryUID()); + NotebookEntryDTO notebookEntryDTO = new NotebookEntryDTO(notebookEntry); + userDTO.setEntryDTO(notebookEntryDTO); + request.getSession().setAttribute("mindmapUserDTO", userDTO); + } + request.getSession().setAttribute("mindmapContentPath", filename + ".xml"); request.getSession().setAttribute("localizationPath", "locale.xml"); @@ -270,38 +296,32 @@ } private void doTeacherMultiModeExport(HttpServletRequest request, HttpServletResponse response, String directoryName, - Cookie[] cookies) throws MindmapException { + Cookie[] cookies, Mindmap mindmap, MindmapSessionDTO mindmapSessionDTO) + throws MindmapException { logger.debug("doExportTeacher: toolContentID: " + toolContentID); - - // check if toolContentID available - if (toolContentID == null) { - String error = "Tool Content ID is missing. Unable to continue"; - logger.error(error); - throw new MindmapException(error); - } - Mindmap mindmap = mindmapService.getMindmapByContentId(toolContentID); - MindmapDTO mindmapDTO = new MindmapDTO(mindmap); - mindmapDTO.setTitle(mindmap.getTitle()); - mindmapDTO.setInstructions(mindmap.getInstructions()); + String filename = mindmapSessionDTO.getSessionName() + "_" + mindmapSessionDTO.getSessionID(); - request.getSession().setAttribute("localizationPath", "locale.xml"); - - // if Mindmap is in Multi-mode - if (mindmap.isMultiUserMode()) - { - Set sessionDTOs = mindmapDTO.getSessionDTOs(); - for (Iterator iterator = sessionDTOs.iterator(); iterator.hasNext();) { - MindmapSessionDTO mindmapSessionDTO = (MindmapSessionDTO) iterator.next(); - - List mindmapNodeList = mindmapService.getAuthorRootNodeByMindmapSession(mindmap.getUid(), mindmapSessionDTO.getSessionID()); - - exportMindmapNodes(mindmapNodeList, mindmap, null, directoryName + "/mindmap.xml"); + if (mindmap.isReflectOnActivity()) { + Set userDTOs = mindmapSessionDTO.getUserDTOs(); + for (Iterator userIterator = userDTOs.iterator(); userIterator.hasNext();) { + MindmapUserDTO mindmapUserDTO = (MindmapUserDTO) userIterator.next(); + MindmapUser mindmapUser = mindmapService.getUserByUID(mindmapUserDTO.getUid()); + NotebookEntry notebookEntry = mindmapService.getEntry(mindmapUser.getEntryUID()); + NotebookEntryDTO notebookEntryDTO = new NotebookEntryDTO(notebookEntry); + mindmapUserDTO.setEntryDTO(notebookEntryDTO); } + request.getSession().setAttribute("userDTOs", userDTOs); } - request.getSession().setAttribute("mindmapDTO", mindmapDTO); + request.getSession().setAttribute("mindmapContentPath", filename + ".xml"); + request.getSession().setAttribute("localizationPath", "locale.xml"); + + List mindmapNodeList = mindmapService.getAuthorRootNodeByMindmapSession(mindmap.getUid(), mindmapSessionDTO.getSessionID()); + + exportMindmapNodes(mindmapNodeList, mindmap, null, directoryName + "/" + filename + ".xml"); + } } Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_mindmap/web/pages/export/exportPortfolio.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_mindmap/web/pages/export/exportPortfolioMultimode.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/pages/export/exportPortfolioMultimode.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_mindmap/web/pages/export/exportPortfolioMultimode.jsp 13 May 2009 08:35:26 -0000 1.2 +++ lams_tool_mindmap/web/pages/export/exportPortfolioMultimode.jsp 18 May 2009 08:07:41 -0000 1.3 @@ -39,29 +39,42 @@

- - - - +
- label.multimode -
+ + + - - + + - - -
+ label.multimode +
- -
+ + -
-
- message.enableJavaScript -
-
-
+ +
+
+ message.enableJavaScript +
+
+ + + + + + + ${user.firstName} ${user.lastName} + + + ${user.entryDTO.entry} + + + + + + Index: lams_tool_mindmap/web/pages/export/exportPortfolioMultimodeLinks.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/pages/export/exportPortfolioMultimodeLinks.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_mindmap/web/pages/export/exportPortfolioMultimodeLinks.jsp 13 May 2009 08:35:26 -0000 1.2 +++ lams_tool_mindmap/web/pages/export/exportPortfolioMultimodeLinks.jsp 18 May 2009 08:07:41 -0000 1.3 @@ -28,27 +28,25 @@  

- - - - - +
- ${user.firstName} ${user.lastName} -
+ + + - - - - + + + + -
+ label.multimode +
- - - - - -
+ + + + + +
- + Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_mindmap/web/pages/export/exportPortfolioSinglemode.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_mindmap/web/pages/export/exportPortfolioSinglemodeLinks.jsp'. Fisheye: No comparison available. Pass `N' to diff?